Merge pull request #86 from GTNewHorizons/opv-final

Don't overwrite GT_Values

2 files changed, 4 insertions, 45 deletions

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/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() {}
 }