Commit graph

3869 commits

Author SHA1 Message Date
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
modmuss50
47eea962a0 Start on recipe serde rewrite 2021-12-19 13:44:46 +00:00
Ayutac
47fe351ecb
Added Silver Armor. Textures by Xanthian. (#2659). Thanks to Ayutac
Silver is 2 times as durable as gold (still less than iron), -5 of gold's enchantability (still more than diamond and netherite) and cannot pacify/distract piglins. Also, it looks very fancy.
2021-12-19 16:38:05 +03:00
Ayutac
5eab27bead
Fixed activation of root advancement. (#2658) 2021-12-19 12:37:50 +00:00
drcrazy
774d42d944 Fixed some warnings 2021-12-19 04:19:46 +03:00
Jose
a0d827fa3b
TR ores fixes (#2654). Thanks to josilo
* Remove deprecated breakByTool() function. Closes #2609

* Removed leftover unused imports

* Set correct BlockSoundGroup for deepslate ores

* Fix tin tool tag
2021-12-19 03:54:47 +03:00
equal-l2
dec9b8287d
Fix chainsaws don't work for non-wood materials (#2646). Thanks to equal-l2 2021-12-12 21:10:07 +03:00
Technici4n
7d9fb6d414
Use custom tool materials (#2631)
* Use custom tool materials

* Separate jackhammer materials
2021-12-07 12:53:39 +00:00
modmuss50
d7cb40ccbd Fix disabling ore gen, also disabling rubber tree gen... 2021-12-06 20:35:06 +00:00
modmuss50
45e79fe7b3 Fix licenses 2021-12-03 19:02:55 +00:00
modmuss50
f7f8127ba0 Move some smelting and blasting recipes to data gen. 2021-12-03 17:34:42 +00:00
modmuss50
27c684d376 Add tooltip for ore generation depths.
Will only work in SP for now, will need to create a packet to send the data from the server.
2021-11-28 14:14:35 +00:00
modmuss50
5ce0881f56 Add config to disable ore and/or rubber tree generation 2021-11-28 13:39:05 +00:00
modmuss50
262473bd69 Fix breaking drain with wrench, closes #2608 2021-11-26 21:14:01 +00:00
modmuss50
3e1f1b394a Allow covering waterlogged cables. Closes #2610 2021-11-26 21:09:09 +00:00
modmuss50
4a839ae74f Fix cable covers getting used up in creative. 2021-11-26 21:08:18 +00:00
modmuss50
8b24b8439a Replace MixinItemRenderer by the new 1.17 vanilla API. Fixes #2602 2021-11-26 21:06:45 +00:00
modmuss50
3752154bcd Add a simple tool to visualise ore distribution. 2021-11-26 20:01:08 +00:00
modmuss50
98bfb7b958 Deepslate ore gen improvements. 2021-11-17 23:19:38 +00:00
modmuss50
6f8282b188 Add deepslate ores 2021-11-17 22:40:02 +00:00