From f524eccc011cfdee187f514709c053efea844c87 Mon Sep 17 00:00:00 2001 From: Flanks255 <32142731+Flanks255@users.noreply.github.com> Date: Sun, 10 Mar 2024 13:19:11 -0500 Subject: [PATCH] Fixed recipe conflicts. Fixed fluid placer wasting fluids. --- .../.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 | 6 +++--- .../recipes/tagged_slime_block.json} | 2 +- .../recipes/tagged_sticky_piston.json} | 2 +- .../actuallyadditions/data/ItemRecipeGenerator.java | 12 ++++++------ .../actuallyadditions/data/ItemTagsGenerator.java | 2 +- .../mod/tile/TileEntityFluidCollector.java | 3 +-- 6 files changed, 13 insertions(+), 14 deletions(-) rename src/generated/resources/data/{minecraft/recipes/slime_block.json => actuallyadditions/recipes/tagged_slime_block.json} (80%) rename src/generated/resources/data/{minecraft/recipes/sticky_piston.json => actuallyadditions/recipes/tagged_sticky_piston.json} (83%) diff --git a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 index d5b12a3ee..f540869d9 100644 --- a/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 +++ b/src/generated/resources/.cache/9cf54cdf67e16111ec482a2a3b607e8fd75a4246 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-08T17:07:43.7158398 Item Recipes +// 1.20.4 2024-03-10T13:16:06.5711018 Item Recipes d374edde9294d1a224b4b5610b50117a11328c00 data/actuallyadditions/recipes/advanced_coil.json f67629e45d152c96f3467a90a67520f78ecf9f07 data/actuallyadditions/recipes/advanced_leaf_blower.json d65e5a70232fa2f0e74d2a67c1cd4b0e87124242 data/actuallyadditions/recipes/basic_coil.json @@ -87,6 +87,8 @@ f6c73cb2e41a8a21e2fda888b28bf52672b33d2e data/actuallyadditions/recipes/rice_sli 764d4f63e1d978d02419d30d2ad845b914e594c0 data/actuallyadditions/recipes/ring_of_magnetizing.json fc0a5281fc77edde16f22165e164f73dd28d7fcd data/actuallyadditions/recipes/single_battery.json cb0454ccb8e918d506a1dd488187453678f82751 data/actuallyadditions/recipes/stone_aiot.json +c57c0ac561f1919f6085f052060ca285a67ac579 data/actuallyadditions/recipes/tagged_slime_block.json +be5e09790d225ca17dfef8089caece4095f3b6cf data/actuallyadditions/recipes/tagged_sticky_piston.json b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport_staff.json 0ec48b429486a03aba107cb8b6dc9e03694ca68f data/actuallyadditions/recipes/tiny_to_charcoal.json 5745a05f877fce254a1990f1e89f80e91846e270 data/actuallyadditions/recipes/tiny_to_coal.json @@ -94,5 +96,3 @@ b4aa29ef0d47b557f354a23cb6ee8ef60d273de3 data/actuallyadditions/recipes/teleport 89c9512eeb746befb1bdc31037baa9bd86220f74 data/actuallyadditions/recipes/triple_battery.json 0737014abee48f688982412297e04e994aa6f9a6 data/actuallyadditions/recipes/wings_of_the_bats.json c80073fcade3cdcb15f28c4a1cb12df4ae6cf4ec data/actuallyadditions/recipes/wooden_aiot.json -2bd8e4e4ed83a0d870e4509c0e722a9bbfd54a73 data/minecraft/recipes/slime_block.json -77fa026351592845c5fd6bbe430e6362e755eaaf data/minecraft/recipes/sticky_piston.json diff --git a/src/generated/resources/data/minecraft/recipes/slime_block.json b/src/generated/resources/data/actuallyadditions/recipes/tagged_slime_block.json similarity index 80% rename from src/generated/resources/data/minecraft/recipes/slime_block.json rename to src/generated/resources/data/actuallyadditions/recipes/tagged_slime_block.json index 01eac01ff..219688a7a 100644 --- a/src/generated/resources/data/minecraft/recipes/slime_block.json +++ b/src/generated/resources/data/actuallyadditions/recipes/tagged_slime_block.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "R": { - "item": "actuallyadditions:rice_slimeball" + "tag": "forge:slimeballs" } }, "pattern": [ diff --git a/src/generated/resources/data/minecraft/recipes/sticky_piston.json b/src/generated/resources/data/actuallyadditions/recipes/tagged_sticky_piston.json similarity index 83% rename from src/generated/resources/data/minecraft/recipes/sticky_piston.json rename to src/generated/resources/data/actuallyadditions/recipes/tagged_sticky_piston.json index 0065d5706..11d774c3f 100644 --- a/src/generated/resources/data/minecraft/recipes/sticky_piston.json +++ b/src/generated/resources/data/actuallyadditions/recipes/tagged_sticky_piston.json @@ -6,7 +6,7 @@ "item": "minecraft:piston" }, "R": { - "item": "actuallyadditions:rice_slimeball" + "tag": "forge:slimeballs" } }, "pattern": [ diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java index cf7eb9b84..d3f5df994 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemRecipeGenerator.java @@ -489,18 +489,18 @@ public class ItemRecipeGenerator extends RecipeProvider { .define('I', Items.IRON_HELMET) .save(recipeOutput); - // Sticky Piston from rice slime + // Sticky Piston from tagged slime balls Recipe.shaped(Items.STICKY_PISTON) .pattern("R", "P") - .define('R', ActuallyItems.RICE_SLIMEBALL.get()) + .define('R', Tags.Items.SLIMEBALLS) .define('P', Items.PISTON) - .save(recipeOutput); + .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "tagged_sticky_piston")); - // Slime block from rice slime balls + // Slime block from tagged balls Recipe.shaped(Items.SLIME_BLOCK) .pattern("RRR", "RRR", "RRR") - .define('R', ActuallyItems.RICE_SLIMEBALL.get()) - .save(recipeOutput); + .define('R', Tags.Items.SLIMEBALLS) + .save(recipeOutput, new ResourceLocation(ActuallyAdditions.MODID, "tagged_slime_block")); //Shards addShard(recipeOutput, ActuallyItems.VOID_CRYSTAL_SHARD, ActuallyItems.VOID_CRYSTAL); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index 46e16fe4f..70f689faf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -17,7 +17,7 @@ import java.util.concurrent.CompletableFuture; public class ItemTagsGenerator extends ItemTagsProvider { public ItemTagsGenerator(PackOutput packOutput, CompletableFuture lookupProvider, - TagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) { + TagsProvider blockTagProvider, ExistingFileHelper existingFileHelper) { super(packOutput, lookupProvider, blockTagProvider.contentsGetter(), ActuallyAdditions.MODID, existingFileHelper); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java index edfb78771..83835f576 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFluidCollector.java @@ -36,7 +36,6 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.FluidType; -import net.neoforged.neoforge.fluids.IFluidBlock; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import javax.annotation.Nonnull; @@ -116,7 +115,7 @@ public class TileEntityFluidCollector extends TileEntityBase implements ISharing Block fluid = stack.getFluid().defaultFluidState().createLegacyBlock().getBlock(); if (fluid != null) { BlockPos offsetPos = this.worldPosition.relative(sideToManipulate); - boolean placeable = !(blockToBreak instanceof IFluidBlock) && blockToBreak.defaultBlockState().canBeReplaced(); + boolean placeable = !stateToBreak.getFluidState().isSource() && blockToBreak.defaultBlockState().canBeReplaced(); if (placeable) { this.tank.drainInternal(FluidType.BUCKET_VOLUME, IFluidHandler.FluidAction.EXECUTE); // TODO: [port] validate this check is still valid.