diff options
Diffstat (limited to 'src/main/java')
6 files changed, 254 insertions, 120 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 7bcf771e4d..5e0297c158 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -3176,6 +3176,11 @@ public class ResearchStationAssemblyLine implements Runnable { CustomItemList.eM_energyMulti64_UIV.get(1), CustomItemList.eM_energyMulti64_UMV.get(1), CustomItemList.eM_energyMulti64_UXV.get(1) }; + ItemStack[] laserTargets_UXV = { CustomItemList.eM_energyTunnel1_UXV.get(1), + CustomItemList.eM_energyTunnel2_UXV.get(1), CustomItemList.eM_energyTunnel3_UXV.get(1), + CustomItemList.eM_energyTunnel4_UXV.get(1), CustomItemList.eM_energyTunnel5_UXV.get(1), + CustomItemList.eM_energyTunnel6_UXV.get(1), CustomItemList.eM_energyTunnel7_UXV.get(1) }; + ItemStack[] dynamoHatches = { ItemList.Hatch_Dynamo_ULV.get(1), ItemList.Hatch_Dynamo_LV.get(1), ItemList.Hatch_Dynamo_MV.get(1), ItemList.Hatch_Dynamo_HV.get(1), ItemList.Hatch_Dynamo_EV.get(1), ItemList.Hatch_Dynamo_IV.get(1), ItemList.Hatch_Dynamo_LuV.get(1), ItemList.Hatch_Dynamo_ZPM.get(1), @@ -3233,6 +3238,12 @@ public class ResearchStationAssemblyLine implements Runnable { CustomItemList.eM_energyWirelessMulti64_UIV.get(1), CustomItemList.eM_energyWirelessMulti64_UMV.get(1), CustomItemList.eM_energyWirelessMulti64_UXV.get(1) }; + ItemStack[] wirelessLasers = { CustomItemList.eM_energyWirelessTunnel1_UXV.get(1), + CustomItemList.eM_energyWirelessTunnel2_UXV.get(1), CustomItemList.eM_energyWirelessTunnel3_UXV.get(1), + CustomItemList.eM_energyWirelessTunnel4_UXV.get(1), CustomItemList.eM_energyWirelessTunnel5_UXV.get(1), + CustomItemList.eM_energyWirelessTunnel6_UXV.get(1), + CustomItemList.eM_energyWirelessTunnel7_UXV.get(1) }; + ItemStack[] wirelessDynamos = { ItemList.Wireless_Dynamo_Energy_ULV.get(1), ItemList.Wireless_Dynamo_Energy_LV.get(1), ItemList.Wireless_Dynamo_Energy_MV.get(1), ItemList.Wireless_Dynamo_Energy_HV.get(1), ItemList.Wireless_Dynamo_Energy_EV.get(1), @@ -3278,7 +3289,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 4), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.WhiteDwarfMatter, 1), + GT_OreDictUnificator.get("plateTripleShirabon", 4L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Flerovium, 4), circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) }, new FluidStack[] { new FluidStack(solderUEV, 1_296 * 4), MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 4) }, @@ -3301,7 +3313,8 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(16), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 16), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.BlackDwarfMatter, 1), + GT_OreDictUnificator.get("plateTripleShirabon", 16L), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.TranscendentMetal, 4), circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) }, new FluidStack[] { new FluidStack(solderUEV, 1_296 * 16), MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 16) }, @@ -3324,8 +3337,9 @@ public class ResearchStationAssemblyLine implements Runnable { ItemList.Casing_Coil_Superconductor.get(1), CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(64), GT_OreDictUnificator.get(OrePrefixes.wireGt01, MaterialsUEVplus.SpaceTime, 64), - GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Universium, 1), - circuitsTierPlusTwo[i + 4], ItemList.EnergisedTesseract.get(1) }, + GT_OreDictUnificator.get("plateTripleShirabon", 64L), + GT_OreDictUnificator.get("plateDenseMetastableOganesson", 4), circuitsTierPlusTwo[i + 4], + ItemList.EnergisedTesseract.get(1) }, new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64), MaterialsUEVplus.ExcitedDTEC.getFluid(500L * 64) }, wirelessHatches_64A[i], @@ -3333,6 +3347,35 @@ public class ResearchStationAssemblyLine implements Runnable { recipeEuPerTick); } + // ------------------------ Wireless UXV Lasers ------------------------ + + for (int i = 0; i < wirelessLasers.length; i++) { + + TT_recipeAdder.addResearchableAssemblylineRecipe( + laserTargets_UXV[i], + totalComputation * 64, + compPerSecond * 64, + researchEuPerTick * 4, + researchAmperage * 16, + new Object[] { laserTargets_UXV[i], getModItem(GoodGenerator.ID, "compactFusionCoil", 1, 4), + // Dyson Swarm Module Deployment Unit Superconducting Magnet + getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 4), + CustomItemList.Machine_Multi_Transformer.get(1), CustomItemList.eM_Power.get(64), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, MaterialsUEVplus.SpaceTime, 64), + GT_OreDictUnificator.get(OrePrefixes.plateDense, MaterialsUEVplus.Eternity, 32), + GT_OreDictUnificator.get( + OrePrefixes.plateDense, + MaterialsUEVplus.MagnetohydrodynamicallyConstrainedStarMatter, + 16), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Quantum, 16L), + ItemList.EnergisedTesseract.get(1) }, + new FluidStack[] { new FluidStack(solderUEV, 1_296 * 64 * 4), + MaterialsUEVplus.ExcitedDTSC.getFluid(500L * 64) }, + wirelessLasers[i], + recipeDurationTicks, + recipeEuPerTick); + } + // ------------------------ Wireless EU dynamos ------------------------ for (int i = 0; i < wirelessHatches.length; i++) { 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 900d607eee..6828206888 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 @@ -305,6 +305,13 @@ import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessM import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessMulti64_ZPM; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel1_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel2_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel3_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel4_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel5_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel6_UXV; +import static com.github.technus.tectech.thing.CustomItemList.eM_energyWirelessTunnel7_UXV; import static com.github.technus.tectech.thing.CustomItemList.eM_in_UEV; import static com.github.technus.tectech.thing.CustomItemList.eM_in_UHV; import static com.github.technus.tectech.thing.CustomItemList.eM_in_UIV; @@ -1023,6 +1030,55 @@ public class MachineLoader implements Runnable { 14, 64).getStackForm(1L)); + eM_energyWirelessTunnel1_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15500, + "hatch.energywirelesstunnel1.tier.13", + "UXV 256A Wireless Energy Hatch", + 13, + 256).getStackForm(1L)); + eM_energyWirelessTunnel2_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15501, + "hatch.energywirelesstunnel2.tier.13", + "UXV 1,024A Wireless Energy Hatch", + 13, + 1024).getStackForm(1L)); + eM_energyWirelessTunnel3_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15502, + "hatch.energywirelesstunnel3.tier.13", + "UXV 4,096A Wireless Energy Hatch", + 13, + 4096).getStackForm(1L)); + eM_energyWirelessTunnel4_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15503, + "hatch.energywirelesstunnel4.tier.13", + "UXV 16,384A Wireless Energy Hatch", + 13, + 16384).getStackForm(1L)); + eM_energyWirelessTunnel5_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15504, + "hatch.energywirelesstunnel5.tier.13", + "UXV 65,536A Wireless Energy Hatch", + 13, + 65536).getStackForm(1L)); + eM_energyWirelessTunnel6_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15505, + "hatch.energywirelesstunnel6.tier.13", + "UXV 262,144A Wireless Energy Hatch", + 13, + 262144).getStackForm(1L)); + eM_energyWirelessTunnel7_UXV.set( + new GT_MetaTileEntity_Hatch_WirelessMulti( + 15506, + "hatch.energywirelesstunnel7.tier.13", + "UXV 1,048,576A Wireless Energy Hatch", + 13, + 1048576).getStackForm(1L)); // =================================================================================================== // Multi AMP Laser INPUTS // =================================================================================================== @@ -1038,42 +1094,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15140, "hatch.energytunnel2.tier.05", - "IV 1024A/t Laser Target Hatch", + "IV 1,024A/t Laser Target Hatch", 5, 1024).getStackForm(1L)); eM_energyTunnel3_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15150, "hatch.energytunnel3.tier.05", - "IV 4096A/t Laser Target Hatch", + "IV 4,096A/t Laser Target Hatch", 5, 4096).getStackForm(1L)); eM_energyTunnel4_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15160, "hatch.energytunnel4.tier.05", - "IV 16384A/t Laser Target Hatch", + "IV 16,384A/t Laser Target Hatch", 5, 16384).getStackForm(1L)); eM_energyTunnel5_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15170, "hatch.energytunnel5.tier.05", - "IV 65536A/t Laser Target Hatch", + "IV 65,536A/t Laser Target Hatch", 5, 65536).getStackForm(1L)); eM_energyTunnel6_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15180, "hatch.energytunnel6.tier.05", - "IV 262144A/t Laser Target Hatch", + "IV 262,144A/t Laser Target Hatch", 5, 262144).getStackForm(1L)); eM_energyTunnel7_IV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15190, "hatch.energytunnel7.tier.05", - "IV 1048576A/t Laser Target Hatch", + "IV 1,048,576A/t Laser Target Hatch", 5, 1048576).getStackForm(1L)); @@ -1088,42 +1144,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15141, "hatch.energytunnel2.tier.06", - "LuV 1024A/t Laser Target Hatch", + "LuV 1,024A/t Laser Target Hatch", 6, 1024).getStackForm(1L)); eM_energyTunnel3_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15151, "hatch.energytunnel3.tier.06", - "LuV 4096A/t Laser Target Hatch", + "LuV 4,096A/t Laser Target Hatch", 6, 4096).getStackForm(1L)); eM_energyTunnel4_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15161, "hatch.energytunnel4.tier.06", - "LuV 16384A/t Laser Target Hatch", + "LuV 16,384A/t Laser Target Hatch", 6, 16384).getStackForm(1L)); eM_energyTunnel5_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15171, "hatch.energytunnel5.tier.06", - "LuV 65536A/t Laser Target Hatch", + "LuV 65,536A/t Laser Target Hatch", 6, 65536).getStackForm(1L)); eM_energyTunnel6_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15181, "hatch.energytunnel6.tier.06", - "LuV 262144A/t Laser Target Hatch", + "LuV 262,144A/t Laser Target Hatch", 6, 262144).getStackForm(1L)); eM_energyTunnel7_LuV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15191, "hatch.energytunnel7.tier.06", - "LuV 1048576A/t Laser Target Hatch", + "LuV 1,048,576A/t Laser Target Hatch", 6, 1048576).getStackForm(1L)); @@ -1138,42 +1194,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15142, "hatch.energytunnel2.tier.07", - "ZPM 1024A/t Laser Target Hatch", + "ZPM 1,024A/t Laser Target Hatch", 7, 1024).getStackForm(1L)); eM_energyTunnel3_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15152, "hatch.energytunnel3.tier.07", - "ZPM 4096A/t Laser Target Hatch", + "ZPM 4,096A/t Laser Target Hatch", 7, 4096).getStackForm(1L)); eM_energyTunnel4_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15162, "hatch.energytunnel4.tier.07", - "ZPM 16384A/t Laser Target Hatch", + "ZPM 16,384A/t Laser Target Hatch", 7, 16384).getStackForm(1L)); eM_energyTunnel5_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15172, "hatch.energytunnel5.tier.07", - "ZPM 65536A/t Laser Target Hatch", + "ZPM 65,536A/t Laser Target Hatch", 7, 65536).getStackForm(1L)); eM_energyTunnel6_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15182, "hatch.energytunnel6.tier.07", - "ZPM 262144A/t Laser Target Hatch", + "ZPM 262,144A/t Laser Target Hatch", 7, 262144).getStackForm(1L)); eM_energyTunnel7_ZPM.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15192, "hatch.energytunnel7.tier.07", - "ZPM 1048576A/t Laser Target Hatch", + "ZPM 1,048,576A/t Laser Target Hatch", 7, 1048576).getStackForm(1L)); @@ -1188,42 +1244,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15143, "hatch.energytunnel2.tier.08", - "UV 1024A/t Laser Target Hatch", + "UV 1,024A/t Laser Target Hatch", 8, 1024).getStackForm(1L)); eM_energyTunnel3_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15153, "hatch.energytunnel3.tier.08", - "UV 4096A/t Laser Target Hatch", + "UV 4,096A/t Laser Target Hatch", 8, 4096).getStackForm(1L)); eM_energyTunnel4_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15163, "hatch.energytunnel4.tier.08", - "UV 16384A/t Laser Target Hatch", + "UV 16,384A/t Laser Target Hatch", 8, 16384).getStackForm(1L)); eM_energyTunnel5_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15173, "hatch.energytunnel5.tier.08", - "UV 65536A/t Laser Target Hatch", + "UV 65,536A/t Laser Target Hatch", 8, 65536).getStackForm(1L)); eM_energyTunnel6_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15183, "hatch.energytunnel6.tier.08", - "UV 262144A/t Laser Target Hatch", + "UV 262,144A/t Laser Target Hatch", 8, 262144).getStackForm(1L)); eM_energyTunnel7_UV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15193, "hatch.energytunnel7.tier.08", - "UV 1048576A/t Laser Target Hatch", + "UV 1,048,576A/t Laser Target Hatch", 8, 1048576).getStackForm(1L)); @@ -1238,42 +1294,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15144, "hatch.energytunnel2.tier.09", - "UHV 1024A/t Laser Target Hatch", + "UHV 1,024A/t Laser Target Hatch", 9, 1024).getStackForm(1L)); eM_energyTunnel3_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15154, "hatch.energytunnel3.tier.09", - "UHV 4096A/t Laser Target Hatch", + "UHV 4,096A/t Laser Target Hatch", 9, 4096).getStackForm(1L)); eM_energyTunnel4_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15164, "hatch.energytunnel4.tier.09", - "UHV 16384A/t Laser Target Hatch", + "UHV 16,384A/t Laser Target Hatch", 9, 16384).getStackForm(1L)); eM_energyTunnel5_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15174, "hatch.energytunnel5.tier.09", - "UHV 65536A/t Laser Target Hatch", + "UHV 65,536A/t Laser Target Hatch", 9, 65536).getStackForm(1L)); eM_energyTunnel6_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15184, "hatch.energytunnel6.tier.09", - "UHV 262144A/t Laser Target Hatch", + "UHV 262,144A/t Laser Target Hatch", 9, 262144).getStackForm(1L)); eM_energyTunnel7_UHV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15194, "hatch.energytunnel7.tier.09", - "UHV 1048576A/t Laser Target Hatch", + "UHV 1,048,576A/t Laser Target Hatch", 9, 1048576).getStackForm(1L)); @@ -1288,42 +1344,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15145, "hatch.energytunnel2.tier.10", - "UEV 1024A/t Laser Target Hatch", + "UEV 1,024A/t Laser Target Hatch", 10, 1024).getStackForm(1L)); eM_energyTunnel3_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15155, "hatch.energytunnel3.tier.10", - "UEV 4096A/t Laser Target Hatch", + "UEV 4,096A/t Laser Target Hatch", 10, 4096).getStackForm(1L)); eM_energyTunnel4_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15165, "hatch.energytunnel4.tier.10", - "UEV 16384A/t Laser Target Hatch", + "UEV 16,384A/t Laser Target Hatch", 10, 16384).getStackForm(1L)); eM_energyTunnel5_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15175, "hatch.energytunnel5.tier.10", - "UEV 65536A/t Laser Target Hatch", + "UEV 65,536A/t Laser Target Hatch", 10, 65536).getStackForm(1L)); eM_energyTunnel6_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15185, "hatch.energytunnel6.tier.10", - "UEV 262144A/t Laser Target Hatch", + "UEV 262,144A/t Laser Target Hatch", 10, 262144).getStackForm(1L)); eM_energyTunnel7_UEV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15195, "hatch.energytunnel7.tier.10", - "UEV 1048576A/t Laser Target Hatch", + "UEV 1,048,576A/t Laser Target Hatch", 10, 1048576).getStackForm(1L)); @@ -1338,42 +1394,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15146, "hatch.energytunnel2.tier.11", - "UIV 1024A/t Laser Target Hatch", + "UIV 1,024A/t Laser Target Hatch", 11, 1024).getStackForm(1L)); eM_energyTunnel3_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15156, "hatch.energytunnel3.tier.11", - "UIV 4096A/t Laser Target Hatch", + "UIV 4,096A/t Laser Target Hatch", 11, 4096).getStackForm(1L)); eM_energyTunnel4_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15166, "hatch.energytunnel4.tier.11", - "UIV 16384A/t Laser Target Hatch", + "UIV 16,384A/t Laser Target Hatch", 11, 16384).getStackForm(1L)); eM_energyTunnel5_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15176, "hatch.energytunnel5.tier.11", - "UIV 65536A/t Laser Target Hatch", + "UIV 65,536A/t Laser Target Hatch", 11, 65536).getStackForm(1L)); eM_energyTunnel6_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15186, "hatch.energytunnel6.tier.11", - "UIV 262144A/t Laser Target Hatch", + "UIV 262,144A/t Laser Target Hatch", 11, 262144).getStackForm(1L)); eM_energyTunnel7_UIV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15196, "hatch.energytunnel7.tier.11", - "UIV 1048576A/t Laser Target Hatch", + "UIV 1,048,576A/t Laser Target Hatch", 11, 1048576).getStackForm(1L)); @@ -1388,42 +1444,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15147, "hatch.energytunnel2.tier.12", - "UMV 1024A/t Laser Target Hatch", + "UMV 1,024A/t Laser Target Hatch", 12, 1024).getStackForm(1L)); eM_energyTunnel3_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15157, "hatch.energytunnel3.tier.12", - "UMV 4096A/t Laser Target Hatch", + "UMV 4,096A/t Laser Target Hatch", 12, 4096).getStackForm(1L)); eM_energyTunnel4_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15167, "hatch.energytunnel4.tier.12", - "UMV 16384A/t Laser Target Hatch", + "UMV 16,384A/t Laser Target Hatch", 12, 16384).getStackForm(1L)); eM_energyTunnel5_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15177, "hatch.energytunnel5.tier.12", - "UMV 65536A/t Laser Target Hatch", + "UMV 65,536A/t Laser Target Hatch", 12, 65536).getStackForm(1L)); eM_energyTunnel6_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15187, "hatch.energytunnel6.tier.12", - "UMV 262144A/t Laser Target Hatch", + "UMV 262,144A/t Laser Target Hatch", 12, 262144).getStackForm(1L)); eM_energyTunnel7_UMV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15197, "hatch.energytunnel7.tier.12", - "UMV 1048576A/t Laser Target Hatch", + "UMV 1,048,576A/t Laser Target Hatch", 12, 1048576).getStackForm(1L)); @@ -1438,42 +1494,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_EnergyTunnel( 15148, "hatch.energytunnel2.tier.13", - "UXV 1024A/t Laser Target Hatch", + "UXV 1,024A/t Laser Target Hatch", 13, 1024).getStackForm(1L)); eM_energyTunnel3_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15158, "hatch.energytunnel3.tier.13", - "UXV 4096A/t Laser Target Hatch", + "UXV 4,096A/t Laser Target Hatch", 13, 4096).getStackForm(1L)); eM_energyTunnel4_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15168, "hatch.energytunnel4.tier.13", - "UXV 16384A/t Laser Target Hatch", + "UXV 16,384A/t Laser Target Hatch", 13, 16384).getStackForm(1L)); eM_energyTunnel5_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15178, "hatch.energytunnel5.tier.13", - "UXV 65536A/t Laser Target Hatch", + "UXV 65,536A/t Laser Target Hatch", 13, 65536).getStackForm(1L)); eM_energyTunnel6_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15188, "hatch.energytunnel6.tier.13", - "UXV 262144A/t Laser Target Hatch", + "UXV 262,144A/t Laser Target Hatch", 13, 262144).getStackForm(1L)); eM_energyTunnel7_UXV.set( new GT_MetaTileEntity_Hatch_EnergyTunnel( 15198, "hatch.energytunnel7.tier.13", - "UXV 1048576A/t Laser Target Hatch", + "UXV 1,048,576A/t Laser Target Hatch", 13, 1048576).getStackForm(1L)); eM_energyTunnel9001.set( @@ -1722,42 +1778,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15240, "hatch.dynamotunnel2.tier.05", - "IV 1024A/t Laser Source Hatch", + "IV 1,024A/t Laser Source Hatch", 5, 1024).getStackForm(1L)); eM_dynamoTunnel3_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15250, "hatch.dynamotunnel3.tier.05", - "IV 4096A/t Laser Source Hatch", + "IV 4,096A/t Laser Source Hatch", 5, 4096).getStackForm(1L)); eM_dynamoTunnel4_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15260, "hatch.dynamotunnel4.tier.05", - "IV 16384A/t Laser Source Hatch", + "IV 16,384A/t Laser Source Hatch", 5, 16384).getStackForm(1L)); eM_dynamoTunnel5_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15270, "hatch.dynamotunnel5.tier.05", - "IV 65536A/t Laser Source Hatch", + "IV 65,536A/t Laser Source Hatch", 5, 65536).getStackForm(1L)); eM_dynamoTunnel6_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15280, "hatch.dynamotunnel6.tier.05", - "IV 262144A/t Laser Source Hatch", + "IV 262,144A/t Laser Source Hatch", 5, 262144).getStackForm(1L)); eM_dynamoTunnel7_IV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15290, "hatch.dynamotunnel7.tier.05", - "IV 1048576A/t Laser Source Hatch", + "IV 1,048,576A/t Laser Source Hatch", 5, 1048576).getStackForm(1L)); @@ -1772,42 +1828,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15241, "hatch.dynamotunnel2.tier.06", - "LuV 1024A/t Laser Source Hatch", + "LuV 1,024A/t Laser Source Hatch", 6, 1024).getStackForm(1L)); eM_dynamoTunnel3_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15251, "hatch.dynamotunnel3.tier.06", - "LuV 4096A/t Laser Source Hatch", + "LuV 4,096A/t Laser Source Hatch", 6, 4096).getStackForm(1L)); eM_dynamoTunnel4_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15261, "hatch.dynamotunnel4.tier.06", - "LuV 16384A/t Laser Source Hatch", + "LuV 16,384A/t Laser Source Hatch", 6, 16384).getStackForm(1L)); eM_dynamoTunnel5_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15271, "hatch.dynamotunnel5.tier.06", - "LuV 65536A/t Laser Source Hatch", + "LuV 65,536A/t Laser Source Hatch", 6, 65536).getStackForm(1L)); eM_dynamoTunnel6_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15281, "hatch.dynamotunnel6.tier.06", - "LuV 262144A/t Laser Source Hatch", + "LuV 262,144A/t Laser Source Hatch", 6, 262144).getStackForm(1L)); eM_dynamoTunnel7_LuV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15291, "hatch.dynamotunnel7.tier.06", - "LuV 1048576A/t Laser Source Hatch", + "LuV 1,048,576A/t Laser Source Hatch", 6, 1048576).getStackForm(1L)); @@ -1822,42 +1878,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15242, "hatch.dynamotunnel2.tier.07", - "ZPM 1024A/t Laser Source Hatch", + "ZPM 1,024A/t Laser Source Hatch", 7, 1024).getStackForm(1L)); eM_dynamoTunnel3_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15252, "hatch.dynamotunnel3.tier.07", - "ZPM 4096A/t Laser Source Hatch", + "ZPM 4,096A/t Laser Source Hatch", 7, 4096).getStackForm(1L)); eM_dynamoTunnel4_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15262, "hatch.dynamotunnel4.tier.07", - "ZPM 16384A/t Laser Source Hatch", + "ZPM 16,384A/t Laser Source Hatch", 7, 16384).getStackForm(1L)); eM_dynamoTunnel5_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15272, "hatch.dynamotunnel5.tier.07", - "ZPM 65536A/t Laser Source Hatch", + "ZPM 65,536A/t Laser Source Hatch", 7, 65536).getStackForm(1L)); eM_dynamoTunnel6_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15282, "hatch.dynamotunnel6.tier.07", - "ZPM 262144A/t Laser Source Hatch", + "ZPM 262,144A/t Laser Source Hatch", 7, 262144).getStackForm(1L)); eM_dynamoTunnel7_ZPM.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15292, "hatch.dynamotunnel7.tier.07", - "ZPM 1048576A/t Laser Source Hatch", + "ZPM 1,048,576A/t Laser Source Hatch", 7, 1048576).getStackForm(1L)); @@ -1872,42 +1928,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15243, "hatch.dynamotunnel2.tier.08", - "UV 1024A/t Laser Source Hatch", + "UV 1,024A/t Laser Source Hatch", 8, 1024).getStackForm(1L)); eM_dynamoTunnel3_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15253, "hatch.dynamotunnel3.tier.08", - "UV 4096A/t Laser Source Hatch", + "UV 4,096A/t Laser Source Hatch", 8, 4096).getStackForm(1L)); eM_dynamoTunnel4_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15263, "hatch.dynamotunnel4.tier.08", - "UV 16384A/t Laser Source Hatch", + "UV 16,384A/t Laser Source Hatch", 8, 16384).getStackForm(1L)); eM_dynamoTunnel5_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15273, "hatch.dynamotunnel5.tier.08", - "UV 65536A/t Laser Source Hatch", + "UV 65,536A/t Laser Source Hatch", 8, 65536).getStackForm(1L)); eM_dynamoTunnel6_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15283, "hatch.dynamotunnel6.tier.08", - "UV 262144A/t Laser Source Hatch", + "UV 262,144A/t Laser Source Hatch", 8, 262144).getStackForm(1L)); eM_dynamoTunnel7_UV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15293, "hatch.dynamotunnel7.tier.08", - "UV 1048576A/t Laser Source Hatch", + "UV 1,048,576A/t Laser Source Hatch", 8, 1048576).getStackForm(1L)); @@ -1922,42 +1978,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15244, "hatch.dynamotunnel2.tier.09", - "UHV 1024A/t Laser Source Hatch", + "UHV 1,024A/t Laser Source Hatch", 9, 1024).getStackForm(1L)); eM_dynamoTunnel3_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15254, "hatch.dynamotunnel3.tier.09", - "UHV 4096A/t Laser Source Hatch", + "UHV 4,096A/t Laser Source Hatch", 9, 4096).getStackForm(1L)); eM_dynamoTunnel4_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15264, "hatch.dynamotunnel4.tier.09", - "UHV 16384A/t Laser Source Hatch", + "UHV 16,384A/t Laser Source Hatch", 9, 16384).getStackForm(1L)); eM_dynamoTunnel5_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15274, "hatch.dynamotunnel5.tier.09", - "UHV 65536A/t Laser Source Hatch", + "UHV 65,536A/t Laser Source Hatch", 9, 65536).getStackForm(1L)); eM_dynamoTunnel6_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15284, "hatch.dynamotunnel6.tier.09", - "UHV 262144A/t Laser Source Hatch", + "UHV 262,144A/t Laser Source Hatch", 9, 262144).getStackForm(1L)); eM_dynamoTunnel7_UHV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15294, "hatch.dynamotunnel7.tier.09", - "UHV 1048576A/t Laser Source Hatch", + "UHV 1,048,576A/t Laser Source Hatch", 9, 1048576).getStackForm(1L)); @@ -1972,42 +2028,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15245, "hatch.dynamotunnel2.tier.10", - "UEV 1024A/t Laser Source Hatch", + "UEV 1,024A/t Laser Source Hatch", 10, 1024).getStackForm(1L)); eM_dynamoTunnel3_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15255, "hatch.dynamotunnel3.tier.10", - "UEV 4096A/t Laser Source Hatch", + "UEV 4,096A/t Laser Source Hatch", 10, 4096).getStackForm(1L)); eM_dynamoTunnel4_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15265, "hatch.dynamotunnel4.tier.10", - "UEV 16384A/t Laser Source Hatch", + "UEV 16,384A/t Laser Source Hatch", 10, 16384).getStackForm(1L)); eM_dynamoTunnel5_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15275, "hatch.dynamotunnel5.tier.10", - "UEV 65536A/t Laser Source Hatch", + "UEV 65,536A/t Laser Source Hatch", 10, 65536).getStackForm(1L)); eM_dynamoTunnel6_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15285, "hatch.dynamotunnel6.tier.10", - "UEV 262144A/t Laser Source Hatch", + "UEV 262,144A/t Laser Source Hatch", 10, 262144).getStackForm(1L)); eM_dynamoTunnel7_UEV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15295, "hatch.dynamotunnel7.tier.10", - "UEV 1048576A/t Laser Source Hatch", + "UEV 1,048,576A/t Laser Source Hatch", 10, 1048576).getStackForm(1L)); @@ -2022,42 +2078,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15246, "hatch.dynamotunnel2.tier.11", - "UIV 1024A/t Laser Source Hatch", + "UIV 1,024A/t Laser Source Hatch", 11, 1024).getStackForm(1L)); eM_dynamoTunnel3_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15256, "hatch.dynamotunnel3.tier.11", - "UIV 4096A/t Laser Source Hatch", + "UIV 4,096A/t Laser Source Hatch", 11, 4096).getStackForm(1L)); eM_dynamoTunnel4_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15266, "hatch.dynamotunnel4.tier.11", - "UIV 16384A/t Laser Source Hatch", + "UIV 16,384A/t Laser Source Hatch", 11, 16384).getStackForm(1L)); eM_dynamoTunnel5_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15276, "hatch.dynamotunnel5.tier.11", - "UIV 65536A/t Laser Source Hatch", + "UIV 65,536A/t Laser Source Hatch", 11, 65536).getStackForm(1L)); eM_dynamoTunnel6_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15286, "hatch.dynamotunnel6.tier.11", - "UIV 262144A/t Laser Source Hatch", + "UIV 262,144A/t Laser Source Hatch", 11, 262144).getStackForm(1L)); eM_dynamoTunnel7_UIV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15296, "hatch.dynamotunnel7.tier.11", - "UIV 1048576A/t Laser Source Hatch", + "UIV 1,048,576A/t Laser Source Hatch", 11, 1048576).getStackForm(1L)); @@ -2072,42 +2128,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15247, "hatch.dynamotunnel2.tier.12", - "UMV 1024A/t Laser Source Hatch", + "UMV 1,024A/t Laser Source Hatch", 12, 1024).getStackForm(1L)); eM_dynamoTunnel3_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15257, "hatch.dynamotunnel3.tier.12", - "UMV 4096A/t Laser Source Hatch", + "UMV 4,096A/t Laser Source Hatch", 12, 4096).getStackForm(1L)); eM_dynamoTunnel4_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15267, "hatch.dynamotunnel4.tier.12", - "UMV 16384A/t Laser Source Hatch", + "UMV 16,384A/t Laser Source Hatch", 12, 16384).getStackForm(1L)); eM_dynamoTunnel5_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15277, "hatch.dynamotunnel5.tier.12", - "UMV 65536A/t Laser Source Hatch", + "UMV 65,536A/t Laser Source Hatch", 12, 65536).getStackForm(1L)); eM_dynamoTunnel6_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15287, "hatch.dynamotunnel6.tier.12", - "UMV 262144A/t Laser Source Hatch", + "UMV 262,144A/t Laser Source Hatch", 12, 262144).getStackForm(1L)); eM_dynamoTunnel7_UMV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15297, "hatch.dynamotunnel7.tier.12", - "UMV 1048576A/t Laser Source Hatch", + "UMV 1,048,576A/t Laser Source Hatch", 12, 1048576).getStackForm(1L)); @@ -2122,42 +2178,42 @@ public class MachineLoader implements Runnable { new GT_MetaTileEntity_Hatch_DynamoTunnel( 15248, "hatch.dynamotunnel2.tier.13", - "UXV 1024A/t Laser Source Hatch", + "UXV 1,024A/t Laser Source Hatch", 13, 1024).getStackForm(1L)); eM_dynamoTunnel3_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15258, "hatch.dynamotunnel3.tier.13", - "UXV 4096A/t Laser Source Hatch", + "UXV 4,096A/t Laser Source Hatch", 13, 4096).getStackForm(1L)); eM_dynamoTunnel4_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15268, "hatch.dynamotunnel4.tier.13", - "UXV 16384A/t Laser Source Hatch", + "UXV 16,384A/t Laser Source Hatch", 13, 16384).getStackForm(1L)); eM_dynamoTunnel5_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15278, "hatch.dynamotunnel5.tier.13", - "UXV 65536A/t Laser Source Hatch", + "UXV 65,536A/t Laser Source Hatch", 13, 65536).getStackForm(1L)); eM_dynamoTunnel6_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15288, "hatch.dynamotunnel6.tier.13", - "UXV 262144A/t Laser Source Hatch", + "UXV 262,144A/t Laser Source Hatch", 13, 262144).getStackForm(1L)); eM_dynamoTunnel7_UXV.set( new GT_MetaTileEntity_Hatch_DynamoTunnel( 15298, "hatch.dynamotunnel7.tier.13", - "UXV 1048576A/t Laser Source Hatch", + "UXV 1,048,576A/t Laser Source Hatch", 13, 1048576).getStackForm(1L)); eM_dynamoTunnel9001.set( 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 ce7fa23f60..39d7150482 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -295,6 +295,13 @@ public enum CustomItemList implements IItemContainer { eM_energyTunnel6_UXV, eM_energyTunnel7_UXV, eM_energyTunnel9001, + eM_energyWirelessTunnel1_UXV, + eM_energyWirelessTunnel2_UXV, + eM_energyWirelessTunnel3_UXV, + eM_energyWirelessTunnel4_UXV, + eM_energyWirelessTunnel5_UXV, + eM_energyWirelessTunnel6_UXV, + eM_energyWirelessTunnel7_UXV, eM_in_UV, eM_in_UHV, 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 08c7bbf0b1..fc906e7099 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 @@ -60,6 +60,8 @@ public class Textures { "iconsets/OVERLAY_ENERGY_ON_WIRELESS_4A"); private static final IIconContainer OVERLAY_ENERGY_ON_WIRELESS_16A = new CustomIcon( "iconsets/OVERLAY_ENERGY_ON_WIRELESS_16A"); + private static final IIconContainer OVERLAY_ENERGY_ON_WIRELESS_LASER = new CustomIcon( + "iconsets/OVERLAY_ENERGY_ON_WIRELESS_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"); @@ -269,6 +271,23 @@ public class Textures { TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 25, 43, 255, 0 }), TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 25, 43, 255, 0 }) }; + public static final ITexture[] OVERLAYS_ENERGY_IN_WIRELESS_LASER = { + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS_LASER, new short[] { 255, 255, 255, 0 }) }; + public static ITexture[][] MACHINE_CASINGS_TT = new ITexture[15][17]; public static ITexture TESLA_TRANSCEIVER_TOP_BA = new GT_RenderedTexture(TESLA_TRANSCEIVER_TOP); 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 56cc0d67d3..98adba55d1 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 @@ -29,22 +29,24 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatch_DynamoMulti implements IConnectsToEnergyTunnel { - public GT_MetaTileEntity_Hatch_DynamoTunnel(int aID, String aName, String aNameRegional, int aTier, int aAmp) { + public GT_MetaTileEntity_Hatch_DynamoTunnel(int ID, String unlocalisedName, String localisedName, int tier, + int amps) { super( - aID, - aName, - aNameRegional, - aTier, + ID, + unlocalisedName, + localisedName, + tier, 0, new String[] { CommonValues.TEC_MARK_GENERAL, translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"), translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(aAmp * V[aTier]) + + GT_Utility.formatNumbers(amps * V[tier]) + EnumChatFormatting.RESET + " EU/t" }, - aAmp); // Energy extracting terminal for Multiblocks - TT_Utility.setTier(aTier, this); + amps); + + TT_Utility.setTier(tier, this); } public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String[] aDescription, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java index da4e987628..28c4e8231d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.hatch; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_LASER; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_16A; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_4A; import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_WIRELESS_MULTI_64A; @@ -66,6 +67,9 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat case 64: TEXTURE_OVERLAY = OVERLAYS_ENERGY_IN_WIRELESS_MULTI_64A; break; + default: + TEXTURE_OVERLAY = OVERLAYS_ENERGY_IN_WIRELESS_LASER; + break; } return new ITexture[] { aBaseTexture, TEXTURE_OVERLAY[mTier] }; } @@ -82,6 +86,9 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat case 64: TEXTURE_OVERLAY = OVERLAYS_ENERGY_IN_WIRELESS_MULTI_64A; break; + default: + TEXTURE_OVERLAY = OVERLAYS_ENERGY_IN_WIRELESS_LASER; + break; } return new ITexture[] { aBaseTexture, TEXTURE_OVERLAY[mTier] }; } |