From 4ff3ef790f4e22cc80986258f13f8a8643fda0dc Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Sun, 3 Dec 2023 00:50:34 +0800
Subject: fix steam machine nei structure diagram (#789)

* fix steam machine nei structure diagram

this is caused by repeated failure of checkMachine(), which is caused by it not clearing special steam hatches

* more special hatch clearing
---
 .../base/GregtechMeta_MultiBlockBase.java            | 12 ++++++++++++
 .../base/GregtechMeta_SteamMultiBase.java            | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api')

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 cf460ca084..aa7422a79b 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
@@ -582,6 +582,18 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                 && (this.getPollutionPerSecond(null) > 0 ? !mMufflerHatches.isEmpty() : true);
     }
 
+    @Override
+    public void clearHatches() {
+        super.clearHatches();
+        this.mChargeHatches.clear();
+        this.mDischargeHatches.clear();
+        this.mAirIntakes.clear();
+        this.mTecTechEnergyHatches.clear();
+        this.mTecTechDynamoHatches.clear();
+        this.mAllEnergyHatches.clear();
+        this.mAllDynamoHatches.clear();
+    }
+
     public <E> boolean addToMachineListInternal(ArrayList<E> aList, final IGregTechTileEntity aTileEntity,
             final int aBaseCasingIndex) {
         return addToMachineListInternal(aList, getMetaTileEntity(aTileEntity), aBaseCasingIndex);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index 13b879dd00..7b88f718b5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -24,6 +24,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_HatchElementBuilder;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.IGT_HatchAdder;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
@@ -307,6 +308,25 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         return false;
     }
 
+    @Override
+    public void clearHatches() {
+        super.clearHatches();
+        mSteamInputFluids.clear();
+        mSteamInputs.clear();
+        mSteamOutputs.clear();
+    }
+
+    @Override
+    public boolean resetRecipeMapForAllInputHatches(GT_Recipe.GT_Recipe_Map aMap) {
+        boolean ret = super.resetRecipeMapForAllInputHatches(aMap);
+        for (GT_MetaTileEntity_Hatch_Steam_BusInput hatch : mSteamInputs) {
+            if (resetRecipeMapForHatch(hatch, aMap)) {
+                ret = true;
+            }
+        }
+        return ret;
+    }
+
     protected static <T extends GregtechMeta_SteamMultiBase<T>> GT_HatchElementBuilder<T> buildSteamInput(
             Class<T> typeToken) {
         return buildHatchAdder(typeToken).adder(GregtechMeta_SteamMultiBase::addToMachineList).hatchIds(31040)
-- 
cgit