Add some more hatches.

2 files changed, 88 insertions, 36 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
index 580f9a9f2f..4a41a9dfc8 100644
--- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
@@ -86,93 +86,136 @@ public class MachineLoader implements Runnable {
         // Multi AMP Power INPUTS
         // ===================================================================================================
 
+        eM_energymulti4_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15100, "hatch.energymulti04.tier.05", "IV 4A Energy Hatch", 5, 4).getStackForm(1L));
+        eM_energymulti16_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15110, "hatch.energymulti16.tier.05", "IV 16A Energy Hatch", 5, 16).getStackForm(1L));
+        eM_energymulti64_IV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15120, "hatch.energymulti64.tier.05", "IV 64A Energy Hatch", 5, 64).getStackForm(1L));
+
+        eM_energymulti4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15101, "hatch.energymulti04.tier.06", "LuV 4A Energy Hatch", 6, 4).getStackForm(1L));
+        eM_energymulti16_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15111, "hatch.energymulti16.tier.06", "LuV 16A Energy Hatch", 6, 16).getStackForm(1L));
+        eM_energymulti64_LuV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15121, "hatch.energymulti64.tier.06", "LuV 64A Energy Hatch", 6, 64).getStackForm(1L));
+
+        eM_energymulti4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15102, "hatch.energymulti04.tier.07", "ZPM 4A Energy Hatch", 7, 4).getStackForm(1L));
+        eM_energymulti16_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15112, "hatch.energymulti16.tier.07", "ZPM 16A Energy Hatch", 7, 16).getStackForm(1L));
+        eM_energymulti64_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
+                15122, "hatch.energymulti64.tier.07", "ZPM 64A Energy Hatch", 7, 64).getStackForm(1L));
+
         eM_energymulti4_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15100, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L));
+                15103, "hatch.energymulti04.tier.08", "UV 4A Energy Hatch", 8, 4).getStackForm(1L));
         eM_energymulti16_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15110, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L));
+                15113, "hatch.energymulti16.tier.08", "UV 16A Energy Hatch", 8, 16).getStackForm(1L));
         eM_energymulti64_UV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15120, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L));
+                15123, "hatch.energymulti64.tier.08", "UV 64A Energy Hatch", 8, 64).getStackForm(1L));
 
         eM_energymulti4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15101, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L));
+                15104, "hatch.energymulti04.tier.09", "UHV 4A Energy Hatch", 9, 4).getStackForm(1L));
         eM_energymulti16_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15111, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L));
+                15114, "hatch.energymulti16.tier.09", "UHV 16A Energy Hatch", 9, 16).getStackForm(1L));
         eM_energymulti64_UHV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15121, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L));
+                15124, "hatch.energymulti64.tier.09", "UHV 64A Energy Hatch", 9, 64).getStackForm(1L));
 
         eM_energymulti4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15102, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L));
+                15105, "hatch.energymulti04.tier.10", "UEV 4A Energy Hatch", 10, 4).getStackForm(1L));
         eM_energymulti16_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15112, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L));
+                15115, "hatch.energymulti16.tier.10", "UEV 16A Energy Hatch", 10, 16).getStackForm(1L));
         eM_energymulti64_UEV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15122, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L));
+                15125, "hatch.energymulti64.tier.10", "UEV 64A Energy Hatch", 10, 64).getStackForm(1L));
 
         eM_energymulti4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15103, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L));
+                15106, "hatch.energymulti04.tier.11", "UIV 4A Energy Hatch", 11, 4).getStackForm(1L));
         eM_energymulti16_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15113, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L));
+                15116, "hatch.energymulti16.tier.11", "UIV 16A Energy Hatch", 11, 16).getStackForm(1L));
         eM_energymulti64_UIV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15123, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L));
+                15126, "hatch.energymulti64.tier.11", "UIV 64A Energy Hatch", 11, 64).getStackForm(1L));
 
         eM_energymulti4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15104, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L));
+                15107, "hatch.energymulti04.tier.12", "UMV 4A Energy Hatch", 12, 4).getStackForm(1L));
         eM_energymulti16_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15114, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L));
+                15117, "hatch.energymulti16.tier.12", "UMV 16A Energy Hatch", 12, 16).getStackForm(1L));
         eM_energymulti64_UMV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15124, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L));
