From d47057911716b1a03ad212928f8c2dad649eafd2 Mon Sep 17 00:00:00 2001 From: GDCloud <93287602+GDCloudstrike@users.noreply.github.com> Date: Sat, 8 Jul 2023 23:50:46 +0200 Subject: [PATCH] High amp wireless + low amp recipe changes (#228) * adjust low amp wireless recipes * add hatches * localization * texture * recipes * fix circuits * custom texture * fix achievement localisation * number formatting * Small clean. * spotlessApply (#230) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../recipe/ResearchStationAssemblyLine.java | 51 +++- .../tectech/loader/thing/MachineLoader.java | 272 +++++++++++------- .../technus/tectech/thing/CustomItemList.java | 7 + .../thing/metaTileEntity/Textures.java | 19 ++ .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 18 +- ...GT_MetaTileEntity_Hatch_WirelessMulti.java | 7 + .../OVERLAY_ENERGY_ON_WIRELESS_LASER.png | Bin 0 -> 8627 bytes ...VERLAY_ENERGY_ON_WIRELESS_LASER.png.mcmeta | 1 + .../resources/assets/tectech/lang/en_US.lang | 232 ++++++++------- 9 files changed, 379 insertions(+), 228 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png create mode 100644 src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png.mcmeta 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 7bcf771e4..5e0297c15 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 @@ private void addWirelessEnergyRecipes() { 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 @@ private void addWirelessEnergyRecipes() { 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 @@ private void addWirelessEnergyRecipes() { 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 @@ private void addWirelessEnergyRecipes() { 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 @@ private void addWirelessEnergyRecipes() { 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 @@ private void addWirelessEnergyRecipes() { 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 900d607ee..682820688 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_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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 void run() { 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 ce7fa23f6..39d715048 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 08c7bbf0b..fc906e709 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 56cc0d67d..98adba55d 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 @@ 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 da4e98762..28c4e8231 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 ITexture[] getTexturesActive(ITexture aBaseTexture) { 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 ITexture[] getTexturesInactive(ITexture aBaseTexture) { 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] }; } diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png new file mode 100644 index 0000000000000000000000000000000000000000..aef6a37f1b33d430d8bad40f1b977b18ed4c568c GIT binary patch literal 8627 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%0ASKF`i#W%aPtl8g*C5|57!tN!{@-FU! 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 IRPC_;18f4C6aWAK literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png.mcmeta new file mode 100644 index 000000000..0dab81071 --- /dev/null +++ b/src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_ENERGY_ON_WIRELESS_LASER.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 3}} \ No newline at end of file diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index fbfb25771..21f7333a4 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -287,69 +287,85 @@ achievement.gt.blockmachines.hatch.energywirelessmulti04.tier.14.desc=Multi Amp achievement.gt.blockmachines.hatch.energywirelessmulti16.tier.14.desc=Multi Amp Wireless Energy! achievement.gt.blockmachines.hatch.energywirelessmulti64.tier.14.desc=Multi Amp Wireless Energy! +gt.blockmachines.hatch.energywirelesstunnel1.tier.13.name=UXV 256A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel2.tier.13.name=UXV 1,024A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel3.tier.13.name=UXV 4,096A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel4.tier.13.name=UXV 16,384A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel5.tier.13.name=UXV 65,536A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel6.tier.13.name=UXV 262,144A Wireless Energy Hatch +gt.blockmachines.hatch.energywirelesstunnel7.tier.13.name=UXV 1,048,576A Wireless Energy Hatch + +achievement.gt.blockmachines.hatch.energywirelesstunnel1.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel2.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel3.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel4.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel5.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel6.tier.13.desc=High Amp Wireless Energy at last! +achievement.gt.blockmachines.hatch.energywirelesstunnel7.tier.13.desc=High Amp Wireless Energy at last! + gt.blockmachines.hatch.energytunnel1.tier.05.name=IV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.05.name=IV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.05.name=IV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.05.name=IV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.05.name=IV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.05.name=IV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.05.name=IV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.05.name=IV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.05.name=IV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.05.name=IV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.05.name=IV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.05.name=IV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.05.name=IV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.06.name=LuV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.06.name=LuV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.06.name=LuV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.06.name=LuV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.06.name=LuV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.06.name=LuV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.06.name=LuV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.06.name=LuV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.06.name=LuV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.06.name=LuV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.06.name=LuV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.06.name=LuV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.06.name=LuV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.07.name=ZPM 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.07.name=ZPM 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.07.name=ZPM 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.07.name=ZPM 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.07.name=ZPM 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.07.name=ZPM 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.07.name=ZPM 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.07.name=ZPM 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.07.name=ZPM 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.07.name=ZPM 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.07.name=ZPM 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.07.name=ZPM 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.07.name=ZPM 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.08.name=UV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.08.name=UV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.08.name=UV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.08.name=UV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.08.name=UV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.08.name=UV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.08.name=UV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.08.name=UV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.08.name=UV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.08.name=UV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.08.name=UV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.08.name=UV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.08.name=UV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.09.name=UHV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.09.name=UHV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.09.name=UHV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.09.name=UHV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.09.name=UHV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.09.name=UHV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.09.name=UHV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.09.name=UHV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.09.name=UHV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.09.name=UHV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.09.name=UHV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.09.name=UHV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.09.name=UHV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.10.name=UEV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.10.name=UEV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.10.name=UEV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.10.name=UEV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.10.name=UEV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.10.name=UEV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.10.name=UEV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.10.name=UEV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.10.name=UEV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.10.name=UEV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.10.name=UEV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.10.name=UEV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.10.name=UEV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.11.name=UIV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.11.name=UIV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.11.name=UIV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.11.name=UIV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.11.name=UIV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.11.name=UIV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.11.name=UIV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.11.name=UIV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.11.name=UIV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.11.name=UIV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.11.name=UIV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.11.name=UIV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.11.name=UIV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.12.name=UMV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.12.name=UMV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.12.name=UMV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.12.name=UMV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.12.name=UMV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.12.name=UMV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.12.name=UMV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.12.name=UMV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.12.name=UMV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.12.name=UMV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.12.name=UMV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.12.name=UMV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.12.name=UMV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel1.tier.13.name=UXV 256A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel2.tier.13.name=UXV 1024A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel3.tier.13.name=UXV 4096A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel4.tier.13.name=UXV 16384A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel5.tier.13.name=UXV 65536A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel6.tier.13.name=UXV 262144A/t Laser Target Hatch -gt.blockmachines.hatch.energytunnel7.tier.13.name=UXV 1048576A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel2.tier.13.name=UXV 1,024A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel3.tier.13.name=UXV 4,096A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel4.tier.13.name=UXV 16,384A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel5.tier.13.name=UXV 65,536A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel6.tier.13.name=UXV 262,144A/t Laser Target Hatch +gt.blockmachines.hatch.energytunnel7.tier.13.name=UXV 1,048,576A/t Laser Target Hatch gt.blockmachines.hatch.energytunnel.tier.14.name=Legendary Laser Target Hatch gt.blockmachines.hatch.energytunnel.desc.0=Energy injecting terminal for Multiblocks gt.blockmachines.hatch.energytunnel.desc.1=Throughput @@ -385,68 +401,68 @@ gt.blockmachines.hatch.dynamomulti.desc.0=Multiple Ampere Energy Extractor for M gt.blockmachines.hatch.dynamomulti.desc.1=Amperes Out gt.blockmachines.hatch.dynamotunnel1.tier.05.name=IV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.05.name=IV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.05.name=IV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.05.name=IV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.05.name=IV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.05.name=IV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.05.name=IV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.05.name=IV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.05.name=IV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.05.name=IV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.05.name=IV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.05.name=IV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.05.name=IV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.06.name=LuV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.06.name=LuV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.06.name=LuV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.06.name=LuV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.06.name=LuV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.06.name=LuV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.06.name=LuV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.06.name=LuV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.06.name=LuV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.06.name=LuV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.06.name=LuV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.06.name=LuV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.06.name=LuV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.07.name=ZPM 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.07.name=ZPM 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.07.name=ZPM 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.07.name=ZPM 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.07.name=ZPM 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.07.name=ZPM 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.07.name=ZPM 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.07.name=ZPM 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.07.name=ZPM 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.07.name=ZPM 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.07.name=ZPM 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.07.name=ZPM 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.07.name=ZPM 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.08.name=UV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.08.name=UV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.08.name=UV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.08.name=UV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.08.name=UV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.08.name=UV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.08.name=UV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.08.name=UV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.08.name=UV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.08.name=UV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.08.name=UV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.08.name=UV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.08.name=UV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.09.name=UHV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.09.name=UHV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.09.name=UHV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.09.name=UHV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.09.name=UHV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.09.name=UHV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.09.name=UHV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.09.name=UHV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.09.name=UHV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.09.name=UHV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.09.name=UHV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.09.name=UHV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.09.name=UHV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.10.name=UEV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.10.name=UEV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.10.name=UEV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.10.name=UEV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.10.name=UEV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.10.name=UEV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.10.name=UEV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.10.name=UEV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.10.name=UEV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.10.name=UEV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.10.name=UEV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.10.name=UEV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.10.name=UEV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.11.name=UIV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.11.name=UIV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.11.name=UIV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.11.name=UIV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.11.name=UIV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.11.name=UIV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.11.name=UIV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.11.name=UIV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.11.name=UIV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.11.name=UIV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.11.name=UIV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.11.name=UIV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.11.name=UIV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.12.name=UMV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.12.name=UMV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.12.name=UMV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.12.name=UMV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.12.name=UMV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.12.name=UMV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.12.name=UMV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.12.name=UMV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.12.name=UMV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.12.name=UMV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.12.name=UMV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.12.name=UMV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.12.name=UMV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel1.tier.13.name=UXV 256A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel2.tier.13.name=UXV 1024A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel3.tier.13.name=UXV 4096A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel4.tier.13.name=UXV 16384A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel5.tier.13.name=UXV 65536A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel6.tier.13.name=UXV 262144A/t Laser Source Hatch -gt.blockmachines.hatch.dynamotunnel7.tier.13.name=UXV 1048576A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel2.tier.13.name=UXV 1,024A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel3.tier.13.name=UXV 4,096A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel4.tier.13.name=UXV 16,384A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel5.tier.13.name=UXV 65,536A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel6.tier.13.name=UXV 262,144A/t Laser Source Hatch +gt.blockmachines.hatch.dynamotunnel7.tier.13.name=UXV 1,048,576A/t Laser Source Hatch gt.blockmachines.hatch.dynamotunnel.tier.14.name=Legendary Laser Source Hatch gt.blockmachines.hatch.dynamotunnel.desc.0=Energy extracting terminal for Multiblocks gt.blockmachines.hatch.dynamotunnel.desc.1=Throughput