aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java252
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java82
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java30
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java2
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java4
7 files changed, 157 insertions, 221 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
index 920e14a16e..0d3ef48d8d 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java
@@ -162,139 +162,139 @@ public class MachineLoader implements Runnable {
// ===================================================================================================
eM_energytunnel1_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15130, "hatch.energytunnel1.tier.05", "IV 256A Laser Target Hatch", 5, 256).getStackForm(1L));
+ 15130, "hatch.energytunnel1.tier.05", "IV 256/t Laser Target Hatch", 5, 256).getStackForm(1L));
eM_energytunnel2_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15140, "hatch.energytunnel2.tier.05", "IV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L));
+ 15140, "hatch.energytunnel2.tier.05", "IV 1024/t Laser Target Hatch", 5, 1024).getStackForm(1L));
eM_energytunnel3_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15150, "hatch.energytunnel3.tier.05", "IV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L));
+ 15150, "hatch.energytunnel3.tier.05", "IV 4096/t Laser Target Hatch", 5, 4096).getStackForm(1L));
eM_energytunnel4_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15160, "hatch.energytunnel4.tier.05", "IV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L));
+ 15160, "hatch.energytunnel4.tier.05", "IV 16384/t Laser Target Hatch", 5, 16384).getStackForm(1L));
eM_energytunnel5_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15170, "hatch.energytunnel5.tier.05", "IV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L));
+ 15170, "hatch.energytunnel5.tier.05", "IV 65536/t Laser Target Hatch", 5, 65536).getStackForm(1L));
eM_energytunnel6_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15180, "hatch.energytunnel6.tier.05", "IV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L));
+ 15180, "hatch.energytunnel6.tier.05", "IV 262144/t Laser Target Hatch", 5, 262144).getStackForm(1L));
eM_energytunnel7_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15190, "hatch.energytunnel7.tier.05", "IV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L));
+ 15190, "hatch.energytunnel7.tier.05", "IV 1048576/t Laser Target Hatch", 5, 1048576).getStackForm(1L));
eM_energytunnel1_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15131, "hatch.energytunnel1.tier.06", "LuV 256A Laser Target Hatch", 6, 256).getStackForm(1L));
+ 15131, "hatch.energytunnel1.tier.06", "LuV 256/t Laser Target Hatch", 6, 256).getStackForm(1L));
eM_energytunnel2_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15141, "hatch.energytunnel2.tier.06", "LuV 1024A Laser Target Hatch", 6, 1024).getStackForm(1L));
+ 15141, "hatch.energytunnel2.tier.06", "LuV 1024/t Laser Target Hatch", 6, 1024).getStackForm(1L));
eM_energytunnel3_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15151, "hatch.energytunnel3.tier.06", "LuV 4096A Laser Target Hatch", 6, 4096).getStackForm(1L));
+ 15151, "hatch.energytunnel3.tier.06", "LuV 4096/t Laser Target Hatch", 6, 4096).getStackForm(1L));
eM_energytunnel4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15161, "hatch.energytunnel4.tier.06", "LuV 16384A Laser Target Hatch", 6, 16384).getStackForm(1L));
+ 15161, "hatch.energytunnel4.tier.06", "LuV 16384/t Laser Target Hatch", 6, 16384).getStackForm(1L));
eM_energytunnel5_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15171, "hatch.energytunnel5.tier.06", "LuV 65536A Laser Target Hatch", 6, 65536).getStackForm(1L));
+ 15171, "hatch.energytunnel5.tier.06", "LuV 65536/t Laser Target Hatch", 6, 65536).getStackForm(1L));
eM_energytunnel6_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15181, "hatch.energytunnel6.tier.06", "LuV 262144A Laser Target Hatch", 6, 262144).getStackForm(1L));
+ 15181, "hatch.energytunnel6.tier.06", "LuV 262144/t Laser Target Hatch", 6, 262144).getStackForm(1L));
eM_energytunnel7_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15191, "hatch.energytunnel7.tier.06", "LuV 1048576A Laser Target Hatch", 6, 1048576).getStackForm(1L));
+ 15191, "hatch.energytunnel7.tier.06", "LuV 1048576/t Laser Target Hatch", 6, 1048576).getStackForm(1L));
eM_energytunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15132, "hatch.energytunnel1.tier.07", "ZPM 256A Laser Target Hatch", 7, 256).getStackForm(1L));
+ 15132, "hatch.energytunnel1.tier.07", "ZPM 256/t Laser Target Hatch", 7, 256).getStackForm(1L));
eM_energytunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15142, "hatch.energytunnel2.tier.07", "ZPM 1024A Laser Target Hatch", 7, 1024).getStackForm(1L));
+ 15142, "hatch.energytunnel2.tier.07", "ZPM 1024/t Laser Target Hatch", 7, 1024).getStackForm(1L));
eM_energytunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15152, "hatch.energytunnel3.tier.07", "ZPM 4096A Laser Target Hatch", 7, 4096).getStackForm(1L));
+ 15152, "hatch.energytunnel3.tier.07", "ZPM 4096/t Laser Target Hatch", 7, 4096).getStackForm(1L));
eM_energytunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15162, "hatch.energytunnel4.tier.07", "ZPM 16384A Laser Target Hatch", 7, 16384).getStackForm(1L));
+ 15162, "hatch.energytunnel4.tier.07", "ZPM 16384/t Laser Target Hatch", 7, 16384).getStackForm(1L));
eM_energytunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15172, "hatch.energytunnel5.tier.07", "ZPM 65536A Laser Target Hatch", 7, 65536).getStackForm(1L));
+ 15172, "hatch.energytunnel5.tier.07", "ZPM 65536/t Laser Target Hatch", 7, 65536).getStackForm(1L));
eM_energytunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15182, "hatch.energytunnel6.tier.07", "ZPM 262144A Laser Target Hatch", 7, 262144).getStackForm(1L));
+ 15182, "hatch.energytunnel6.tier.07", "ZPM 262144/t Laser Target Hatch", 7, 262144).getStackForm(1L));
eM_energytunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15192, "hatch.energytunnel7.tier.07", "ZPM 1048576A Laser Target Hatch", 7, 1048576).getStackForm(1L));
+ 15192, "hatch.energytunnel7.tier.07", "ZPM 1048576/t Laser Target Hatch", 7, 1048576).getStackForm(1L));
eM_energytunnel1_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15133, "hatch.energytunnel1.tier.08", "UV 256A Laser Target Hatch", 8, 256).getStackForm(1L));
+ 15133, "hatch.energytunnel1.tier.08", "UV 256/t Laser Target Hatch", 8, 256).getStackForm(1L));
eM_energytunnel2_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15143, "hatch.energytunnel2.tier.08", "UV 1024A Laser Target Hatch", 8, 1024).getStackForm(1L));
+ 15143, "hatch.energytunnel2.tier.08", "UV 1024/t Laser Target Hatch", 8, 1024).getStackForm(1L));
eM_energytunnel3_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15153, "hatch.energytunnel3.tier.08", "UV 4096A Laser Target Hatch", 8, 4096).getStackForm(1L));
+ 15153, "hatch.energytunnel3.tier.08", "UV 4096/t Laser Target Hatch", 8, 4096).getStackForm(1L));
eM_energytunnel4_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15163, "hatch.energytunnel4.tier.08", "UV 16384A Laser Target Hatch", 8, 16384).getStackForm(1L));
+ 15163, "hatch.energytunnel4.tier.08", "UV 16384/t Laser Target Hatch", 8, 16384).getStackForm(1L));
eM_energytunnel5_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15173, "hatch.energytunnel5.tier.08", "UV 65536A Laser Target Hatch", 8, 65536).getStackForm(1L));
+ 15173, "hatch.energytunnel5.tier.08", "UV 65536/t Laser Target Hatch", 8, 65536).getStackForm(1L));
eM_energytunnel6_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15183, "hatch.energytunnel6.tier.08", "UV 262144A Laser Target Hatch", 8, 262144).getStackForm(1L));
+ 15183, "hatch.energytunnel6.tier.08", "UV 262144/t Laser Target Hatch", 8, 262144).getStackForm(1L));
eM_energytunnel7_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15193, "hatch.energytunnel7.tier.08", "UV 1048576A Laser Target Hatch", 8, 1048576).getStackForm(1L));
+ 15193, "hatch.energytunnel7.tier.08", "UV 1048576/t Laser Target Hatch", 8, 1048576).getStackForm(1L));
eM_energytunnel1_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15134, "hatch.energytunnel1.tier.09", "UHV 256A Laser Target Hatch", 9, 256).getStackForm(1L));
+ 15134, "hatch.energytunnel1.tier.09", "UHV 256/t Laser Target Hatch", 9, 256).getStackForm(1L));
eM_energytunnel2_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15144, "hatch.energytunnel2.tier.09", "UHV 1024A Laser Target Hatch", 9, 1024).getStackForm(1L));
+ 15144, "hatch.energytunnel2.tier.09", "UHV 1024/t Laser Target Hatch", 9, 1024).getStackForm(1L));
eM_energytunnel3_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15154, "hatch.energytunnel3.tier.09", "UHV 4096A Laser Target Hatch", 9, 4096).getStackForm(1L));
+ 15154, "hatch.energytunnel3.tier.09", "UHV 4096/t Laser Target Hatch", 9, 4096).getStackForm(1L));
eM_energytunnel4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15164, "hatch.energytunnel4.tier.09", "UHV 16384A Laser Target Hatch", 9, 16384).getStackForm(1L));
+ 15164, "hatch.energytunnel4.tier.09", "UHV 16384/t Laser Target Hatch", 9, 16384).getStackForm(1L));
eM_energytunnel5_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15174, "hatch.energytunnel5.tier.09", "UHV 65536A Laser Target Hatch", 9, 65536).getStackForm(1L));
+ 15174, "hatch.energytunnel5.tier.09", "UHV 65536/t Laser Target Hatch", 9, 65536).getStackForm(1L));
eM_energytunnel6_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15184, "hatch.energytunnel6.tier.09", "UHV 262144A Laser Target Hatch", 9, 262144).getStackForm(1L));
+ 15184, "hatch.energytunnel6.tier.09", "UHV 262144/t Laser Target Hatch", 9, 262144).getStackForm(1L));
eM_energytunnel7_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15194, "hatch.energytunnel7.tier.09", "UHV 1048576A Laser Target Hatch", 9, 1048576).getStackForm(1L));
+ 15194, "hatch.energytunnel7.tier.09", "UHV 1048576/t Laser Target Hatch", 9, 1048576).getStackForm(1L));
eM_energytunnel1_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15135, "hatch.energytunnel1.tier.10", "UEV 256A Laser Target Hatch", 10, 256).getStackForm(1L));
+ 15135, "hatch.energytunnel1.tier.10", "UEV 256/t Laser Target Hatch", 10, 256).getStackForm(1L));
eM_energytunnel2_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15145, "hatch.energytunnel2.tier.10", "UEV 1024A Laser Target Hatch", 10, 1024).getStackForm(1L));
+ 15145, "hatch.energytunnel2.tier.10", "UEV 1024/t Laser Target Hatch", 10, 1024).getStackForm(1L));
eM_energytunnel3_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15155, "hatch.energytunnel3.tier.10", "UEV 4096A Laser Target Hatch", 10, 4096).getStackForm(1L));
+ 15155, "hatch.energytunnel3.tier.10", "UEV 4096/t Laser Target Hatch", 10, 4096).getStackForm(1L));
eM_energytunnel4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15165, "hatch.energytunnel4.tier.10", "UEV 16384A Laser Target Hatch", 10, 16384).getStackForm(1L));
+ 15165, "hatch.energytunnel4.tier.10", "UEV 16384/t Laser Target Hatch", 10, 16384).getStackForm(1L));
eM_energytunnel5_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15175, "hatch.energytunnel5.tier.10", "UEV 65536A Laser Target Hatch", 10, 65536).getStackForm(1L));
+ 15175, "hatch.energytunnel5.tier.10", "UEV 65536/t Laser Target Hatch", 10, 65536).getStackForm(1L));
eM_energytunnel6_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15185, "hatch.energytunnel6.tier.10", "UEV 262144A Laser Target Hatch", 10, 262144).getStackForm(1L));
+ 15185, "hatch.energytunnel6.tier.10", "UEV 262144/t Laser Target Hatch", 10, 262144).getStackForm(1L));
eM_energytunnel7_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15195, "hatch.energytunnel7.tier.10", "UEV 1048576A Laser Target Hatch", 10, 1048576).getStackForm(1L));
+ 15195, "hatch.energytunnel7.tier.10", "UEV 1048576/t Laser Target Hatch", 10, 1048576).getStackForm(1L));
eM_energytunnel1_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15136, "hatch.energytunnel1.tier.11", "UIV 256A Laser Target Hatch", 11, 256).getStackForm(1L));
+ 15136, "hatch.energytunnel1.tier.11", "UIV 256/t Laser Target Hatch", 11, 256).getStackForm(1L));
eM_energytunnel2_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15146, "hatch.energytunnel2.tier.11", "UIV 1024A Laser Target Hatch", 11, 1024).getStackForm(1L));
+ 15146, "hatch.energytunnel2.tier.11", "UIV 1024/t Laser Target Hatch", 11, 1024).getStackForm(1L));
eM_energytunnel3_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15156, "hatch.energytunnel3.tier.11", "UIV 4096A Laser Target Hatch", 11, 4096).getStackForm(1L));
+ 15156, "hatch.energytunnel3.tier.11", "UIV 4096/t Laser Target Hatch", 11, 4096).getStackForm(1L));
eM_energytunnel4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15166, "hatch.energytunnel4.tier.11", "UIV 16384A Laser Target Hatch", 11, 16384).getStackForm(1L));
+ 15166, "hatch.energytunnel4.tier.11", "UIV 16384/t Laser Target Hatch", 11, 16384).getStackForm(1L));
eM_energytunnel5_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15176, "hatch.energytunnel5.tier.11", "UIV 65536A Laser Target Hatch", 11, 65536).getStackForm(1L));
+ 15176, "hatch.energytunnel5.tier.11", "UIV 65536/t Laser Target Hatch", 11, 65536).getStackForm(1L));
eM_energytunnel6_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15186, "hatch.energytunnel6.tier.11", "UIV 262144A Laser Target Hatch", 11, 262144).getStackForm(1L));
+ 15186, "hatch.energytunnel6.tier.11", "UIV 262144/t Laser Target Hatch", 11, 262144).getStackForm(1L));
eM_energytunnel7_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15196, "hatch.energytunnel7.tier.11", "UIV 1048576A Laser Target Hatch", 11, 1048576).getStackForm(1L));
+ 15196, "hatch.energytunnel7.tier.11", "UIV 1048576/t Laser Target Hatch", 11, 1048576).getStackForm(1L));
eM_energytunnel1_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15137, "hatch.energytunnel1.tier.12", "UMV 256A Laser Target Hatch", 12, 256).getStackForm(1L));
+ 15137, "hatch.energytunnel1.tier.12", "UMV 256/t Laser Target Hatch", 12, 256).getStackForm(1L));
eM_energytunnel2_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15147, "hatch.energytunnel2.tier.12", "UMV 1024A Laser Target Hatch", 12, 1024).getStackForm(1L));
+ 15147, "hatch.energytunnel2.tier.12", "UMV 1024/t Laser Target Hatch", 12, 1024).getStackForm(1L));
eM_energytunnel3_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15157, "hatch.energytunnel3.tier.12", "UMV 4096A Laser Target Hatch", 12, 4096).getStackForm(1L));
+ 15157, "hatch.energytunnel3.tier.12", "UMV 4096/t Laser Target Hatch", 12, 4096).getStackForm(1L));
eM_energytunnel4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15167, "hatch.energytunnel4.tier.12", "UMV 16384A Laser Target Hatch", 12, 16384).getStackForm(1L));
+ 15167, "hatch.energytunnel4.tier.12", "UMV 16384/t Laser Target Hatch", 12, 16384).getStackForm(1L));
eM_energytunnel5_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15177, "hatch.energytunnel5.tier.12", "UMV 65536A Laser Target Hatch", 12, 65536).getStackForm(1L));
+ 15177, "hatch.energytunnel5.tier.12", "UMV 65536/t Laser Target Hatch", 12, 65536).getStackForm(1L));
eM_energytunnel6_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15187, "hatch.energytunnel6.tier.12", "UMV 262144A Laser Target Hatch", 12, 262144).getStackForm(1L));
+ 15187, "hatch.energytunnel6.tier.12", "UMV 262144/t Laser Target Hatch", 12, 262144).getStackForm(1L));
eM_energytunnel7_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15197, "hatch.energytunnel7.tier.12", "UMV 1048576A Laser Target Hatch", 12, 1048576).getStackForm(1L));
+ 15197, "hatch.energytunnel7.tier.12", "UMV 1048576/t Laser Target Hatch", 12, 1048576).getStackForm(1L));
eM_energytunnel1_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15138, "hatch.energytunnel1.tier.13", "UXV 256A Laser Target Hatch", 13, 256).getStackForm(1L));
+ 15138, "hatch.energytunnel1.tier.13", "UXV 256/t Laser Target Hatch", 13, 256).getStackForm(1L));
eM_energytunnel2_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15148, "hatch.energytunnel2.tier.13", "UXV 1024A Laser Target Hatch", 13, 1024).getStackForm(1L));
+ 15148, "hatch.energytunnel2.tier.13", "UXV 1024/t Laser Target Hatch", 13, 1024).getStackForm(1L));
eM_energytunnel3_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15158, "hatch.energytunnel3.tier.13", "UXV 4096A Laser Target Hatch", 13, 4096).getStackForm(1L));
+ 15158, "hatch.energytunnel3.tier.13", "UXV 4096/t Laser Target Hatch", 13, 4096).getStackForm(1L));
eM_energytunnel4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15168, "hatch.energytunnel4.tier.13", "UXV 16384A Laser Target Hatch", 13, 16384).getStackForm(1L));
+ 15168, "hatch.energytunnel4.tier.13", "UXV 16384/t Laser Target Hatch", 13, 16384).getStackForm(1L));
eM_energytunnel5_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15178, "hatch.energytunnel5.tier.13", "UXV 65536A Laser Target Hatch", 13, 65536).getStackForm(1L));
+ 15178, "hatch.energytunnel5.tier.13", "UXV 65536/t Laser Target Hatch", 13, 65536).getStackForm(1L));
eM_energytunnel6_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15188, "hatch.energytunnel6.tier.13", "UXV 262144A Laser Target Hatch", 13, 262144).getStackForm(1L));
+ 15188, "hatch.energytunnel6.tier.13", "UXV 262144/t Laser Target Hatch", 13, 262144).getStackForm(1L));
eM_energytunnel7_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel(
- 15198, "hatch.energytunnel7.tier.13", "UXV 1048576A Laser Target Hatch", 13, 1048576).getStackForm(1L));
+ 15198, "hatch.energytunnel7.tier.13", "UXV 1048576/t Laser Target Hatch", 13, 1048576).getStackForm(1L));
// ===================================================================================================
// Multi AMP Power OUTPUTS
@@ -369,139 +369,139 @@ public class MachineLoader implements Runnable {
// ===================================================================================================
eM_dynamotunnel1_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15230, "hatch.dynamotunnel1.tier.05", "IV 256A Laser Source Hatch", 5, 256).getStackForm(1L));
+ 15230, "hatch.dynamotunnel1.tier.05", "IV 256/t Laser Source Hatch", 5, 256).getStackForm(1L));
eM_dynamotunnel2_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15240, "hatch.dynamotunnel2.tier.05", "IV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L));
+ 15240, "hatch.dynamotunnel2.tier.05", "IV 1024/t Laser Source Hatch", 5, 1024).getStackForm(1L));
eM_dynamotunnel3_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15250, "hatch.dynamotunnel3.tier.05", "IV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L));
+ 15250, "hatch.dynamotunnel3.tier.05", "IV 4096/t Laser Source Hatch", 5, 4096).getStackForm(1L));
eM_dynamotunnel4_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15260, "hatch.dynamotunnel4.tier.05", "IV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L));
+ 15260, "hatch.dynamotunnel4.tier.05", "IV 16384/t Laser Source Hatch", 5, 16384).getStackForm(1L));
eM_dynamotunnel5_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15270, "hatch.dynamotunnel5.tier.05", "IV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L));
+ 15270, "hatch.dynamotunnel5.tier.05", "IV 65536/t Laser Source Hatch", 5, 65536).getStackForm(1L));
eM_dynamotunnel6_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15280, "hatch.dynamotunnel6.tier.05", "IV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L));
+ 15280, "hatch.dynamotunnel6.tier.05", "IV 262144/t Laser Source Hatch", 5, 262144).getStackForm(1L));
eM_dynamotunnel7_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15290, "hatch.dynamotunnel7.tier.05", "IV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L));
+ 15290, "hatch.dynamotunnel7.tier.05", "IV 1048576/t Laser Source Hatch", 5, 1048576).getStackForm(1L));
eM_dynamotunnel1_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15231, "hatch.dynamotunnel1.tier.06", "LuV 256A Laser Source Hatch", 6, 256).getStackForm(1L));
+ 15231, "hatch.dynamotunnel1.tier.06", "LuV 256/t Laser Source Hatch", 6, 256).getStackForm(1L));
eM_dynamotunnel2_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15241, "hatch.dynamotunnel2.tier.06", "LuV 1024A Laser Source Hatch", 6, 1024).getStackForm(1L));
+ 15241, "hatch.dynamotunnel2.tier.06", "LuV 1024/t Laser Source Hatch", 6, 1024).getStackForm(1L));
eM_dynamotunnel3_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15251, "hatch.dynamotunnel3.tier.06", "LuV 4096A Laser Source Hatch", 6, 4096).getStackForm(1L));
+ 15251, "hatch.dynamotunnel3.tier.06", "LuV 4096/t Laser Source Hatch", 6, 4096).getStackForm(1L));
eM_dynamotunnel4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15261, "hatch.dynamotunnel4.tier.06", "LuV 16384A Laser Source Hatch", 6, 16384).getStackForm(1L));
+ 15261, "hatch.dynamotunnel4.tier.06", "LuV 16384/t Laser Source Hatch", 6, 16384).getStackForm(1L));
eM_dynamotunnel5_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15271, "hatch.dynamotunnel5.tier.06", "LuV 65536A Laser Source Hatch", 6, 65536).getStackForm(1L));
+ 15271, "hatch.dynamotunnel5.tier.06", "LuV 65536/t Laser Source Hatch", 6, 65536).getStackForm(1L));
eM_dynamotunnel6_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15281, "hatch.dynamotunnel6.tier.06", "LuV 262144A Laser Source Hatch", 6, 262144).getStackForm(1L));
+ 15281, "hatch.dynamotunnel6.tier.06", "LuV 262144/t Laser Source Hatch", 6, 262144).getStackForm(1L));
eM_dynamotunnel7_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15291, "hatch.dynamotunnel7.tier.06", "LuV 1048576A Laser Source Hatch", 6, 1048576).getStackForm(1L));
+ 15291, "hatch.dynamotunnel7.tier.06", "LuV 1048576/t Laser Source Hatch", 6, 1048576).getStackForm(1L));
eM_dynamotunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15232, "hatch.dynamotunnel1.tier.07", "ZPM 256A Laser Source Hatch", 7, 256).getStackForm(1L));
+ 15232, "hatch.dynamotunnel1.tier.07", "ZPM 256/t Laser Source Hatch", 7, 256).getStackForm(1L));
eM_dynamotunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15242, "hatch.dynamotunnel2.tier.07", "ZPM 1024A Laser Source Hatch", 7, 1024).getStackForm(1L));
+ 15242, "hatch.dynamotunnel2.tier.07", "ZPM 1024/t Laser Source Hatch", 7, 1024).getStackForm(1L));
eM_dynamotunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15252, "hatch.dynamotunnel3.tier.07", "ZPM 4096A Laser Source Hatch", 7, 4096).getStackForm(1L));
+ 15252, "hatch.dynamotunnel3.tier.07", "ZPM 4096/t Laser Source Hatch", 7, 4096).getStackForm(1L));
eM_dynamotunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15262, "hatch.dynamotunnel4.tier.07", "ZPM 16384A Laser Source Hatch", 7, 16384).getStackForm(1L));
+ 15262, "hatch.dynamotunnel4.tier.07", "ZPM 16384/t Laser Source Hatch", 7, 16384).getStackForm(1L));
eM_dynamotunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15272, "hatch.dynamotunnel5.tier.07", "ZPM 65536A Laser Source Hatch", 7, 65536).getStackForm(1L));
+ 15272, "hatch.dynamotunnel5.tier.07", "ZPM 65536/t Laser Source Hatch", 7, 65536).getStackForm(1L));
eM_dynamotunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15282, "hatch.dynamotunnel6.tier.07", "ZPM 262144A Laser Source Hatch", 7, 262144).getStackForm(1L));
+ 15282, "hatch.dynamotunnel6.tier.07", "ZPM 262144/t Laser Source Hatch", 7, 262144).getStackForm(1L));
eM_dynamotunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15292, "hatch.dynamotunnel7.tier.07", "ZPM 1048576A Laser Source Hatch", 7, 1048576).getStackForm(1L));
+ 15292, "hatch.dynamotunnel7.tier.07", "ZPM 1048576/t Laser Source Hatch", 7, 1048576).getStackForm(1L));
eM_dynamotunnel1_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15233, "hatch.dynamotunnel1.tier.08", "UV 256A Laser Source Hatch", 8, 256).getStackForm(1L));
+ 15233, "hatch.dynamotunnel1.tier.08", "UV 256/t Laser Source Hatch", 8, 256).getStackForm(1L));
eM_dynamotunnel2_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15243, "hatch.dynamotunnel2.tier.08", "UV 1024A Laser Source Hatch", 8, 1024).getStackForm(1L));
+ 15243, "hatch.dynamotunnel2.tier.08", "UV 1024/t Laser Source Hatch", 8, 1024).getStackForm(1L));
eM_dynamotunnel3_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15253, "hatch.dynamotunnel3.tier.08", "UV 4096A Laser Source Hatch", 8, 4096).getStackForm(1L));
+ 15253, "hatch.dynamotunnel3.tier.08", "UV 4096/t Laser Source Hatch", 8, 4096).getStackForm(1L));
eM_dynamotunnel4_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15263, "hatch.dynamotunnel4.tier.08", "UV 16384A Laser Source Hatch", 8, 16384).getStackForm(1L));
+ 15263, "hatch.dynamotunnel4.tier.08", "UV 16384/t Laser Source Hatch", 8, 16384).getStackForm(1L));
eM_dynamotunnel5_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15273, "hatch.dynamotunnel5.tier.08", "UV 65536A Laser Source Hatch", 8, 65536).getStackForm(1L));
+ 15273, "hatch.dynamotunnel5.tier.08", "UV 65536/t Laser Source Hatch", 8, 65536).getStackForm(1L));
eM_dynamotunnel6_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15283, "hatch.dynamotunnel6.tier.08", "UV 262144A Laser Source Hatch", 8, 262144).getStackForm(1L));
+ 15283, "hatch.dynamotunnel6.tier.08", "UV 262144/t Laser Source Hatch", 8, 262144).getStackForm(1L));
eM_dynamotunnel7_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15293, "hatch.dynamotunnel7.tier.08", "UV 1048576A Laser Source Hatch", 8, 1048576).getStackForm(1L));
+ 15293, "hatch.dynamotunnel7.tier.08", "UV 1048576/t Laser Source Hatch", 8, 1048576).getStackForm(1L));
eM_dynamotunnel1_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15234, "hatch.dynamotunnel1.tier.09", "UHV 256A Laser Source Hatch", 9, 256).getStackForm(1L));
+ 15234, "hatch.dynamotunnel1.tier.09", "UHV 256/t Laser Source Hatch", 9, 256).getStackForm(1L));
eM_dynamotunnel2_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15244, "hatch.dynamotunnel2.tier.09", "UHV 1024A Laser Source Hatch", 9, 1024).getStackForm(1L));
+ 15244, "hatch.dynamotunnel2.tier.09", "UHV 1024/t Laser Source Hatch", 9, 1024).getStackForm(1L));
eM_dynamotunnel3_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15254, "hatch.dynamotunnel3.tier.09", "UHV 4096A Laser Source Hatch", 9, 4096).getStackForm(1L));
+ 15254, "hatch.dynamotunnel3.tier.09", "UHV 4096/t Laser Source Hatch", 9, 4096).getStackForm(1L));
eM_dynamotunnel4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15264, "hatch.dynamotunnel4.tier.09", "UHV 16384A Laser Source Hatch", 9, 16384).getStackForm(1L));
+ 15264, "hatch.dynamotunnel4.tier.09", "UHV 16384/t Laser Source Hatch", 9, 16384).getStackForm(1L));
eM_dynamotunnel5_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15274, "hatch.dynamotunnel5.tier.09", "UHV 65536A Laser Source Hatch", 9, 65536).getStackForm(1L));
+ 15274, "hatch.dynamotunnel5.tier.09", "UHV 65536/t Laser Source Hatch", 9, 65536).getStackForm(1L));
eM_dynamotunnel6_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15284, "hatch.dynamotunnel6.tier.09", "UHV 262144A Laser Source Hatch", 9, 262144).getStackForm(1L));
+ 15284, "hatch.dynamotunnel6.tier.09", "UHV 262144/t Laser Source Hatch", 9, 262144).getStackForm(1L));
eM_dynamotunnel7_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15294, "hatch.dynamotunnel7.tier.09", "UHV 1048576A Laser Source Hatch", 9, 1048576).getStackForm(1L));
+ 15294, "hatch.dynamotunnel7.tier.09", "UHV 1048576/t Laser Source Hatch", 9, 1048576).getStackForm(1L));
eM_dynamotunnel1_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15235, "hatch.dynamotunnel1.tier.10", "UEV 256A Laser Source Hatch", 10, 256).getStackForm(1L));
+ 15235, "hatch.dynamotunnel1.tier.10", "UEV 256/t Laser Source Hatch", 10, 256).getStackForm(1L));
eM_dynamotunnel2_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15245, "hatch.dynamotunnel2.tier.10", "UEV 1024A Laser Source Hatch", 10, 1024).getStackForm(1L));
+ 15245, "hatch.dynamotunnel2.tier.10", "UEV 1024/t Laser Source Hatch", 10, 1024).getStackForm(1L));
eM_dynamotunnel3_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15255, "hatch.dynamotunnel3.tier.10", "UEV 4096A Laser Source Hatch", 10, 4096).getStackForm(1L));
+ 15255, "hatch.dynamotunnel3.tier.10", "UEV 4096/t Laser Source Hatch", 10, 4096).getStackForm(1L));
eM_dynamotunnel4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15265, "hatch.dynamotunnel4.tier.10", "UEV 16384A Laser Source Hatch", 10, 16384).getStackForm(1L));
+ 15265, "hatch.dynamotunnel4.tier.10", "UEV 16384/t Laser Source Hatch", 10, 16384).getStackForm(1L));
eM_dynamotunnel5_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15275, "hatch.dynamotunnel5.tier.10", "UEV 65536A Laser Source Hatch", 10, 65536).getStackForm(1L));
+ 15275, "hatch.dynamotunnel5.tier.10", "UEV 65536/t Laser Source Hatch", 10, 65536).getStackForm(1L));
eM_dynamotunnel6_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15285, "hatch.dynamotunnel6.tier.10", "UEV 262144A Laser Source Hatch", 10, 262144).getStackForm(1L));
+ 15285, "hatch.dynamotunnel6.tier.10", "UEV 262144/t Laser Source Hatch", 10, 262144).getStackForm(1L));
eM_dynamotunnel7_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15295, "hatch.dynamotunnel7.tier.10", "UEV 1048576A Laser Source Hatch", 10, 1048576).getStackForm(1L));
+ 15295, "hatch.dynamotunnel7.tier.10", "UEV 1048576/t Laser Source Hatch", 10, 1048576).getStackForm(1L));
eM_dynamotunnel1_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15236, "hatch.dynamotunnel1.tier.11", "UIV 256A Laser Source Hatch", 11, 256).getStackForm(1L));
+ 15236, "hatch.dynamotunnel1.tier.11", "UIV 256/t Laser Source Hatch", 11, 256).getStackForm(1L));
eM_dynamotunnel2_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15246, "hatch.dynamotunnel2.tier.11", "UIV 1024A Laser Source Hatch", 11, 1024).getStackForm(1L));
+ 15246, "hatch.dynamotunnel2.tier.11", "UIV 1024/t Laser Source Hatch", 11, 1024).getStackForm(1L));
eM_dynamotunnel3_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15256, "hatch.dynamotunnel3.tier.11", "UIV 4096A Laser Source Hatch", 11, 4096).getStackForm(1L));
+ 15256, "hatch.dynamotunnel3.tier.11", "UIV 4096/t Laser Source Hatch", 11, 4096).getStackForm(1L));
eM_dynamotunnel4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15266, "hatch.dynamotunnel4.tier.11", "UIV 16384A Laser Source Hatch", 11, 16384).getStackForm(1L));
+ 15266, "hatch.dynamotunnel4.tier.11", "UIV 16384/t Laser Source Hatch", 11, 16384).getStackForm(1L));
eM_dynamotunnel5_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15276, "hatch.dynamotunnel5.tier.11", "UIV 65536A Laser Source Hatch", 11, 65536).getStackForm(1L));
+ 15276, "hatch.dynamotunnel5.tier.11", "UIV 65536/t Laser Source Hatch", 11, 65536).getStackForm(1L));
eM_dynamotunnel6_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15286, "hatch.dynamotunnel6.tier.11", "UIV 262144A Laser Source Hatch", 11, 262144).getStackForm(1L));
+ 15286, "hatch.dynamotunnel6.tier.11", "UIV 262144/t Laser Source Hatch", 11, 262144).getStackForm(1L));
eM_dynamotunnel7_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15296, "hatch.dynamotunnel7.tier.11", "UIV 1048576A Laser Source Hatch", 11, 1048576).getStackForm(1L));
+ 15296, "hatch.dynamotunnel7.tier.11", "UIV 1048576/t Laser Source Hatch", 11, 1048576).getStackForm(1L));
eM_dynamotunnel1_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15237, "hatch.dynamotunnel1.tier.12", "UMV 256A Laser Source Hatch", 12, 256).getStackForm(1L));
+ 15237, "hatch.dynamotunnel1.tier.12", "UMV 256/t Laser Source Hatch", 12, 256).getStackForm(1L));
eM_dynamotunnel2_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15247, "hatch.dynamotunnel2.tier.12", "UMV 1024A Laser Source Hatch", 12, 1024).getStackForm(1L));
+ 15247, "hatch.dynamotunnel2.tier.12", "UMV 1024/t Laser Source Hatch", 12, 1024).getStackForm(1L));
eM_dynamotunnel3_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15257, "hatch.dynamotunnel3.tier.12", "UMV 4096A Laser Source Hatch", 12, 4096).getStackForm(1L));
+ 15257, "hatch.dynamotunnel3.tier.12", "UMV 4096/t Laser Source Hatch", 12, 4096).getStackForm(1L));
eM_dynamotunnel4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15267, "hatch.dynamotunnel4.tier.12", "UMV 16384A Laser Source Hatch", 12, 16384).getStackForm(1L));
+ 15267, "hatch.dynamotunnel4.tier.12", "UMV 16384/t Laser Source Hatch", 12, 16384).getStackForm(1L));
eM_dynamotunnel5_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15277, "hatch.dynamotunnel5.tier.12", "UMV 65536A Laser Source Hatch", 12, 65536).getStackForm(1L));
+ 15277, "hatch.dynamotunnel5.tier.12", "UMV 65536/t Laser Source Hatch", 12, 65536).getStackForm(1L));
eM_dynamotunnel6_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15287, "hatch.dynamotunnel6.tier.12", "UMV 262144A Laser Source Hatch", 12, 262144).getStackForm(1L));
+ 15287, "hatch.dynamotunnel6.tier.12", "UMV 262144/t Laser Source Hatch", 12, 262144).getStackForm(1L));
eM_dynamotunnel7_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15297, "hatch.dynamotunnel7.tier.12", "UMV 1048576A Laser Source Hatch", 12, 1048576).getStackForm(1L));
+ 15297, "hatch.dynamotunnel7.tier.12", "UMV 1048576/t Laser Source Hatch", 12, 1048576).getStackForm(1L));
eM_dynamotunnel1_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15238, "hatch.dynamotunnel1.tier.13", "UXV 256A Laser Source Hatch", 13, 256).getStackForm(1L));
+ 15238, "hatch.dynamotunnel1.tier.13", "UXV 256/t Laser Source Hatch", 13, 256).getStackForm(1L));
eM_dynamotunnel2_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15248, "hatch.dynamotunnel2.tier.13", "UXV 1024A Laser Source Hatch", 13, 1024).getStackForm(1L));
+ 15248, "hatch.dynamotunnel2.tier.13", "UXV 1024/t Laser Source Hatch", 13, 1024).getStackForm(1L));
eM_dynamotunnel3_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15258, "hatch.dynamotunnel3.tier.13", "UXV 4096A Laser Source Hatch", 13, 4096).getStackForm(1L));
+ 15258, "hatch.dynamotunnel3.tier.13", "UXV 4096/t Laser Source Hatch", 13, 4096).getStackForm(1L));
eM_dynamotunnel4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15268, "hatch.dynamotunnel4.tier.13", "UXV 16384A Laser Source Hatch", 13, 16384).getStackForm(1L));
+ 15268, "hatch.dynamotunnel4.tier.13", "UXV 16384/t Laser Source Hatch", 13, 16384).getStackForm(1L));
eM_dynamotunnel5_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15278, "hatch.dynamotunnel5.tier.13", "UXV 65536A Laser Source Hatch", 13, 65536).getStackForm(1L));
+ 15278, "hatch.dynamotunnel5.tier.13", "UXV 65536/t Laser Source Hatch", 13, 65536).getStackForm(1L));
eM_dynamotunnel6_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15288, "hatch.dynamotunnel6.tier.13", "UXV 262144A Laser Source Hatch", 13, 262144).getStackForm(1L));
+ 15288, "hatch.dynamotunnel6.tier.13", "UXV 262144/t Laser Source Hatch", 13, 262144).getStackForm(1L));
eM_dynamotunnel7_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel(
- 15298, "hatch.dynamotunnel7.tier.13", "UXV 1048576A Laser Source Hatch", 13, 1048576).getStackForm(1L));
+ 15298, "hatch.dynamotunnel7.tier.13", "UXV 1048576/t Laser Source Hatch", 13, 1048576).getStackForm(1L));
// ===================================================================================================
// MULTIBLOCKS
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
index 1d29cef285..46daa46729 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
@@ -11,7 +11,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.CommonValues.TRANSFER_AT;
import static com.github.technus.tectech.CommonValues.V;
@@ -22,7 +22,6 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_
*/
public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel {
private final long upkeep;
- private long packetsCount=0;
public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
super(aID, aName, aNameRegional, aTier, 0, "Energy extracting terminal for Multiblocks",aAmp);
@@ -46,18 +45,6 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
}
@Override
- public void loadNBTData(NBTTagCompound aNBT) {
- super.loadNBTData(aNBT);
- packetsCount=aNBT.getLong("ePackets");
- }
-
- @Override
- public void saveNBTData(NBTTagCompound aNBT) {
- super.saveNBTData(aNBT);
- aNBT.setLong("ePackets",packetsCount);
- }
-
- @Override
public boolean isSimpleMachine() {
return true;
}
@@ -121,7 +108,8 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
public String[] getDescription() {
return new String[]{
CommonValues.TEC_MARK_GENERAL,
- mDescription
+ mDescription,
+ "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUOutput())+EnumChatFormatting.RESET+" EU/t"
};
}
@@ -130,27 +118,15 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
if (aBaseMetaTileEntity.isServerSide()) {
byte Tick = (byte) (aTick % 20);
if (TRANSFER_AT == Tick) {
- if(aBaseMetaTileEntity.getStoredEU()>=maxEUOutput()) {
- long diff = aBaseMetaTileEntity.getStoredEU() / maxEUOutput();
- setEUVar(aBaseMetaTileEntity.getStoredEU() - diff * maxEUOutput());
- addPackets(diff);
- }
- if(packetsCount>0){
- moveAround(aBaseMetaTileEntity);
- }
- if(packetsCount>0){
- long diff=(maxEUStore()-aBaseMetaTileEntity.getStoredEU())/maxEUOutput();
- if(diff>0) {
- setEUVar(aBaseMetaTileEntity.getStoredEU() + takePackets(diff) * maxEUOutput());
- }
- }
if(aBaseMetaTileEntity.getStoredEU()>0){
setEUVar(aBaseMetaTileEntity.getStoredEU()-upkeep);
if(aBaseMetaTileEntity.getStoredEU()<0){
setEUVar(0);
}
}
- getBaseMetaTileEntity().setActive(packetsCount>0);
+ if(aBaseMetaTileEntity.getStoredEU()>getMinimumStoredEU()){
+ moveAround(aBaseMetaTileEntity);
+ }
}
}
}
@@ -171,22 +147,26 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
opposite == tGTTileEntity.getFrontFacing()) {
if(maxEUOutput()>((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()){
aMetaTileEntity.doExplosion(maxEUOutput());
+ setEUVar(aBaseMetaTileEntity.getStoredEU()-maxEUOutput());
+ return;
}else if(maxEUOutput()==((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()) {
- long ampRx = ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).Amperes;
- if (Amperes > ampRx) {
- if (packetsCount > ampRx) {
- tGTTileEntity.setToFire();
- } else {
- tGTTileEntity.setOnFire();
- ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).addPackets(takePackets(Amperes));
- }
- } else {
- ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).addPackets(takePackets(Amperes));
- }
+ long diff=Math.min(
+ Amperes*20,
+ Math.min(
+ ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUStore()-
+ aMetaTileEntity.getBaseMetaTileEntity().getStoredEU(),
+ maxEUStore()-aBaseMetaTileEntity.getStoredEU()
+ )/maxEUOutput()
+ )*maxEUOutput();
+
+ setEUVar(aBaseMetaTileEntity.getStoredEU()-diff);
+
+ ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity)
+ .setEUVar(aMetaTileEntity.getBaseMetaTileEntity().getStoredEU()+diff);
}
return;
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) {
- if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount > 2) {
+ if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount != 2) {
return;
}else {
((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed();
@@ -207,22 +187,4 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
public boolean canConnect(byte side) {
return isOutputFacing(side);
}
-
- public void addPackets(long count){
- packetsCount+=count;
- if(packetsCount>Amperes<<2){
- packetsCount=Amperes<<2;
- }
- }
-
- public long takePackets(long count){
- if(packetsCount>count){
- packetsCount-=count;
- return count;
- }else {
- count=packetsCount;
- packetsCount=0;
- return count;
- }
- }
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
index b0dd51182c..7241ba763b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java
@@ -9,6 +9,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
import static com.github.technus.tectech.CommonValues.TRANSFER_AT;
import static com.github.technus.tectech.CommonValues.V;
@@ -19,7 +20,6 @@ import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_
*/
public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch_EnergyMulti implements IConnectsToEnergyTunnel {
private final long upkeep;
- private long packetsCount=0;
public GT_MetaTileEntity_Hatch_EnergyTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
super(aID, aName, aNameRegional, aTier, 0, "Energy injecting terminal for Multiblocks",aAmp);
@@ -45,13 +45,11 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
@Override
public void loadNBTData(NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
- packetsCount=aNBT.getLong("ePackets");
}
@Override
public void saveNBTData(NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
- aNBT.setLong("ePackets",packetsCount);
}
@Override
@@ -119,6 +117,7 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
return new String[]{
CommonValues.TEC_MARK_GENERAL,
mDescription,
+ "Throughput: "+ EnumChatFormatting.YELLOW +(Amperes*maxEUInput())+EnumChatFormatting.RESET+" EU/t"
};
}
@@ -132,38 +131,13 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
if (aBaseMetaTileEntity.isServerSide()) {
byte Tick = (byte) (aTick % 20);
if (TRANSFER_AT == Tick) {
- if(packetsCount>0){
- long diff=(maxEUStore()-aBaseMetaTileEntity.getStoredEU())/maxEUInput();
- if(diff>0) {
- setEUVar(aBaseMetaTileEntity.getStoredEU() + takePackets(diff) * maxEUInput());
- }
- }
if(aBaseMetaTileEntity.getStoredEU()>0){
setEUVar(aBaseMetaTileEntity.getStoredEU()-upkeep);
if(aBaseMetaTileEntity.getStoredEU()<0){
setEUVar(0);
}
}
- getBaseMetaTileEntity().setActive(packetsCount>0);
}
}
}
-
- public void addPackets(long count){
- packetsCount+=count;
- if(packetsCount>Amperes<<2){
- packetsCount=Amperes<<2;
- }
- }
-
- public long takePackets(long count){
- if(packetsCount>count){
- packetsCount-=count;
- return count;
- }else {
- count=packetsCount;
- packetsCount=0;
- return count;
- }
- }
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
index 39889e5c3f..adfcb1d464 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java
@@ -65,7 +65,7 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H
content.clear();
return;
} else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_EM) {
- if (((GT_MetaTileEntity_Pipe_EM) aMetaTileEntity).connectionCount > 2) {
+ if (((GT_MetaTileEntity_Pipe_EM) aMetaTileEntity).connectionCount != 2) {
return;
}else {
((GT_MetaTileEntity_Pipe_EM) aMetaTileEntity).markUsed();
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
index 09f52e2611..826f75696a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
@@ -112,12 +112,12 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn
if (aBaseMetaTileEntity.isServerSide()) {
if ((aTick & 31) == 31) {
if(activity){
- if(TecTech.RANDOM.next(15)==0) {
+ if(TecTech.RANDOM.nextInt(15)==0) {
aBaseMetaTileEntity.setActive(true);
}
activity=false;
}else if(aBaseMetaTileEntity.isActive()){
- if(TecTech.RANDOM.next(15)==0) {
+ if(TecTech.RANDOM.nextInt(15)==0) {
aBaseMetaTileEntity.setActive(false);
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
index e2a17da4ac..ef17d9b688 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java
@@ -113,12 +113,12 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec
if (aBaseMetaTileEntity.isServerSide()) {
if ((aTick & 31) == 31) {
if(activity){
- if(TecTech.RANDOM.next(7)==0) {
+ if(TecTech.RANDOM.nextInt(7)==0) {
aBaseMetaTileEntity.setActive(true);
}
activity=false;
}else if(aBaseMetaTileEntity.isActive()){
- if(TecTech.RANDOM.next(7)==0) {
+ if(TecTech.RANDOM.nextInt(7)==0) {
aBaseMetaTileEntity.setActive(false);
}
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
index 761cef3c23..3d49077c3a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java
@@ -109,12 +109,12 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo
if (aBaseMetaTileEntity.isServerSide()) {
if ((aTick & 31) == 31) {
if(activity){
- if(TecTech.RANDOM.next(31)==0) {
+ if(TecTech.RANDOM.nextInt(31)==0) {
aBaseMetaTileEntity.setActive(true);
}
activity=false;
}else if(aBaseMetaTileEntity.isActive()){
- if(TecTech.RANDOM.next(31)==0) {
+ if(TecTech.RANDOM.nextInt(31)==0) {
aBaseMetaTileEntity.setActive(false);
}
}