Delete/modify some reflection + more renaming (#3037)

8 files changed, 50 insertions, 196 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
index 7f7553bf1d..6b9c5ae8f2 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBeeDefinition.java
@@ -1,13 +1,11 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
-import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.Locale;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.BiomeDictionary.Type;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
 import org.apache.commons.lang3.text.WordUtils;
 
 import forestry.api.apiculture.BeeManager;
@@ -28,14 +26,14 @@ import forestry.apiculture.genetics.BeeVariation;
 import forestry.apiculture.genetics.IBeeDefinition;
 import forestry.core.genetics.alleles.AlleleHelper;
 import gregtech.loaders.misc.GTBeeDefinition;
+import gregtech.loaders.misc.GTBranchDefinition;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public enum GTPPBeeDefinition implements IBeeDefinition {
 
-    SILICON(GTPPBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
+    SILICON(GTBranchDefinition.ORGANIC, "Silicon", true, Utils.rgbtoHexValue(75, 75, 75),
         Utils.rgbtoHexValue(125, 125, 125)) {
 
         @Override
@@ -54,13 +52,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         @Override
         protected void registerMutations() {
             IBeeMutationCustom tMutation = registerMutation(
-                getGregtechBeeType("SLIMEBALL"),
-                getGregtechBeeType("STICKYRESIN"),
+                GTBeeDefinition.SLIMEBALL.getSpecies(),
+                GTBeeDefinition.STICKYRESIN.getSpecies(),
                 10);
         }
     },
 
-    RUBBER(GTPPBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
+    RUBBER(GTBranchDefinition.ORGANIC, "Rubber", true, Utils.rgbtoHexValue(55, 55, 55),
         Utils.rgbtoHexValue(75, 75, 75)) {
 
         @Override
@@ -79,13 +77,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         @Override
         protected void registerMutations() {
             IBeeMutationCustom tMutation = registerMutation(
-                getGregtechBeeType("SLIMEBALL"),
-                getGregtechBeeType("STICKYRESIN"),
+                GTBeeDefinition.SLIMEBALL.getSpecies(),
+                GTBeeDefinition.STICKYRESIN.getSpecies(),
                 10);
         }
     },
 
-    PLASTIC(GTPPBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
+    PLASTIC(GTBranchDefinition.ORGANIC, "Plastic", true, Utils.rgbtoHexValue(245, 245, 245),
         Utils.rgbtoHexValue(175, 175, 175)) {
 
         @Override
@@ -103,11 +101,14 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
 
         @Override
         protected void registerMutations() {
-            IBeeMutationCustom tMutation = registerMutation(RUBBER.species, getGregtechBeeType("OIL"), 10);
+            IBeeMutationCustom tMutation = registerMutation(
+                GTPPBeeDefinition.RUBBER.species,
+                GTBeeDefinition.OIL.getSpecies(),
+                10);
         }
     },
 
-    PTFE(GTPPBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
+    PTFE(GTBranchDefinition.ORGANIC, "Ptfe", true, Utils.rgbtoHexValue(150, 150, 150),
         Utils.rgbtoHexValue(75, 75, 75)) {
 
         @Override
@@ -129,7 +130,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         }
     },
 
-    PBS(GTPPBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
+    PBS(GTBranchDefinition.ORGANIC, "Pbs", true, Utils.rgbtoHexValue(33, 26, 24), Utils.rgbtoHexValue(23, 16, 14)) {
 
         @Override
         protected void setSpeciesProperties(IAlleleBeeSpeciesCustom beeSpecies) {
@@ -153,7 +154,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
     /**
      * Fuels
      */
-    BIOMASS(GTPPBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
+    BIOMASS(GTBranchDefinition.ORGANIC, "Biomass", true, Utils.rgbtoHexValue(33, 225, 24),
         Utils.rgbtoHexValue(23, 175, 14)) {
 
         @Override
@@ -176,7 +177,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         }
     },
 
-    ETHANOL(GTPPBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
+    ETHANOL(GTBranchDefinition.ORGANIC, "Ethanol", true, Utils.rgbtoHexValue(255, 128, 0),
         Utils.rgbtoHexValue(220, 156, 32)) {
 
         @Override
@@ -202,7 +203,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
     /**
      * Materials
      */
-    FLUORINE(GTPPBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
+    FLUORINE(GTBranchDefinition.ORGANIC, "Fluorine", true, Utils.rgbtoHexValue(30, 230, 230),
         Utils.rgbtoHexValue(10, 150, 150)) {
 
         @Override
@@ -221,8 +222,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         @Override
         protected void registerMutations() {
             IBeeMutationCustom tMutation = registerMutation(
-                getGregtechBeeType("LAPIS"),
-                getGregtechBeeType("SAPPHIRE"),
+                GTBeeDefinition.LAPIS.getSpecies(),
+                GTBeeDefinition.SAPPHIRE.getSpecies(),
                 5);
             tMutation.restrictBiomeType(Type.COLD);
         }
@@ -231,7 +232,7 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
     // Coke
 
     // Force
-    FORCE(GTPPBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
+    FORCE(GTBranchDefinition.METAL, "Force", true, Utils.rgbtoHexValue(250, 250, 20),
         Utils.rgbtoHexValue(200, 200, 5)) {
 
         @Override
@@ -252,15 +253,15 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         @Override
         protected void registerMutations() {
             IBeeMutationCustom tMutation = registerMutation(
-                getGregtechBeeType("STEEL"),
-                getGregtechBeeType("GOLD"),
+                GTBeeDefinition.STEEL.getSpecies(),
+                GTBeeDefinition.GOLD.getSpecies(),
                 10);
             tMutation.restrictBiomeType(Type.HOT);
         }
     },
 
     // Nikolite
-    NIKOLITE(GTPPBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
+    NIKOLITE(GTBranchDefinition.METAL, "Nikolite", true, Utils.rgbtoHexValue(60, 180, 200),
         Utils.rgbtoHexValue(40, 150, 170)) {
 
         @Override
@@ -279,8 +280,8 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         @Override
         protected void registerMutations() {
             IBeeMutationCustom tMutation = registerMutation(
-                getGregtechBeeType("ALUMINIUM"),
-                getGregtechBeeType("SILVER"),
+                GTBeeDefinition.ALUMINIUM.getSpecies(),
+                GTBeeDefinition.SILVER.getSpecies(),
                 8);
             tMutation.restrictBiomeType(Type.HOT);
         }
@@ -476,13 +477,13 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
 
     ;
 
-    private final GTPPBranchDefinition branch;
+    private final GTBranchDefinition branch;
     private final IAlleleBeeSpeciesCustom species;
 
     private IAllele[] template;
     private IBeeGenome genome;
 
-    GTPPBeeDefinition(GTPPBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) {
+    GTPPBeeDefinition(GTBranchDefinition branch, String binomial, boolean dominant, int primary, int secondary) {
         String lowercaseName = this.toString()
             .toLowerCase(Locale.ENGLISH);
         String species = "species" + WordUtils.capitalize(lowercaseName);
@@ -587,18 +588,4 @@ public enum GTPPBeeDefinition implements IBeeDefinition {
         }
         return result;
     }
-
-    public static IAlleleBeeSpecies getGregtechBeeType(String name) {
-        try {
-            Enum<GTBeeDefinition> gtBeeEnumObject = Enum.valueOf(GTBeeDefinition.class, name);
-            Field gtBeesField = FieldUtils.getDeclaredField(GTBeeDefinition.class, "species", true);
-            gtBeesField.setAccessible(true);
-            ReflectionUtils.makeFieldAccessible(gtBeesField);
-            Object beeType = gtBeesField.get(gtBeeEnumObject);
-            return (IAlleleBeeSpecies) beeType;
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
index f0cd284bdf..583e66d2c6 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBees.java
@@ -5,19 +5,14 @@ import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes;
 import static gregtech.api.util.GTRecipeBuilder.SECONDS;
 import static gregtech.api.util.GTRecipeBuilder.TICKS;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
-
-import gregtech.GTMod;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
+import gregtech.common.items.CombType;
+import gregtech.loaders.misc.GTBees;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.base.ingots.BaseItemIngotOld;
 import gtPlusPlus.core.item.base.misc.BaseItemMisc;
@@ -25,7 +20,6 @@ import gtPlusPlus.core.item.base.misc.BaseItemMisc.MiscTypes;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class GTPPBees {
 
@@ -39,11 +33,9 @@ public class GTPPBees {
     // Base Comb Item
     public static ItemCustomComb combs;
 
-    // Combs obtained via reflection
     public static ItemStack Comb_Slag;
     public static ItemStack Comb_Stone;
 
-    // Materials obtained via reflection
     public static Materials PTFE;
     public static Materials PBS;
 
@@ -52,7 +44,6 @@ public class GTPPBees {
     public GTPPBees() {
         if (Forestry.isModLoaded()) {
 
-            // Set Materials and Comb stacks from GT via Reflection
             setMaterials();
             setCustomItems();
 
@@ -99,67 +90,19 @@ public class GTPPBees {
             .addTo(fluidExtractionRecipes);
     }
 
-    private static boolean tryGetBeesBoolean() {
-        try {
-            Class<?> mProxy = Class.forName("gregtech.GTMod.gregtechproxy");
-            Field mNerf = FieldUtils.getDeclaredField(mProxy, "mGTBees", true);
-            boolean returnValue = (boolean) mNerf.get(GTMod.gregtechproxy);
-            return returnValue;
-        } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) {
-            return false;
-        }
-    }
-
     private void setMaterials() {
-        try {
-
-            Class<?> gtBees = Class.forName("gregtech.loaders.misc.GTBees");
-            Class<?> gtCombItemClass = Class.forName("gregtech.common.items.ItemComb");
-            Class gtCombEnumClass = Class.forName("gregtech.common.items.CombType");
-            Field gtCombs = FieldUtils.getDeclaredField(gtBees, "combs", true);
-            gtCombs.setAccessible(true);
-            ReflectionUtils.makeFieldAccessible(gtCombs);
-            Enum gtCombTypeSlag = Enum.valueOf(gtCombEnumClass, "SLAG");
-            Enum gtCombTypeStone = Enum.valueOf(gtCombEnumClass, "STONE");
-            Object oCombObject = gtCombs.get(null);
-
-            Logger.DEBUG_BEES("Field getModifiers: " + gtCombs.getModifiers());
-            Logger.DEBUG_BEES("Field toGenericString: " + gtCombs.toGenericString());
-            Logger.DEBUG_BEES("Field getClass: " + gtCombs.getClass());
-            Logger.DEBUG_BEES("Field isEnumConstant: " + gtCombs.isEnumConstant());
-            Logger.DEBUG_BEES("Field isSynthetic: " + gtCombs.isSynthetic());
-            Logger.DEBUG_BEES("Field get(gtBees) != null: " + (gtCombs.get(gtBees) != null));
-            Logger.DEBUG_BEES("Field isAccessible: " + gtCombs.isAccessible());
-
-            Logger.BEES("gtBees: " + (gtBees != null));
-            Logger.BEES("gtCombItemClass: " + (gtCombItemClass != null));
-            Logger.BEES("gtCombEnumClass: " + (gtCombEnumClass != null));
-            Logger.BEES("gtCombs: " + (gtCombs != null));
-            Logger.BEES("gtCombTypeSlag: " + (gtCombTypeSlag != null));
-            Logger.BEES("gtCombTypeStone: " + (gtCombTypeStone != null));
-            Logger.BEES("oCombObject: " + (oCombObject != null));
-
-            // if (gtCombItemClass.isInstance(oCombObject)){
-            Method getStackForType;
-            getStackForType = gtCombItemClass.getDeclaredMethod("getStackForType", gtCombEnumClass);
-
-            if (getStackForType != null) {
-                Logger.BEES("Found Method: getStackForType");
-            }
-            if (Comb_Slag == null) {
-                Comb_Slag = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeSlag);
-            }
-            if (Comb_Stone == null) {
-                Comb_Stone = (ItemStack) getStackForType.invoke(gtBees, gtCombTypeStone);
-            }
-
-        } catch (NullPointerException | ClassNotFoundException | IllegalArgumentException | IllegalAccessException
-            | NoSuchMethodException | SecurityException | InvocationTargetException e) {
-            Logger.BEES("Bad Reflection. setMaterials()");
+        if (Comb_Slag == null) {
+            Comb_Slag = GTBees.combs.getStackForType(CombType.SLAG);
+        }
+        if (Comb_Stone == null) {
+            Comb_Stone = GTBees.combs.getStackForType(CombType.STONE);
+        }
+        if (PTFE == null) {
+            PTFE = trySetValue("Polytetrafluoroethylene");
+        }
+        if (PBS == null) {
+            PBS = trySetValue("StyreneButadieneRubber");
         }
-
-        PTFE = trySetValue("Polytetrafluoroethylene");
-        PBS = trySetValue("StyreneButadieneRubber");
     }
 
     private Materials trySetValue(String material) {
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
deleted file mode 100644
index ca35849172..0000000000
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPPBranchDefinition.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package gtPlusPlus.xmod.forestry.bees.custom;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import forestry.api.genetics.IAllele;
-import forestry.api.genetics.IClassification;
-import gtPlusPlus.api.objects.Logger;
-
-public enum GTPPBranchDefinition {
-
-    ORGANIC("ORGANIC"),
-    GEM("GEM"),
-    METAL("METAL"),
-    RAREMETAL("RAREMETAL"),
-    RADIOACTIVE("RADIOACTIVE");
-
-    final String mFieldName;
-    final Enum mActualValues;
-
-    GTPPBranchDefinition(String mValue) {
-        this.mFieldName = mValue;
-        this.mActualValues = setEnumVar(mValue);
-    }
-
-    public final IAllele[] getTemplate() {
-        Class gtBranchDefClass;
-        try {
-            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
-            Enum enumA = mActualValues;
-            Method methodMyMethod = gtBranchDefClass.getMethod("getTemplate");
-
-            Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null));
-            Logger.INFO("[Bees] enumA: " + (enumA != null));
-            Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null));
-
-            return (IAllele[]) methodMyMethod.invoke(enumA);
-        } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
-            | IllegalArgumentException | InvocationTargetException e) {
-            Logger.INFO("[Bees] Bad Reflection. getTemplate()");
-            e.printStackTrace();
-            // gregtech.loaders.misc.GT_BranchDefinition.getTemplate()
-            return null;
-        }
-    }
-
-    public final IClassification getBranch() {
-        Class gtBranchDefClass;
-        try {
-            gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
-            Enum enum_MY_SAMPLE_ENUM = mActualValues;
-            Method methodMyMethod = gtBranchDefClass.getMethod("getBranch");
-
-            Logger.INFO("[Bees] gtBranchDefClass: " + (gtBranchDefClass != null));
-            Logger.INFO("[Bees] enum_MY_SAMPLE_ENUM: " + (enum_MY_SAMPLE_ENUM != null));
-            Logger.INFO("[Bees] methodMyMethod: " + (methodMyMethod != null));
-
-            return (IClassification) methodMyMethod.invoke(enum_MY_SAMPLE_ENUM);
-        } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException
-            | IllegalArgumentException | InvocationTargetException e) {
-            Logger.INFO("[Bees] Bad Reflection. getBranch()");
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    private Enum setEnumVar(String value) {
-        try {
-            Class gtBranchDefClass = Class.forName("gregtech.loaders.misc.GTBranchDefinition");
-            Enum branchDef = Enum.valueOf(gtBranchDefClass, value);
-            return branchDef;
-        } catch (ClassNotFoundException e) {
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
index dad53f54f6..738afb0d90 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
@@ -634,10 +634,10 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas
 
         // Handle Custom Hatches
         if (aMetaTileEntity instanceof MTEHatchInputBattery) {
-            log("Found GT_MetaTileEntity_Hatch_InputBattery");
+            log("Found MTEHatchInputBattery");
             aDidAdd = addToMachineListInternal(mChargeHatches, aMetaTileEntity, aBaseCasingIndex);
         } else if (aMetaTileEntity instanceof MTEHatchOutputBattery) {
-            log("Found GT_MetaTileEntity_Hatch_OutputBattery");
+            log("Found MTEHatchOutputBattery");
             aDidAdd = addToMachineListInternal(mDischargeHatches, aMetaTileEntity, aBaseCasingIndex);
         } else if (aMetaTileEntity instanceof METHatchAirIntake) {
             aDidAdd = addToMachineListInternal(mAirIntakes, aMetaTileEntity, aBaseCasingIndex)
@@ -1020,7 +1020,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas
             if (tCurrentItem != null) {
                 // Logger.INFO("Holding Item.");
                 if (tCurrentItem.getItem() instanceof MetaGeneratedTool) {
-                    // Logger.INFO("Is GT_MetaGenerated_Tool.");
+                    // Logger.INFO("Is MetaGeneratedTool.");
                     int[] aOreID = OreDictionary.getOreIDs(tCurrentItem);
                     for (int id : aOreID) {
                         // Plunger
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
index d1a6ac34f0..063b5747b9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
@@ -201,7 +201,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi
             return false;
         }
         if (aMetaTileEntity instanceof MTEHatchMillingBalls) {
-            log("Found GT_MetaTileEntity_Hatch_MillingBalls");
+            log("Found MTEHatchMillingBalls");
             return addToMachineListInternal(mMillingBallBuses, aMetaTileEntity, aBaseCasingIndex);
         }
         return super.addToMachineList(aTileEntity, aBaseCasingIndex);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
index 2046de6c1c..5de235982f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
@@ -508,7 +508,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple
             return false;
         }
         if (aMetaTileEntity instanceof MTEHatchCatalysts) {
-            log("Found GT_MetaTileEntity_Hatch_Catalysts");
+            log("Found MTEHatchCatalysts");
             return addToMachineListInternal(mCatalystBuses, aMetaTileEntity, aBaseCasingIndex);
         }
         return super.addToMachineList(aTileEntity, aBaseCasingIndex);
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index 69e3580f11..0bd1397137 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -267,7 +267,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
             return false;
         }
         if (aMetaTileEntity instanceof MTEHatchTurbine aTurbineHatch) {
-            log("Found GT_MetaTileEntity_Hatch_Turbine");
+            log("Found MTEHatchTurbine");
             updateTexture(aTileEntity, aBaseCasingIndex);
             IGregTechTileEntity g = this.getBaseMetaTileEntity();
             if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index f08457f807..9f66dc394f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -700,8 +700,8 @@ public class GregtechConduits {
             OrePrefixes.pipeMedium.get(material),
             new MTEFluid(
                 startID + 2,
-                "GT_Pipe_" + material.mDefaultLocalName + "",
-                "" + material.mDefaultLocalName + " Fluid Pipe",
+                "GT_Pipe_" + material.mDefaultLocalName,
+                material.mDefaultLocalName + " Fluid Pipe",
                 0.5F,
                 material,
                 transferRatePerTick * 12,
@@ -761,8 +761,8 @@ public class GregtechConduits {
             OrePrefixes.pipeMedium.get(material),
             new GTPPMTEFluid(
                 startID + 2,
-                "GT_Pipe_" + material.mDefaultLocalName + "",
-                "" + material.mDefaultLocalName + " Fluid Pipe",
+                "GT_Pipe_" + material.mDefaultLocalName,
+                material.mDefaultLocalName + " Fluid Pipe",
                 0.5F,
                 material,
                 transferRatePerTick * 12,