The Great Renaming (#3014)

* move kekztech to a single root dir

* move detrav to a single root dir

* move gtnh-lanthanides to a single root dir

* move tectech and delete some gross reflection in gt++

* remove more reflection inside gt5u

* delete more reflection in gt++

* fix imports

* move bartworks and bwcrossmod

* fix proxies

* move galactigreg and ggfab

* move gtneioreplugin

* try to fix gt++ bee loader

* apply the rename rules to BW

* apply rename rules to bwcrossmod

* apply rename rules to detrav scanner mod

* apply rename rules to galacticgreg

* apply rename rules to ggfab

* apply rename rules to goodgenerator

* apply rename rules to gtnh-lanthanides

* apply rename rules to gt++

* apply rename rules to kekztech

* apply rename rules to kubatech

* apply rename rules to tectech

* apply rename rules to gt

apply the rename rules to gt

* fix tt import

* fix mui hopefully

* fix coremod except intergalactic

* rename assline recipe class

* fix a class name i stumbled on

* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib

* temporary rename of GTTooltipDataCache to old name

* fix gt client/server proxy names

7 files changed, 55 insertions, 61 deletions

diff --git a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java b/src/main/java/gtPlusPlus/preloader/PreloaderCore.java
index 146c92764b..cabee48bc9 100644
--- a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java
+++ b/src/main/java/gtPlusPlus/preloader/PreloaderCore.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 
-public class CORE_Preloader {
+public class PreloaderCore {
 
     public static final String NAME = "GT++ Preloader";
     public static final String MODID = "GT++_Preloader";
diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java
index 9a350ab5e4..be5fc10090 100644
--- a/src/main/java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/main/java/gtPlusPlus/preloader/PreloaderGTOreDict.java
@@ -7,60 +7,54 @@ import net.minecraft.item.ItemStack;
 import org.apache.logging.log4j.Level;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gtPlusPlus.core.lib.CORE;
+import gregtech.common.items.MetaGeneratedItem01;
+import gregtech.common.items.MetaGeneratedItem03;
+import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
-public class Preloader_GT_OreDict {
+public class PreloaderGTOreDict {
 
     public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) {
 
         if (bannedItem == null) {
             return false;
-        } else if (!CORE_Preloader.enableOldGTcircuits) {
+        } else if (!PreloaderCore.enableOldGTcircuits) {
             return false;
         }
 
         try {
-            if (CORE_Preloader.enableOldGTcircuits) {
+            if (PreloaderCore.enableOldGTcircuits) {
                 if ((bannedItem != null) && ItemUtils.getModId(bannedItem)
                     .toLowerCase()
                     .equals(GregTech.ID)) {
                     final int damageValue = bannedItem.getItemDamage() - 32000;
-                    if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
+                    if (bannedItem.getItem() instanceof MetaGeneratedItem01) { // 700-720
                         if ((damageValue >= 700) && (damageValue <= 720)) {
                             return true;
                         }
-                    } else {
-                        if (ReflectionUtils.doesClassExist("gregtech.common.items.GT_MetaGenerated_Item_03")) { // 6/11/12/14/16/20/30-57/69-73/79-96
-                            final Class<?> MetaItem03 = ReflectionUtils
-                                .getClass("gregtech.common.items.GT_MetaGenerated_Item_03");
-                            if (isInstanceOf(MetaItem03, bannedItem.getItem())) {
-                                if ((damageValue == 6) || (damageValue == 7)
-                                    || (damageValue == 11)
-                                    || (damageValue == 12)
-                                    || (damageValue == 14)
-                                    || (damageValue == 16)
-                                    || (damageValue == 20)
-                                    || (damageValue == 21)
-                                    || (damageValue == 22)) {
-                                    return true;
-                                } else if ((damageValue >= 30) && (damageValue <= 57)) {
-                                    return true;
-                                } else if ((damageValue >= 69) && (damageValue <= 73)) {
-                                    return true;
-                                } else if ((damageValue >= 78) && (damageValue <= 96)) {
-                                    return true;
-                                }
-                            }
+                    } else if (bannedItem.getItem() instanceof MetaGeneratedItem03) {
+                        if ((damageValue == 6) || (damageValue == 7)
+                            || (damageValue == 11)
+                            || (damageValue == 12)
+                            || (damageValue == 14)
+                            || (damageValue == 16)
+                            || (damageValue == 20)
+                            || (damageValue == 21)
+                            || (damageValue == 22)) {
+                            return true;
+                        } else if ((damageValue >= 30) && (damageValue <= 57)) {
+                            return true;
+                        } else if ((damageValue >= 69) && (damageValue <= 73)) {
+                            return true;
+                        } else if ((damageValue >= 78) && (damageValue <= 96)) {
+                            return true;
                         }
                     }
                 }
             }
 
         } catch (final Throwable e) {
-            if (CORE.ConfigSwitches.showHiddenNEIItems) {
+            if (GTPPCore.ConfigSwitches.showHiddenNEIItems) {
                 FMLRelaunchLog.log(
                     "[GT++ ASM] OreDictTransformer",
                     Level.INFO,
diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java b/src/main/java/gtPlusPlus/preloader/PreloaderLogger.java
index 477e1371e3..e5f193a3fd 100644
--- a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java
+++ b/src/main/java/gtPlusPlus/preloader/PreloaderLogger.java
@@ -4,9 +4,9 @@ import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-public class Preloader_Logger {
+public class PreloaderLogger {
 
-    private Preloader_Logger() {}
+    private PreloaderLogger() {}
 
     // Logging Functions
     public static final Logger MODLOGGER = LogManager.getLogger("GT++ ASM");
diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
index b4a49c275c..5fa903906a 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java
@@ -9,7 +9,7 @@ import net.minecraftforge.common.config.Property;
 import org.apache.logging.log4j.Level;
 
 import cpw.mods.fml.common.FMLLog;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderLogger;
 
 public class AsmConfig {
 
@@ -130,11 +130,11 @@ public class AsmConfig {
                 config.save();
             }
 
-            Preloader_Logger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix);
-            Preloader_Logger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix);
-            Preloader_Logger.INFO("COFH Patch - Enabled: " + enableCofhPatch);
-            Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety);
-            Preloader_Logger
+            PreloaderLogger.INFO("Gt Nbt Fix - Enabled: " + enableGtNbtFix);
+            PreloaderLogger.INFO("Gt Tooltip Fix - Enabled: " + enableGtTooltipFix);
+            PreloaderLogger.INFO("COFH Patch - Enabled: " + enableCofhPatch);
+            PreloaderLogger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety);
+            PreloaderLogger
                 .INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth);
 
         } catch (Exception var3) {
diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
index c77f570a8d..8e0684e53f 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/PreloaderDummyContainer.java
@@ -15,17 +15,17 @@ import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.LoadController;
 import cpw.mods.fml.common.ModMetadata;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.preloader.PreloaderLogger;
 
-public class Preloader_DummyContainer extends DummyModContainer {
+public class PreloaderDummyContainer extends DummyModContainer {
 
-    public Preloader_DummyContainer() {
+    public PreloaderDummyContainer() {
         super(new ModMetadata());
         ModMetadata meta = getMetadata();
-        meta.modId = CORE_Preloader.MODID;
-        meta.name = CORE_Preloader.NAME;
-        meta.version = CORE_Preloader.VERSION;
+        meta.modId = PreloaderCore.MODID;
+        meta.name = PreloaderCore.NAME;
+        meta.version = PreloaderCore.VERSION;
         meta.credits = "Roll Credits ...";
         meta.authorList = Collections.singletonList("Alkalus");
         meta.screenshots = new String[0];
@@ -40,7 +40,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
 
     @Subscribe
     public void preInit(FMLPreInitializationEvent event) {
-        Preloader_Logger.INFO("Loading " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION);
+        PreloaderLogger.INFO("Loading " + PreloaderCore.MODID + " V" + PreloaderCore.VERSION);
         // Handle GT++ Config
         handleConfigFile(event);
     }
@@ -51,7 +51,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
         config.load();
 
         // BGM Watchdog
-        CORE_Preloader.enableWatchdogBGM = config.getInt(
+        PreloaderCore.enableWatchdogBGM = config.getInt(
             "enableWatchdogBGM",
             "features",
             0,
@@ -60,7 +60,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
             "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s.");
 
         // Circuits
-        CORE_Preloader.enableOldGTcircuits = config.getBoolean(
+        PreloaderCore.enableOldGTcircuits = config.getBoolean(
             "enableOldGTcircuits",
             GregTech.ID,
             false,
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
index 82526b1290..89554db7a1 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
@@ -56,7 +56,7 @@ public class Preloader_ClassTransformer {
                     .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
                 super.visitMethodInsn(
                     INVOKESTATIC,
-                    "gtPlusPlus/preloader/Preloader_GT_OreDict",
+                    "gtPlusPlus/preloader/PreloaderGTOreDict",
                     "shouldPreventRegistration",
                     "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
                     false);
@@ -65,7 +65,7 @@ public class Preloader_ClassTransformer {
                     .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
                 super.visitMethodInsn(
                     INVOKESTATIC,
-                    "gtPlusPlus/preloader/Preloader_GT_OreDict",
+                    "gtPlusPlus/preloader/PreloaderGTOreDict",
                     "shouldPreventRegistration",
                     "(Ljava/lang/String;Ladd;)Z",
                     false);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 922ce88e27..06372740e4 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -9,8 +9,8 @@ import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.preloader.CORE_Preloader;
-import gtPlusPlus.preloader.Preloader_Logger;
+import gtPlusPlus.preloader.PreloaderCore;
+import gtPlusPlus.preloader.PreloaderLogger;
 import gtPlusPlus.preloader.asm.AsmConfig;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
 
@@ -51,14 +51,14 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
             // Do not transform if using lwjgl3
             && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
             boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard");
-            Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
+            PreloaderLogger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
             return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter()
                 .toByteArray();
         }
 
         // Fix the OreDictionary - Forge
         if (transformedName.equals(FORGE_ORE_DICTIONARY) && AsmConfig.enableOreDictPatch) {
-            Preloader_Logger.INFO("OreDictTransformer", "Transforming " + transformedName);
+            PreloaderLogger.INFO("OreDictTransformer", "Transforming " + transformedName);
             ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
             new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
             return classWriter.toByteArray();
@@ -66,15 +66,15 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 
         // Fix the OreDictionary COFH
         if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER)
-            && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) {
-            Preloader_Logger.INFO("COFH", "Transforming " + transformedName);
+            && (AsmConfig.enableCofhPatch || PreloaderCore.DEV_ENVIRONMENT)) {
+            PreloaderLogger.INFO("COFH", "Transforming " + transformedName);
             return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter()
                 .toByteArray();
         }
 
         if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) {
-            Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
-            return new ClassTransformer_IC2_GetHarvestTool(basicClass, !CORE_Preloader.DEV_ENVIRONMENT, transformedName)
+            PreloaderLogger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
+            return new ClassTransformer_IC2_GetHarvestTool(basicClass, !PreloaderCore.DEV_ENVIRONMENT, transformedName)
                 .getWriter()
                 .toByteArray();
         }
@@ -82,8 +82,8 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
         // Fix Thaumcraft stuff
         // Patching ItemWispEssence to allow invalid item handling
         if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) {
-            Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
-            return new ClassTransformer_TC_ItemWispEssence(basicClass, !CORE_Preloader.DEV_ENVIRONMENT).getWriter()
+            PreloaderLogger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
+            return new ClassTransformer_TC_ItemWispEssence(basicClass, !PreloaderCore.DEV_ENVIRONMENT).getWriter()
                 .toByteArray();
         }