Merge pull request #87 from GTNewHorizons/opv-final-final

Purge OpV

4 files changed, 16 insertions, 69 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/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);