From 581b4b8b3012f9a36220400ad56821ee060790ae Mon Sep 17 00:00:00 2001
From: evgengoldwar <69961523+evgengoldwar@users.noreply.github.com>
Date: Fri, 7 Jun 2024 07:41:03 +0400
Subject: Add Steam Multi (#2631)

* add Steam Centrifuge

* add Steam Washer

* Change Steam Washer

* Change Steam Multi

* Fix tooltip Washer

* Change Washer

* Change Steam Multi

* add id comment

* update deps + sa

* Added centrifuge tiers

* Added washer tiers

* Added compressor tiers

* Added macerator tiers

* Delete fixAllMaintenanceIssue();

* Delete fixAllMaintenanceIssue();

* Changed recipes

* Added meaningful names

* sa + update bs

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../xmod/gregtech/api/enums/GregtechItemList.java        |  4 ++++
 .../base/GregtechMeta_SteamMultiBase.java                | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

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

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 6367d22f77..e1f7c415ef 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -443,6 +443,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 
     // Big Steam Macerator
     Controller_SteamMaceratorMulti,
+    // Bit Steam Washer
+    Controller_SteamWasherMulti,
+    // Big Steam Centrifuge
+    Controller_SteamCentrifugeMulti,
     // Big Steam Compressor
     Controller_SteamCompressorMulti,
 
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 6e501815f0..abebb5a38a 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
@@ -27,6 +27,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.logic.ProcessingLogic;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.recipe.RecipeMap;
@@ -129,6 +130,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
             if (this.mUpdate == 1 || this.mStartUpCheck == 1) {
                 this.mSteamInputs.clear();
                 this.mSteamOutputs.clear();
+                this.mInputHatches.clear();
                 this.mSteamInputFluids.clear();
             }
         }
@@ -180,7 +182,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Steam_BusOutput) {
             log("Adding Steam Output Bus");
             aDidAdd = addToMachineListInternal(mSteamOutputs, aMetaTileEntity, aBaseCasingIndex);
-        }
+        } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input)
+            aDidAdd = addToMachineListInternal(mInputHatches, aMetaTileEntity, aBaseCasingIndex);
+        else if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output);
 
         return aDidAdd;
     }
@@ -251,6 +255,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
                 rList.add(tHatch.getFillableStack());
             }
         }
+        for (GT_MetaTileEntity_Hatch_Input hatch : this.mInputHatches) if (hatch.getFillableStack() != null) {
+            rList.add(hatch.getFillableStack());
+        }
         return rList;
     }
 
@@ -338,6 +345,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
     @Override
     public void clearHatches() {
         super.clearHatches();
+        mInputHatches.clear();
         mSteamInputFluids.clear();
         mSteamInputs.clear();
         mSteamOutputs.clear();
@@ -351,6 +359,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
                 ret = true;
             }
         }
+        for (GT_MetaTileEntity_Hatch_Input g : this.mInputHatches) {
+            if (resetRecipeMapForHatch(g, aMap)) {
+                ret = true;
+            }
+        }
+
         return ret;
     }
 
-- 
cgit