+                15127, "hatch.energymulti64.tier.12", "UMV 64A Energy Hatch", 12, 64).getStackForm(1L));
 
         eM_energymulti4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15105, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L));
+                15108, "hatch.energymulti04.tier.13", "UXV 4A Energy Hatch", 13, 4).getStackForm(1L));
         eM_energymulti16_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15115, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L));
+                15118, "hatch.energymulti16.tier.13", "UXV 16A Energy Hatch", 13, 16).getStackForm(1L));
         eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti(
-                15125, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L));
+                15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L));
 
         // ===================================================================================================
         // Multi AMP Power OUTPUTS
         // ===================================================================================================
 
+
+        eM_dynamomulti4_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15200, "hatch.dynamomulti04.tier.05", "IV 4A Dynamo Hatch", 5, 4).getStackForm(1L));
+        eM_dynamomulti16_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15210, "hatch.dynamomulti16.tier.05", "IV 16A Dynamo Hatch", 5, 16).getStackForm(1L));
+        eM_dynamomulti64_IV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15220, "hatch.dynamomulti64.tier.05", "IV 64A Dynamo Hatch", 5, 64).getStackForm(1L));
+
+        eM_dynamomulti4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15201, "hatch.dynamomulti04.tier.06", "LuV 4A Dynamo Hatch", 6, 4).getStackForm(1L));
+        eM_dynamomulti16_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15211, "hatch.dynamomulti16.tier.06", "LuV 16A Dynamo Hatch", 6, 16).getStackForm(1L));
+        eM_dynamomulti64_LuV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15221, "hatch.dynamomulti64.tier.06", "LuV 64A Dynamo Hatch", 6, 64).getStackForm(1L));
+
+        eM_dynamomulti4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15202, "hatch.dynamomulti04.tier.07", "ZPM 4A Dynamo Hatch", 7, 4).getStackForm(1L));
+        eM_dynamomulti16_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15212, "hatch.dynamomulti16.tier.07", "ZPM 16A Dynamo Hatch", 7, 16).getStackForm(1L));
+        eM_dynamomulti64_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
+                15222, "hatch.dynamomulti64.tier.07", "ZPM 64A Dynamo Hatch", 7, 64).getStackForm(1L));
+
         eM_dynamomulti4_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15200, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L));
+                15203, "hatch.dynamomulti04.tier.08", "UV 4A Dynamo Hatch", 8, 4).getStackForm(1L));
         eM_dynamomulti16_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15210, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L));
+                15213, "hatch.dynamomulti16.tier.08", "UV 16A Dynamo Hatch", 8, 16).getStackForm(1L));
         eM_dynamomulti64_UV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15220, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L));
+                15223, "hatch.dynamomulti64.tier.08", "UV 64A Dynamo Hatch", 8, 64).getStackForm(1L));
 
         eM_dynamomulti4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15201, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L));
+                15204, "hatch.dynamomulti04.tier.09", "UHV 4A Dynamo Hatch", 9, 4).getStackForm(1L));
         eM_dynamomulti16_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15211, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L));
+                15214, "hatch.dynamomulti16.tier.09", "UHV 16A Dynamo Hatch", 9, 16).getStackForm(1L));
         eM_dynamomulti64_UHV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15221, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L));
+                15224, "hatch.dynamomulti64.tier.09", "UHV 64A Dynamo Hatch", 9, 64).getStackForm(1L));
 
         eM_dynamomulti4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15202, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L));
+                15205, "hatch.dynamomulti04.tier.10", "UEV 4A Dynamo Hatch", 10, 4).getStackForm(1L));
         eM_dynamomulti16_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15212, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L));
+                15215, "hatch.dynamomulti16.tier.10", "UEV 16A Dynamo Hatch", 10, 16).getStackForm(1L));
         eM_dynamomulti64_UEV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15222, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L));
+                15225, "hatch.dynamomulti64.tier.10", "UEV 64A Dynamo Hatch", 10, 64).getStackForm(1L));
 
         eM_dynamomulti4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15203, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L));
+                15206, "hatch.dynamomulti04.tier.11", "UIV 4A Dynamo Hatch", 11, 4).getStackForm(1L));
         eM_dynamomulti16_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15213, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L));
