maxscout/Create-The_Factory_Must_Grow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to create 6.0.7 and cleanup tag handling

Browse Source
This commit is contained in:
Frizi
2025-10-31 04:59:48 +01:00
parent ec8d92bb77
commit a1e4d51e21
17 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/generated/resources/data/c/tags/block/concrete.json
View File

@@ -1,6 +0,0 @@
{
"values": [
"tfmg:concrete",
"tfmg:rebar_concrete"
]
}

6
src/generated/resources/data/c/tags/item/concrete.json
View File

@@ -1,6 +0,0 @@
{
"values": [
"tfmg:concrete",
"tfmg:rebar_concrete"
]
}

2
src/generated/resources/data/c/tags/item/dusts.json
View File

@@ -2,8 +2,6 @@
"values": [
"tfmg:sulfur_dust",
"tfmg:nitrate_dust",
"tfmg:rubber_sheet",
"tfmg:silicon_ingot",
"tfmg:coal_coke_dust"
]
}

3
src/generated/resources/data/create/tags/item/create_ingots.json
View File

@@ -7,6 +7,7 @@
"tfmg:lead_ingot",
"tfmg:nickel_ingot",
"tfmg:constantan_ingot",
"tfmg:lithium_ingot"
"tfmg:lithium_ingot",
"tfmg:silicon_ingot"
]
}

2
src/generated/resources/data/tfmg/recipe/casting/cinderblock.json
View File

@@ -2,7 +2,7 @@
"type": "tfmg:casting",
"ingredients": [
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 144,
"fluid": "tfmg:liquid_concrete"
}

2
src/generated/resources/data/tfmg/recipe/compacting/bitumen.json
View File

@@ -3,7 +3,7 @@
"heat_requirement": "heated",
"ingredients": [
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 1000,
"fluid": "tfmg:heavy_oil"
}

2
src/generated/resources/data/tfmg/recipe/filling/air_tank.json
View File

@@ -5,7 +5,7 @@
"item": "minecraft:bucket"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 1000,
"fluid": "tfmg:air"
}

2
src/generated/resources/data/tfmg/recipe/filling/carbon_dioxide_tank.json
View File

@@ -5,7 +5,7 @@
"item": "minecraft:bucket"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 1000,
"fluid": "tfmg:carbon_dioxide"
}

2
src/generated/resources/data/tfmg/recipe/filling/ethylene_tank.json
View File

@@ -5,7 +5,7 @@
"item": "minecraft:bucket"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 1000,
"fluid": "tfmg:ethylene"
}

4
src/generated/resources/data/tfmg/recipe/mixing/cooling_fluid.json
View File

@@ -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"
}

2
src/generated/resources/data/tfmg/recipe/mixing/copper_sulfate.json
View File

@@ -5,7 +5,7 @@
"item": "minecraft:copper_ingot"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 500,
"fluid": "tfmg:sulfuric_acid"
}

1
src/generated/resources/data/tfmg/recipe/sequenced_assembly/capacitor.json
View File

@@ -3,7 +3,6 @@
"ingredient": {
"tag": "c:plates/steel"
},
"loops": 1,
"results": [
{
"count": 4,

2
src/generated/resources/data/tfmg/recipe/vat_machine_recipe/concrete.json
View File

@@ -15,7 +15,7 @@
"item": "tfmg:limesand"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 250,
"fluid": "minecraft:water"
}

2
src/generated/resources/data/tfmg/recipe/vat_machine_recipe/etched_circuit_board.json
View File

@@ -5,7 +5,7 @@
"item": "tfmg:coated_circuit_board"
},
{
"type": "fluid_stack",
"type": "neoforge:single",
"amount": 250,
"fluid": "tfmg:sulfuric_acid"
}

5
src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/blast_stove/BlastStoveBlockEntity.java
View File

@@ -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()));

8
src/main/java/com/drmangotea/tfmg/content/machinery/metallurgy/casting_basin/CastingBasinBlockEntity.java
View File

@@ -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++;

7
src/main/java/com/drmangotea/tfmg/recipes/CastingRecipe.java
View File

@@ -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<RecipeInput> {
@@ -23,7 +20,7 @@ public class CastingRecipe extends StandardProcessingRecipe<RecipeInput> {
protected int getMaxFluidInputCount() {
return 1;
}
public FluidIngredient getIngrenient(){
public SizedFluidIngredient getIngrenient(){
return fluidIngredients.get(0);
}