From f765b4e65dd2b228ab9d62c67284aa44e1ac8e23 Mon Sep 17 00:00:00 2001
From: Yang Xizhi <60341015+GlodBlock@users.noreply.github.com>
Date: Wed, 13 Jul 2022 22:10:10 +0800
Subject: more tiers of quad input hatches (#1123)

---
 src/main/java/gregtech/api/enums/ItemList.java                     | 6 +++++-
 .../implementations/GT_MetaTileEntity_Hatch_MultiInput.java        | 7 +++----
 2 files changed, 8 insertions(+), 5 deletions(-)

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

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index b50415c3ef..275a6bdd7b 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -973,7 +973,11 @@ public enum ItemList implements IItemContainer {
     Hatch_Input_UV,
     Hatch_Input_MAX,
 
-    Hatch_Input_Multi_2x2,
+    Hatch_Input_Multi_2x2_EV,
+    Hatch_Input_Multi_2x2_IV,
+    Hatch_Input_Multi_2x2_LuV,
+    Hatch_Input_Multi_2x2_ZPM,
+    Hatch_Input_Multi_2x2_UV,
 
     Hatch_Input_Bus_ULV,
     Hatch_Input_Bus_LV,
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java
index 39599006f2..b16ec3c7c7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java
@@ -1,6 +1,5 @@
 package gregtech.api.metatileentity.implementations;
 
-import gregtech.GT_Mod;
 import gregtech.api.enums.ItemList;
 import gregtech.api.gui.GT_Container_2by2_Fluid;
 import gregtech.api.gui.GT_GUIContainer_2by2_Fluid;
@@ -15,7 +14,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 
-import static gregtech.api.enums.Textures.BlockIcons.*;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_INPUT_HATCH_2x2;
 
 public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_Input {
 
@@ -29,7 +28,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
     }
 
     public GT_MetaTileEntity_Hatch_MultiInput(String aName, int aSlot, int aTier, String[] aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aSlot, aDescription, aTextures);
+        super(aName, aSlot, aTier, aDescription, aTextures);
         this.mStoredFluid = new FluidStack[aSlot];
         mCapacityPer = 8000 * (1 << aTier) / aSlot;
     }
@@ -217,7 +216,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
     @Override
     public FluidStack drain(ForgeDirection from, FluidStack aFluid, boolean doDrain) {
         if (getFluid() != null && aFluid != null && getFluid().isFluidEqual(aFluid)) {
-            if (hasFluid(aFluid) && !canTankBeEmptied()) {
+            if (hasFluid(aFluid)) {
                 FluidStack tStored = mStoredFluid[getFluidSlot(aFluid)];
                 if (tStored.amount <= 0 && isFluidChangingAllowed()) {
                     setFluid(null, getFluidSlot(tStored));
-- 
cgit