Commit graph

4560 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
modmuss50
b59c535c3d Use fabric resource conditions api. Remove reborncore's. 2022-01-17 22:34:47 +00:00
xanthian
6b01bf64e2
Update silver and steel armor icons. Thanks to xanthian.
color corrected icons to match ingot hex codes identically.
2022-01-16 23:07:34 +03:00
Ayutac
1d6e11ed4f
Recipe removal, fixes #2750. Thanks to Ayutac.
Delete centrifuge recipe for poisonous potato
2022-01-15 00:42:07 +03:00
Ayutac
b2dac12c0f
Centrifuge recipe: podzol fix. Thanks to Ayutac
wrong mod tag (and count unnecessary)
2022-01-14 19:55:52 +03:00
Ayutac
9277acfadb
Added quantum suit to freeze immunables. Thank to Ayutac 2022-01-14 19:30:48 +03:00
Ayutac
f7ad6c3094
Misc recipe additions/changes. Thanks to Ayutac.
* Misc recipe additions/changes

Added smooth basalt to basalts that can be centrifuged.
Added centrifuge recipes for rooted dirt and coarse dirt.
Added centrifuge recipe for moss block, which gives (uncompressed) plant ball.
Changed centrifuge recipe for grass block to give uncompr. plant ball instead of wheat seeds, eliminating the implication that every grass block holds wheat seeds.
Added grinder recipe to get small glowstone dust out of shroomlights (I forgot that in the fungus update)
Changed grinder recipe for gravel, now accepts all stone tool materials instead of only cobblestone.
Added a use for the andesite/diorite/granite dusts. Craft all 3 together with flint to get 4 gravel.
Added crafting 9 leaves/saplings of any kind into a plantball.
Added extractor recipe for green dye by using uncompr. plantball. Should never allow compressed plantball as that is out of juice, so to say.
Added extractor recipe for orange dye by using carrots.
Added extractor recipe for red dye by using beetroot.
Added extractor recipe for hanging roots by using rooted dirt.
Changed extractor recipe for stick to yield two sticks instead of one.
Changed electrolyzer recipe to accept anything tagged as sand instead of only the item sand, now also allowing red sand to be electrolyzed into silicon.

* Changed coarse dirt and sapling plantball thanks to feedback.

* Added centrifuge recipe for podzol

The idea here is that while there is a lot of plant stuff on the podzol stuff, it is not as fresh, hence only 1 plantball. On the other hand IRL podzol is rich of minerals and stuff, so two clay balls instead of one?
2022-01-10 01:14:57 +03:00
drcrazy
c887d1652d Fix item storage blocks. Closes #2717 2022-01-10 00:39:56 +03:00
Ayutac
347117b95a
Added calcite related recipes. Thanks to Ayutac.
* Added calcite related recipes.

Successfully tested.

* Rebalanced the centrifuge color output for coral blocks

The initial value came from thinking "this should be more than an extractor yield" which would be 60, but that way of thinking is wrong because we get methane from the block after all

