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

17 files changed, 78 insertions, 392 deletions

diff --git a/src/main/java/gregtech/api/GregTechAPI.java b/src/main/java/gregtech/api/GregTechAPI.java
index 6cabb8e04c..e10c773579 100644
--- a/src/main/java/gregtech/api/GregTechAPI.java
+++ b/src/main/java/gregtech/api/GregTechAPI.java
@@ -26,7 +26,6 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
@@ -47,10 +46,6 @@ import gregtech.api.interfaces.internal.IGTRecipeAdder;
 import gregtech.api.interfaces.internal.IThaumcraftCompat;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IMachineBlockUpdateable;
-import gregtech.api.items.GTGenericItem;
-import gregtech.api.items.ItemCoolantCell;
-import gregtech.api.items.ItemCoolantCellIC;
-import gregtech.api.items.ItemTool;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.objects.GTCoverDefault;
 import gregtech.api.objects.GTCoverNone;
@@ -287,20 +282,7 @@ public class GregTechAPI {
     static {
         sItemStackMappings.add(sCovers);
         sItemStackMappings.add(sCoverBehaviors);
-
         dummyWorlds.add(GTDummyWorld.class);
-        tryAddDummyWorld("blockrenderer6343.client.world.DummyWorld");
-    }
-
-    private static void tryAddDummyWorld(String className) {
-        ClassLoader cl = GregTechAPI.class.getClassLoader();
-        Class<?> clazz;
-        try {
-            clazz = Class.forName(className, false, cl);
-        } catch (ReflectiveOperationException ex) {
-            return;
-        }
-        dummyWorlds.add(clazz);
     }
 
     public static void addDummyWorld(Class<?> clazz) {
@@ -408,284 +390,6 @@ public class GregTechAPI {
     }
 
     /**
-     * Creates a new Coolant Cell Item for your Nuclear Reactor
-     */
-    public static Item constructCoolantCellItem(String aUnlocalized, String aEnglish, int aMaxStore) {
-        try {
-            return new ItemCoolantCellIC(aUnlocalized, aEnglish, aMaxStore);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        try {
-            return new ItemCoolantCell(aUnlocalized, aEnglish, aMaxStore);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
-    }
-
-    /**
-     * Creates a new Energy Armor Item
-     */
-    public static Item constructElectricArmorItem(String aUnlocalized, String aEnglish, int aCharge, int aTransfer,
-        int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider,
-        int aType, int aArmorIndex) {
-        try {
-            return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmorIC_Item")
-                .getConstructors()[0].newInstance(
-                    aUnlocalized,
-                    aEnglish,
-                    aCharge,
-                    aTransfer,
-                    aTier,
-                    aDamageEnergyCost,
-                    aSpecials,
-                    aArmorAbsorbtionPercentage,
-                    aChargeProvider,
-                    aType,
-                    aArmorIndex);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        try {
-            return (Item) Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item")
-                .getConstructors()[0].newInstance(
-                    aUnlocalized,
-                    aEnglish,
-                    aCharge,
-                    aTransfer,
-                    aTier,
-                    aDamageEnergyCost,
-                    aSpecials,
-                    aArmorAbsorbtionPercentage,
-                    aChargeProvider,
-                    aType,
-                    aArmorIndex);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
-    }
-
-    /**
-     * Creates a new Energy Battery Item
-     */
-    public static Item constructElectricEnergyStorageItem(String aUnlocalized, String aEnglish, int aCharge,
-        int aTransfer, int aTier, int aEmptyID, int aFullID) {
-        try {
-            return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStoreIC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        try {
-            return (Item) Class.forName("gregtechmod.api.items.GT_EnergyStore_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aCharge, aTransfer, aTier, aEmptyID, aFullID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new GTGenericItem(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug");
-    }
-
-    /**
-     * Creates a new Hard Hammer Item
-     */
-    public static ItemTool constructHardHammerItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_HardHammer_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new Crowbar Item
-     */
-    public static ItemTool constructCrowbarItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_CrowbarRC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_Crowbar_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new Wrench Item
-     */
-    public static ItemTool constructWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage,
-        int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_Wrench_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new electric Screwdriver Item
-     */
-    public static ItemTool constructElectricScrewdriverItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_ScrewdriverIC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new electric Wrench Item
-     */
-    public static ItemTool constructElectricWrenchItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_WrenchIC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new electric Saw Item
-     */
-    public static ItemTool constructElectricSawItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak,
-        int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_SawIC_Item")
-                .getConstructors()[0].newInstance(
-                    aUnlocalized,
-                    aEnglish,
-                    aMaxDamage,
-                    aEntityDamage,
-                    aToolQuality,
-                    aToolStrength,
-                    aEnergyConsumptionPerBlockBreak,
-                    aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new electric Drill Item
-     */
-    public static ItemTool constructElectricDrillItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak,
-        int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_DrillIC_Item")
-                .getConstructors()[0].newInstance(
-                    aUnlocalized,
-                    aEnglish,
-                    aMaxDamage,
-                    aEntityDamage,
-                    aToolQuality,
-                    aToolStrength,
-                    aEnergyConsumptionPerBlockBreak,
-                    aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new electric Soldering Tool
-     */
-    public static ItemTool constructElectricSolderingToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aEntityDamage, int aDisChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_SolderingToolIC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aEntityDamage, aDisChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(
-            aUnlocalized,
-            aEnglish,
-            "Doesn't work as intended, this is a Bug",
-            aMaxDamage,
-            aEntityDamage,
-            false);
-    }
-
-    /**
-     * Creates a new empty electric Tool
-     */
-    public static ItemTool constructEmptyElectricToolItem(String aUnlocalized, String aEnglish, int aMaxDamage,
-        int aChargedGTID) {
-        try {
-            return (ItemTool) Class.forName("gregtechmod.api.items.GT_EmptyToolIC_Item")
-                .getConstructors()[0].newInstance(aUnlocalized, aEnglish, aMaxDamage, aChargedGTID);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return new ItemTool(aUnlocalized, aEnglish, "Doesn't work as intended, this is a Bug", aMaxDamage, 0, false);
-    }
-
-    /**
      * Provides a new BaseMetaTileEntity. Because some interfaces are not always loaded (Buildcraft, Universal
      * Electricity) we have to use invocation at the constructor of the BaseMetaTileEntity.
      */
diff --git a/src/main/java/gregtech/api/objects/GTChunkManager.java b/src/main/java/gregtech/api/objects/GTChunkManager.java
index 59bc90aa1c..436fd0d7d8 100644
--- a/src/main/java/gregtech/api/objects/GTChunkManager.java
+++ b/src/main/java/gregtech/api/objects/GTChunkManager.java
@@ -111,7 +111,7 @@ public class GTChunkManager
         if (!GTValues.enableChunkloaders) return false;
         if (!GTValues.alwaysReloadChunkloaders && chunkXZ == null) return false;
         if (GTValues.debugChunkloaders && chunkXZ != null)
-            GTLog.out.println("GT_ChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
+            GTLog.out.println("GTChunkManager: Chunk request: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
         if (instance.registeredTickets.containsKey(owner)) {
             ForgeChunkManager.forceChunk(instance.registeredTickets.get(owner), chunkXZ);
         } else {
@@ -122,11 +122,11 @@ public class GTChunkManager
                 .requestPlayerTicket(GTMod.instance, player, owner.getWorldObj(), ForgeChunkManager.Type.NORMAL);
             if (ticket == null) {
                 if (GTValues.debugChunkloaders)
-                    GTLog.out.println("GT_ChunkManager: ForgeChunkManager.requestTicket failed");
+                    GTLog.out.println("GTChunkManager: ForgeChunkManager.requestTicket failed");
                 return false;
             }
             if (GTValues.debugChunkloaders) GTLog.out.println(
-                "GT_ChunkManager: ticket issued for machine at: (" + owner.xCoord
+                "GTChunkManager: ticket issued for machine at: (" + owner.xCoord
                     + ", "
                     + owner.yCoord
                     + ", "
@@ -154,7 +154,7 @@ public class GTChunkManager
         Ticket ticket = instance.registeredTickets.get(owner);
         if (ticket != null) {
             if (GTValues.debugChunkloaders) GTLog.out
-                .println("GT_ChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
+                .println("GTChunkManager: Chunk release: (" + chunkXZ.chunkXPos + ", " + chunkXZ.chunkZPos + ")");
             ForgeChunkManager.unforceChunk(ticket, chunkXZ);
         }
     }
@@ -165,14 +165,14 @@ public class GTChunkManager
         if (ticket != null) {
             if (GTValues.debugChunkloaders) {
                 GTLog.out.println(
-                    "GT_ChunkManager: ticket released by machine at: (" + owner.xCoord
+                    "GTChunkManager: ticket released by machine at: (" + owner.xCoord
                         + ", "
                         + owner.yCoord
                         + ", "
                         + owner.zCoord
                         + ")");
                 for (ChunkCoordIntPair chunk : ticket.getChunkList()) GTLog.out
-                    .println("GT_ChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")");
+                    .println("GTChunkManager: Chunk release: (" + chunk.chunkXPos + ", " + chunk.chunkZPos + ")");
             }
             ForgeChunkManager.releaseTicket(ticket);
             instance.registeredTickets.remove(owner);
@@ -180,10 +180,10 @@ public class GTChunkManager
     }
 
     public static void printTickets() {
-        GTLog.out.println("GT_ChunkManager: Start forced chunks dump:");
+        GTLog.out.println("GTChunkManager: Start forced chunks dump:");
         instance.registeredTickets.forEach((machine, ticket) -> {
             GTLog.out.print(
-                "GT_ChunkManager: Chunks forced by the machine at (" + machine.xCoord
+                "GTChunkManager: Chunks forced by the machine at (" + machine.xCoord
                     + ", "
                     + machine.yCoord
                     + ", "
@@ -199,6 +199,6 @@ public class GTChunkManager
                 GTLog.out.print("), ");
             }
         });
-        GTLog.out.println("GT_ChunkManager: End forced chunks dump:");
+        GTLog.out.println("GTChunkManager: End forced chunks dump:");
     }
 }
diff --git a/src/main/java/gregtech/api/objects/GTRenderedTexture.java b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
index a4d0a064ff..abb2e28051 100644
--- a/src/main/java/gregtech/api/objects/GTRenderedTexture.java
+++ b/src/main/java/gregtech/api/objects/GTRenderedTexture.java
@@ -14,7 +14,7 @@ public class GTRenderedTexture extends gregtech.common.render.GTRenderedTexture
 
     public GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         super(aIcon, aRGBa, aAllowAlpha, false, true, false);
-        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
+        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTRenderedTexture");
         mRGBa = aRGBa;
     }
 
diff --git a/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java
index d11e176f3d..7b0af48085 100644
--- a/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java
+++ b/src/main/java/gregtech/api/threads/RunnableMachineUpdate.java
@@ -98,8 +98,8 @@ public class RunnableMachineUpdate implements Runnable {
                 EXECUTOR_SERVICE.shutdownNow(); // Cancel currently executing tasks
                 // Wait a while for tasks to respond to being cancelled
                 if (!EXECUTOR_SERVICE.awaitTermination(60, TimeUnit.SECONDS)) {
-                    GTMod.GT_FML_LOGGER.error(
-                        "Well this didn't terminated well... GT_Runnable_MachineBlockUpdate.shutdownExecutorService");
+                    GTMod.GT_FML_LOGGER
+                        .error("Well this didn't terminated well... RunnableMachineUpdate.shutdownExecutorService");
                 }
             }
         } catch (InterruptedException ie) {
@@ -114,7 +114,7 @@ public class RunnableMachineUpdate implements Runnable {
             // (Re-)Cancel in case
             EXECUTOR_SERVICE.shutdownNow();
         } finally {
-            GTMod.GT_FML_LOGGER.info("Leaving... GT_Runnable_MachineBlockUpdate.shutdownExecutorService");
+            GTMod.GT_FML_LOGGER.info("Leaving... RunnableMachineUpdate.shutdownExecutorService");
         }
     }
 
diff --git a/src/main/java/gregtech/api/util/GTChunkAssociatedData.java b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java
index 7a81c715cb..c87697b80d 100644
--- a/src/main/java/gregtech/api/util/GTChunkAssociatedData.java
+++ b/src/main/java/gregtech/api/util/GTChunkAssociatedData.java
@@ -114,7 +114,7 @@ public abstract class GTChunkAssociatedData<T extends GTChunkAssociatedData.IDat
         this.version = version;
         this.saveDefaults = saveDefaults;
         if (instances.putIfAbsent(aId, this) != null)
-            throw new IllegalArgumentException("Duplicate GT_ChunkAssociatedData: " + aId);
+            throw new IllegalArgumentException("Duplicate GTChunkAssociatedData: " + aId);
     }
 
     private ChunkCoordIntPair getRegionID(int aChunkX, int aChunkZ) {
diff --git a/src/main/java/gregtech/api/util/GTModHandler.java b/src/main/java/gregtech/api/util/GTModHandler.java
index 23cddf2eb1..af7ddb82ea 100644
--- a/src/main/java/gregtech/api/util/GTModHandler.java
+++ b/src/main/java/gregtech/api/util/GTModHandler.java
@@ -82,6 +82,8 @@ import ic2.api.reactor.IReactorComponent;
 import ic2.api.recipe.IRecipeInput;
 import ic2.api.recipe.RecipeInputItemStack;
 import ic2.api.recipe.RecipeOutput;
+import ic2.api.recipe.Recipes;
+import ic2.core.IC2;
 import ic2.core.item.ItemToolbox;
 
 /**
@@ -459,11 +461,11 @@ public class GTModHandler {
     public static boolean addValuableOre(Block aBlock, int aMeta, int aValue) {
         if (aValue <= 0) return false;
         try {
-            Class.forName("ic2.core.IC2")
-                .getMethod("addValuableOre", IRecipeInput.class, int.class)
-                .invoke(null, new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue);
-        } catch (Throwable e) {
-            /* Do nothing */
+            IC2.addValuableOre(new RecipeInputItemStack(new ItemStack(aBlock, 1, aMeta)), aValue);
+        } catch (Exception e) {
+            // TODO remove try catch
+            // TODO fix : why is bartworks registering items stacks with .getItem() == null
+            GTLog.err.println("Caught exception when calling IC2.addValuableOre");
         }
         return true;
     }
@@ -476,11 +478,7 @@ public class GTModHandler {
         if (aOutput == null || aChance <= 0) return false;
         aOutput.stackSize = 1;
         if (GTConfig.troll && !GTUtility.areStacksEqual(aOutput, new ItemStack(Items.wooden_hoe, 1, 0))) return false;
-        try {
-            ic2.api.recipe.Recipes.scrapboxDrops.addDrop(GTUtility.copyOrNull(aOutput), aChance);
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
+        Recipes.scrapboxDrops.addDrop(GTUtility.copyOrNull(aOutput), aChance);
         return true;
     }
 
@@ -489,11 +487,7 @@ public class GTModHandler {
      */
     public static boolean addToRecyclerBlackList(ItemStack aRecycledStack) {
         if (aRecycledStack == null) return false;
-        try {
-            ic2.api.recipe.Recipes.recyclerBlacklist.add(new RecipeInputItemStack(aRecycledStack));
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
+        Recipes.recyclerBlacklist.add(new RecipeInputItemStack(aRecycledStack));
         return true;
     }
 
@@ -626,48 +620,23 @@ public class GTModHandler {
     }
 
     public static Map<IRecipeInput, RecipeOutput> getExtractorRecipeList() {
-        try {
-            return ic2.api.recipe.Recipes.extractor.getRecipes();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return emptyRecipeMap;
+        return Recipes.extractor.getRecipes();
     }
 
     public static Map<IRecipeInput, RecipeOutput> getCompressorRecipeList() {
-        try {
-            return ic2.api.recipe.Recipes.compressor.getRecipes();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return emptyRecipeMap;
+        return Recipes.compressor.getRecipes();
     }
 
     public static Map<IRecipeInput, RecipeOutput> getMaceratorRecipeList() {
-        try {
-            return ic2.api.recipe.Recipes.macerator.getRecipes();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return emptyRecipeMap;
+        return Recipes.macerator.getRecipes();
     }
 
     public static Map<IRecipeInput, RecipeOutput> getThermalCentrifugeRecipeList() {
-        try {
-            return ic2.api.recipe.Recipes.centrifuge.getRecipes();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return emptyRecipeMap;
+        return Recipes.centrifuge.getRecipes();
     }
 
     public static Map<IRecipeInput, RecipeOutput> getOreWashingRecipeList() {
-        try {
-            return ic2.api.recipe.Recipes.oreWashing.getRecipes();
-        } catch (Throwable e) {
-            /* Do nothing */
-        }
-        return emptyRecipeMap;
+        return Recipes.oreWashing.getRecipes();
     }
 
     /**
@@ -1997,13 +1966,13 @@ public class GTModHandler {
 
     private static void generateRecyclerCache() {
         recyclerWhitelist = new HashSet<>();
-        for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerWhitelist) {
+        for (IRecipeInput input : Recipes.recyclerWhitelist) {
             for (ItemStack stack : input.getInputs()) {
                 recyclerWhitelist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
             }
         }
         recyclerBlacklist = new HashSet<>();
-        for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerBlacklist) {
+        for (IRecipeInput input : Recipes.recyclerBlacklist) {
             for (ItemStack stack : input.getInputs()) {
                 recyclerBlacklist.add(GTUtility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
             }
@@ -2022,7 +1991,7 @@ public class GTModHandler {
      * For the Scrapboxinator
      */
     public static ItemStack getRandomScrapboxDrop() {
-        return ic2.api.recipe.Recipes.scrapboxDrops.getDrop(ItemList.IC2_Scrapbox.get(1), false);
+        return Recipes.scrapboxDrops.getDrop(ItemList.IC2_Scrapbox.get(1), false);
     }
 
     /**
diff --git a/src/main/java/gregtech/asm/GTCorePlugin.java b/src/main/java/gregtech/asm/GTCorePlugin.java
index 1d44fb9017..777cad836a 100644
--- a/src/main/java/gregtech/asm/GTCorePlugin.java
+++ b/src/main/java/gregtech/asm/GTCorePlugin.java
@@ -22,11 +22,10 @@ import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler;
 @IFMLLoadingPlugin.MCVersion("1.7.10")
 @IFMLLoadingPlugin.TransformerExclusions({ "bartworks.ASM", "gtPlusPlus.preloader", "gregtech.asm" })
 @IFMLLoadingPlugin.Name("GregTech 5 Unofficial core plugin")
-@SuppressWarnings("unused") // loaded by FML
 public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
 
-    public static final String BWCORE_PLUGIN_NAME = "BartWorks ASM Core Plugin";
     public static File minecraftDir;
+    private static Boolean islwjgl3Present = null;
 
     public GTCorePlugin() {
         // Injection Code taken from CodeChickenLib
@@ -76,4 +75,18 @@ public class GTCorePlugin implements IFMLLoadingPlugin, IEarlyMixinLoader {
     public List<String> getMixins(Set<String> loadedCoreMods) {
         return Mixin.getEarlyMixins(loadedCoreMods);
     }
+
+    public static boolean islwjgl3Present() {
+        if (islwjgl3Present == null) {
+            try {
+                final String className = "org.lwjgl.system.Platform";
+                islwjgl3Present = ClassLoader.getSystemClassLoader()
+                    .getResource(className) != null;
+            } catch (Exception e) {
+                islwjgl3Present = Boolean.FALSE;
+            }
+        }
+        return islwjgl3Present;
+    }
+
 }
diff --git a/src/main/java/gregtech/common/GTWorldgenerator.java b/src/main/java/gregtech/common/GTWorldgenerator.java
index 6762fb868c..a853472089 100644
--- a/src/main/java/gregtech/common/GTWorldgenerator.java
+++ b/src/main/java/gregtech/common/GTWorldgenerator.java
@@ -71,7 +71,7 @@ public class GTWorldgenerator implements IWorldGenerator {
         mEndAsteroidProbability = ConfigEndAsteroids.EndAsteroidProbability;
         GameRegistry.registerWorldGenerator(this, 1073741823);
         if (debugWorldGen) {
-            GTLog.out.println("GT_Worldgenerator created");
+            GTLog.out.println("GTWorldgenerator created");
         }
     }
 
diff --git a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
index ab4282c7ba..3ce8823663 100644
--- a/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
+++ b/src/main/java/gregtech/common/render/GTCopiedBlockTextureRender.java
@@ -15,7 +15,8 @@ public class GTCopiedBlockTextureRender extends GTTextureBase implements ITextur
     private final byte mSide, mMeta;
 
     protected GTCopiedBlockTextureRender(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
-        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedBlockTexture");
+        if (aRGBa.length != 4)
+            throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedBlockTextureRender");
         mBlock = aBlock;
         mSide = (byte) ordinalSide;
         mMeta = (byte) aMeta;
diff --git a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
index d3f6292435..a33ead9ec5 100644
--- a/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
+++ b/src/main/java/gregtech/common/render/GTCopiedCTMBlockTexture.java
@@ -17,7 +17,7 @@ class GTCopiedCTMBlockTexture extends GTTextureBase implements ITexture, IBlockC
 
     GTCopiedCTMBlockTexture(Block aBlock, int ordinalSide, int aMeta, short[] aRGBa, boolean allowAlpha) {
         if (aRGBa.length != 4)
-            throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_CopiedCTMBlockTexture");
+            throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTCopiedCTMBlockTexture");
         mBlock = aBlock;
         mSide = (byte) ordinalSide;
         mMeta = (byte) aMeta;
diff --git a/src/main/java/gregtech/common/render/GTRenderedTexture.java b/src/main/java/gregtech/common/render/GTRenderedTexture.java
index 3bd4e6d864..b6bffc9553 100644
--- a/src/main/java/gregtech/common/render/GTRenderedTexture.java
+++ b/src/main/java/gregtech/common/render/GTRenderedTexture.java
@@ -36,7 +36,7 @@ public class GTRenderedTexture extends GTTextureBase implements ITexture, IColor
 
     protected GTRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean allowAlpha, boolean glow,
         boolean stdOrient, boolean extFacing) {
-        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
+        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTRenderedTexture");
         mIconContainer = aIcon;
         mRGBa = aRGBa;
         this.glow = glow;
diff --git a/src/main/java/gregtech/common/render/GTSidedTextureRender.java b/src/main/java/gregtech/common/render/GTSidedTextureRender.java
index 15885f10ce..f2f40bff97 100644
--- a/src/main/java/gregtech/common/render/GTSidedTextureRender.java
+++ b/src/main/java/gregtech/common/render/GTSidedTextureRender.java
@@ -20,7 +20,7 @@ public class GTSidedTextureRender extends GTTextureBase implements ITexture, ICo
 
     protected GTSidedTextureRender(IIconContainer aIcon0, IIconContainer aIcon1, IIconContainer aIcon2,
         IIconContainer aIcon3, IIconContainer aIcon4, IIconContainer aIcon5, short[] aRGBa, boolean aAllowAlpha) {
-        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
+        if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GTSidedTextureRender");
         mTextures = new ITexture[] { TextureFactory.of(aIcon0, aRGBa, aAllowAlpha),
             TextureFactory.of(aIcon1, aRGBa, aAllowAlpha), TextureFactory.of(aIcon2, aRGBa, aAllowAlpha),
             TextureFactory.of(aIcon3, aRGBa, aAllowAlpha), TextureFactory.of(aIcon4, aRGBa, aAllowAlpha),
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java
index a89064ba35..bb086dc654 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEWorldAccelerator.java
@@ -342,7 +342,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock {
                 }
             }
         } catch (Exception e) {
-            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.onPostTick.crash\n" + e.getMessage());
+            GTLog.err.println("MTEWorldAccelerator.onPostTick.crash\n" + e.getMessage());
         }
     }
 
@@ -367,7 +367,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock {
                 }
             }
         } catch (Exception e) {
-            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage());
+            GTLog.err.println("MTEWorldAccelerator.doAccelerateTileEntities.crash\n" + e.getMessage());
         }
     }
 
@@ -464,7 +464,7 @@ public class MTEWorldAccelerator extends MTETieredMachineBlock {
                 }
             }
         } catch (Exception e) {
-            GTLog.err.println("GT_MetaTileEntity_WorldAccelerator.tryTickBlock.crash\n" + e.getMessage());
+            GTLog.err.println("MTEWorldAccelerator.tryTickBlock.crash\n" + e.getMessage());
         }
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java
index 12153fc10e..74f7d4c655 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEWormholeGenerator.java
@@ -694,7 +694,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG
                 aNBT.setTag("mLink", link);
             }
         } catch (Throwable t) {
-            GTMod.GT_FML_LOGGER.error("Could not save GT_MetaTileEntity_WormholeGenerator", t);
+            GTMod.GT_FML_LOGGER.error("Could not save MTEWormholeGenerator", t);
         }
 
     }
@@ -742,7 +742,7 @@ public class MTEWormholeGenerator extends MTEEnhancedMultiBlockBase<MTEWormholeG
                         Math.min(send_amounts.length, mLink.mSendAmounts.length));
                 }
             } catch (Throwable t) {
-                GTMod.GT_FML_LOGGER.error("Could not load GT_MetaTileEntity_WormholeGenerator", t);
+                GTMod.GT_FML_LOGGER.error("Could not load MTEWormholeGenerator", t);
             }
         }
     }
diff --git a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
index c8fcf5839e..fe0e4b201f 100644
--- a/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GTBeeDefinition.java
@@ -2815,4 +2815,8 @@ public enum GTBeeDefinition implements IBeeDefinition {
     public final ItemStack getMemberStack(EnumBeeType beeType) {
         return BeeManager.beeRoot.getMemberStack(getIndividual(), beeType.ordinal());
     }
+
+    public GTAlleleBeeSpecies getSpecies() {
+        return species;
+    }
 }
diff --git a/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
index 65c150bd1d..ad05b038ed 100644
--- a/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
+++ b/src/main/java/gregtech/loaders/misc/bees/GTEffectTreeTwister.java
@@ -32,10 +32,10 @@ public class GTEffectTreeTwister extends GTAlleleEffect {
 
     static {
         if (TF_TRANS_SAPLING == null) {
-            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GTEffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
         if (BARN_SAPLING == null) {
-            GTMod.GT_FML_LOGGER.info("GT_EffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
+            GTMod.GT_FML_LOGGER.info("GTEffectTreeTwister(): Could not get ItemStack for BarnardaC sapling");
         }
     }
 
diff --git a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
index adcd0f33bc..0072a8148c 100644
--- a/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
+++ b/src/main/java/gregtech/loaders/preload/LoaderGTBlockFluid.java
@@ -37,6 +37,7 @@ import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.MaterialsKevlar;
 import gregtech.api.enums.MaterialsUEVplus;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.SubTag;
 import gregtech.api.enums.TierEU;
@@ -44,6 +45,7 @@ import gregtech.api.fluid.GTFluidFactory;
 import gregtech.api.items.BlockLongDistancePipe;
 import gregtech.api.items.GTGenericItem;
 import gregtech.api.items.ItemBreederCell;
+import gregtech.api.items.ItemCoolantCellIC;
 import gregtech.api.items.ItemRadioactiveCellIC;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
@@ -196,29 +198,28 @@ public class LoaderGTBlockFluid implements Runnable {
 
         ItemList.Neutron_Reflector.set(new ItemNeutronReflector("neutronreflector", "Iridium Neutron Reflector", 0));
         ItemList.Reactor_Coolant_He_1
-            .set(GregTechAPI.constructCoolantCellItem("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000));
+            .set(new ItemCoolantCellIC("60k_Helium_Coolantcell", "60k He Coolant Cell", 60000));
         ItemList.Reactor_Coolant_He_3
-            .set(GregTechAPI.constructCoolantCellItem("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000));
+            .set(new ItemCoolantCellIC("180k_Helium_Coolantcell", "180k He Coolant Cell", 180000));
         ItemList.Reactor_Coolant_He_6
-            .set(GregTechAPI.constructCoolantCellItem("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000));
-        ItemList.Reactor_Coolant_NaK_1
-            .set(GregTechAPI.constructCoolantCellItem("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000));
+            .set(new ItemCoolantCellIC("360k_Helium_Coolantcell", "360k He Coolant Cell", 360000));
+        ItemList.Reactor_Coolant_NaK_1.set(new ItemCoolantCellIC("60k_NaK_Coolantcell", "60k NaK Coolantcell", 60000));
         ItemList.Reactor_Coolant_NaK_3
-            .set(GregTechAPI.constructCoolantCellItem("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000));
+            .set(new ItemCoolantCellIC("180k_NaK_Coolantcell", "180k NaK Coolantcell", 180000));
         ItemList.Reactor_Coolant_NaK_6
-            .set(GregTechAPI.constructCoolantCellItem("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000));
+            .set(new ItemCoolantCellIC("360k_NaK_Coolantcell", "360k NaK Coolantcell", 360000));
 
         ItemList.Reactor_Coolant_Sp_1
-            .set(GregTechAPI.constructCoolantCellItem("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000));
+            .set(new ItemCoolantCellIC("180k_Space_Coolantcell", "180k Sp Coolant Cell", 180000));
 
         ItemList.Reactor_Coolant_Sp_2
-            .set(GregTechAPI.constructCoolantCellItem("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000));
+            .set(new ItemCoolantCellIC("360k_Space_Coolantcell", "360k Sp Coolant Cell", 360000));
 
         ItemList.Reactor_Coolant_Sp_3
-            .set(GregTechAPI.constructCoolantCellItem("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000));
+            .set(new ItemCoolantCellIC("540k_Space_Coolantcell", "540k Sp Coolant Cell", 540000));
 
         ItemList.Reactor_Coolant_Sp_6
-            .set(GregTechAPI.constructCoolantCellItem("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000));
+            .set(new ItemCoolantCellIC("1080k_Space_Coolantcell", "1080k Sp Coolant Cell", 1080000));
 
         ItemList.GlowstoneCell.set(
             new ItemBreederCell(
@@ -231,9 +232,8 @@ public class LoaderGTBlockFluid implements Runnable {
                 () -> ItemList.SunnariumCell.get(1)));
         ItemList.SunnariumCell.set(new ItemDepletedCell("sunnariumCell", "Sunnarium Fuel Rod", 1));
 
-        ItemList.neutroniumHeatCapacitor.set(
-            GregTechAPI
-                .constructCoolantCellItem("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000));
+        ItemList.neutroniumHeatCapacitor
+            .set(new ItemCoolantCellIC("neutroniumHeatCapacitor", "1G Neutronium Heat Capacitor", 1000000000));
 
         ItemList.Depleted_Thorium_1.set(new ItemDepletedCell("ThoriumcellDep", "Fuel Rod (Depleted Thorium)", 1));
         ItemList.Depleted_Thorium_2
@@ -1987,14 +1987,9 @@ public class LoaderGTBlockFluid implements Runnable {
                 ItemList.Spray_Empty.get(1L)));
 
         if (!GTValues.D1) {
-            try {
-                Class.forName("codechicken.nei.api.API");
+            if (Mods.NotEnoughItems.isModLoaded()) {
                 GTLog.out.println("GTMod: Hiding certain Items from NEI.");
                 API.hideItem(ItemList.Display_Fluid.getWildcard(1L));
-            } catch (Throwable e) {
-                if (GTValues.D1) {
-                    e.printStackTrace(GTLog.err);
-                }
             }
         }