From 5585a21664981f0b012049ffa3537ac8a5f7cf7d Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 5 Mar 2026 19:31:04 -0500 Subject: [PATCH 1/2] Update createImportFluidHandler to include all tanks Refactor fluid handling to include lubricant and coolant tanks in the import fluid handler. --- .../electric/SuSyMetaTileEntitySingleCombustion.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java b/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java index b0f90fd08..1ee415272 100644 --- a/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java +++ b/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java @@ -1,5 +1,7 @@ package supersymmetry.common.metatileentities.single.electric; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.function.Function; import java.util.function.Supplier; @@ -86,7 +88,6 @@ public void readFromNBT(NBTTagCompound data) { protected FluidTankList createImportFluidHandler() { if (workable == null) return new FluidTankList(false); - // Only recipe fluid inputs go here — no lubricant/coolant FluidTank[] fluidImports = new FluidTank[workable.getRecipeMap().getMaxFluidInputs()]; FluidTank[] displayedTanks = new FluidTank[workable.getRecipeMap().getMaxFluidInputs()]; for (int i = 0; i < fluidImports.length; i++) { @@ -96,14 +97,17 @@ protected FluidTankList createImportFluidHandler() { displayedTanks[i] = tank; } - // Lubricant/coolant tanks are standalone — NOT part of the import handler this.lubricantTank = (SuSyFluidTankHandler) new SuSyFluidTankHandler(1000, this, false) .setFilter(SuSyFluidFilters.LUBRICANT); this.coolantTank = (SuSyFluidTankHandler) new SuSyFluidTankHandler(1000, this, false) .setFilter(SuSyFluidFilters.COOLANT); this.displayedTankList = new FluidTankList(false, displayedTanks); - return new FluidTankList(false, fluidImports); + + List allTanks = new ArrayList<>(Arrays.asList(fluidImports)); + allTanks.add(lubricantTank); + allTanks.add(coolantTank); + return new FluidTankList(false, allTanks.toArray(new FluidTank[0])); } @Override From 91e84f1bc4b4657e7dc8f7520d92079fb4c260bf Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 5 Mar 2026 20:16:01 -0500 Subject: [PATCH 2/2] Remove NBT methods for lubricant and coolant tanks Removed NBT read/write methods for lubricant and coolant tanks. --- .../SuSyMetaTileEntitySingleCombustion.java | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java b/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java index 1ee415272..32c640e27 100644 --- a/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java +++ b/src/main/java/supersymmetry/common/metatileentities/single/electric/SuSyMetaTileEntitySingleCombustion.java @@ -9,7 +9,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; @@ -65,25 +64,6 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { this.getTankScalingFunction()); } - @Override - public NBTTagCompound writeToNBT(NBTTagCompound data) { - super.writeToNBT(data); - if (lubricantTank != null) - data.setTag("LubricantTank", lubricantTank.writeToNBT(new NBTTagCompound())); - if (coolantTank != null) - data.setTag("CoolantTank", coolantTank.writeToNBT(new NBTTagCompound())); - return data; - } - - @Override - public void readFromNBT(NBTTagCompound data) { - super.readFromNBT(data); - if (lubricantTank != null && data.hasKey("LubricantTank")) - lubricantTank.readFromNBT(data.getCompoundTag("LubricantTank")); - if (coolantTank != null && data.hasKey("CoolantTank")) - coolantTank.readFromNBT(data.getCompoundTag("CoolantTank")); - } - @Override protected FluidTankList createImportFluidHandler() { if (workable == null) return new FluidTankList(false);