* Of course, I forgot that calcite grinds to calcite dust...
2022-01-09 01:45:45 +03:00
Ayutac
a856fb0a8a
Added berry related recipes (#2731)
Successfully tested.
2022-01-08 14:02:46 +00:00
Ayutac
232012cce9
Added wither skeleton skull recipe (#2730)
Untested. Since skeleton skulls are not too easy to come by either and wither roses are usually locked behind the first wither summon, this seems balanced.
2022-01-08 14:02:03 +00:00
Ayutac
59b76b0a95
Added TR ingots to beacon payments. (#2728)
Didn't add the gems because they are way more common than emeralds or diamonds.
2022-01-08 14:01:44 +00:00
drcrazy
ac69d914f7 Fix excessive water mill frame. 2022-01-07 17:46:47 +03:00
Ayutac
5cceaeab47
Added recipes related to nether fungus. Thanks to Ayutac.
Balancing notes: 1 ender pearl dust can infuse 2 planks, leading to all the warped infusion recipes. Shroomlights should at least take as much glowstone dust as normal glowstone, hence 4. On the other hand, 2 Shroomlights giving 1 glowstone dust when centrifuged is a bit stingy, but we also have to take into account the methane, which we need only 8 blocks for, because shroomlights are less common than the wart blocks. Wart blocks were copied from mushroom blocks. Nylium was inspired by mycelium, but a bit changed with netherrack dust in mind.

Ah, and mushroom stems cannot be used to create shroomlights, because that would mean crimson/warped stems could be used too. I wanted to avoid that, since nether stems are more like wood than like mushroom blocks.
2022-01-07 17:45:11 +03:00
Ayutac
a0b749fdb9
Added 2 blaze powder related recipes (#2716)
1 Blaze Rod gets grinded into 4 powders already, so compressing 5 powders into 1 rod shouldn't be a problem. The Ind Centrifuge magma block recipe is more interesting. Double normal water amount because half of that is used to cool the remains of the magma block down afterwards, the other half for usual centrifuge recipe. Magma is relatively soft, so one magma block only needs half as much time as an ore, but we have 5 to grind, so 2.5 that time amount, leading to a time of 250. Only one Magma Cream gets produced. 2 are needed to centrifuge to blaze powder, so 10 Magma blocks. Hence 120 Magma blocks or about 2 stacks to get enough blaze powder to create 12 Ender Eyes, or just half of that (1 stack) if chemical reactor is used. Sounds balanced to me.
2022-01-07 17:36:14 +03:00
Ayutac
6f554fbecc
Deleted empty columns in Wind Mill recipe. Thanks to Ayutac.
Unneccessary empty columns in Wind Mill recipe
2022-01-07 17:35:22 +03:00
Ayutac
e1b23bd0c2
Deleted empty columns in MV trans recipe. Thanks to Ayutac.
Unneccessary empty columns in MV transformer recipe
2022-01-07 17:34:48 +03:00
Ayutac
a40a0a24c8 Deleted empty columns in HV trans recipe. Thanks to Ayutac.
Unneccessary empty columns in HV transformer recipe
2022-01-07 17:25:35 +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
Ayutac
18b7d935df
Added basic_machine_frame from RefIron Storage Block. Thanks to Ayutac.
Just a nice thing to have imo.
2022-01-07 16:59:16 +03:00
Ayutac
69151af0a4
Added drills and omnitool to full-amethyst-harvesters. Thanks to Ayutac.
Minecraft tags indicate that iron pickaxe and above always yield 4 amethyst shards when used on a maxed out cluster. Therefore added drills and omnitool, which is part drill. Since jackhammer doesn't mine ores usually it felt right to leave it out of this too.
2022-01-07 16:25:08 +03:00
Ayutac
387d24996f
Simplified crude storage unit recipe. Thanks to Ayutac
* Simplified crude storage unit recipe

The normal one was contained within the blockus one, given that the tag existed. This commit sees to that.

* Corrected the tag folder
2022-01-07 16:24:17 +03:00
Ayutac
77b9a5e7b4
Fixed behaviour of raw storage walls/slabs/stairs. Thanks to Ayutac
Tags were missing and at least the walls didn't connect. Didn't test if the slabs/stairs were also malfunctioning before, but now they all behave properly.
2022-01-07 16:23:37 +03:00
Ayutac
dfb3c66d51
Rebalanced drain recipe. Thanks to Ayutac
Drain was more expensive in iron than anvil, made no sense. New recipe better.
2022-01-06 02:11:19 +03:00
Technici4n
1329c30556
Fix #2566: Implement Fabric's Fluid-containing Item API (#2706) 2022-01-03 17:29:46 +00:00
Adirelle
d85501a057
Add tag-based recipes for plantballs and compressed plantballs. Thanks to Adirelle
* Add tag-based recipes for plantballs and compressed plantballs

* Remove the plantball recipe to avoid conflict with storage block recipes.
2022-01-02 23:48:43 +03:00
Ayutac
330521fdfe
Added smelting iron plates into refined iron plates. Thanks to Ayutac
Normal cooking times by using the datagen I hope, and there is no reason to not have this.
2022-01-02 12:13:42 +03: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
5cd8e58c1a
Update AE2 compat recipes for AE2 modid change (#2703) 2022-01-01 21:08:13 +01: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
Ayutac
a813368c5e
Vacuum Freezer: Added Blue Ice (#2673)
Because why not? 2 Ice are needed to vacuum freeze into 1 Packed Ice, and since Blue Ice is more sought out, I thought 4 Packed Ice into 1 Blue Ice for same energy is fair. This means instead of 81 Ice blocks to make 1 Blue Ice with TR only 8 are needed, about -90% for a task that usually takes extreme amounts of grinding/afk. Without the new recipe it would be 18 Ice Blocks, so about -80%.

Other balancing could be done with power or time, but I am not well versed enough in these to balance them right.
2021-12-30 19:40:56 +00:00
Ayutac
ab17489074
Fixes #2681, thanks to Xanthian and Ayutac (#2682)
Added crafting recipes for the raw storage blocks and (vanilla) blast furnace recipes for smelting them.
2021-12-30 19:40:29 +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
drcrazy
0b5d3d183e Fix deepslate galena ore texture. Closes #2660 2021-12-22 03:16:14 +03:00
Ayutac
68d407544a
Extractor: Fixed Sunflower and added Wither Rose. Thanks to Ayutac
Sunflower gives 2 dyes normally in-game and the extractor usually doubles the amount, so sunflower giving 2 dyes in Extractor was a bug. Also added dye from Wither Rose (gives 1 dye normally, so here 2).
2021-12-22 00:27:28 +03:00
Lorenz Voßgätter
bdf906c4fc
Fix texture for Greenhouse. Thanks to LauchInterceptor 2021-12-21 01:40:23 +03:00
Lorenz Voßgätter
4e17a341c3
Rubber leaves are mineable with a hoe now (#2668) Thanks to LauchInterceptor 2021-12-21 01:30:56 +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
Ayutac
8d2c181b17
Simplified centrifuging meat with tags (#2651). Thanks to Ayutac
* Simplified centrifuging meat with tags

* Fixed Recipe File Name Typo
2021-12-17 21:53:26 +03:00
Jose
06321451b8
Add missing tags to deepslate ores (#2650). Thanks to josilo 2021-12-17 21:37:05 +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
xanthian
52e43da3a8
Fix lamps missing textures (#2634)
* Update lamp_incandescent.json

* Update lamp_incandescent_on.json

* Update lamp_led.json

* Update lamp_led_on.json
2021-12-07 12:54:27 +00: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
xanthian
fb29f4b329
Particle Fix (#2628)
Adds corrected texture for breaking particles for lamps
2021-12-05 00:40:49 +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
58423c560d Remove old scripts that were used to generate a lot of the existing data.
If needed again they should be rewritten using the datagen mod.
2021-12-03 16:00:41 +00:00
modmuss50
89b47b33fd Add base datagen sourceset 2021-12-03 15:58:43 +00:00
xanthian
f86c7c8202
Animated Generators (#2624)
* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

added orientable variants

* Update advanced_tank_unit.json

* Update basic_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update industrial_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update watermill_top_on.png.mcmeta

add additional frames from the sprite, mill animation completes a continuous 360 degree motion rather than back and forth 180 degrees

* Update watermill_side_on.png.mcmeta

adds basic 4 frame animation for side, previous 31 frame sprite was stationary

* Add files via upload

animated 4 frame side

* Delete watermill_side_on.png

* Add files via upload

new 4 frame sprite

* Animated generator textures

added generator side animated texture, which also adds to the gas turbine.
Changed the side texture to be static do easily identify the front

updated semi fluid generator top and side textures to be animated, stuck with existing colour palette although it made no sense :P
2021-11-30 12:16:28 +00:00
xanthian
3d3877b5f1
added dragon siphon animated textures (#2623). Thanks to Xanthian 2021-11-28 18:11:17 +03:00
modmuss50
898298b4d1 Remove unused/broken block loot tables. 2021-11-28 14:22:52 +00:00
xanthian
ededc3b9d0
Orientable Tank blocks (#2618)
* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

added orientable variants

* Update advanced_tank_unit.json

* Update basic_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update industrial_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update watermill_top_on.png.mcmeta

add additional frames from the sprite, mill animation completes a continuous 360 degree motion rather than back and forth 180 degrees

* Update watermill_side_on.png.mcmeta

adds basic 4 frame animation for side, previous 31 frame sprite was stationary

* Add files via upload

animated 4 frame side

* Delete watermill_side_on.png

* Add files via upload

new 4 frame sprite
2021-11-28 14:20:52 +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
6c12d752fe Fix deepslate ores not dropping anything. 2021-11-26 20:16:10 +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
modmuss50
dd79effe80 Finish rubber trees. 2021-11-17 21:28:26 +00:00
modmuss50
e1093d782a First pass at world gen, rubber tree needs further work, ideally depends on fab api changes. 2021-11-16 23:54:31 +00:00
modmuss50
4a2e81550f Port to 1.18-pre2 without worldgen 2021-11-16 22:38:31 +00:00
KySoto
2fc6856826
Added deepslate variants of vanilla ores (#2600)
* Added deepslate variants of vanilla ores
* Update src/main/resources/data/c/tags/items/lapis_ores.json
Oof thanks for that catch
Co-authored-by: modmuss50 <modmuss50@gmail.com>
* Update coal_ores.json
forgot to add deepslate coal to the tag update
Co-authored-by: KySoto <kysoto2@gmail.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-11-11 10:30:15 +03:00
drcrazy
9dad64722c Fix potted rubber sapling name and drop. Closes #2596 2021-11-10 16:55:10 +03:00
modmuss50
a221d757aa Dont use fabric impl classes. 2021-11-06 12:32:17 +00:00
nalepamarcin
94ef6d1562
Fix missing hitbox of single block cable (#2593)
It prevented user from destroying last cable piece as it could not
be hit without being connected to other cable or a machine.

Bug was introduced in commit f39c619c "Fix cable shape computation".
2021-11-03 23:12:04 +01:00
Technici4n
7b4306a883
Fix #2569: make IDSU work properly with the new energy API (#2588) 2021-11-02 15:59:23 +01:00
Technici4n
b300456e77
Fix #2574: Use the fabric item API for auto input and auto output (#2585)
* Fix #2574: Use the fabric item API for auto input and auto output

* Only auto-insert at most 4 items at once
2021-10-31 18:14:26 +01:00
Technici4n
5a9d974eda Fix AE2 recipes: remove old charged certus, add deepslate certus support, fix dupe bugwhen grinding crystals 2021-10-22 18:40:31 +02:00
drcrazy
36203239e1 Cables with different transfer rate shouldn't connect. Closes #2572 2021-10-22 09:11:45 +03:00
Technici4n
165d27cfda
Set creative tank amount to capacity on tick. Fix #2558. Thanks to Technici4n
* Set creative tank amount to capacity on tick. Fix #2558.
* Remove FluidValue.INFINITE
* Was better with the /1000
2021-10-08 08:49:19 +03:00
Technici4n
f39c619c22
Fix cable shape computation. Closes #2435. Thanks to Technici4n
* Fix cable shape computation. Closes #2435.
* Remove unused import
2021-10-08 08:48:11 +03:00
Technici4n
99c46f0a56 Use new AE2 tag for certus quartz crystals 2021-10-03 23:06:56 +02:00
drcrazy
3c050b2105 Use exchangeStack method in fluid pickup. 2021-09-20 14:01:49 +03:00
Justin Vitale
f8c224ecf5 Add closing brackets to fusion reactor state text 2021-09-20 20:04:28 +10:00
drcrazy
4c4881e7e5 Cells should work on caludron. Closes #2490 2021-09-20 05:38:43 +03:00
Dave Smith
6b89b08ff0
Adds compressor recipe for empty cell -> compressed air cell (#2505) 2021-09-20 01:50:25 +03:00
Dave Smith
7d85960a4a
Fix 2509; reviewed all ticking entities to ensure consistency in checks (#2510) 2021-09-20 01:48:41 +03:00
drcrazy
42f0d5ce42 Smelt iron block to refined iron block. Closes #2487 2021-09-17 23:20:11 +03:00
drcrazy
5261d9f11f Bauxite should be mined with iron pickaxe. Closes #2489 2021-09-17 22:59:33 +03:00
drcrazy
69626d279b Sawdust got usage in recipes 2021-09-17 22:33:22 +03:00
Dave Smith
69be970d72
Removed unnecessary getFacingEnum method; super does all this stuff already and is more correct (#2502) 2021-09-17 18:28:29 +10:00
Technici4n
9fb725bdc5
Buff solar panels a bit (#2501)
* Buff solar panels

* First two tiers don't produce energy at night

Co-authored-by: Dave Smith <dizzyd@dizzyd.com>
2021-09-16 23:46:07 +02:00
Dave Smith
56dcc4dd16
Add support for solar energy scaling during day (#2497) 2021-09-16 23:45:38 +02:00
Dave Smith
dcca103f9a
Fix #2407: Enable overfill checking on fusion reactor energy stored (#2495) 2021-09-16 22:31:54 +02:00
Dave Smith
41422f4a66
Fix #2478; make sure to use correct units when calculating fuel usage per tick (#2499) 2021-09-16 22:25:02 +02:00
Technici4n
086ad25a47
Network energy cables (#2493) 2021-09-16 22:23:41 +02:00
Dave Smith
9d6890946d
Fix issue 2496; don't tick watermill on client side (#2498) 2021-09-15 20:40:16 +03:00
modmuss50
8c6a0155e7 Add a basic gametest to test the grinder. 2021-09-01 23:08:42 +01:00
modmuss50
6c3b461e11 Fix build and update deps 2021-09-01 21:17:58 +01:00
Technici4n
3e2b0e11ae
Initial migration to V2 Energy API (#2474)
* Initial Energy API refactor

* Allow charging in energy storage BEs

* Remove maven for experimental fabric

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-09-01 21:14:15 +01:00
drcrazy
a9850d0d61 Rock cutter is available earlier for ppl used to modded ore doubling. Closes #2463 2021-08-14 01:11:12 +03:00
drcrazy
7d415eb163 Smelt raw iridium in Industrial Blast Furnace. Closes #2467 2021-08-14 00:21:18 +03:00
drcrazy
cb747b0b67 Raw metal blocks are now smeltable. Closes #2446 2021-08-14 00:09:13 +03:00
drcrazy
38aaeabf3c Fix powered tools combat stats. Closes #2468 2021-08-12 17:22:43 +03:00
Technici4n
fd9d776b43
Initial move to the fabric fluid API (#2465) 2021-08-05 20:51:11 +01:00
modmuss50
482fe4f01f Update Trinkets api 2021-07-23 00:43:57 +01:00
modmuss50
548c12eee8 Cleanup worldgen code, should fix a lot of issues with other mods. Configuration will come later. 2021-07-20 20:16:10 +01:00
modmuss50
08e504a607 Update Gradle, loom. Give it more memory. 2021-07-20 19:15:03 +01:00
modmuss50
66c70e7e96 Fix conflicts with mojang's mappings 2021-07-20 19:03:30 +01:00
modmuss50
2ae5e8ff5b Finish 1.17.1 port 2021-07-20 19:01:38 +01:00
drcrazy
08a2cdb081 First pass on 1.17.1 update. 13 errors left 2021-07-20 03:38:43 +03:00
drcrazy
3edf36e0ef Decrease carbon footprint of Solid fuel generator. Improvement due to #2403 2021-07-19 21:04:45 +03:00
drcrazy
0932b86811 Revert fix for corner. I was looking on a wrong line on debug screen. Closes #2450 2021-07-19 16:40:46 +03:00
drcrazy
cb6c6337a8 Fix some warnings. 2021-07-19 16:15:49 +03:00
drcrazy
9cb90bb56d Bronze small dust is gone. 2021-07-19 10:55:40 +03:00
drcrazy
163d41ad85 Aluminium and brass small dusts are gone 2021-07-19 10:49:20 +03:00
drcrazy
c319e66b81 Silver and lead small dusts are gone. 2021-07-19 10:33:11 +03:00
drcrazy
1dde0f962d Fix centrifuge recipes for brass, bronze and electrum. 2021-07-18 13:51:41 +03:00
drcrazy
0cab865fdb Gold and Tin small dusts are gone. 2021-07-18 13:45:07 +03:00
drcrazy
a05b497cb2 Raw metals got "c" tags. Closes #2448 2021-07-16 02:15:43 +03:00
drcrazy
c70a8b4eb4 More loot tables for the god of loot tables. Closes #2454 2021-07-16 01:36:25 +03:00
Yan Chubikov
8c57ae4a4e
DashLoader compatibility (#2453). Thanks to alphaqu 2021-07-16 00:59:12 +03:00
Technici4n
779a2c8b60
Make 1 copper block give 9 copper plates (#2449). Thanks to Technici4n!
Copper blocks were changed to 9 copper ingots at some point during the snapshots.
2021-07-16 00:58:09 +03:00
drcrazy
b8715ecdda Gold small dust is gone. All hail gold nugget. 2021-07-07 16:28:03 +03:00
drcrazy
f9f911bf04 Fix cell rendering for modded spriteless fluids. Closes #2429 2021-07-07 14:12:34 +03:00
drcrazy
f9381b5e01 Change speed increase to time decrease. Closes #2438 2021-07-05 21:11:03 +03:00
drcrazy
5d1d5f79bb FIx breaking speed to TR ores. Closes #2425 2021-07-05 20:52:05 +03:00
drcrazy
53cd1d8f6b Fix ore drop. Closes #2427 2021-07-05 12:00:54 +03:00
drcrazy
23868443b5 Iron small dust is gone. All hail iron nugget. 2021-07-05 11:39:02 +03:00
drcrazy
5eef35551a Fix recipe outputs display in REI. Closes #2417 2021-07-03 01:11:18 +03:00
drcrazy
399f267b43 Probably fix attempt to grow rubber tree not on server. Closes #2418 and #2357 2021-07-02 22:46:49 +03:00
drcrazy
15b354fd65 Autocrafting table got proper orientation. Closes #2419 2021-07-02 17:02:00 +03:00
drcrazy
729b645cd7 Nerf clay block in extractor. Closes #2421 2021-07-02 14:18:18 +03:00
drcrazy
45725217a5 Fix end stone bricks recipe. Closes #2394 2021-07-01 20:58:23 +03:00
drcrazy
05d8c2ccc6 Fix step down buttons for Fusion reactor. Closes #2412 2021-07-01 20:37:45 +03:00
drcrazy
d5f995e7e9 Fix corner calculation for GreenhouseController 2021-06-29 12:07:29 +03:00
Thornton Fernbacher
85d69faec7
Greenhouse Controller try harvest/grow blocks in order instead of at random + growth fix (#2420). Thanks to trobol
* Greenhouse Controller try harvest/grow blocks in order
* fix greenhouse growth acceleration
2021-06-29 11:19:52 +03:00
drcrazy
5390cbfe2e Prevent easy dupe introduced by IR 2021-06-25 10:01:15 +03:00
drcrazy
42e86acba3 Raw tin, silver, lead, tungsten and iridium storage blocks 2021-06-22 17:18:36 +03:00
drcrazy
78a9a61bb4 Raw tin, silver, lead, tungsten and iridium 2021-06-21 13:58:53 +03:00
shedaniel
ecff51d498
Fix rei rendering (#2414). Thanks to shedaniel
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-21 12:24:40 +03:00
drcrazy
8f0e22d624 New textures for ores, circuits, tin and silver things 2021-06-21 11:44:14 +03:00
drcrazy
0ae56a367c Tin cable got updated texture 2021-06-21 11:27:23 +03:00
drcrazy
fa2469b034 Fix crash with casing loading. Closes #2410 2021-06-19 02:47:14 +03:00
drcrazy
8ab3b3a7be Player detector got radius config 2021-06-18 23:05:43 +03:00
drcrazy
88d5ee015a One Energy to rule them all. 2021-06-18 20:16:57 +03:00
drcrazy
193dc94f80 Fix GUI for TR Manual 2021-06-18 12:14:08 +03:00
drcrazy
75f14c145c Removed astromine compat 2021-06-18 12:13:42 +03:00
drcrazy
7216f55ba9 Copper stairs, blocks and slabs are gone. 2021-06-15 00:38:29 +03:00
drcrazy
c4011c800b Replace copper dust with raw copper in recipes 2021-06-14 22:15:38 +03:00
drcrazy
d8a11eaebf Replace gold dust with raw gold in recipes 2021-06-14 21:34:53 +03:00
drcrazy
765d96a05a Replace iron dust with raw iron in recipes 2021-06-14 21:17:11 +03:00
drcrazy
a49daa0339 Probably fixed rubber leaves drop 2021-06-14 11:14:54 +03:00
drcrazy
bff7238679 Fix advancements 2021-06-11 13:31:27 +03:00
drcrazy
b445582784 Oh no. We lost TR copper ore. All Hail MC Copper ore. 2021-06-11 02:47:25 +03:00
shedaniel
8243c936be
Update to REI 6 (#2404)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2021-06-03 16:58:56 +01:00
modmuss50
dc216b974d Fix UU matter recipes.
Adds a PaddedShapedRecipe to RebornCore
2021-06-02 21:25:15 +01:00