+                15216, "hatch.dynamomulti16.tier.11", "UIV 16A Dynamo Hatch", 11, 16).getStackForm(1L));
         eM_dynamomulti64_UIV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15223, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L));
+                15226, "hatch.dynamomulti64.tier.11", "UIV 64A Dynamo Hatch", 11, 64).getStackForm(1L));
 
         eM_dynamomulti4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15204, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L));
+                15207, "hatch.dynamomulti04.tier.12", "UMV 4A Dynamo Hatch", 12, 4).getStackForm(1L));
         eM_dynamomulti16_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15214, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L));
+                15217, "hatch.dynamomulti16.tier.12", "UMV 16A Dynamo Hatch", 12, 16).getStackForm(1L));
         eM_dynamomulti64_UMV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15224, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L));
+                15227, "hatch.dynamomulti64.tier.12", "UMV 64A Dynamo Hatch", 12, 64).getStackForm(1L));
 
         eM_dynamomulti4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15205, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L));
+                15208, "hatch.dynamomulti04.tier.13", "UXV 4A Dynamo Hatch", 13, 4).getStackForm(1L));
         eM_dynamomulti16_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15215, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L));
+                15218, "hatch.dynamomulti16.tier.13", "UXV 16A Dynamo Hatch", 13, 16).getStackForm(1L));
         eM_dynamomulti64_UXV.set(new GT_MetaTileEntity_Hatch_DynamoMulti(
-                15225, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L));
+                15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L));
 
         // ===================================================================================================
         // MULTIBLOCKS
diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 94a948593e..5c2d6c631d 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -13,18 +13,27 @@ import static gregtech.api.enums.GT_Values.W;
 public enum CustomItemList implements IItemContainer {
     Machine_DebugWriter,Machine_DebugGenny,
     EMpipe, DATApipe, rack_Hatch, holder_Hatch,
+
+    eM_dynamomulti4_IV, eM_dynamomulti16_IV, eM_dynamomulti64_IV,
+    eM_dynamomulti4_LuV, eM_dynamomulti16_LuV, eM_dynamomulti64_LuV,
+    eM_dynamomulti4_ZPM, eM_dynamomulti16_ZPM, eM_dynamomulti64_ZPM,
     eM_dynamomulti4_UV, eM_dynamomulti16_UV, eM_dynamomulti64_UV,
     eM_dynamomulti4_UHV, eM_dynamomulti16_UHV, eM_dynamomulti64_UHV,
     eM_dynamomulti4_UEV, eM_dynamomulti16_UEV, eM_dynamomulti64_UEV,
     eM_dynamomulti4_UIV, eM_dynamomulti16_UIV, eM_dynamomulti64_UIV,
     eM_dynamomulti4_UMV, eM_dynamomulti16_UMV, eM_dynamomulti64_UMV,
     eM_dynamomulti4_UXV, eM_dynamomulti16_UXV, eM_dynamomulti64_UXV,
+
+    eM_energymulti4_IV, eM_energymulti16_IV, eM_energymulti64_IV,
+    eM_energymulti4_LuV, eM_energymulti16_LuV, eM_energymulti64_LuV,
+    eM_energymulti4_ZPM, eM_energymulti16_ZPM, eM_energymulti64_ZPM,
     eM_energymulti4_UV, eM_energymulti16_UV, eM_energymulti64_UV,
     eM_energymulti4_UHV, eM_energymulti16_UHV, eM_energymulti64_UHV,
     eM_energymulti4_UEV, eM_energymulti16_UEV, eM_energymulti64_UEV,
     eM_energymulti4_UIV, eM_energymulti16_UIV, eM_energymulti64_UIV,
     eM_energymulti4_UMV, eM_energymulti16_UMV, eM_energymulti64_UMV,
     eM_energymulti4_UXV, eM_energymulti16_UXV, eM_energymulti64_UXV,
+
     eM_in_UV, eM_in_UHV, eM_in_UEV, eM_in_UIV, eM_in_UMV, eM_in_UXV,
     eM_out_UV, eM_out_UHV, eM_out_UEV, eM_out_UIV, eM_out_UMV, eM_out_UXV,
     eM_muffler_UV, eM_muffler_UHV, eM_muffler_UEV, eM_muffler_UIV, eM_muffler_UMV, eM_muffler_UXV,