From a27af22b433051a7e6c250930cf57c4776c9a20a Mon Sep 17 00:00:00 2001 From: HoleFish <48403212+HoleFish@users.noreply.github.com> Date: Sun, 21 Jan 2024 03:43:16 +0800 Subject: Fix chemical plant (#821) * Fix chemical plant * mistake --- .../base/GregtechMeta_MultiBlockBase.java | 6 +++- .../chemplant/GregtechMTE_ChemicalPlant.java | 42 +++++++++++----------- 2 files changed, 27 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index d387a6e1a0..079b90f81c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -75,6 +75,7 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gregtech.api.util.IGT_HatchAdder; import gregtech.common.items.GT_MetaGenerated_Tool_01; +import gregtech.common.tileentities.machines.IDualInputHatch; import gtPlusPlus.GTplusplus; import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.api.objects.Logger; @@ -725,7 +726,10 @@ public abstract class GregtechMeta_MultiBlockBase= 9 || mMachineCasingTier >= maxTierOfHatch; + return (mMachineCasingTier >= 9 || mMachineCasingTier >= maxTierOfHatch) && mCatalystBuses.size() <= 1; } return false; } public void updateHatchTexture() { for (GT_MetaTileEntity_Hatch h : mCatalystBuses) h.updateTexture(getCasingTextureID()); + for (IDualInputHatch h : mDualInputHatches) h.updateTexture(getCasingTextureID()); for (GT_MetaTileEntity_Hatch h : mInputBusses) h.updateTexture(getCasingTextureID()); for (GT_MetaTileEntity_Hatch h : mMaintenanceHatches) h.updateTexture(getCasingTextureID()); for (GT_MetaTileEntity_Hatch h : mEnergyHatches) h.updateTexture(getCasingTextureID()); @@ -573,21 +577,19 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase foundCatalyst = Arrays.stream(aItemInputs) + .filter(i -> GT_Utility.areStacksEqual(i, catalyst, true)).findFirst(); + if (foundCatalyst.isPresent()) { + return foundCatalyst.get(); } } return null; @@ -675,6 +671,12 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase getCatalystInputs() { + ArrayList tItems = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_Catalysts tHatch : filterValidMTEs(mCatalystBuses)) { AutoMap aHatchContent = tHatch.getContentUsageSlots(); if (!aHatchContent.isEmpty()) { -- cgit