diff options
10 files changed, 36 insertions, 146 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java index b08480fe8a..e444e08fb1 100644 --- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java +++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/NoDreamCraftMachineLoader.java @@ -96,13 +96,9 @@ public class NoDreamCraftMachineLoader implements Runnable { 12012, "wettransformer.tier.12", "Mega Ultimate Power Transformer", 12) .getStackForm(1L)); // UXV -> UMV (Use Soft Mallet to invert) - CustomItemList.WetTransformer_OPV_UXV.set(new GT_MetaTileEntity_WetTransformer( + CustomItemList.WetTransformer_MAXV_UXV.set(new GT_MetaTileEntity_WetTransformer( 12013, "wettransformer.tier.13", "Extended Mega Ultimate Power Transformer", 13) - .getStackForm(1L)); // OPV -> UXV (Use Soft Mallet to invert) - - CustomItemList.WetTransformer_MAXV_OPV.set(new GT_MetaTileEntity_WetTransformer( - 12014, "wettransformer.tier.14", "Overpowered Power Transformer", 14) - .getStackForm(1L)); // MAX -> OPV (Use Soft Mallet to invert) + .getStackForm(1L)); // MAX -> UXV (Use Soft Mallet to invert) try { MetaTileEntity temp; @@ -143,18 +139,11 @@ public class NoDreamCraftMachineLoader implements Runnable { } CustomItemList.Hull_UXV.set(temp.getStackForm(1L)); - temp = new GT_MetaTileEntity_BasicHull(11234, "hull.tier.14", "OPV Machine Hull", 14, imagination); + temp = new GT_MetaTileEntity_BasicHull(11234, "hull.tier.14", "MAX Machine Hull", 14, imagination); TT_Utility.setTier(14, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } - CustomItemList.Hull_OPV.set(temp.getStackForm(1L)); - - temp = new GT_MetaTileEntity_BasicHull(11235, "hull.tier.15", "MAX Machine Hull", 15, imagination); - TT_Utility.setTier(15, temp); - if (GT_Values.GT.isClientSide()) { - field.set(temp, method.invoke(temp, iTexture)); - } CustomItemList.Hull_MAXV.set(temp.getStackForm(1L)); temp = new GT_MetaTileEntity_TT_Transformer( @@ -201,23 +190,12 @@ public class NoDreamCraftMachineLoader implements Runnable { 11224, "tt.transformer.tier.13", "Extended Mega Ultimate Transformer", - 13); // OPV -> UXV (Use Soft Mallet to invert) + 13); // MAX -> UXV (Use Soft Mallet to invert) TT_Utility.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } - CustomItemList.Transformer_OPV_UXV.set(temp.getStackForm(1L)); - - temp = new GT_MetaTileEntity_TT_Transformer( - 11225, - "tt.transformer.tier.14", - "Overpowered Transformer", - 14); // MAX -> OPV (Use Soft Mallet to invert) - TT_Utility.setTier(14, temp); - if (GT_Values.GT.isClientSide()) { - field.set(temp, method.invoke(temp, iTexture)); - } - CustomItemList.Transformer_MAXV_OPV.set(temp.getStackForm(1L)); + CustomItemList.Transformer_MAXV_UXV.set(temp.getStackForm(1L)); if (Loader.isModLoaded(Reference.GTPLUSPLUS)) { Class clazz = Class.forName( @@ -278,26 +256,13 @@ public class NoDreamCraftMachineLoader implements Runnable { "transformer.ha.tier.13", "Extended Mega Ultimate Hi-Amp Transformer", 13, - // OPV -> UXV (Use Soft Mallet to invert) + // MAXV -> UXV (Use Soft Mallet to invert) translateToLocal("gt.blockmachines.transformer.ha.tier.13.desc")); TT_Utility.setTier(13, temp); if (GT_Values.GT.isClientSide()) { field.set(temp, method.invoke(temp, iTexture)); } - CustomItemList.Transformer_HA_OPV_UXV.set(temp.getStackForm(1)); - - temp = constructor.newInstance( - 11914, - "transformer.ha.tier.14", - "Overpowered Hi-Amp Transformer", - 14, - // MAX -> OPV (Use Soft Mallet to invert) - translateToLocal("gt.blockmachines.transformer.ha.tier.14.desc")); - TT_Utility.setTier(14, temp); - if (GT_Values.GT.isClientSide()) { - field.set(temp, method.invoke(temp, iTexture)); - } - CustomItemList.Transformer_HA_MAXV_OPV.set(temp.getStackForm(1)); + CustomItemList.Transformer_HA_MAXV_UXV.set(temp.getStackForm(1)); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index f34ee81709..042b184ea1 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -32,7 +32,6 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Recipe; @@ -53,11 +52,6 @@ public final class MainLoader { private MainLoader() {} public static void staticLoad() { - for (int i = 0; i < 16; i++) { - GT_Values.V[i] = V[i]; - GT_Values.VN[i] = VN[i]; - GT_Values.VOLTAGE_NAMES[i] = VOLTAGE_NAMES[i]; - } new ComponentLoader(); } 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 c58c43ef8d..0723b30099 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 @@ -1014,18 +1014,18 @@ public class MachineLoader implements Runnable { // Debug Stuff // =================================================================================================== Machine_DebugPollutor.set( - new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 15) + new GT_MetaTileEntity_DebugPollutor(15495, "debug.tt.pollutor", "Debug Pollution Generator", 14) .getStackForm(1)); - hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 15) + hatch_CreativeData.set(new GT_MetaTileEntity_Hatch_CreativeData(15496, "debug.tt.data", "Debug Data Hatch", 14) .getStackForm(1)); hatch_CreativeMaintenance.set(new GT_MetaTileEntity_Hatch_CreativeMaintenance( - 15497, "debug.tt.maintenance", "Auto-Taping Maintenance Hatch", 15) + 15497, "debug.tt.maintenance", "Auto-Taping Maintenance Hatch", 14) .getStackForm(1L)); Machine_DebugGenny.set( - new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 15) + new GT_MetaTileEntity_DebugPowerGenerator(15498, "debug.tt.genny", "Debug Power Generator", 14) .getStackForm(1L)); Machine_DebugWriter.set( - new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 15) + new GT_MetaTileEntity_DebugStructureWriter(15499, "debug.tt.writer", "Debug Structure Writer", 14) .getStackForm(1L)); UnusedStuff.set(new ItemStack(Blocks.air)); 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 6f00ed021f..01310a8a6f 100644 --- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java +++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java @@ -15,20 +15,17 @@ public enum CustomItemList implements IItemContainer { Casing_UIV, Casing_UMV, Casing_UXV, - Casing_OPV, Casing_MAXV, Hull_UEV, Hull_UIV, Hull_UMV, Hull_UXV, - Hull_OPV, Hull_MAXV, Transformer_UEV_UHV, Transformer_UIV_UEV, Transformer_UMV_UIV, Transformer_UXV_UMV, - Transformer_OPV_UXV, - Transformer_MAXV_OPV, + Transformer_MAXV_UXV, WetTransformer_LV_ULV, WetTransformer_MV_LV, WetTransformer_HV_MV, @@ -42,15 +39,13 @@ public enum CustomItemList implements IItemContainer { WetTransformer_UIV_UEV, WetTransformer_UMV_UIV, WetTransformer_UXV_UMV, - WetTransformer_OPV_UXV, - WetTransformer_MAXV_OPV, + WetTransformer_MAXV_UXV, Transformer_HA_UEV_UHV, Transformer_HA_UIV_UEV, Transformer_HA_UMV_UIV, Transformer_HA_UXV_UMV, - Transformer_HA_OPV_UXV, - Transformer_HA_MAXV_OPV, + Transformer_HA_MAXV_UXV, hatch_CreativeMaintenance, hatch_CreativeData, diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java index 61e4847eb8..f4888b5125 100644 --- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java +++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsNH.java @@ -32,15 +32,13 @@ public class GT_Block_CasingsNH extends GT_Block_Casings_Abstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "UIV Machine Casing"); // adding GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "UMV Machine Casing"); // adding GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "UXV Machine Casing"); // adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "OPV Machine Casing"); // adding - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "MAX Machine Casing"); // adding + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "MAX Machine Casing"); // adding CustomItemList.Casing_UEV.set(new ItemStack(this, 1, 10)); CustomItemList.Casing_UIV.set(new ItemStack(this, 1, 11)); CustomItemList.Casing_UMV.set(new ItemStack(this, 1, 12)); CustomItemList.Casing_UXV.set(new ItemStack(this, 1, 13)); - CustomItemList.Casing_OPV.set(new ItemStack(this, 1, 14)); - CustomItemList.Casing_MAXV.set(new ItemStack(this, 1, 15)); + CustomItemList.Casing_MAXV.set(new ItemStack(this, 1, 14)); } @Override 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 08a14fecc2..37cfe64acd 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 @@ -18,19 +18,16 @@ public class Textures { private static final IIconContainer MACHINE_UIV_SIDE = new CustomIcon("iconsets/MACHINE_UIV_SIDE"); private static final IIconContainer MACHINE_UMV_SIDE = new CustomIcon("iconsets/MACHINE_UMV_SIDE"); private static final IIconContainer MACHINE_UXV_SIDE = new CustomIcon("iconsets/MACHINE_UXV_SIDE"); - private static final IIconContainer MACHINE_OPV_SIDE = new CustomIcon("iconsets/MACHINE_OPV_SIDE"); private static final IIconContainer MACHINE_MAXV_SIDE = new CustomIcon("iconsets/MACHINE_MAXV_SIDE"); private static final IIconContainer MACHINE_UEV_TOP = new CustomIcon("iconsets/MACHINE_UEV_TOP"); private static final IIconContainer MACHINE_UIV_TOP = new CustomIcon("iconsets/MACHINE_UIV_TOP"); private static final IIconContainer MACHINE_UMV_TOP = new CustomIcon("iconsets/MACHINE_UMV_TOP"); private static final IIconContainer MACHINE_UXV_TOP = new CustomIcon("iconsets/MACHINE_UXV_TOP"); - private static final IIconContainer MACHINE_OPV_TOP = new CustomIcon("iconsets/MACHINE_OPV_TOP"); private static final IIconContainer MACHINE_MAXV_TOP = new CustomIcon("iconsets/MACHINE_MAXV_TOP"); private static final IIconContainer MACHINE_UEV_BOTTOM = new CustomIcon("iconsets/MACHINE_UEV_BOTTOM"); private static final IIconContainer MACHINE_UIV_BOTTOM = new CustomIcon("iconsets/MACHINE_UIV_BOTTOM"); private static final IIconContainer MACHINE_UMV_BOTTOM = new CustomIcon("iconsets/MACHINE_UMV_BOTTOM"); private static final IIconContainer MACHINE_UXV_BOTTOM = new CustomIcon("iconsets/MACHINE_UXV_BOTTOM"); - private static final IIconContainer MACHINE_OPV_BOTTOM = new CustomIcon("iconsets/MACHINE_OPV_BOTTOM"); private static final IIconContainer MACHINE_MAXV_BOTTOM = new CustomIcon("iconsets/MACHINE_MAXV_BOTTOM"); private static final IIconContainer TESLA_TRANSCEIVER_TOP = new CustomIcon("iconsets/TESLA_TRANSCEIVER_TOP"); @@ -41,21 +38,21 @@ public class Textures { MACHINE_8V_SIDE, MACHINE_LV_SIDE, MACHINE_MV_SIDE, MACHINE_HV_SIDE, MACHINE_EV_SIDE, MACHINE_IV_SIDE, MACHINE_LuV_SIDE, MACHINE_ZPM_SIDE, MACHINE_UV_SIDE, MACHINE_MAX_SIDE, MACHINE_UEV_SIDE, MACHINE_UIV_SIDE, - MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, MACHINE_OPV_SIDE, MACHINE_MAXV_SIDE, + MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, MACHINE_MAXV_SIDE, }, MACHINECASINGS_TOP_TT = new IIconContainer[] { MACHINE_8V_TOP, MACHINE_LV_TOP, MACHINE_MV_TOP, MACHINE_HV_TOP, MACHINE_EV_TOP, MACHINE_IV_TOP, MACHINE_LuV_TOP, MACHINE_ZPM_TOP, MACHINE_UV_TOP, MACHINE_MAX_TOP, MACHINE_UEV_TOP, MACHINE_UIV_TOP, - MACHINE_UMV_TOP, MACHINE_UXV_TOP, MACHINE_OPV_TOP, MACHINE_MAXV_TOP, + MACHINE_UMV_TOP, MACHINE_UXV_TOP, MACHINE_MAXV_TOP, }, MACHINECASINGS_BOTTOM_TT = new IIconContainer[] { MACHINE_8V_BOTTOM, MACHINE_LV_BOTTOM, MACHINE_MV_BOTTOM, MACHINE_HV_BOTTOM, MACHINE_EV_BOTTOM, MACHINE_IV_BOTTOM, MACHINE_LuV_BOTTOM, MACHINE_ZPM_BOTTOM, MACHINE_UV_BOTTOM, MACHINE_MAX_BOTTOM, MACHINE_UEV_BOTTOM, MACHINE_UIV_BOTTOM, - MACHINE_UMV_BOTTOM, MACHINE_UXV_BOTTOM, MACHINE_OPV_BOTTOM, MACHINE_MAXV_BOTTOM, + MACHINE_UMV_BOTTOM, MACHINE_UXV_BOTTOM, MACHINE_MAXV_BOTTOM, }; public static ITexture[] OVERLAYS_ENERGY_IN_TT = @@ -75,7 +72,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_OUT_TT = new ITexture[] { @@ -94,7 +90,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_IN_MULTI_TT = new ITexture[] { @@ -113,7 +108,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_MULTI, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_OUT_MULTI_TT = new ITexture[] { @@ -132,7 +126,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_MULTI, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_IN_POWER_TT = new ITexture[] { @@ -151,7 +144,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_POWER, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_OUT_POWER_TT = new ITexture[] { @@ -170,7 +162,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_POWER, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_IN_LASER_TT = new ITexture[] { @@ -189,7 +180,6 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_IN_LASER, new short[] {40, 40, 245, 0}), }, OVERLAYS_ENERGY_OUT_LASER_TT = new ITexture[] { @@ -208,10 +198,9 @@ public class Textures { new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {100, 100, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {80, 80, 245, 0}), new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {60, 60, 245, 0}), - new GT_RenderedTexture(OVERLAY_ENERGY_OUT_LASER, new short[] {40, 40, 245, 0}), }; - public static ITexture[][] MACHINE_CASINGS_TT = new ITexture[16][17]; + 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/multi/GT_MetaTileEntity_EM_research.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java index c8aeb7933e..3fc01b02a9 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_research.java @@ -95,7 +95,7 @@ public class GT_MetaTileEntity_EM_research extends GT_MetaTileEntity_MultiblockB .addElement('B', ofBlock(sBlockCasingsTT, 2)) .addElement('C', ofBlock(sBlockCasingsTT, 3)) .addElement('D', classicHatches(textureOffset + 1, 1, sBlockCasingsTT, 1)) - .addElement('E', HolderHatchElement.INSTANCE.newAny(3, 2)) + .addElement('E', HolderHatchElement.INSTANCE.newAny(textureOffset + 3, 2)) .build(); // endregion diff --git a/src/main/java/com/github/technus/tectech/util/CommonValues.java b/src/main/java/com/github/technus/tectech/util/CommonValues.java index cb894f8e9c..5b3ee851d1 100644 --- a/src/main/java/com/github/technus/tectech/util/CommonValues.java +++ b/src/main/java/com/github/technus/tectech/util/CommonValues.java @@ -1,5 +1,6 @@ package com.github.technus.tectech.util; +import gregtech.api.enums.GT_Values; import net.minecraft.util.EnumChatFormatting; /** @@ -27,45 +28,9 @@ public final class CommonValues { public static final long[] AatV = new long[] { 268435455, 67108863, 16777215, 4194303, 1048575, 262143, 65535, 16383, 4095, 1023, 255, 63, 15, 3, 1, 1 }; - public static final String[] VOLTAGE_NAMES = new String[] { - "Ultra Low Voltage", - "Low Voltage", - "Medium Voltage", - "High Voltage", - "Extreme Voltage", - "Insane Voltage", - "Ludicrous Voltage", - "ZPM Voltage", - "Ultimate Voltage", - "Ultimate High Voltage", - "Ultimate Extreme Voltage", - "Ultimate Insane Voltage", - "Ultimate Mega Voltage", - "Ultimate Extended Mega Voltage", - "Overpowered Voltage", - "Maximum Voltage" - }; - public static final String[] VN = new String[] { - "ULV", "LV", "MV", "HV", "EV", "IV", "LuV", "ZPM", "UV", "UHV", "UEV", "UIV", "UMV", "UXV", "OpV", "MAX" - }; - public static final long[] V = new long[] { - 8L, - 32L, - 128L, - 512L, - 2048L, - 8192L, - 32768L, - 131072L, - 524288L, - 2097152L, - 8388608L, - 33554432L, - 134217728L, - 536870912L, - 1073741824L, - Integer.MAX_VALUE - 7 - }; + public static final String[] VOLTAGE_NAMES = GT_Values.VOLTAGE_NAMES; + public static final String[] VN = GT_Values.VN; + public static final long[] V = GT_Values.V; private CommonValues() {} } diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang index 6393b2eeed..ab27b89dd6 100644 --- a/src/main/resources/assets/tectech/lang/en_US.lang +++ b/src/main/resources/assets/tectech/lang/en_US.lang @@ -111,8 +111,7 @@ gt.blockmachines.hull.tier.10.name=UEV Machine Hull gt.blockmachines.hull.tier.11.name=UIV Machine Hull gt.blockmachines.hull.tier.12.name=UMV Machine Hull gt.blockmachines.hull.tier.13.name=UXV Machine Hull -gt.blockmachines.hull.tier.14.name=OPV Machine Hull -gt.blockmachines.hull.tier.15.name=MAX Machine Hull +gt.blockmachines.hull.tier.14.name=MAX Machine Hull #Transformers gt.blockmachines.wetransformer.tier.00.name=Ultra Low Voltage Power Transformer @@ -142,9 +141,7 @@ gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to inver gt.blockmachines.wetransformer.tier.12.name=Mega Ultimate Power Transformer gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) gt.blockmachines.wetransformer.tier.13.name=Extended Mega Ultimate Power Transformer -gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.wetransformer.tier.14.name=Overpowered Power Transformer -gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.wetransformer.tier.13.desc=MAX -> UXV (Use Soft Mallet to invert) gt.blockmachines.tt.transformer.tier.09.name=Highly Ultimate Transformer gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert) @@ -155,9 +152,7 @@ gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (Use Soft Mallet to inve gt.blockmachines.tt.transformer.tier.12.name=Mega Ultimate Transformer gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) gt.blockmachines.tt.transformer.tier.13.name=Extended Mega Ultimate Transformer -gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.tt.transformer.tier.14.name=Overpowered Transformer -gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.tt.transformer.tier.13.desc=MAX -> UXV (Use Soft Mallet to invert) gt.blockmachines.transformer.ha.tier.09.name=Highly Ultimate Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (Use Soft Mallet to invert @@ -168,9 +163,7 @@ gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (Use Soft Mallet to inve gt.blockmachines.transformer.ha.tier.12.name=Mega Ultimate Hi-Amp Transformer gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (Use Soft Mallet to invert) gt.blockmachines.transformer.ha.tier.13.name=Extended Mega Ultimate Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (Use Soft Mallet to invert) -gt.blockmachines.transformer.ha.tier.14.name=Overpowered Hi-Amp Transformer -gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (Use Soft Mallet to invert) +gt.blockmachines.transformer.ha.tier.13.desc=MAX -> UXV (Use Soft Mallet to invert) #Hatches tt.base.emhatch.desc.0=Max stacks amount: @@ -450,8 +443,7 @@ gt.blockcasingsNH.10.name=UEV Machine Casing gt.blockcasingsNH.11.name=UIV Machine Casing gt.blockcasingsNH.12.name=UMV Machine Casing gt.blockcasingsNH.13.name=UXV Machine Casing -gt.blockcasingsNH.14.name=OPV Machine Casing -gt.blockcasingsNH.15.name=MAX Machine Casing +gt.blockcasingsNH.14.name=MAX Machine Casing gt.blockhintTT.desc.0=Helps while building gt.blockhintTT.0.name=Hint 1 dot diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang index 83cc8f72e9..870998d56a 100644 --- a/src/main/resources/assets/tectech/lang/zh_CN.lang +++ b/src/main/resources/assets/tectech/lang/zh_CN.lang @@ -111,8 +111,7 @@ gt.blockmachines.hull.tier.10.name=UEV机器外壳 gt.blockmachines.hull.tier.11.name=UIV机器外壳 gt.blockmachines.hull.tier.12.name=UMV机器外壳 gt.blockmachines.hull.tier.13.name=UXV机器外壳 -gt.blockmachines.hull.tier.14.name=OPV机器外壳 -gt.blockmachines.hull.tier.15.name=MAX机器外壳 +gt.blockmachines.hull.tier.14.name=MAX机器外壳 #Transformers gt.blockmachines.wetransformer.tier.00.name=ULV高能变压器 @@ -142,9 +141,7 @@ gt.blockmachines.wetransformer.tier.11.desc=UMV -> UIV (用软锤右击以反转 gt.blockmachines.wetransformer.tier.12.name=UMV高能变压器 gt.blockmachines.wetransformer.tier.12.desc=UXV -> UMV (用软锤右击以反转) gt.blockmachines.wetransformer.tier.13.name=UXV高能变压器 -gt.blockmachines.wetransformer.tier.13.desc=OPV -> UXV (用软锤右击以反转) -gt.blockmachines.wetransformer.tier.14.name=OpV高能变压器 -gt.blockmachines.wetransformer.tier.14.desc=MAX -> OPV (用软锤右击以反转) +gt.blockmachines.wetransformer.tier.13.desc=MAX -> UXV (用软锤右击以反转) gt.blockmachines.tt.transformer.tier.09.name=UHV变压器 gt.blockmachines.tt.transformer.tier.09.desc=UEV -> UHV (用软锤右击以反转) @@ -155,9 +152,7 @@ gt.blockmachines.tt.transformer.tier.11.desc=UMV -> UIV (用软锤右击以反 gt.blockmachines.tt.transformer.tier.12.name=UMV变压器 gt.blockmachines.tt.transformer.tier.12.desc=UXV -> UMV (用软锤右击以反转) gt.blockmachines.tt.transformer.tier.13.name=UXV变压器 -gt.blockmachines.tt.transformer.tier.13.desc=OPV -> UXV (用软锤右击以反转) -gt.blockmachines.tt.transformer.tier.14.name=OpV变压器 -gt.blockmachines.tt.transformer.tier.14.desc=MAX -> OPV (用软锤右击以反转) +gt.blockmachines.tt.transformer.tier.13.desc=MAX -> UXV (用软锤右击以反转) gt.blockmachines.transformer.ha.tier.09.name=UHV高电流变压器 gt.blockmachines.transformer.ha.tier.09.desc=UEV -> UHV (用软锤右击以反转 @@ -168,9 +163,7 @@ gt.blockmachines.transformer.ha.tier.11.desc=UMV -> UIV (用软锤右击以反 gt.blockmachines.transformer.ha.tier.12.name=UMV高电流变压器 gt.blockmachines.transformer.ha.tier.12.desc=UXV -> UMV (用软锤右击以反转) gt.blockmachines.transformer.ha.tier.13.name=UXV高电流变压器 -gt.blockmachines.transformer.ha.tier.13.desc=OPV -> UXV (用软锤右击以反转) -gt.blockmachines.transformer.ha.tier.14.name=OpV高电流变压器 -gt.blockmachines.transformer.ha.tier.14.desc=MAX -> OPV (用软锤右击以反转) +gt.blockmachines.transformer.ha.tier.13.desc=MAX -> UXV (用软锤右击以反转) #Hatches tt.base.emhatch.desc.0=最大元物质组数： @@ -450,8 +443,7 @@ gt.blockcasingsNH.10.name=UEV机械方块 gt.blockcasingsNH.11.name=UIV机械方块 gt.blockcasingsNH.12.name=UMV机械方块 gt.blockcasingsNH.13.name=UXV机械方块 -gt.blockcasingsNH.14.name=OPV机械方块 -gt.blockcasingsNH.15.name=MAX机械方块 +gt.blockcasingsNH.14.name=MAX机械方块 gt.blockhintTT.desc.0=构造时的帮助 gt.blockhintTT.0.name=提示方块：1号 |