Commit graph

5245 commits

Author SHA1 Message Date
BoogieMonster1O1
ff56edb2c3
Fix fluid rendering in GUI. Thanks to BoogieMonster1O1 2022-02-25 22:09:53 +03:00
drcrazy
0ece1d570c IndGrinder recipes for Iridium ore 2022-02-20 12:39:25 +03:00
ErrorSys
774f7709ef
Change Primary output to Raw Iridium. Thanks to ErrorSys.
Changes primary output to 2x raw iridium as other recipes that use mercury with this machine generally have a greater output than just with water.
Makes more sense to have the raw ore as the output from this machine instead of an ingot, which you would usually get from a furnace of some type.
2022-02-20 12:35:19 +03:00
AngelBottomless
1a4895e525
Fixes Invalid recipe lag by caching validity of recipe. Thanks to aria1th.
reduces 5mspt -> 0.01mspt
2022-02-20 12:26:07 +03:00
drcrazy
df8706381b Fix coolant cells recipe 2022-02-18 23:28:22 +03:00
Ayutac
92f98a5c56
Fixes #2783 (#2791). Thanks to Ayutac
* Fixes #2783 hopefully

Needs to be tested still. Goal: changed blasting to use half as much as time as regular furnace for same item.

* Fixed bug in commit thanks to ErrorSys

forgot that order of optional arguments is important and that int can be cast to float automatically
2022-02-18 13:57:01 +03:00
Ayutac
3b6e1d1d89
Removed empty line in crafting recipe. Thanks to Ayutac 2022-02-18 13:55:28 +03:00
ErrorSys
7b6c117f7a
Fixes deepslate ores having the same hardness values as their stone variants. They shouldn't be the same. Thanks to ErrorSys 2022-02-18 13:53:48 +03:00
Ayutac
805b5418db
Removed empty line from crafting recipe. Thanks to Ayutac. 2022-02-18 13:53:17 +03:00
Ayutac
eadd16c4be
Added 2 canning machine recipes for coolant cells. Thanks to Ayutac
Hopefully this can ease the construction of those.
2022-02-18 13:52:39 +03:00
Ayutac
07f8722d83
rebalanced tank capacities. Thanks to Ayutac.
I increased the capacity of tanks to be even remotely considered an alternative to storage units with cells. I kept the values conservative since increasing is always an option, but decreasing might cause item loss.

Changes:
Basic Tank: 35 -> 128 (about 3.5 times)
Advanced Tank: 200 -> 512 (about 2.5 times)
Industrial Tank: 500 -> 1024 (about 2 times)

I oriented myself at the storage unit steps, which are quadrupled with each tier until advanced, then doubled to industrial.

While I was at it, I changed everything to powers of 2 with the shift operator (so other code readers aren't too confused about seemingly arbitrary values) and added explaining comments.
2022-02-18 13:49:39 +03:00
ErrorSys
19b44c200a
Added properties for individual metal blocks for hardness. Thanks to ErrorSys.
Added properties for individual machine casings so that they are easier to break with a pickaxe.
2022-02-18 13:47:10 +03: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
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
Ayutac
6180141cd0
Added optional removal of the current recipe unlock (#2758)
Should default to false in old and new configs, ie no new behaviour, but now I can deactivate it via config instead of using an unofficial distribution. Will probably come back to this once the toasts are finished...
2022-01-20 19:56:47 +00:00
modmuss50
e3e5414cee
Merge pull request #2760 from Ayutac/1.18-Ayutac-38
Added XP for ores, fixes #2759
2022-01-20 19:56:23 +00:00
modmuss50
17e8911978
Refactor recipe system. 2022-01-20 19:55:40 +00:00
modmuss50
7e1125f6aa Fix #2625. 2022-01-20 19:54:20 +00:00
modmuss50
c0b6b231c4 Fix datagen 2022-01-20 19:44:11 +00:00
modmuss50
3eb91f255c Finish 2022-01-20 19:40:55 +00:00
modmuss50
8863ea30b3 Merge branch '1.18' into recipe_serde
# Conflicts:
#	RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java
#	src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy
2022-01-20 18:51:48 +00:00
modmuss50
646132e908 Cleanup build script and hopefully fix datagen. 2022-01-20 18:39:34 +00:00
Ayutac
f4c0cf9e8e Fixed bug introduced in previous commit.
Deepslate was a problem because they don't save their distribution. Added a workaround.
2022-01-20 16:30:18 +01:00
Ayutac
b7a42f0a01 Added XP for ores, fixes #2759
The ore XP drop is not done by JSON but by hard-coding as a second parameter to OreBlock.
2022-01-20 02:34:33 +01:00
modmuss50
55eb70742f Migrate to SLF4j 2022-01-19 20:41:36 +00:00
xanthian
98eed4da8e
Cell dupe fix (#2737)
* Update nitro_diesel.json

reduced from 5 to 2 to remove the cell duplication.
running this recipe gave 3 free cells

* Update nitrocoal_fuel.json

reduced from 5 to 2 to remove the cell duplication.
running this recipe gave 3 free cells

* Update sulfuric_acid.json

reduced from 3 to 2 to remove the cell duplication.
running this recipe gave 1 free cell

* Update nitrogen_dioxide.json

increased from 1 to 2 return correct cell input
running this recipe lost 1 cell

* Update water.json

increased from 1 to 2 return correct cell input
running this recipe lost 1 cell
2022-01-17 22:47:07 +00:00
Ayutac
6db3df3037
Added sponge piece + recipes, texture by Spearkiller (#2751) 2022-01-17 22:41:50 +00:00
Ayutac
2278b76d8d
Added prismarine related recipes (#2749)
* Added prismarine related recipes

* Fixed glowstone recipe for chemical reactor

* On second thought, removed the chemical reactor recipes.

* Revert "On second thought, removed the chemical reactor recipes."

This reverts commit 708dfb308c55577584cb85e8cf253f0cd8c21174.
2022-01-17 22:40:58 +00:00
Ayutac
9ae1f53c7d
Added misc recipes (#2748)
* Added misc recipes

3 new recipes for plantball. 1 via 3x3 grass variants (new tag), 1 via cross/ball per kelp and sugar so it doesn't take up the space of a storage block in other mods maybe.
5 small calcite dust -> calcite (requiring one more small dust than yielded by grinding calcite)
Centrifuge recipes for eggs and turtle eggs, yielding methane and a bit of calcite dust
Centrifuge recipe for tuff into ashes and dark ashes.

* Added misc recipes

3 new recipes for plantball. 1 via 3x3 grass variants (new tag), 1 via cross/ball per kelp and sugar so it doesn't take up the space of a storage block in other mods maybe.
5 small calcite dust -> calcite (requiring one more small dust than yielded by grinding calcite)
Centrifuge recipes for eggs and turtle eggs, yielding methane and a bit of calcite dust
Centrifuge recipe for tuff into ashes and dark ashes.
2022-01-17 22:40:19 +00:00
Technici4n
86850033e3
Fix #2579: expose inner storage unit stack to transfer API (#2738)
* Fix #2579: expose inner storage unit stack to transfer API

* Maintain == ItemStack.EMPTY
2022-01-17 22:39:57 +00:00