From a1e4d51e21d47f8a032f33244bd1d858ce33ccbc Mon Sep 17 00:00:00 2001 From: Frizi Date: Fri, 31 Oct 2025 04:59:48 +0100 Subject: [PATCH] update to create 6.0.7 and cleanup tag handling --- src/generated/resources/data/c/tags/block/concrete.json | 6 ------ src/generated/resources/data/c/tags/item/concrete.json | 6 ------ src/generated/resources/data/c/tags/item/dusts.json | 2 -- .../resources/data/create/tags/item/create_ingots.json | 3 ++- .../resources/data/tfmg/recipe/casting/cinderblock.json | 2 +- .../resources/data/tfmg/recipe/compacting/bitumen.json | 2 +- .../resources/data/tfmg/recipe/filling/air_tank.json | 2 +- .../data/tfmg/recipe/filling/carbon_dioxide_tank.json | 2 +- .../resources/data/tfmg/recipe/filling/ethylene_tank.json | 2 +- .../resources/data/tfmg/recipe/mixing/cooling_fluid.json | 4 ++-- .../resources/data/tfmg/recipe/mixing/copper_sulfate.json | 2 +- .../data/tfmg/recipe/sequenced_assembly/capacitor.json | 1 - .../data/tfmg/recipe/vat_machine_recipe/concrete.json | 2 +- .../recipe/vat_machine_recipe/etched_circuit_board.json | 2 +- .../metallurgy/blast_stove/BlastStoveBlockEntity.java | 5 ++--- .../metallurgy/casting_basin/CastingBasinBlockEntity.java | 8 +------- .../java/com/drmangotea/tfmg/recipes/CastingRecipe.java | 7 ++----- 17 files changed, 17 insertions(+), 41 deletions(-) delete mode 100644 src/generated/resources/data/c/tags/block/concrete.json delete mode 100644 src/generated/resources/data/c/tags/item/concrete.json diff --git a/src/generated/resources/data/c/tags/block/concrete.json b/src/generated/resources/data/c/tags/block/concrete.json deleted file mode 100644 index 4fa61502..00000000 --- a/src/generated/resources/data/c/tags/block/concrete.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "tfmg:concrete", - "tfmg:rebar_concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/concrete.json b/src/generated/resources/data/c/tags/item/concrete.json deleted file mode 100644 index 4fa61502..00000000 --- a/src/generated/resources/data/c/tags/item/concrete.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "tfmg:concrete", - "tfmg:rebar_concrete" - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/dusts.json b/src/generated/resources/data/c/tags/item/dusts.json index 13263c9c..b0d6b468 100644 --- a/src/generated/resources/data/c/tags/item/dusts.json +++ b/src/generated/resources/data/c/tags/item/dusts.json @@ -2,8 +2,6 @@ "values": [ "tfmg:sulfur_dust", "tfmg:nitrate_dust", - "tfmg:rubber_sheet", - "tfmg:silicon_ingot", "tfmg:coal_coke_dust" ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/item/create_ingots.json b/src/generated/resources/data/create/tags/item/create_ingots.json index 56c764e0..084f4b40 100644 --- a/src/generated/resources/data/create/tags/item/create_ingots.json +++ b/src/generated/resources/data/create/tags/item/create_ingots.json @@ -7,6 +7,7 @@ "tfmg:lead_ingot", "tfmg:nickel_ingot", "tfmg:constantan_ingot", - "tfmg:lithium_ingot" + "tfmg:lithium_ingot", + "tfmg:silicon_ingot" ] } \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipe/casting/cinderblock.json b/src/generated/resources/data/tfmg/recipe/casting/cinderblock.json index 7c089fff..4cb47a85 100644 --- a/src/generated/resources/data/tfmg/recipe/casting/cinderblock.json +++ b/src/generated/resources/data/tfmg/recipe/casting/cinderblock.json @@ -2,7 +2,7 @@ "type": "tfmg:casting", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 144, "fluid": "tfmg:liquid_concrete" } diff --git a/src/generated/resources/data/tfmg/recipe/compacting/bitumen.json b/src/generated/resources/data/tfmg/recipe/compacting/bitumen.json index dffca76f..af7f92e9 100644 --- a/src/generated/resources/data/tfmg/recipe/compacting/bitumen.json +++ b/src/generated/resources/data/tfmg/recipe/compacting/bitumen.json @@ -3,7 +3,7 @@ "heat_requirement": "heated", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:heavy_oil" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/air_tank.json b/src/generated/resources/data/tfmg/recipe/filling/air_tank.json index 4effee6d..303a4274 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/air_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/air_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:air" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json b/src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json index 810441f1..f3fdf22c 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:carbon_dioxide" } diff --git a/src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json b/src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json index cc932f48..bf7b3fe4 100644 --- a/src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json +++ b/src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json @@ -5,7 +5,7 @@ "item": "minecraft:bucket" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:ethylene" } diff --git a/src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json b/src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json index eed588d3..1ec4229f 100644 --- a/src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json +++ b/src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json @@ -2,12 +2,12 @@ "type": "create:mixing", "ingredients": [ { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "minecraft:water" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 1000, "fluid": "tfmg:ethylene" } diff --git a/src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json b/src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json index 3d14f724..db512fa2 100644 --- a/src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json +++ b/src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json @@ -5,7 +5,7 @@ "item": "minecraft:copper_ingot" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 500, "fluid": "tfmg:sulfuric_acid" } diff --git a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json index bcae3c96..9d81c4ce 100644 --- a/src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json +++ b/src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json @@ -3,7 +3,6 @@ "ingredient": { "tag": "c:plates/steel" }, - "loops": 1, "results": [ { "count": 4, diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json index c4ba24df..d40057cc 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json @@ -15,7 +15,7 @@ "item": "tfmg:limesand" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "minecraft:water" } diff --git a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json index ea7cb660..5a1173fd 100644 --- a/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json +++ b/src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json @@ -5,7 +5,7 @@ "item": "tfmg:coated_circuit_board" }, { - "type": "fluid_stack", + "type": "neoforge:single", "amount": 250, "fluid": "tfmg:sulfuric_acid" } diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java index fe813e81..f8d0cede 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java @@ -37,7 +37,6 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; -import javax.annotation.Nullable; import java.util.List; @@ -112,8 +111,8 @@ public class BlastStoveBlockEntity extends FluidTankBlockEntity implements IHave if ((primaryOutputInventory.isEmpty() || primaryOutputInventory.getFluid().isFluidEqual(recipe.getPrimaryResult())) && (secondaryOutputInventory.isEmpty() || secondaryOutputInventory.getFluid().isFluidEqual(recipe.getSecondaryResult()))) { - primaryInputInventory.setFluid(new FluidStack(primaryInputInventory.getFluid().copy().getFluidHolder(), primaryInputInventory.getFluidAmount() - recipe.getPrimaryIngredient().getRequiredAmount())); - secondaryInputInventory.setFluid(new FluidStack(secondaryInputInventory.getFluid().copy().getFluidHolder(), secondaryInputInventory.getFluidAmount() - recipe.getSecondaryIngredient().getRequiredAmount())); + primaryInputInventory.setFluid(new FluidStack(primaryInputInventory.getFluid().copy().getFluidHolder(), primaryInputInventory.getFluidAmount() - recipe.getPrimaryIngredient().amount())); + secondaryInputInventory.setFluid(new FluidStack(secondaryInputInventory.getFluid().copy().getFluidHolder(), secondaryInputInventory.getFluidAmount() - recipe.getSecondaryIngredient().amount())); primaryOutputInventory.setFluid(new FluidStack(recipe.getPrimaryResult().getFluidHolder(), primaryOutputInventory.getFluidAmount() + recipe.getPrimaryResult().getAmount())); diff --git a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java index 800de96c..b9d4c4ad 100644 --- a/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java +++ b/src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java @@ -14,7 +14,6 @@ import com.simibubi.create.foundation.recipe.RecipeConditions; import com.simibubi.create.foundation.recipe.RecipeFinder; import net.createmod.catnip.animation.LerpedFloat; import net.minecraft.core.BlockPos; -import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.chat.Component; @@ -28,13 +27,8 @@ import net.neoforged.neoforge.fluids.FluidStack; import net.neoforged.neoforge.fluids.capability.IFluidHandler; import net.neoforged.neoforge.fluids.capability.templates.FluidTank; import net.neoforged.neoforge.items.IItemHandlerModifiable; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.List; -import java.util.function.Supplier; - -import static net.minecraft.world.level.block.HorizontalDirectionalBlock.FACING; public class CastingBasinBlockEntity extends SmartBlockEntity implements IHaveGoggleInformation { @@ -79,7 +73,7 @@ public class CastingBasinBlockEntity extends SmartBlockEntity implements IHaveGo if(recipe.getIngrenient().test(tank.getFluid())) { if (timer >= recipe.getProcessingDuration()) { tank.setFluid(FluidStack.EMPTY); - inventory.setStackInSlot(0, recipe.getRollableResults().get(0).rollOutput()); + inventory.setStackInSlot(0, recipe.getRollableResults().get(0).rollOutput(level.random)); recipe = null; timer = 0; } else timer++; diff --git a/src/main/java/com/drmangotea/tfmg/recipes/CastingRecipe.java b/src/main/java/com/drmangotea/tfmg/recipes/CastingRecipe.java index 8bd845e2..f4710473 100644 --- a/src/main/java/com/drmangotea/tfmg/recipes/CastingRecipe.java +++ b/src/main/java/com/drmangotea/tfmg/recipes/CastingRecipe.java @@ -1,14 +1,11 @@ package com.drmangotea.tfmg.recipes; import com.drmangotea.tfmg.registry.TFMGRecipeTypes; -import com.simibubi.create.content.processing.recipe.ProcessingRecipe; -import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.processing.recipe.ProcessingRecipeParams; import com.simibubi.create.content.processing.recipe.StandardProcessingRecipe; -import com.simibubi.create.foundation.fluid.FluidIngredient; import net.minecraft.world.item.crafting.RecipeInput; import net.minecraft.world.level.Level; -import net.neoforged.neoforge.items.wrapper.RecipeWrapper; +import net.neoforged.neoforge.fluids.crafting.SizedFluidIngredient; public class CastingRecipe extends StandardProcessingRecipe { @@ -23,7 +20,7 @@ public class CastingRecipe extends StandardProcessingRecipe { protected int getMaxFluidInputCount() { return 1; } - public FluidIngredient getIngrenient(){ + public SizedFluidIngredient getIngrenient(){ return fluidIngredients.get(0); }