Commit graph

5611 commits

Author SHA1 Message Date
Ayutac
145ba48e27 Put the default toast additions into a proper place. 2022-02-10 08:10:56 +01:00
xanthian
b4adfd652c Update tungsten_ingot.json
correct tag to prevent being unlocked erroneously
2022-02-09 21:12:00 +01:00
Ayutac
4bbace58bc Added byg compatibility recipe advancements 2022-02-09 20:49:26 +01:00
Ayutac
290dde38de Some bug fixes to the new toasts 2022-02-09 20:47:40 +01:00
Ayutac
5a03882e9b Added Industrial Blast Furnace recipe advancements
Excluding getting Silicon Plate recipe by silicon fluid.
2022-02-09 20:47:12 +01:00
Ayutac
1a8253c6ed Added Assembly Machine Smelter recipe advancements
Excluding getting Lithium Ion Battery recipe by lithium fluid. Assembly Machine doesn't has correct symbol displayed in toast because of inconsistency in assembly/assembling.
2022-02-09 20:45:08 +01:00
Ayutac
b9ec2e36af Added Alloy Smelter recipe advancements 2022-02-09 20:45:04 +01:00
Ayutac
52c9802f4d Added Vacuum Freezer Recipe toasts w/o Helium Plasma 2022-02-09 20:44:40 +01:00
Ayutac
145427db0b Added Implosion Compressor Recipe toasts w/o alt
alt being End Crystal instead of TNT, which doesn't really change the toast
2022-02-09 20:44:35 +01:00
Ayutac
1b83168ca2 Added Extractor Recipe toasts w/o empty cell 2022-02-09 20:44:28 +01:00
Ayutac
560d0b102f Added Chemical Reactor Recipe toasts w/o fluids 2022-02-09 20:44:20 +01:00
Ayutac
2928d8a713 Added toasts for crafting recipes not in subfolders 2022-02-09 20:43:52 +01:00
Ayutac
954afe21a5 Improved the industrial_electrolyzer toasts 2022-02-09 20:43:36 +01:00
Ayutac
c874fde92d Added toasts for industrial_electrolyzer thanks to Xanthian 2022-02-09 20:43:29 +01:00
Ayutac
572f0b0e65 Added toasts for crafting_table/tool 2022-02-09 20:42:21 +01:00
Ayutac
1c1ed7c3eb Added toasts for crafting_table/upgrade 2022-02-09 20:35:26 +01:00
Ayutac
9a2dfd746e Added toasts for crafting_table/solar_panel 2022-02-09 20:35:17 +01:00
Ayutac
580a8b54f1 Added toasts for crafting_table/cable 2022-02-09 20:35:10 +01:00
Ayutac
f4d75ef59b Added toasts for crafting_table/machine_block 2022-02-09 20:34:57 +01:00
Ayutac
3f26e24184 Changed drain toast according to new recipe. 2022-02-09 20:33:52 +01:00
Ayutac
672e3134e8 Added toasts for crafting_table/machine 2022-02-09 20:32:33 +01:00
Ayutac
19f657a0d6 Merge branch '1.18' into 1.18-Ayutac-datagen-6 2022-02-09 20:30:43 +01:00
Ayutac
6fa922c022 Added toast generation for datagen'd recipes 2022-02-09 20:29:50 +01:00
Ayutac
a097f9eae1 Fixed Blast Furnace data gen. 2022-02-09 13:44:06 +01:00
Foo
43c0fa9e89
Fix spelling, grammar, javadocs, and similar issues (#2784)
* fix naming in ModelSantaHat.java

* Fix grammar, spelling, and javadocs in RebornCore

* Fix spelling error in datagen

* fix missed variable name

* fix grammar, spelling, and javadoc errors

* fix grammar and spelling errors in project files

* specify indent_size in .editorconfig
2022-02-06 13:14:56 +00:00
bvoo
bd971c12bd
Add death.attack.shock.player message (#2785) 2022-02-06 13:14:47 +00:00
Ayutac
8ed5082d81
Fixed datagen related bug (#2790)
Raw metals thought the ingot storage block variant was their variant. THIS AFFECTS STORAGE RECIPES! Effectively means 9 raw variants can be combined to one ingot storage block, so maybe quickly new beta?
2022-02-06 13:14:32 +00:00
modmuss50
378df75c80 Beta 9 2022-02-03 11:35:57 +00:00
modmuss50
30dcd5dfa8 Depend on the reborn core version it was built against. 2022-02-03 11:35:39 +00:00
modmuss50
1fcf18707b Handle the world not existing for some reason when calculating the ore depth. 2022-02-03 11:20:37 +00:00
modmuss50
31743d7684 Update Energy API and deps. 2022-02-02 21:21:06 +00:00
Ayutac
100579c288
Added two storage blocks, textures by Xanthian. Thanks to Ayutac.
* Half of 2 new blocks, other half is a lot of data/model files

* Rest of the data/asset changes for new storage blocks.

* Bugfixes

* made hot tungstensteel storage block opaque
2022-02-01 13:53:11 +03:00
modmuss50
831dcf0ccb Beta 8 2022-01-31 18:25:24 +00:00
modmuss50
7082238357 Fix rolling machine crash. 2022-01-31 18:24:51 +00:00
Ayutac
45c1016105
Removed unused GUI textures. (#2778) 2022-01-31 17:15:48 +00:00
Ayutac
af5f1b37c3 Tried adding BlastFurnace recipes, doesn't work yet 2022-01-31 17:43:49 +01:00
Ayutac
4952cee268 Used TagConvertible for all smelting recipes. 2022-01-31 16:22:49 +01:00
Ayutac
5b4dec0cc3 Compressor datagen w/o toasts. 66 recipes changed from manual to datagen
Unified power/time for a couple of similar processings.
2022-01-29 17:26:55 +01:00
Ayutac
79715b89a1 Grinder datagen w/o toasts. -25 manual, +41 datagen recipes
Unified power/time for a couple of similar processings.
All storage blocks of items that could be grinded should be able to be grinded now, with some time save compared to the items themselves.
2022-01-29 10:27:51 +01:00
modmuss50
5b596aa5f8 Sync ore depths to all clients via a packet on server login. 2022-01-28 20:14:35 +00:00
modmuss50
32368f8388 First look at data generated machine recipes.
Doesn't support all the features but should be a good start.
2022-01-28 19:18:43 +00:00
modmuss50
9e6b4385f6
Beta 7 2022-01-28 14:04:27 +00:00
modmuss50
fa657d46e8 Fix recipe syncing, improve (add) error handling. 2022-01-27 20:34:26 +00:00
modmuss50
bd6bcf55ab
Beta 6 2022-01-27 15:49:16 +00:00
Ayutac
9fcf9447e4
Added Rubber Sapling to wandering trader (#2772) 2022-01-23 18:35:26 +00:00
Ayutac
f65e4466fe
added missing loot chests (#2771) 2022-01-23 18:35:11 +00:00
Ayutac
f6eca1440b
Small Piglin tag update (#2770)
* Small Piglin tag update

added gold plate and electrum to piglin stuff. Piglins should be able to smell the gold out of an electrum ingot and a block, but not a nugget. Baby piglins are worse at this.

Explicitly used TR IDs instead of c tags because this is part of TR flavor imo

* forgot electrum plate

* and gold cables
2022-01-23 18:34:47 +00:00
Ayutac
0a5be13901
1.18 ayutac datagen4 (#2769)
* Added dust crafting data gen.

Generation works, but how do I get TR to recognize the existence of the new stuff?

* Added generic armor and tools to the datagen. Also resolved conflicts from the merge with recently changed datagen

* Fixed copy-paste error

by accident for second ingredient first would be taken again

* automatized tag generation

* fixed lingering bugs from previous commit

* much much more gen, for about 269 files

* wrongly deleted recipes in last commit

* Added rest of the decorative storage block variants to datagen
2022-01-23 18:34:35 +00:00
Ayutac
9f5a616b15
fixed typo in variable declaration via refactor. Thanks to Ayutac. 2022-01-23 13:05:12 +03:00
Ayutac
18c8c40f27
Fixed AutoCrafting Table bug (#2762)
If the table was locked, canMake only checked for each ingredient to be there more than once, but make greedily took all items from the first encountered slot of the needed ingredient if the recipe didn't use the full crafting table and the ingredients weren't aligned to the upper left corner of the crafting table (discovered and reproducible with three wheat in the first column second row and single wheats in the other two columns of the second row).

This commit simply disallows greedy behaviour, each crafting grid slot can only be used once.

I also made one or two changes to the rest of the code (formatting,use of constants etc) while I was at it, but these didn't change functionality.
2022-01-20 20:20:32 +00:00