diff options
16 files changed, 465 insertions, 64 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 24652296b9..20f6cfce58 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 @@ -9,6 +9,7 @@ import com.github.technus.tectech.thing.metaTileEntity.multi.*; import com.github.technus.tectech.thing.metaTileEntity.multi.em_machine.GT_MetaTileEntity_EM_machine; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; import com.github.technus.tectech.thing.metaTileEntity.single.*; import cpw.mods.fml.common.Loader; import net.minecraft.init.Blocks; @@ -155,6 +156,146 @@ public class MachineLoader implements Runnable { eM_energymulti64_UXV.set(new GT_MetaTileEntity_Hatch_EnergyMulti( 15128, "hatch.energymulti64.tier.13", "UXV 64A Energy Hatch", 13, 64).getStackForm(1L)); + + // =================================================================================================== + // Multi AMP Laser INPUTS + // =================================================================================================== + + eM_energytunnel1_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15130, "hatch.energytunnel1.tier.05", "IV 256A 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)); + eM_energytunnel3_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15150, "hatch.energytunnel3.tier.05", "IV 4096A 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)); + eM_energytunnel5_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15170, "hatch.energytunnel5.tier.05", "IV 65536A 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)); + eM_energytunnel7_IV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15190, "hatch.energytunnel7.tier.05", "IV 1048576A 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", 5, 256).getStackForm(1L)); + eM_energytunnel2_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15141, "hatch.energytunnel2.tier.06", "LuV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15151, "hatch.energytunnel3.tier.06", "LuV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15161, "hatch.energytunnel4.tier.06", "LuV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15171, "hatch.energytunnel5.tier.06", "LuV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15181, "hatch.energytunnel6.tier.06", "LuV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_LuV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15191, "hatch.energytunnel7.tier.06", "LuV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15132, "hatch.energytunnel1.tier.07", "ZPM 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15142, "hatch.energytunnel2.tier.07", "ZPM 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15152, "hatch.energytunnel3.tier.07", "ZPM 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15162, "hatch.energytunnel4.tier.07", "ZPM 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15172, "hatch.energytunnel5.tier.07", "ZPM 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15182, "hatch.energytunnel6.tier.07", "ZPM 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15192, "hatch.energytunnel7.tier.07", "ZPM 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15133, "hatch.energytunnel1.tier.08", "UV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15143, "hatch.energytunnel2.tier.08", "UV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15153, "hatch.energytunnel3.tier.08", "UV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15163, "hatch.energytunnel4.tier.08", "UV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15173, "hatch.energytunnel5.tier.08", "UV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15183, "hatch.energytunnel6.tier.08", "UV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15193, "hatch.energytunnel7.tier.08", "UV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15134, "hatch.energytunnel1.tier.09", "UHV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15144, "hatch.energytunnel2.tier.09", "UHV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15154, "hatch.energytunnel3.tier.09", "UHV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15164, "hatch.energytunnel4.tier.09", "UHV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15174, "hatch.energytunnel5.tier.09", "UHV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15184, "hatch.energytunnel6.tier.09", "UHV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UHV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15194, "hatch.energytunnel7.tier.09", "UHV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15135, "hatch.energytunnel1.tier.10", "UEV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15145, "hatch.energytunnel2.tier.10", "UEV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15155, "hatch.energytunnel3.tier.10", "UEV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15165, "hatch.energytunnel4.tier.10", "UEV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15175, "hatch.energytunnel5.tier.10", "UEV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15185, "hatch.energytunnel6.tier.10", "UEV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UEV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15195, "hatch.energytunnel7.tier.10", "UEV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15136, "hatch.energytunnel1.tier.11", "UIV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15146, "hatch.energytunnel2.tier.11", "UIV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15156, "hatch.energytunnel3.tier.11", "UIV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15166, "hatch.energytunnel4.tier.11", "UIV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15176, "hatch.energytunnel5.tier.11", "UIV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15186, "hatch.energytunnel6.tier.11", "UIV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UIV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15196, "hatch.energytunnel7.tier.11", "UIV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15137, "hatch.energytunnel1.tier.12", "UMV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15147, "hatch.energytunnel2.tier.12", "UMV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15157, "hatch.energytunnel3.tier.12", "UMV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15167, "hatch.energytunnel4.tier.12", "UMV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15177, "hatch.energytunnel5.tier.12", "UMV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15187, "hatch.energytunnel6.tier.12", "UMV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UMV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15197, "hatch.energytunnel7.tier.12", "UMV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + + eM_energytunnel1_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15138, "hatch.energytunnel1.tier.13", "UXV 256A Laser Target Hatch", 5, 256).getStackForm(1L)); + eM_energytunnel2_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15148, "hatch.energytunnel2.tier.13", "UXV 1024A Laser Target Hatch", 5, 1024).getStackForm(1L)); + eM_energytunnel3_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15158, "hatch.energytunnel3.tier.13", "UXV 4096A Laser Target Hatch", 5, 4096).getStackForm(1L)); + eM_energytunnel4_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15168, "hatch.energytunnel4.tier.13", "UXV 16384A Laser Target Hatch", 5, 16384).getStackForm(1L)); + eM_energytunnel5_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15178, "hatch.energytunnel5.tier.13", "UXV 65536A Laser Target Hatch", 5, 65536).getStackForm(1L)); + eM_energytunnel6_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15188, "hatch.energytunnel6.tier.13", "UXV 262144A Laser Target Hatch", 5, 262144).getStackForm(1L)); + eM_energytunnel7_UXV.set(new GT_MetaTileEntity_Hatch_EnergyTunnel( + 15198, "hatch.energytunnel7.tier.13", "UXV 1048576A Laser Target Hatch", 5, 1048576).getStackForm(1L)); + // =================================================================================================== // Multi AMP Power OUTPUTS // =================================================================================================== @@ -224,6 +365,145 @@ public class MachineLoader implements Runnable { 15228, "hatch.dynamomulti64.tier.13", "UXV 64A Dynamo Hatch", 13, 64).getStackForm(1L)); // =================================================================================================== + // Multi AMP Laser OUTPUTS + // =================================================================================================== + + eM_dynamotunnel1_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15230, "hatch.dynamotunnel1.tier.05", "IV 256A 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)); + eM_dynamotunnel3_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15250, "hatch.dynamotunnel3.tier.05", "IV 4096A 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)); + eM_dynamotunnel5_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15270, "hatch.dynamotunnel5.tier.05", "IV 65536A 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)); + eM_dynamotunnel7_IV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15290, "hatch.dynamotunnel7.tier.05", "IV 1048576A 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", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15241, "hatch.dynamotunnel2.tier.06", "LuV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15251, "hatch.dynamotunnel3.tier.06", "LuV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15261, "hatch.dynamotunnel4.tier.06", "LuV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15271, "hatch.dynamotunnel5.tier.06", "LuV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15281, "hatch.dynamotunnel6.tier.06", "LuV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_LuV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15291, "hatch.dynamotunnel7.tier.06", "LuV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15232, "hatch.dynamotunnel1.tier.07", "ZPM 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15242, "hatch.dynamotunnel2.tier.07", "ZPM 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15252, "hatch.dynamotunnel3.tier.07", "ZPM 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15262, "hatch.dynamotunnel4.tier.07", "ZPM 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15272, "hatch.dynamotunnel5.tier.07", "ZPM 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15282, "hatch.dynamotunnel6.tier.07", "ZPM 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_ZPM.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15292, "hatch.dynamotunnel7.tier.07", "ZPM 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15233, "hatch.dynamotunnel1.tier.08", "UV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15243, "hatch.dynamotunnel2.tier.08", "UV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15253, "hatch.dynamotunnel3.tier.08", "UV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15263, "hatch.dynamotunnel4.tier.08", "UV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15273, "hatch.dynamotunnel5.tier.08", "UV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15283, "hatch.dynamotunnel6.tier.08", "UV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15293, "hatch.dynamotunnel7.tier.08", "UV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15234, "hatch.dynamotunnel1.tier.09", "UHV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15244, "hatch.dynamotunnel2.tier.09", "UHV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15254, "hatch.dynamotunnel3.tier.09", "UHV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15264, "hatch.dynamotunnel4.tier.09", "UHV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15274, "hatch.dynamotunnel5.tier.09", "UHV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15284, "hatch.dynamotunnel6.tier.09", "UHV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UHV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15294, "hatch.dynamotunnel7.tier.09", "UHV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15235, "hatch.dynamotunnel1.tier.10", "UEV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15245, "hatch.dynamotunnel2.tier.10", "UEV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15255, "hatch.dynamotunnel3.tier.10", "UEV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15265, "hatch.dynamotunnel4.tier.10", "UEV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15275, "hatch.dynamotunnel5.tier.10", "UEV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15285, "hatch.dynamotunnel6.tier.10", "UEV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UEV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15295, "hatch.dynamotunnel7.tier.10", "UEV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15236, "hatch.dynamotunnel1.tier.11", "UIV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15246, "hatch.dynamotunnel2.tier.11", "UIV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15256, "hatch.dynamotunnel3.tier.11", "UIV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15266, "hatch.dynamotunnel4.tier.11", "UIV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15276, "hatch.dynamotunnel5.tier.11", "UIV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15286, "hatch.dynamotunnel6.tier.11", "UIV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UIV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15296, "hatch.dynamotunnel7.tier.11", "UIV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15237, "hatch.dynamotunnel1.tier.12", "UMV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15247, "hatch.dynamotunnel2.tier.12", "UMV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15257, "hatch.dynamotunnel3.tier.12", "UMV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15267, "hatch.dynamotunnel4.tier.12", "UMV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15277, "hatch.dynamotunnel5.tier.12", "UMV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15287, "hatch.dynamotunnel6.tier.12", "UMV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UMV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15297, "hatch.dynamotunnel7.tier.12", "UMV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + eM_dynamotunnel1_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15238, "hatch.dynamotunnel1.tier.13", "UXV 256A Laser Source Hatch", 5, 256).getStackForm(1L)); + eM_dynamotunnel2_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15248, "hatch.dynamotunnel2.tier.13", "UXV 1024A Laser Source Hatch", 5, 1024).getStackForm(1L)); + eM_dynamotunnel3_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15258, "hatch.dynamotunnel3.tier.13", "UXV 4096A Laser Source Hatch", 5, 4096).getStackForm(1L)); + eM_dynamotunnel4_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15268, "hatch.dynamotunnel4.tier.13", "UXV 16384A Laser Source Hatch", 5, 16384).getStackForm(1L)); + eM_dynamotunnel5_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15278, "hatch.dynamotunnel5.tier.13", "UXV 65536A Laser Source Hatch", 5, 65536).getStackForm(1L)); + eM_dynamotunnel6_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15288, "hatch.dynamotunnel6.tier.13", "UXV 262144A Laser Source Hatch", 5, 262144).getStackForm(1L)); + eM_dynamotunnel7_UXV.set(new GT_MetaTileEntity_Hatch_DynamoTunnel( + 15298, "hatch.dynamotunnel7.tier.13", "UXV 1048576A Laser Source Hatch", 5, 1048576).getStackForm(1L)); + + // =================================================================================================== // MULTIBLOCKS // =================================================================================================== @@ -287,7 +567,7 @@ public class MachineLoader implements Runnable { // =================================================================================================== EMpipe.set(new GT_MetaTileEntity_Pipe_EM(15460, "pipe.elementalmatter", "Quantum \"Tunnel\"").getStackForm(1L)); - + LASERpipe.set(new GT_MetaTileEntity_Pipe_Energy(15465, "pipe.energystream", "High Power Optical Fiber Cable").getStackForm(1L)); DATApipe.set(new GT_MetaTileEntity_Pipe_Data(15470, "pipe.datastream", "Optical Fiber Cable").getStackForm(1L)); // =================================================================================================== 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 e17766ce5b..2a7674f0ab 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -29,7 +29,7 @@ public enum CustomItemList implements IItemContainer { Machine_BuckConverter_UV,Machine_BuckConverter_UHV,Machine_BuckConverter_UEV, Machine_BuckConverter_UIV,Machine_BuckConverter_UMV, Machine_BuckConverter_UXV, Machine_DebugWriter,Machine_DebugGenny,UnusedStuff, - EMpipe, DATApipe, rack_Hatch, holder_Hatch, capacitor_Hatch, + EMpipe, DATApipe, LASERpipe, rack_Hatch, holder_Hatch, capacitor_Hatch, eM_dynamomulti4_IV, eM_dynamomulti16_IV, eM_dynamomulti64_IV, eM_dynamomulti4_LuV, eM_dynamomulti16_LuV, eM_dynamomulti64_LuV, @@ -40,6 +40,15 @@ public enum CustomItemList implements IItemContainer { 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_dynamotunnel1_IV,eM_dynamotunnel2_IV,eM_dynamotunnel3_IV,eM_dynamotunnel4_IV,eM_dynamotunnel5_IV,eM_dynamotunnel6_IV,eM_dynamotunnel7_IV, + eM_dynamotunnel1_LuV,eM_dynamotunnel2_LuV,eM_dynamotunnel3_LuV,eM_dynamotunnel4_LuV,eM_dynamotunnel5_LuV,eM_dynamotunnel6_LuV,eM_dynamotunnel7_LuV, + eM_dynamotunnel1_ZPM,eM_dynamotunnel2_ZPM,eM_dynamotunnel3_ZPM,eM_dynamotunnel4_ZPM,eM_dynamotunnel5_ZPM,eM_dynamotunnel6_ZPM,eM_dynamotunnel7_ZPM, + eM_dynamotunnel1_UV,eM_dynamotunnel2_UV,eM_dynamotunnel3_UV,eM_dynamotunnel4_UV,eM_dynamotunnel5_UV,eM_dynamotunnel6_UV,eM_dynamotunnel7_UV, + eM_dynamotunnel1_UHV,eM_dynamotunnel2_UHV,eM_dynamotunnel3_UHV,eM_dynamotunnel4_UHV,eM_dynamotunnel5_UHV,eM_dynamotunnel6_UHV,eM_dynamotunnel7_UHV, + eM_dynamotunnel1_UEV,eM_dynamotunnel2_UEV,eM_dynamotunnel3_UEV,eM_dynamotunnel4_UEV,eM_dynamotunnel5_UEV,eM_dynamotunnel6_UEV,eM_dynamotunnel7_UEV, + eM_dynamotunnel1_UIV,eM_dynamotunnel2_UIV,eM_dynamotunnel3_UIV,eM_dynamotunnel4_UIV,eM_dynamotunnel5_UIV,eM_dynamotunnel6_UIV,eM_dynamotunnel7_UIV, + eM_dynamotunnel1_UMV,eM_dynamotunnel2_UMV,eM_dynamotunnel3_UMV,eM_dynamotunnel4_UMV,eM_dynamotunnel5_UMV,eM_dynamotunnel6_UMV,eM_dynamotunnel7_UMV, + eM_dynamotunnel1_UXV,eM_dynamotunnel2_UXV,eM_dynamotunnel3_UXV,eM_dynamotunnel4_UXV,eM_dynamotunnel5_UXV,eM_dynamotunnel6_UXV,eM_dynamotunnel7_UXV, eM_energymulti4_IV, eM_energymulti16_IV, eM_energymulti64_IV, eM_energymulti4_LuV, eM_energymulti16_LuV, eM_energymulti64_LuV, @@ -50,6 +59,15 @@ public enum CustomItemList implements IItemContainer { 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_energytunnel1_IV,eM_energytunnel2_IV,eM_energytunnel3_IV,eM_energytunnel4_IV,eM_energytunnel5_IV,eM_energytunnel6_IV,eM_energytunnel7_IV, + eM_energytunnel1_LuV,eM_energytunnel2_LuV,eM_energytunnel3_LuV,eM_energytunnel4_LuV,eM_energytunnel5_LuV,eM_energytunnel6_LuV,eM_energytunnel7_LuV, + eM_energytunnel1_ZPM,eM_energytunnel2_ZPM,eM_energytunnel3_ZPM,eM_energytunnel4_ZPM,eM_energytunnel5_ZPM,eM_energytunnel6_ZPM,eM_energytunnel7_ZPM, + eM_energytunnel1_UV,eM_energytunnel2_UV,eM_energytunnel3_UV,eM_energytunnel4_UV,eM_energytunnel5_UV,eM_energytunnel6_UV,eM_energytunnel7_UV, + eM_energytunnel1_UHV,eM_energytunnel2_UHV,eM_energytunnel3_UHV,eM_energytunnel4_UHV,eM_energytunnel5_UHV,eM_energytunnel6_UHV,eM_energytunnel7_UHV, + eM_energytunnel1_UEV,eM_energytunnel2_UEV,eM_energytunnel3_UEV,eM_energytunnel4_UEV,eM_energytunnel5_UEV,eM_energytunnel6_UEV,eM_energytunnel7_UEV, + eM_energytunnel1_UIV,eM_energytunnel2_UIV,eM_energytunnel3_UIV,eM_energytunnel4_UIV,eM_energytunnel5_UIV,eM_energytunnel6_UIV,eM_energytunnel7_UIV, + eM_energytunnel1_UMV,eM_energytunnel2_UMV,eM_energytunnel3_UMV,eM_energytunnel4_UMV,eM_energytunnel5_UMV,eM_energytunnel6_UMV,eM_energytunnel7_UMV, + eM_energytunnel1_UXV,eM_energytunnel2_UXV,eM_energytunnel3_UXV,eM_energytunnel4_UXV,eM_energytunnel5_UXV,eM_energytunnel6_UXV,eM_energytunnel7_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, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java index 99ff2bea97..d77749d130 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java @@ -10,26 +10,28 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; import static gregtech.api.enums.Textures.BlockIcons.*; public class Textures { - private static IIconContainer OVERLAY_ENERGY_IN_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_POWER"); - private static IIconContainer OVERLAY_ENERGY_OUT_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_POWER"); - private static IIconContainer MACHINE_UEV_SIDE = new CustomIcon("iconsets/MACHINE_UEV_SIDE"); - private static IIconContainer MACHINE_UIV_SIDE = new CustomIcon("iconsets/MACHINE_UIV_SIDE"); - private static IIconContainer MACHINE_UMV_SIDE = new CustomIcon("iconsets/MACHINE_UMV_SIDE"); - private static IIconContainer MACHINE_UXV_SIDE = new CustomIcon("iconsets/MACHINE_UXV_SIDE"); - private static IIconContainer MACHINE_OPV_SIDE = new CustomIcon("iconsets/MACHINE_OPV_SIDE"); - private static IIconContainer MACHINE_MAXV_SIDE = new CustomIcon("iconsets/MACHINE_MAXV_SIDE"); - private static IIconContainer MACHINE_UEV_TOP = new CustomIcon("iconsets/MACHINE_UEV_TOP"); - private static IIconContainer MACHINE_UIV_TOP = new CustomIcon("iconsets/MACHINE_UIV_TOP"); - private static IIconContainer MACHINE_UMV_TOP = new CustomIcon("iconsets/MACHINE_UMV_TOP"); - private static IIconContainer MACHINE_UXV_TOP = new CustomIcon("iconsets/MACHINE_UXV_TOP"); - private static IIconContainer MACHINE_OPV_TOP = new CustomIcon("iconsets/MACHINE_OPV_TOP"); - private static IIconContainer MACHINE_MAXV_TOP = new CustomIcon("iconsets/MACHINE_MAXV_TOP"); - private static IIconContainer MACHINE_UEV_BOTTOM = new CustomIcon("iconsets/MACHINE_UEV_BOTTOM"); - private static IIconContainer MACHINE_UIV_BOTTOM = new CustomIcon("iconsets/MACHINE_UIV_BOTTOM"); - private static IIconContainer MACHINE_UMV_BOTTOM = new CustomIcon("iconsets/MACHINE_UMV_BOTTOM"); - private static IIconContainer MACHINE_UXV_BOTTOM = new CustomIcon("iconsets/MACHINE_UXV_BOTTOM"); - private static IIconContainer MACHINE_OPV_BOTTOM = new CustomIcon("iconsets/MACHINE_OPV_BOTTOM"); - private static IIconContainer MACHINE_MAXV_BOTTOM = new CustomIcon("iconsets/MACHINE_MAXV_BOTTOM"); + private static final IIconContainer OVERLAY_ENERGY_IN_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_POWER"); + private static final IIconContainer OVERLAY_ENERGY_OUT_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_POWER"); + private static final IIconContainer OVERLAY_ENERGY_IN_LASER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_LASER"); + private static final IIconContainer OVERLAY_ENERGY_OUT_LASER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_LASER"); + private static final IIconContainer MACHINE_UEV_SIDE = new CustomIcon("iconsets/MACHINE_UEV_SIDE"); + private static final IIconContainer MACHINE_UIV_SIDE = new CustomIcon("iconsets/MACHINE_UIV_SIDE"); + private static final IIconContainer MACHINE_UMV_SIDE = new CustomIcon("iconsets/MACHINE_UMV_SIDE"); + private static final IIconContainer MACHINE_UXV_SIDE = new CustomIcon("iconsets/MACHINE_UXV_SIDE"); + private static final IIconContainer MACHINE_OPV_SIDE = new CustomIcon("iconsets/MACHINE_OPV_SIDE"); + private static final IIconContainer MACHINE_MAXV_SIDE = new CustomIcon("iconsets/MACHINE_MAXV_SIDE"); + private static final IIconContainer MACHINE_UEV_TOP = new CustomIcon("iconsets/MACHINE_UEV_TOP"); + private static final IIconContainer MACHINE_UIV_TOP = new CustomIcon("iconsets/MACHINE_UIV_TOP"); + private static final IIconContainer MACHINE_UMV_TOP = new CustomIcon("iconsets/MACHINE_UMV_TOP"); + private static final IIconContainer MACHINE_UXV_TOP = new CustomIcon("iconsets/MACHINE_UXV_TOP"); + private static final IIconContainer MACHINE_OPV_TOP = new CustomIcon("iconsets/MACHINE_OPV_TOP"); + private static final IIconContainer MACHINE_MAXV_TOP = new CustomIcon("iconsets/MACHINE_MAXV_TOP"); + private static final IIconContainer MACHINE_UEV_BOTTOM = new CustomIcon("iconsets/MACHINE_UEV_BOTTOM"); + private static final IIconContainer MACHINE_UIV_BOTTOM = new CustomIcon("iconsets/MACHINE_UIV_BOTTOM"); + private static final IIconContainer MACHINE_UMV_BOTTOM = new CustomIcon("iconsets/MACHINE_UMV_BOTTOM"); + private static final IIconContainer MACHINE_UXV_BOTTOM = new CustomIcon("iconsets/MACHINE_UXV_BOTTOM"); + private static final IIconContainer MACHINE_OPV_BOTTOM = new CustomIcon("iconsets/MACHINE_OPV_BOTTOM"); + private static final IIconContainer MACHINE_MAXV_BOTTOM = new CustomIcon("iconsets/MACHINE_MAXV_BOTTOM"); public static IIconContainer[] MACHINECASINGS_SIDE_TT = new IIconContainer[]{ MACHINE_8V_SIDE, MACHINE_LV_SIDE, MACHINE_MV_SIDE, MACHINE_HV_SIDE, @@ -149,6 +151,40 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[]{80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[]{60, 60, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[]{40, 40, 245, 0}), + }, OVERLAYS_ENERGY_IN_LASER_TT = new ITexture[]{ + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{180, 180, 180, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{220, 220, 220, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{255, 100, 0, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{255, 255, 30, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{128, 128, 128, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{240, 240, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{220, 220, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{200, 200, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{180, 180, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{160, 160, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{140, 140, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{120, 120, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{100, 100, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{80, 80, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{60, 60, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[]{40, 40, 245, 0}), + }, OVERLAYS_ENERGY_OUT_LASER_TT = new ITexture[]{ + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{180, 180, 180, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{220, 220, 220, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{255, 100, 0, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{255, 255, 30, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{128, 128, 128, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{240, 240, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{220, 220, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{200, 200, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{180, 180, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{160, 160, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{140, 140, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{120, 120, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{100, 100, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{80, 80, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{60, 60, 245, 0}), + new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[]{40, 40, 245, 0}), }; public static ITexture[][] MACHINE_CASINGS_TT = new ITexture[16][17]; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java index eb6909a4a4..d12b0d42d8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java @@ -88,7 +88,8 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc return null; } IMetaTileEntity meta = next.getMetaTileEntity(); - if (meta instanceof GT_MetaTileEntity_Pipe_Data){ + if (meta instanceof GT_MetaTileEntity_Pipe_Data) { + ((GT_MetaTileEntity_Pipe_Data) meta).markUsed(); return (IConnectsToDataPipe) meta; }else if (meta instanceof GT_MetaTileEntity_Hatch_InputData && ((GT_MetaTileEntity_Hatch_InputData) meta).getColorization()==color && diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java index 2ad4593984..cc297d01ea 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java @@ -29,6 +29,12 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch Amperes = aAmp; } + public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description, int aAmp) { + super(aID, aName, aNameRegional, aTier, i, description); + Amperes = aAmp; + Util.setTier(aTier,this); + } + @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; 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 eeacf91014..24a8faf799 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 @@ -1,14 +1,12 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.Util; import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; import com.github.technus.tectech.thing.metaTileEntity.pipe.IConnectsToEnergyTunnel; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -16,37 +14,33 @@ import net.minecraft.nbt.NBTTagCompound; import static com.github.technus.tectech.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.CommonValues.V; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT; /** * Created by danie_000 on 16.12.2016. */ -public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch implements IConnectsToEnergyTunnel { - public final int Amperes; +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"); - Amperes = aAmp; - Util.setTier(aTier,this); + super(aID, aName, aNameRegional, aTier, 0, "Energy extracting terminal for Multiblocks",aAmp); upkeep=Math.max(V[mTier]/Amperes,V[4]); } public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, long aUpkeep, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 0, aDescription, aTextures); - Amperes = aAmp; + super(aName, aTier, aAmp, aDescription, aTextures); upkeep=aUpkeep; } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier]}; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_LASER_TT[mTier]}; } @Override @@ -175,14 +169,16 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc opposite == tGTTileEntity.getFrontFacing()) { if(maxEUOutput()>((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()){ aMetaTileEntity.doExplosion(maxEUOutput()); - }else if(maxEUOutput()==((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).maxEUInput()){ - long ampRx=((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).Amperes; - if(packetsCount > ampRx && Amperes>ampRx){ - tGTTileEntity.setToFire(); - }else if(Amperes>ampRx){ - tGTTileEntity.setOnFire(); - ((GT_MetaTileEntity_Hatch_EnergyTunnel) aMetaTileEntity).addPackets(takePackets(Amperes)); - }else { + }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)); } } @@ -190,6 +186,8 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_Energy) { if (((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).connectionCount > 2) { return; + }else { + ((GT_MetaTileEntity_Pipe_Energy) aMetaTileEntity).markUsed(); } } else { return; @@ -210,6 +208,9 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc public void addPackets(long count){ packetsCount+=count; + if(packetsCount>Amperes<<2){ + packetsCount=Amperes<<2; + } } public long takePackets(long count){ diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 64dda8f84a..b6e58026e4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -30,6 +30,12 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch Amperes = aAmp; } + public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, String description,int aAmp) { + super(aID, aName, aNameRegional, aTier, i, description); + Amperes = aAmp; + Util.setTier(aTier,this); + } + @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; 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 4e7fffcf9f..e844c8eb86 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 @@ -1,49 +1,43 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.Util; import com.github.technus.tectech.thing.metaTileEntity.pipe.IConnectsToEnergyTunnel; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import static com.github.technus.tectech.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.CommonValues.V; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT; /** * Created by danie_000 on 16.12.2016. */ -public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatch implements IConnectsToEnergyTunnel { - public final int Amperes; +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"); - Amperes = aAmp; - Util.setTier(aTier,this); + super(aID, aName, aNameRegional, aTier, 0, "Energy injecting terminal for Multiblocks",aAmp); upkeep=Math.max(V[mTier]/Amperes,V[4]); } public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, long aUpkeep, String aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 0, aDescription, aTextures); - Amperes = aAmp; - this.upkeep=aUpkeep; + super(aName, aTier, aAmp, aDescription, aTextures); + upkeep=aUpkeep; } @Override public ITexture[] getTexturesActive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier]}; } @Override public ITexture[] getTexturesInactive(ITexture aBaseTexture) { - return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_IN_POWER_TT[mTier]}; + return new ITexture[]{aBaseTexture, OVERLAYS_ENERGY_OUT_LASER_TT[mTier]}; } @Override @@ -155,6 +149,9 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc public void addPackets(long count){ packetsCount+=count; + if(packetsCount>Amperes<<2){ + packetsCount=Amperes<<2; + } } public long takePackets(long count){ diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java index d0e5399f75..7c9f8fba5c 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java @@ -87,6 +87,7 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ } IMetaTileEntity meta = next.getMetaTileEntity(); if (meta instanceof GT_MetaTileEntity_Pipe_Data){ + ((GT_MetaTileEntity_Pipe_Data) meta).markUsed(); return (IConnectsToDataPipe) meta; }else if (meta instanceof GT_MetaTileEntity_Hatch_InputData && ((GT_MetaTileEntity_Hatch_InputData) meta).getColorization()==color && diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java index 82bda9d326..472f998d89 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java @@ -127,6 +127,7 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_H } IMetaTileEntity meta = next.getMetaTileEntity(); if (meta instanceof GT_MetaTileEntity_Pipe_Data){ + ((GT_MetaTileEntity_Pipe_Data) meta).markUsed(); return (IConnectsToDataPipe) meta; }else if (meta instanceof GT_MetaTileEntity_Hatch_InputDataItems && ((GT_MetaTileEntity_Hatch_InputDataItems) meta).getColorization()==color && 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 937779ba94..39889e5c3f 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 @@ -67,6 +67,8 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H } else if (aMetaTileEntity instanceof GT_MetaTileEntity_Pipe_EM) { if (((GT_MetaTileEntity_Pipe_EM) aMetaTileEntity).connectionCount > 2) { return; + }else { + ((GT_MetaTileEntity_Pipe_EM) aMetaTileEntity).markUsed(); } } else { return; 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 5234de7129..09f52e2611 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 @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.TecTech; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -30,9 +31,11 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; */ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConnectsToDataPipe { private static Textures.BlockIcons.CustomIcon EMpipe; - private static Textures.BlockIcons.CustomIcon EMbar; + private static Textures.BlockIcons.CustomIcon EMbar,EMbarActive; public byte connectionCount = 0; + private boolean activity; + public GT_MetaTileEntity_Pipe_Data(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); } @@ -51,12 +54,13 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn public void registerIcons(IIconRegister aBlockIconRegister) { EMpipe = new Textures.BlockIcons.CustomIcon("iconsets/EM_DATA"); EMbar = new Textures.BlockIcons.CustomIcon("iconsets/EM_BAR"); + EMbarActive = new Textures.BlockIcons.CustomIcon("iconsets/EM_BAR_ACTIVE"); super.registerIcons(aBlockIconRegister); } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) { - return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(EMbar, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; + return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(aBaseMetaTileEntity.isActive()?EMbarActive:EMbar, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; } @Override @@ -107,6 +111,16 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { + if(activity){ + if(TecTech.RANDOM.next(15)==0) { + aBaseMetaTileEntity.setActive(true); + } + activity=false; + }else if(aBaseMetaTileEntity.isActive()){ + if(TecTech.RANDOM.next(15)==0) { + aBaseMetaTileEntity.setActive(false); + } + } mConnections = 0; connectionCount = 0; byte myColor=aBaseMetaTileEntity.getColorization(); @@ -237,4 +251,8 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn public byte getColorization() { return getBaseMetaTileEntity().getColorization(); } + + public void markUsed() { + this.activity = true; + } } 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 6b7b36fb54..e2a17da4ac 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 @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.TecTech; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -31,9 +32,11 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL; */ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnectsToElementalPipe { private static Textures.BlockIcons.CustomIcon EMpipe; - private static Textures.BlockIcons.CustomIcon EMcandy; + static Textures.BlockIcons.CustomIcon EMcandy,EMCandyActive; public byte connectionCount = 0; + private boolean activity; + public GT_MetaTileEntity_Pipe_EM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); } @@ -52,12 +55,13 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec public void registerIcons(IIconRegister aBlockIconRegister) { EMpipe = new Textures.BlockIcons.CustomIcon("iconsets/EM_PIPE"); EMcandy = new Textures.BlockIcons.CustomIcon("iconsets/EM_CANDY"); + EMCandyActive = new Textures.BlockIcons.CustomIcon("iconsets/EM_CANDY_ACTIVE"); super.registerIcons(aBlockIconRegister); } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) { - return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; + return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(aBaseMetaTileEntity.isActive()?EMCandyActive:EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; } @Override @@ -108,6 +112,16 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { + if(activity){ + if(TecTech.RANDOM.next(7)==0) { + aBaseMetaTileEntity.setActive(true); + } + activity=false; + }else if(aBaseMetaTileEntity.isActive()){ + if(TecTech.RANDOM.next(7)==0) { + aBaseMetaTileEntity.setActive(false); + } + } mConnections = 0; connectionCount = 0; if (aBaseMetaTileEntity.getColorization() < 0) { @@ -145,7 +159,6 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec //} } } - } else if (aBaseMetaTileEntity.isClientSide() && GT_Client.changeDetected == 4) { aBaseMetaTileEntity.issueTextureUpdate(); } @@ -203,4 +216,8 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec } return 0.5f; } + + public void markUsed() { + this.activity = true; + } } 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 6d4be98634..ad5aec16bd 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 @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.pipe; import com.github.technus.tectech.CommonValues; +import com.github.technus.tectech.TecTech; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; @@ -24,13 +25,16 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import static com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM.EMCandyActive; +import static com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_EM.EMcandy; import static gregtech.api.enums.Dyes.MACHINE_METAL; public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements IConnectsToEnergyTunnel { private static Textures.BlockIcons.CustomIcon EMpipe; - private static Textures.BlockIcons.CustomIcon EMcandy; public byte connectionCount = 0; + private boolean activity; + public GT_MetaTileEntity_Pipe_Energy(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); } @@ -48,13 +52,12 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister aBlockIconRegister) { EMpipe = new Textures.BlockIcons.CustomIcon("iconsets/EM_LASER"); - EMcandy = new Textures.BlockIcons.CustomIcon("iconsets/EM_CANDY"); super.registerIcons(aBlockIconRegister); } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) { - return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; + return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(aBaseMetaTileEntity.isActive()?EMCandyActive:EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))}; } @Override @@ -105,6 +108,16 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { + if(activity){ + if(TecTech.RANDOM.next(31)==0) { + aBaseMetaTileEntity.setActive(true); + } + activity=false; + }else if(aBaseMetaTileEntity.isActive()){ + if(TecTech.RANDOM.next(31)==0) { + aBaseMetaTileEntity.setActive(false); + } + } mConnections = 0; connectionCount = 0; if (aBaseMetaTileEntity.getColorization() < 0) { @@ -200,4 +213,8 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo } return 0.5f; } + + public void markUsed() { + this.activity = true; + } }
\ No newline at end of file diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png Binary files differnew file mode 100644 index 0000000000..51f387ba35 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_IN_LASER.png diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png Binary files differnew file mode 100644 index 0000000000..4706e3cf6a --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_OUT_LASER.png |
