Remove a bunch of reflections against GT (#531)

* Remove a bunch of reflections against GT

* missed this one

4 files changed, 6 insertions, 32 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
index 624d8161d6..00799a1030 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bee_Definition.java
@@ -17,6 +17,7 @@ import forestry.api.genetics.AlleleManager;
 import forestry.api.genetics.IAllele;
 import forestry.apiculture.genetics.*;
 import forestry.core.genetics.alleles.AlleleHelper;
+import gregtech.loaders.misc.GT_BeeDefinition;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -575,16 +576,14 @@ public enum GTPP_Bee_Definition implements IBeeDefinition {
     }
 
     public static IAlleleBeeSpecies getGregtechBeeType(String name) {
-        Class<?> gtBees;
         try {
-            Class gtBeeTypes = Class.forName("gregtech.loaders.misc.GT_BeeDefinition");
-            Enum gtBeeEnumObject = Enum.valueOf(gtBeeTypes, name);
-            Field gtBeesField = FieldUtils.getDeclaredField(gtBeeTypes, "species", true);
+            Enum<GT_BeeDefinition> gtBeeEnumObject = Enum.valueOf(GT_BeeDefinition.class, name);
+            Field gtBeesField = FieldUtils.getDeclaredField(GT_BeeDefinition.class, "species", true);
             gtBeesField.setAccessible(true);
             ReflectionUtils.makeFieldAccessible(gtBeesField);
             Object beeType = gtBeesField.get(gtBeeEnumObject);
             return (IAlleleBeeSpecies) beeType;
-        } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) {
+        } catch (IllegalArgumentException | IllegalAccessException e) {
             e.printStackTrace();
         }
         return null;
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
index 9d49df7487..f5d37817ff 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/GTPP_Bees.java
@@ -75,7 +75,6 @@ public class GTPP_Bees {
 
     private void setCustomItems() {
         dropForceGem = new BaseItemMisc("Force", new short[] { 250, 250, 20 }, 64, MiscTypes.GEM, null);
-        // mGregMatLoader.enableMaterial(Materials.Force);
         // MaterialUtils.tryEnableMaterial(Materials.Force);
         // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Force);
         // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Force);
@@ -85,8 +84,6 @@ public class GTPP_Bees {
         // Nikolite may not exist, so lets make it.
         dropNikoliteDust = ItemUtils
                 .generateSpecialUseDusts("Nikolite", "Nikolite", Utils.rgbtoHexValue(60, 180, 200))[2];
-        // mGregMatLoader.enableMaterial(Materials.BlueAlloy);
-        // mGregMatLoader.enableMaterial(Materials.Nikolite);
         // MaterialUtils.tryEnableMaterial(Materials.Nikolite);
         // MaterialUtils.tryEnableMaterialPart(OrePrefixes.dust, Materials.Nikolite);
         // MaterialUtils.tryEnableMaterialPart(OrePrefixes.ingot, Materials.Nikolite);
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
index 60ffb8a051..43ab2fb191 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/ItemCustomComb.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.xmod.forestry.bees.custom;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -9,8 +8,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import org.apache.commons.lang3.reflect.FieldUtils;
-
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -187,7 +184,7 @@ public class ItemCustomComb extends Item {
     }
 
     public void addProcess(ItemStack tComb, Materials aMaterial, int chance) {
-        if (tryGetNerfBoolean()) {
+        if (GT_Mod.gregtechproxy.mNerfedCombs) {
             GT_Values.RA.addChemicalRecipe(
                     GT_Utility.copyAmount(9, tComb),
                     GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1),
@@ -224,7 +221,7 @@ public class ItemCustomComb extends Item {
     }
 
     public void addProcess(ItemStack tComb, Materials aInMaterial, Materials aOutMaterial, int chance) {
-        if (tryGetNerfBoolean()) {
+        if (GT_Mod.gregtechproxy.mNerfedCombs) {
             GT_Values.RA.addChemicalRecipe(
                     GT_Utility.copyAmount(9, tComb),
                     GT_OreDictUnificator.get(OrePrefixes.crushed, aInMaterial, 1),
@@ -259,15 +256,4 @@ public class ItemCustomComb extends Item {
             // ItemList.FR_Wax.get(1, new Object[0]), 0.3f));
         }
     }
-
-    private static boolean tryGetNerfBoolean() {
-        try {
-            Class mProxy = Class.forName("gregtech.GT_Mod.gregtechproxy");
-            Field mNerf = FieldUtils.getDeclaredField(mProxy, "mNerfedCombs", true);
-            boolean returnValue = (boolean) mNerf.get(GT_Mod.gregtechproxy);
-            return returnValue;
-        } catch (ClassNotFoundException | IllegalArgumentException | IllegalAccessException e) {
-            return false;
-        }
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
index 10d9929bc8..56383192c0 100644
--- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
+++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java
@@ -7,7 +7,6 @@ import java.util.HashMap;
 import cpw.mods.fml.common.Loader;
 import gregtech.GT_Mod;
 import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.forestry.bees.handler.*;
@@ -34,13 +33,6 @@ public class GTPP_Bees {
 
     public GTPP_Bees() {
         if (Loader.isModLoaded(MOD_ID_FR) && GT_Mod.gregtechproxy.mGTBees) {
-
-            if (!ReflectionUtils.doesClassExist("gregtech.loaders.misc.GT_BeeDefinition")) {
-                CORE.crash("Missing gregtech.loaders.misc.GT_BeeDefinition.");
-            } else {
-                Logger.BEES("Loading GT++ Bees!");
-            }
-
             Logger.BEES("Creating required items.");
             propolis = new GTPP_Propolis();
             pollen = new GTPP_Pollen();