68 files changed, 1705 insertions, 1629 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java b/src/main/java/gregtech/api/util/AssemblyLineServer.java
index 4c0348683a..49e3882982 100644
--- a/src/main/java/gregtech/api/util/GT_Assemblyline_Server.java
+++ b/src/main/java/gregtech/api/util/AssemblyLineServer.java
@@ -9,11 +9,11 @@ import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.common.config.Property;
 
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsBotania;
 
-public class GT_Assemblyline_Server {
+public class AssemblyLineServer {
 
     public static LinkedHashMap<String, String> lServerNames = new LinkedHashMap<>();
     private static LinkedHashMap<String, String> internal2 = new LinkedHashMap<>(), internal3 = new LinkedHashMap<>(),
@@ -21,7 +21,7 @@ public class GT_Assemblyline_Server {
     private static HashMap<String, Property> internal = new HashMap<>();
 
     public static void fillMap(FMLPreInitializationEvent aEvent) {
-        Configuration conf = GT_LanguageManager.sEnglishFile;
+        Configuration conf = GTLanguageManager.sEnglishFile;
 
         ConfigCategory cat = conf.getCategory("languagefile");
         internal.putAll(cat.getValues());
@@ -56,10 +56,10 @@ public class GT_Assemblyline_Server {
                                 entry.getKey()
                                     .length() - ".name".length()));
                     i = i % 1000;
-                    if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put(
+                    if (GregTechAPI.sGeneratedMaterials[i] != null) lServerNames.put(
                         entry.getKey(),
                         entry.getValue()
-                            .replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+                            .replace("material", GregTechAPI.sGeneratedMaterials[i].toString()));
                     else lServerNames.put(entry.getKey(), null);
                 }
             } catch (Exception ignored) {}
@@ -192,10 +192,10 @@ public class GT_Assemblyline_Server {
                                 entry.getKey()
                                     .length() - ".name".length()));
                     i = i % 1000;
-                    if (GregTech_API.sGeneratedMaterials[i] != null) lServerNames.put(
+                    if (GregTechAPI.sGeneratedMaterials[i] != null) lServerNames.put(
                         entry.getKey(),
                         entry.getValue()
-                            .replace("material", GregTech_API.sGeneratedMaterials[i].toString()));
+                            .replace("material", GregTechAPI.sGeneratedMaterials[i].toString()));
                     else lServerNames.put(entry.getKey(), null);
                 } else if (entry.getKey()
                     .contains("blockmetal")) {
diff --git a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
index dbe0ff2c40..22bed1884b 100644
--- a/src/main/java/gregtech/api/util/GT_AssemblyLineUtils.java
+++ b/src/main/java/gregtech/api/util/AssemblyLineUtils.java
@@ -1,6 +1,6 @@
 package gregtech.api.util;
 
-import static gregtech.GT_Mod.GT_FML_LOGGER;
+import static gregtech.GTMod.GT_FML_LOGGER;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -18,21 +18,21 @@ import net.minecraftforge.common.util.Constants.NBT;
 import net.minecraftforge.fluids.FluidStack;
 
 import cpw.mods.fml.common.FMLCommonHandler;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
 import gregtech.api.enums.ItemList;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
+import gregtech.api.objects.GTItemStack;
+import gregtech.api.util.GTRecipe.RecipeAssemblyLine;
 
-public class GT_AssemblyLineUtils {
+public class AssemblyLineUtils {
 
     /**
      * A cache of Recipes using the Output as Key.
      */
-    private static final HashMap<GT_ItemStack, GT_Recipe_AssemblyLine> sRecipeCacheByOutput = new HashMap<>();
+    private static final HashMap<GTItemStack, GTRecipe.RecipeAssemblyLine> sRecipeCacheByOutput = new HashMap<>();
     /**
      * A cache of Recipes using the Recipe Hash String as Key.
      */
-    private static final HashMap<String, GT_Recipe_AssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>();
+    private static final HashMap<String, GTRecipe.RecipeAssemblyLine> sRecipeCacheByRecipeHash = new HashMap<>();
 
     /**
      * Checks the DataStick for deprecated/invalid recipes, updating them as required.
@@ -40,14 +40,14 @@ public class GT_AssemblyLineUtils {
      * @param aDataStick - The DataStick to process
      * @return Is this DataStick now valid with a current recipe?
      */
-    public static GT_Recipe_AssemblyLine processDataStick(ItemStack aDataStick) {
+    public static GTRecipe.RecipeAssemblyLine processDataStick(ItemStack aDataStick) {
         if (!isItemDataStick(aDataStick)) {
             return null;
         }
         if (doesDataStickNeedUpdate(aDataStick)) {
             ItemStack aStickOutput = getDataStickOutput(aDataStick);
             if (aStickOutput != null) {
-                GT_Recipe_AssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
+                GTRecipe.RecipeAssemblyLine aIntendedRecipe = findAssemblyLineRecipeByOutput(aStickOutput);
                 if (aIntendedRecipe != null && setAssemblyLineRecipeOnDataStick(aDataStick, aIntendedRecipe))
                     return aIntendedRecipe;
             }
@@ -59,9 +59,9 @@ public class GT_AssemblyLineUtils {
      * Finds an Assembly Line recipe from a DataStick.
      *
      * @param aDataStick - The DataStick to check.
-     * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any.
+     * @return The GTRecipe_AssemblyLine recipe contained on the DataStick, if any.
      */
-    public static GT_Recipe_AssemblyLine findAssemblyLineRecipeFromDataStick(ItemStack aDataStick) {
+    public static RecipeAssemblyLine findAssemblyLineRecipeFromDataStick(ItemStack aDataStick) {
         return findAssemblyLineRecipeFromDataStick(aDataStick, false).getRecipe();
     }
 
@@ -69,9 +69,9 @@ public class GT_AssemblyLineUtils {
      * Finds an Assembly Line recipe from a DataStick.
      *
      * @param aDataStick         - The DataStick to check.
-     * @param aReturnBuiltRecipe - Do we return a GT_Recipe_AssemblyLine built from the data on the Data Stick instead
+     * @param aReturnBuiltRecipe - Do we return a GTRecipe_AssemblyLine built from the data on the Data Stick instead
      *                           of searching the Recipe Map?
-     * @return The GT_Recipe_AssemblyLine recipe contained on the DataStick, if any.
+     * @return The GTRecipe_AssemblyLine recipe contained on the DataStick, if any.
      */
     @Nonnull
     public static LookupResult findAssemblyLineRecipeFromDataStick(ItemStack aDataStick, boolean aReturnBuiltRecipe) {
@@ -90,8 +90,9 @@ public class GT_AssemblyLineUtils {
 
         // Get From Cache
         if (doesDataStickHaveRecipeHash(aDataStick)) {
-            GT_Recipe_AssemblyLine aRecipeFromCache = sRecipeCacheByRecipeHash.get(getHashFromDataStack(aDataStick));
-            if (aRecipeFromCache != null && GT_Utility.areStacksEqual(aOutput, aRecipeFromCache.mOutput)) {
+            GTRecipe.RecipeAssemblyLine aRecipeFromCache = sRecipeCacheByRecipeHash
+                .get(getHashFromDataStack(aDataStick));
+            if (aRecipeFromCache != null && GTUtility.areStacksEqual(aOutput, aRecipeFromCache.mOutput)) {
                 return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult(aRecipeFromCache);
             } // else: no cache, or the old recipe run into a hash collision with a different new recipe
         }
@@ -104,45 +105,45 @@ public class GT_AssemblyLineUtils {
 
             List<ItemStack> tAltCurrent = new ArrayList<>();
             for (int j = 0; j < count; j++) {
-                ItemStack tLoaded = GT_Utility.loadItem(aTag, "a" + i + ":" + j);
+                ItemStack tLoaded = GTUtility.loadItem(aTag, "a" + i + ":" + j);
                 if (tLoaded == null) {
                     continue;
                 }
                 tAltCurrent.add(tLoaded);
-                if (GT_Values.D1) {
+                if (GTValues.D1) {
                     GT_FML_LOGGER.info("Item Alt " + i + " : " + tLoaded.getUnlocalizedName());
                 }
             }
             mOreDictAlt.add(tAltCurrent);
-            ItemStack tLoaded = GT_Utility.loadItem(aTag, "" + i);
+            ItemStack tLoaded = GTUtility.loadItem(aTag, "" + i);
             if (tLoaded == null) {
                 continue;
             }
             aInputs.add(tLoaded);
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Item " + i + " : " + tLoaded.getUnlocalizedName());
             }
         }
 
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("All Items done, start fluid check");
         }
         for (int i = 0; i < 4; i++) {
             if (!aTag.hasKey("f" + i)) continue;
-            FluidStack tLoaded = GT_Utility.loadFluid(aTag, "f" + i);
+            FluidStack tLoaded = GTUtility.loadFluid(aTag, "f" + i);
             if (tLoaded == null) continue;
             aFluidInputs.add(tLoaded);
-            if (GT_Values.D1) {
+            if (GTValues.D1) {
                 GT_FML_LOGGER.info("Fluid " + i + " " + tLoaded.getUnlocalizedName());
             }
         }
         if (!aTag.hasKey("output") || !aTag.hasKey("time")
             || aTag.getInteger("time") <= 0
             || !aTag.hasKey("eu")
-            || !GT_Utility.isStackValid(aOutput)) {
+            || !GTUtility.isStackValid(aOutput)) {
             return LookupResultType.INVALID_STICK.getResult();
         }
-        if (GT_Values.D1) {
+        if (GTValues.D1) {
             GT_FML_LOGGER.info("Found Data Stick recipe");
         }
 
@@ -152,7 +153,7 @@ public class GT_AssemblyLineUtils {
         // Try build a recipe instance
         if (aReturnBuiltRecipe) {
             return LookupResultType.VALID_STACK_AND_VALID_HASH.getResult(
-                new GT_Recipe_AssemblyLine(
+                new GTRecipe.RecipeAssemblyLine(
                     null,
                     0,
                     aInputs.toArray(new ItemStack[0]),
@@ -162,17 +163,17 @@ public class GT_AssemblyLineUtils {
                     aEU));
         }
 
-        for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
+        for (GTRecipe.RecipeAssemblyLine aRecipe : RecipeAssemblyLine.sAssemblylineRecipes) {
             if (aRecipe.mEUt != aEU || aRecipe.mDuration != aTime) continue;
-            if (!GT_Utility.areStacksEqual(aOutput, aRecipe.mOutput, true)) continue;
-            if (!GT_Utility.areStackListsEqual(Arrays.asList(aRecipe.mInputs), aInputs, false, true)) continue;
+            if (!GTUtility.areStacksEqual(aOutput, aRecipe.mOutput, true)) continue;
+            if (!GTUtility.areStackListsEqual(Arrays.asList(aRecipe.mInputs), aInputs, false, true)) continue;
             if (!Objects.equals(Arrays.asList(aRecipe.mFluidInputs), aFluidInputs)) continue;
             if (!areStacksEqual(aRecipe.mOreDictAlt, mOreDictAlt)) continue;
 
             // Cache it
             String aRecipeHash = generateRecipeHash(aRecipe);
             sRecipeCacheByRecipeHash.put(aRecipeHash, aRecipe);
-            sRecipeCacheByOutput.put(new GT_ItemStack(aRecipe.mOutput), aRecipe);
+            sRecipeCacheByOutput.put(new GTItemStack(aRecipe.mOutput), aRecipe);
             if (doesDataStickHaveRecipeHash(aDataStick)) {
                 String aStickHash = getHashFromDataStack(aDataStick);
                 if (aRecipeHash.equals(aStickHash))
@@ -192,31 +193,31 @@ public class GT_AssemblyLineUtils {
 
     private static boolean areStacksEqual(ItemStack[] lhs, List<ItemStack> rhs) {
         return lhs == null ? rhs.isEmpty()
-            : !rhs.isEmpty() && GT_Utility.areStackListsEqual(Arrays.asList(lhs), rhs, false, true);
+            : !rhs.isEmpty() && GTUtility.areStackListsEqual(Arrays.asList(lhs), rhs, false, true);
     }
 
     /**
-     * Finds a GT_Recipe_AssemblyLine based on the expected output ItemStack.
+     * Finds a GTRecipe_AssemblyLine based on the expected output ItemStack.
      *
-     * @param aOutput - The Output of a GT_Recipe_AssemblyLine.
-     * @return First found GT_Recipe_AssemblyLine with matching output.
+     * @param aOutput - The Output of a GTRecipe_AssemblyLine.
+     * @return First found GTRecipe_AssemblyLine with matching output.
      */
-    public static GT_Recipe_AssemblyLine findAssemblyLineRecipeByOutput(ItemStack aOutput) {
+    public static GTRecipe.RecipeAssemblyLine findAssemblyLineRecipeByOutput(ItemStack aOutput) {
         if (aOutput == null) {
             return null;
         }
 
         // Check the cache
-        GT_ItemStack aCacheStack = new GT_ItemStack(aOutput);
-        GT_Recipe_AssemblyLine aRecipeFromCache = sRecipeCacheByOutput.get(aCacheStack);
+        GTItemStack aCacheStack = new GTItemStack(aOutput);
+        RecipeAssemblyLine aRecipeFromCache = sRecipeCacheByOutput.get(aCacheStack);
         if (aRecipeFromCache != null) {
             return aRecipeFromCache;
         }
 
         // Iterate all recipes and return the first matching based on Output.
-        for (GT_Recipe_AssemblyLine aRecipe : GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
+        for (RecipeAssemblyLine aRecipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) {
             ItemStack aRecipeOutput = aRecipe.mOutput;
-            if (GT_Utility.areStacksEqual(aRecipeOutput, aOutput)) {
+            if (GTUtility.areStacksEqual(aRecipeOutput, aOutput)) {
                 // Cache it to prevent future iterations of all recipes
                 sRecipeCacheByOutput.put(aCacheStack, aRecipe);
                 sRecipeCacheByRecipeHash.put(generateRecipeHash(aRecipe), aRecipe);
@@ -230,7 +231,7 @@ public class GT_AssemblyLineUtils {
      * @param aRecipe - The recipe to generate a Recipe Hash String from.
      * @return The Recipe Hash String.
      */
-    public static String generateRecipeHash(GT_Recipe_AssemblyLine aRecipe) {
+    public static String generateRecipeHash(GTRecipe.RecipeAssemblyLine aRecipe) {
         String aHash = "Invalid.Recipe.Hash";
         if (aRecipe != null) {
             aHash = "Hash." + aRecipe.getPersistentHash();
@@ -242,10 +243,10 @@ public class GT_AssemblyLineUtils {
      * @param aRecipe - The recipe to add to internal caches
      * @throws IllegalArgumentException if given recipe collide with any existing recipe in the cache
      */
-    public static void addRecipeToCache(GT_Recipe_AssemblyLine aRecipe) {
+    public static void addRecipeToCache(RecipeAssemblyLine aRecipe) {
         if (aRecipe != null) {
             String aHash = "Hash." + aRecipe.getPersistentHash();
-            GT_Recipe_AssemblyLine existing = sRecipeCacheByOutput.put(new GT_ItemStack(aRecipe.mOutput), aRecipe);
+            GTRecipe.RecipeAssemblyLine existing = sRecipeCacheByOutput.put(new GTItemStack(aRecipe.mOutput), aRecipe);
             if (existing != null) throw new IllegalArgumentException("Duplicate assline recipe for " + aRecipe.mOutput);
             existing = sRecipeCacheByRecipeHash.put(aHash, aRecipe);
             if (existing != null && !existing.equals(aRecipe))
@@ -270,7 +271,7 @@ public class GT_AssemblyLineUtils {
      * @return Is this ItemStack a Data Stick?
      */
     public static boolean isItemDataStick(ItemStack aStack) {
-        return GT_Utility.isStackValid(aStack) && ItemList.Tool_DataStick.isStackEqual(aStack, false, true);
+        return GTUtility.isStackValid(aStack) && ItemList.Tool_DataStick.isStackEqual(aStack, false, true);
     }
 
     /**
@@ -292,7 +293,7 @@ public class GT_AssemblyLineUtils {
             String aStickHash = getHashFromDataStack(aDataStick);