More quad input hatches (#2121)

* Saving

* Saving

* Spotless + Import fixes

* Attempt to fix review request

* Spotless

* spotlessApply (#2126)

Co-authored-by: GitHub GTNH Actions <>

* Fixing Requested Changes

* Update src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java

Co-authored-by: Maxim <maxim235@gmx.de>

* Update GT_MetaTileEntity_Hatch_QuadrupleHumongous.java

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>

5 files changed, 59 insertions, 5 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 471176d500..6d2cf37577 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1061,6 +1061,9 @@ public enum ItemList implements IItemContainer {
     Hatch_Input_Multi_2x2_UHV,
     Hatch_Input_Multi_2x2_UEV,
     Hatch_Input_Multi_2x2_UIV,
+    Hatch_Input_Multi_2x2_UMV,
+    Hatch_Input_Multi_2x2_UXV,
+    Hatch_Input_Multi_2x2_Humongous,
 
     Hatch_Input_Bus_ULV,
     Hatch_Input_Bus_LV,
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
index e6d8b13045..57ddcf42d9 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
@@ -40,9 +40,12 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
             aNameRegional,
             aTier,
             aSlot,
-            new String[] { "Fluid Input for Multiblocks",
-                "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier) / aSlot) + "L",
-                "Can hold " + aSlot + " types of fluid." });
+            new String[] { "Fluid Input for Multiblocks", "", "Can hold " + aSlot + " types of fluid." });
+        mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L";
+    }
+
+    public int getCapacityPerTank(int aTier, int aSlot) {
+        return (int) (8000L * (1L << aTier) / aSlot);
     }
 
     public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
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 cd1ea520c8..5dc04f8ea0 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
@@ -30,7 +30,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
         super(aID, aSlot, aName, aNameRegional, aTier);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
-        mCapacityPer = 8000 * (1 << aTier) / aSlot;
+        mCapacityPer = getCapacityPerTank(aTier, aSlot);
     }
 
     public GT_MetaTileEntity_Hatch_MultiInput(String aName, int aSlot, int aTier, String[] aDescription,
@@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_
         super(aName, aSlot, aTier, aDescription, aTextures);
         this.mStoredFluid = new FluidStack[aSlot];
         fluidTanks = new FluidStackTank[aSlot];
-        mCapacityPer = 8000 * (1 << aTier) / aSlot;
+        mCapacityPer = getCapacityPerTank(aTier, aSlot);
         for (int i = 0; i < aSlot; i++) {
             final int index = i;
             fluidTanks[i] = new FluidStackTank(
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
new file mode 100644
index 0000000000..86ebc857f2
--- /dev/null
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
@@ -0,0 +1,27 @@
+package gregtech.api.metatileentity.implementations;
+
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+
+public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntity_Hatch_MultiInput {
+
+    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) {
+        super(aID, aSlot, aName, aNameRegional, 0);
+    }
+
+    public GT_MetaTileEntity_Hatch_QuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription,
+        ITexture[][][] aTextures) {
+        super(aName, aSlot, aTier, aDescription, aTextures);
+    }
+
+    @Override
+    public int getCapacityPerTank(int aTier, int aSlot) {
+        return 500_000_000;
+    }
+
+    @Override
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Hatch_QuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures);
+    }
+}
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 0433a62470..4795f96769 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -27,6 +27,7 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffl
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_MultiInput;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_OutputBus;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_QuadrupleHumongous;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Dynamo;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Wireless_Hatch;
@@ -570,6 +571,26 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
                 "hatch.multi.input.tier.08",
                 "Quadruple Input Hatch (UIV)",
                 11).getStackForm(1L));
+        ItemList.Hatch_Input_Multi_2x2_UMV.set(
+            new GT_MetaTileEntity_Hatch_MultiInput(
+                717,
+                4,
+                "hatch.multi.input.tier.09",
+                "Quadruple Input Hatch (UMV)",
+                12).getStackForm(1L));
+        ItemList.Hatch_Input_Multi_2x2_UXV.set(
+            new GT_MetaTileEntity_Hatch_MultiInput(
+                718,
+                4,
+                "hatch.multi.input.tier.10",
+                "Quadruple Input Hatch (UXV)",
+                13).getStackForm(1L));
+        ItemList.Hatch_Input_Multi_2x2_Humongous.set(
+            new GT_MetaTileEntity_Hatch_QuadrupleHumongous(
+                719,
+                4,
+                "hatch.multi.input.tier.11",
+                "Humongous Quadruple Input Hatch").getStackForm(1L));
 
         ItemList.Hatch_Output_ULV.set(
             new GT_MetaTileEntity_Hatch_Output(60, "hatch.output.tier.00", "Output Hatch (ULV)", 0).getStackForm(1L));