Commit graph

3890 commits

Author SHA1 Message Date
modmuss50
7065f5efae Split GuiType into ClientGuiType to remove some horrid code. 2022-03-02 01:06:05 +00:00
modmuss50
f7d5139332
Port to 1.18.2 (#2824)
* Port to 1.18.2-pre1

* 1.18.2-pre3

* Fix build.

* Fixes and cleanup

* Build fix?

* Update REI
2022-02-28 09:18:27 +00:00
Tryank
4ce4d6c361
Use translation keys on RebornCore and CellItem. Thanks to Maz-T 2022-02-26 14:10:43 +03:00
Ayutac
b378f2dcb9
In-depth update of chrome->chromium, thanks to Ayutac, Xanthian
* In-depth update of chrome->chromium, thanks to Ayutac, Xanthian

This fixes Bug #2621 without accidentally destroying items (untested, but the chrome item registration isn't changed) and supersedes PR #2780 which only made language changes.

I just plainly copied the lang changes from Xanthian. As for the chrome stuff, I thought long and hard how to do it properly. Possible variants:
1. Change tag names in constructor for chrome only.
2. Change tag names in enum for chrome only.
3. Don't change the internal tag names of the enums, but change the tag registration process in datagen for chrome only.
4. Introduce CHROMIUM variant, add conversion recipes etc. and hope over time CHROME can be safely removed.

(4) always had the potential of item loss, so I discarded it first. Deciding between (1), (2) and (3) was harder. The drawback of (2) is code bloating by adding a lot of extra enum constructors, especially for cases which already had enum constructor options. But in the end I decided to go with it because it was the cleanest solution to a dirty problem. This is the first time I encountered a datagen drawback, because if we didn't register by running through the enum array, we could have simply changed it there; a possible (5) but still worse than (2).

* Whoops, forgot recipe changes with the tags

* Merged chromium with hardness/resistance

Replaced the isHot argument from constructors with default false while I was at it.
2022-02-26 14:03:23 +03:00
drcrazy
21515c8908 Check for ability to output from side. Closes #2822 2022-02-26 01:25:00 +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
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
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
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
1fcf18707b Handle the world not existing for some reason when calculating the ore depth. 2022-02-03 11:20:37 +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
7082238357 Fix rolling machine crash. 2022-01-31 18:24:51 +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
fa657d46e8 Fix recipe syncing, improve (add) error handling. 2022-01-27 20:34:26 +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
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
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
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
Ayutac
6db3df3037
Added sponge piece + recipes, texture by Spearkiller (#2751) 2022-01-17 22:41:50 +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
xanthian
2bceaa46c2
Update TechRebornConfig.java (#2736)
fix spelling errors on overclocker config

may or may not have had any impact, 
It is referenced in src/main/java/techreborn/init/TRContent.java

				handler.addSpeedMulti(TechRebornConfig.overclockerSpeed);
				handler.addPowerMulti(TechRebornConfig.overclockerPower);
2022-01-17 22:39:35 +00:00
drcrazy
c887d1652d Fix item storage blocks. Closes #2717 2022-01-10 00:39:56 +03:00
drcrazy
ac69d914f7 Fix excessive water mill frame. 2022-01-07 17:46:47 +03:00
Ayutac
5c6ac37044 Added Steel Armor. Textures by Xanthian. Thanks to Ayutac
Steel's durability is about between iron and diamond, it is almost as tough as diamond, half as tough as netherite, but has same knockback resistance as netherite (which diamond lacks completely). But because we mixed some dirty coal to our iron to make it this tough and resistant, the enchantability is down to 5, which is by far the worst enchantability of all vanilla and TR armors.

Not tested yet, but I basically did the same changes as in the silver armor commit line by line.
2022-01-07 17:25:35 +03:00
xanthian
157ace896c Added Amethyst dust. Thanks to Xanthian.
* Create amethyst_dust_alt

* Update amethyst_dust_alt

* Update and rename amethyst_dust_alt to amethyst_dust_alt.json

* implements grinding of amethyst blocks to dust
1 Block = 2 Dust
implements production of amethyst shards from dust + tnt in implosion compressor.
8 Dust + 16 TNT = 16 Shards

Conversion ratio = 1 Stack of Amethyst Block + 1 Stack of TNT = 1 Stack of Shard

* Update amethyst_dust_alt.json

noticed small mistake chrome dust > quartz dust
2022-01-07 17:25:35 +03:00
Technici4n
1329c30556
Fix #2566: Implement Fabric's Fluid-containing Item API (#2706) 2022-01-03 17:29:46 +00:00
Ayutac
e95428d0f0
Final commit to resolve #2675 I hope. Thanks to Ayutac
Bug history: Cells were able to put out fluids which are not FlowableFluids, causing a textureless block to appear. First commit checked for FlowableFluid necessary in cell item to do anything with it. However since EMPTY is not a FlowableFluid that led to Cells being unable to pick up fluids any longer. Second commit attempted to fix but didn't because I checked it wrongly (tested with buckets instead of cells). In fact it doesn't do anything (because the same check was performed earlier), so I reverted it with this commit. And finally this commit adds EMPTY as an acceptable fluid inside a cell to do something with it.
2022-01-02 12:12:58 +03:00
Ayutac
808f4e9c86
Added tooltip for unplaceable fluids in cells. Thanks to Ayutac
Only cells, not buckets, yes. Because TR only creates cells from other mods' fluids, not buckets. If the other mods' buckets are not placeable, people will complain to the appropriate mod. But if they only use cells and some "TR" cells are not placeable without any indication they will come to us. This tooltip will hopefully keep them from doing that.
2022-01-02 12:12:27 +03:00
xanthian
24a026778d
Update AutoCraftingTableBlockEntity.java (#2696)
to fix #2688
2021-12-30 20:40:23 +00:00
Ayutac
c4625762d1
Added tooltips for unobtainable ores. (#2663) 2021-12-30 19:42:51 +00:00
xanthian
1a2b6e0d9c
Fluid overhaul (#2693)
* Update ModFluids.java

update to add still textures.

* Add files via upload

add still models

* Add files via upload

all new textures including still 
all based off vanilla water templates

* Add files via upload

updated animation files for flowing and still textures
2021-12-30 19:37:20 +00:00
drcrazy
5f7570cfff Fix experience button in Iron Furnace. Closes #2692 2021-12-30 03:39:26 +03:00
Ayutac
d6dfe57963
Fixed bug introduced in previous commit (#2677)
* Fixes the bug mentioned in #2675
* Fixed bug introduced with previous commit
2021-12-23 05:19:33 +03:00
Ayutac
2c792a72ac
Fixes #2675: cells did not check that the fluid was flowable when trying to place it (#2676) 2021-12-23 01:43:05 +01:00
Lorenz Voßgätter
8dbab8f62e
Capacity increase for MFE and MFSU. Thanks to LauchInterceptor
* increase mfe energy storage to 4 million
* increase mfsu energy storage to 100 million
* adjusting mfsu storage to 40 million
* changing javadoc
2021-12-23 01:38:34 +03:00
drcrazy
c868ed13c7 Bump dependencies 2021-12-23 01:34:17 +03:00
Lorenz Voßgätter
bdf906c4fc
Fix texture for Greenhouse. Thanks to LauchInterceptor 2021-12-21 01:40:23 +03:00
drcrazy
a166affd51 Fix mining speed for unpowered rock cutter. Closes #2597 2021-12-19 23:24:26 +03:00