Merge pull request #1 from GlodBlock/fix-crack-recipe-check

Fix crack recipe check

5 files changed, 219 insertions, 237 deletions

diff --git a/src/main/java/gregtech/loaders/misc/GT_Achievements.java b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
index 5965bf6035..e7a34e13d3 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Achievements.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Achievements.java
@@ -30,9 +30,6 @@ import thaumcraft.api.ThaumcraftApiHelper;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class GT_Achievements {
-
-    //public static List<Materials> oreList = new ArrayList<Materials>();
-    //public static List<Integer[]> oreStats = new ArrayList<Integer[]>();
     public static int oreReg = -1;
     public static int assReg=-1;
     public ConcurrentHashMap<String, Achievement> achievementList;
@@ -43,39 +40,7 @@ public class GT_Achievements {
     public GT_Achievements() {
         this.achievementList = new ConcurrentHashMap<>();
         this.issuedAchievements = new ConcurrentHashMap<>();
-        /*int oreList_sS=oreList.size();
-        for (int i = 0; i < oreList_sS; i++) {
-            if (oreList.get(i) != null) {
-                if (GT_Values.D1 && this.achievementList.get(oreList.get(i).mName) == null) {
-                    GT_Log.out.println("achievement." + oreList.get(i).mName + "=Find " + oreList.get(i).mName + " Ore");
-
-                    StringBuilder dimensions = new StringBuilder();
-                    boolean isFirst = true;
-                    if (oreStats.get(i)[3] == 1) {
-                        dimensions.append("Overworld");
-                        isFirst = false;
-                    }
-                    if (oreStats.get(i)[4] == 1) {
-                        if (!isFirst) dimensions.append("/");
-                        dimensions.append("Nether");
-                        isFirst = false;
-                    }
-                    if (oreStats.get(i)[5] == 1) {
-                        if (!isFirst) dimensions.append("/");
-                        dimensions.append("End");
-                        isFirst = false;
-                    }
-                    GT_Log.out.println("achievement." + oreList.get(i).mName + ".desc=Height: " + (oreStats.get(i)[0]) + "-" + (oreStats.get(i)[1]) + ", Chance: " + (oreStats.get(i)[2]) + ", " + dimensions.toString());
-                }
-                //if(oreList.get(i)==null)
-                //    GT_Log.out.println("GT Achievement - Ore with NULL pointer material tries to register achievement.");
-                //if(oreList.get(i).name()==null)
-                //    GT_Log.out.println("GT Achievement - Ore with NULL named material tries to register achievement.");
-                //else
-                registerOreAchievement(oreList.get(i));
-            }
-        }
-*/
+
         for(GT_Recipe recipe: GT_Recipe.GT_Recipe_Map.sAssemblylineVisualRecipes.mRecipeList)
             registerAssAchievement(recipe);
 
@@ -214,13 +179,6 @@ public class GT_Achievements {
             registerAchievement("whatnow", 8, 10, ItemList.ZPM2.get(1), "denseaspossible", false);
         }
 
-//        if(Loader.isModLoaded("NotEnoughItems") && GT_Mod.gregtechproxy.mHideUnusedOres){
-//            for (int i = 1; i < GregTech_API.sGeneratedMaterials.length; i++) {
-//                if ((GregTech_API.sGeneratedMaterials[i] != null) && !oreList.contains(GregTech_API.sGeneratedMaterials[i])) {
-//                    codechicken.nei.api.API.hideItem(GT_OreDictUnificator.get(OrePrefixes.ore, GregTech_API.sGeneratedMaterials[i], 1));
-//                }
-//            }
-//        }
         if (GT_Mod.gregtechproxy.mAchievements) {
             AchievementPage.registerAchievementPage(new AchievementPage("GregTech 5", (Achievement[]) this.achievementList.values().toArray(
                     new Achievement[this.achievementList.size()])));
@@ -230,11 +188,6 @@ public class GT_Achievements {
     }
 
     public static void registerOre(Materials aMaterial, int min, int max, int chance, boolean overworld, boolean nether, boolean end) {
-        /*if (aMaterial != Materials._NULL) {
-            oreList.add(aMaterial);
-            //if(!oreList.add(aMaterial)) Minecraft.getMinecraft().crashed(new CrashReport("GT Achievement - Ore with that (" + aMaterial.name() + ") material already exists.",new IllegalArgumentException()));
-        }
-        oreStats.add(new Integer[]{min, max, chance, overworld ? 1 : 0, nether ? 1 : 0, end ? 1 : 0});*/
     }
 
     public Achievement registerAchievement(String textId, int x, int y, ItemStack icon, Achievement requirement, boolean special) {
@@ -245,7 +198,7 @@ public class GT_Achievements {
         if (special) {
             achievement.setSpecial();
         }
-        achievement.registerStat();
+        ((StatBase)achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");
@@ -263,7 +216,7 @@ public class GT_Achievements {
         if (special) {
             achievement.setSpecial();
         }
-        achievement.registerStat();
+        ((StatBase)achievement).registerStat();
         if (GT_Values.D2) {
             GT_Log.out.println("achievement." + textId + "=");
             GT_Log.out.println("achievement." + textId + ".desc=");
@@ -273,12 +226,6 @@ public class GT_Achievements {
     }
 
     public Achievement registerOreAchievement(Materials aMaterial) {
-    	/*
-        if (this.achievementList.get(aMaterial.mName) == null) {
-            oreReg++;
-            return registerAchievement(aMaterial.mName, -(6 + oreReg % 5), ((oreReg) / 5) - 8, new ItemStack(GregTech_API.sBlockOres1, 1,
-                    aMaterial.mMetaItemSubID), AchievementList.openInventory, false);
-        }*/
         return null;
     }
 
@@ -295,14 +242,7 @@ public class GT_Achievements {
         if (entityplayer == null || !GT_Mod.gregtechproxy.mAchievements) {
             return;
         }
-//		if (this.achievementList.containsKey(textId)) {
-//			if(this.issuedAchievements.containsKey((entityplayer.getDisplayName()+textId))){
-//			return;
-//			}else{
-//			this.issuedAchievements.put((entityplayer.getDisplayName()+textId), true);
         entityplayer.triggerAchievement((StatBase) this.achievementList.get(textId));
-//			}
-//		}
     }
 
     public Achievement getAchievement(String textId) {
@@ -352,18 +292,25 @@ public class GT_Achievements {
         if (player == null || fluid == null) {
             return;
         }
-        if (fluid.getFluid().getUnlocalizedName().equals("fluid.plasma.helium")) {
-            issueAchievement(player, "fusion");
-        } else if (fluid.getFluid().getUnlocalizedName().equals("fluid.molten.europium")) {
-            issueAchievement(player, "advancing");
-        } else if (fluid.getFluid().getUnlocalizedName().equals("fluid.molten.naquadah")) {
-            issueAchievement(player, "stargateliquid");
-        } else if (fluid.getFluid().getUnlocalizedName().equals("fluid.molten.americium")) {
-            issueAchievement(player, "tothelimit");
-        } else if (fluid.getFluid().getUnlocalizedName().equals("fluid.molten.neutronium")) {
-            issueAchievement(player, "denseaspossible");
-        } else if (fluid.getFluid().getUnlocalizedName().equals("fluid.plasma.nitrogen")) {
-            issueAchievement(player, "higherefficency");
+        switch (fluid.getFluid().getUnlocalizedName()) {
+            case "fluid.plasma.helium":
+                issueAchievement(player, "fusion");
+                break;
+            case "fluid.molten.europium":
+                issueAchievement(player, "advancing");
+                break;
+            case "fluid.molten.naquadah":
+                issueAchievement(player, "stargateliquid");
+                break;
+            case "fluid.molten.americium":
+                issueAchievement(player, "tothelimit");
+                break;
+            case "fluid.molten.neutronium":
+                issueAchievement(player, "denseaspossible");
+                break;
+            case "fluid.plasma.nitrogen":
+                issueAchievement(player, "higherefficency");
+                break;
         }
     }
 
@@ -374,35 +321,42 @@ public class GT_Achievements {
         if (player == null || stack == null) {
             return;
         }
-        //if(stack.getItem()==Items.paper){player.inventory.addItemStackToInventory(new ItemStack(Blocks.stone_slab,2));}//TODO REALLY BLOODASP, REALLY
         ItemData data = GT_OreDictUnificator.getItemData(stack);
         if (data != null) {
             if (data.mPrefix == OrePrefixes.dust && data.mMaterial.mMaterial == Materials.Bronze) {
                 issueAchievement(player, "bronze");
-//            } else if (data.mPrefix == OrePrefixes.circuit && data.mMaterial.mMaterial == Materials.Advanced) {
-//                issueAchievement(player, "stepforward");
             }
         }
         if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) {
-            if (stack.getUnlocalizedName().equals("gt.metaitem.01.2300")) {
-                issueAchievement(player, "bronze");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32700")) {
-                issueAchievement(player, "smallparts");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32702")) {
-                issueAchievement(player, "bettercircuits");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.23354")) {
-                issueAchievement(player, "magneticiron");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32600")) {
-                issueAchievement(player, "lvmotor");
-                issueAchievement(player, "buildCable");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32610")) {
-                issueAchievement(player, "pumpcover");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32630")) {
-                issueAchievement(player, "transport");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32650")) {
-                issueAchievement(player, "complexmachines");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32670")) {
-                issueAchievement(player, "hightech");
+            switch (stack.getUnlocalizedName()) {
+                case "gt.metaitem.01.2300":
+                    issueAchievement(player, "bronze");
+                    break;
+                case "gt.metaitem.01.32700":
+                    issueAchievement(player, "smallparts");
+                    break;
+                case "gt.metaitem.01.32702":
+                    issueAchievement(player, "bettercircuits");
+                    break;
+                case "gt.metaitem.01.23354":
+                    issueAchievement(player, "magneticiron");
+                    break;
+                case "gt.metaitem.01.32600":
+                    issueAchievement(player, "lvmotor");
+                    issueAchievement(player, "buildCable");
+                    break;
+                case "gt.metaitem.01.32610":
+                    issueAchievement(player, "pumpcover");
+                    break;
+                case "gt.metaitem.01.32630":
+                    issueAchievement(player, "transport");
+                    break;
+                case "gt.metaitem.01.32650":
+                    issueAchievement(player, "complexmachines");
+                    break;
+                case "gt.metaitem.01.32670":
+                    issueAchievement(player, "hightech");
+                    break;
             }
         } else if (stack.getUnlocalizedName().equals("ic2.blockCrop")) {
             issueAchievement(player, "crops");
@@ -566,64 +520,88 @@ public class GT_Achievements {
         }
 //        GT_FML_LOGGER.info(stack.getUnlocalizedName());
         if (stack.getUnlocalizedName().startsWith("gt.metaitem.")) {
-            if (stack.getUnlocalizedName().equals("gt.metaitem.02.32500")) {
-                issueAchievement(player, "havestlead");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32501")) {
-                issueAchievement(player, "havestsilver");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32503")) {
-                issueAchievement(player, "havestiron");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32504")) {
-                issueAchievement(player, "havestgold");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32530")) {
-                issueAchievement(player, "havestcopper");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32540")) {
-                issueAchievement(player, "havesttin");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32510")) {
-                issueAchievement(player, "havestoil");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.02.32511")) {
-                issueAchievement(player, "havestemeralds");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32082")) {
-                issueAchievement(player, "energyflow");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32702")) {
-                issueAchievement(player, "bettercircuits");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32707")) {
-                issueAchievement(player, "datasaving");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32597")) {
-                issueAchievement(player, "orbs");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32599")) {
-                issueAchievement(player, "thatspower");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32598")) {
-                issueAchievement(player, "luck");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32749")) {
-                issueAchievement(player, "closeit");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32730")) {
-                issueAchievement(player, "manipulation");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32729")) {
-                issueAchievement(player, "filterregulate");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32605")) {
-                issueAchievement(player, "whatnow");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) {
-                issueAchievement(player, "zpmage");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) {
-                issueAchievement(player, "uvage");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32030")) {
-                issueAchievement(player, "gtmonosilicon");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32036")) {
-                issueAchievement(player, "gtlogicwafer");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32701")) {
-                issueAchievement(player, "gtlogiccircuit");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32085")) {
-                issueAchievement(player, "gtquantumprocessor");
-            }  else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32089")) {
-                issueAchievement(player, "gtcrystalprocessor");
-            }  else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32092")) {
-                issueAchievement(player, "gtwetware");
-            }  else if (stack.getUnlocalizedName().equals("gt.metaitem.03.32095")) {
-                issueAchievement(player, "gtwetmain");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32736")) {
-                issueAchievement(player, "zpmage");
-            } else if (stack.getUnlocalizedName().equals("gt.metaitem.01.32737")) {
-                issueAchievement(player, "uvage");
+            switch (stack.getUnlocalizedName()) {
+                case "gt.metaitem.02.32500":
+                    issueAchievement(player, "havestlead");
+                    break;
+                case "gt.metaitem.02.32501":
+                    issueAchievement(player, "havestsilver");
+                    break;
+                case "gt.metaitem.02.32503":
+                    issueAchievement(player, "havestiron");
+                    break;
+                case "gt.metaitem.02.32504":
+                    issueAchievement(player, "havestgold");
+                    break;
+                case "gt.metaitem.02.32530":
+                    issueAchievement(player, "havestcopper");
+                    break;
+                case "gt.metaitem.02.32540":
+                    issueAchievement(player, "havesttin");
+                    break;
+                case "gt.metaitem.02.32510":
+                    issueAchievement(player, "havestoil");
+                    break;
+                case "gt.metaitem.02.32511":
+                    issueAchievement(player, "havestemeralds");
+                    break;
+                case "gt.metaitem.03.32082":
+                    issueAchievement(player, "energyflow");
+                    break;
+                case "gt.metaitem.01.32702":
+                    issueAchievement(player, "bettercircuits");
+                    break;
+                case "gt.metaitem.01.32707":
+                    issueAchievement(player, "datasaving");
+                    break;
+                case "gt.metaitem.01.32597":
+                    issueAchievement(player, "orbs");
+                    break;
+                case "gt.metaitem.01.32599":
+                    issueAchievement(player, "thatspower");
+                    break;
+                case "gt.metaitem.01.32598":
+                    issueAchievement(player, "luck");
+                    break;
+                case "gt.metaitem.01.32749":
+                    issueAchievement(player, "closeit");
+                    break;
+                case "gt.metaitem.01.32730":
+                    issueAchievement(player, "manipulation");
+                    break;
+                case "gt.metaitem.01.32729":
+                    issueAchievement(player, "filterregulate");
+                    break;
+                case "gt.metaitem.01.32605":
+                    issueAchievement(player, "whatnow");
+                    break;
+                case "gt.metaitem.01.32736":
+                    issueAchievement(player, "zpmage");
+                    break;
+                case "gt.metaitem.01.32737":
+                    issueAchievement(player, "uvage");
+                    break;
+                case "gt.metaitem.03.32030":
+                    issueAchievement(player, "gtmonosilicon");
+                    break;
+                case "gt.metaitem.03.32036":
+                    issueAchievement(player, "gtlogicwafer");
+                    break;
+                case "gt.metaitem.01.32701":
+                    issueAchievement(player, "gtlogiccircuit");
+                    break;
+                case "gt.metaitem.03.32085":
+                    issueAchievement(player, "gtquantumprocessor");
+                    break;
+                case "gt.metaitem.03.32089":
+                    issueAchievement(player, "gtcrystalprocessor");
+                    break;
+                case "gt.metaitem.03.32092":
+                    issueAchievement(player, "gtwetware");
+                    break;
+                case "gt.metaitem.03.32095":
+                    issueAchievement(player, "gtwetmain");
+                    break;
             } 
         } else if (stack.getUnlocalizedName().equals("gt.Thoriumcell")) {
             issueAchievement(player, "newfuel");
diff --git a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
index 097c2dd034..e134014d5e 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BeeDefinition.java
@@ -43,6 +43,7 @@ import static forestry.api.core.EnumHumidity.ARID;
 import static forestry.api.core.EnumHumidity.DAMP;
 import static forestry.api.core.EnumTemperature.*;
 import static forestry.core.genetics.alleles.EnumAllele.*;
+import static gregtech.api.enums.GT_Values.MOD_ID_DC;
 import static gregtech.loaders.misc.GT_BeeDefinitionReference.*;
 
 @SuppressWarnings("ALL")
@@ -1234,7 +1235,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             dis -> {
                 IBeeMutationCustom tMutation = dis.registerMutation(getSpecies(MAGICBEES, "TCChaos"), getSpecies(MAGICBEES, "TCVoid"), 6);
                 if (Loader.isModLoaded("TaintedMagic"))
-                    tMutation.requireResource(GameRegistry.findBlock("TaintedMagic", "BlockShadowmetal"), 0);
+                    tMutation.requireResource("blockShadow");
             }
     ),
     DIVIDED(GT_BranchDefinition.THAUMIC, "Unstable", true, new Color(0xF0F0F0), new Color(0xDCDCDC),
@@ -1408,7 +1409,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     ),
     AMERICIUM(GT_BranchDefinition.RADIOACTIVE, "Americium", false, new Color(0xE6E6FF), new Color(0xC8C8C8),
             beeSpecies -> {
-                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICUM), 0.05f);
+                beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.AMERICIUM), 0.05f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(EnumTemperature.NORMAL);
                 beeSpecies.setNocturnal();
@@ -1810,8 +1811,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, LEAD, 7);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.Ledox"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Ledox"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(35, "Europa"));//Europa Dim
                 }
             }
@@ -1829,8 +1830,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(CALLISTO, getSpecies(EXTRABEES, "freezing"), 7);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.CallistoColdIce"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.CallistoColdIce"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(45, "Callisto"));//Callisto Dim
                 }
             }
@@ -1850,8 +1851,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(IO, MITHRIL, 6);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.Mytryl"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Mytryl"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(36, "IO"));//IO Dim
                 }
             }
@@ -1871,8 +1872,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(VENUS, OSMIUM, 6);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.Quantinum"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(39, "Venus"));//Venus Dim
                 }
             }
@@ -1912,8 +1913,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(ENCELADUS, EMERALD, 3);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.MysteriousCrystal"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.MysteriousCrystal"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(41, "Enceladus"));//Enceladus Dim
                 }
             }
@@ -1933,8 +1934,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
                 @Override
                 public void accept(GT_BeeDefinition dis) {
                     IBeeMutationCustom tMutation = dis.registerMutation(PLUTO, PLUTONIUM, 2);
-                    if (Loader.isModLoaded("dreamcraft"))
-                        tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.BlackPlutonium"), 0);
+                    if (Loader.isModLoaded(MOD_ID_DC))
+                        tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.BlackPlutonium"), 0);
                     tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(49, "Pluto"));//Pluto Dim
                 }
             }
@@ -1962,8 +1963,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     MOON(GT_BranchDefinition.PLANET, "Moon", false, new Color(0x373735), new Color(0x7E7E78),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MOON), 0.50f);
-                if (Loader.isModLoaded("dreamcraft"))
-                    beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.MoonStoneDust", 1, 0), 0.10f);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MoonStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(COLD);
                 beeSpecies.setNocturnal();
@@ -1980,7 +1981,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     MARS(GT_BranchDefinition.PLANET, "Mars", false, new Color(0x220D05), new Color(0x3A1505),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.MarsStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MarsStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setNocturnal();
@@ -1997,8 +1998,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     PHOBOS(GT_BranchDefinition.PLANET, "Phobos", true, new Color(0x220D05), new Color(0x7a5706),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f);
-                if (Loader.isModLoaded("dreamcraft"))
-                    beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.PhobosStoneDust", 1, 0), 0.10f);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PhobosStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setNocturnal();
@@ -2014,7 +2015,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     DEIMOS(GT_BranchDefinition.PLANET, "Deimos", true, new Color(0x220D05), new Color(0x7a3206),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MARS), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.DeimosStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.DeimosStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setNocturnal();
@@ -2030,7 +2031,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     CERES(GT_BranchDefinition.PLANET, "Ceres", true, new Color(0x3ca5b7), new Color(0x1e7267),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CeresStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CeresStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setNocturnal();
@@ -2046,12 +2047,12 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     JUPITER(GT_BranchDefinition.PLANET, "Jupiter", false, new Color(0x734B2E), new Color(0xD0CBC4),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CallistoStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CallistoIceDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.IoStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EuropaStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EuropaIceDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.GanymedeStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setNocturnal();
@@ -2060,15 +2061,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {
                 IBeeMutationCustom tMutation = dis.registerMutation(MARS, DESH, 15);
-                if (Loader.isModLoaded("dreamcraft"))
-                    tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.Ledox"), 0);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Ledox"), 0);
                 tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods"));//Asteriods Dim
             }
     ),
     IO(GT_BranchDefinition.PLANET, "IO", true, new Color(0x734B2E), new Color(0xe5701b),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.IoStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.IoStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HELLISH);
             },
@@ -2084,8 +2085,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     EUROPA(GT_BranchDefinition.PLANET, "Europa", true, new Color(0x5982ea), new Color(0x0b36a3),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EuropaStoneDust", 1, 0), 0.10f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EuropaIceDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EuropaIceDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -2102,7 +2103,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     GANYMEDE(GT_BranchDefinition.PLANET, "Ganymede", true, new Color(0x3d1b10), new Color(0x190c07),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.GanymedeStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.GanymedeStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(COLD);
             },
@@ -2117,8 +2118,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     CALLISTO(GT_BranchDefinition.PLANET, "Callisto", true, new Color(0x0f333d), new Color(0x0d84a5),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.JUPITER), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CallistoStoneDust", 1, 0), 0.10f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CallistoIceDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CallistoIceDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -2134,9 +2135,9 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     SATURN(GT_BranchDefinition.PLANET, "Saturn", false, new Color(0xD2A472), new Color(0xF8C37B),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TitanStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EnceladusStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EnceladusIceDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(COLD);
                 beeSpecies.setHasEffect();
@@ -2144,16 +2145,16 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {
                 IBeeMutationCustom tMutation = dis.registerMutation(JUPITER, LEDOX, 25, 2);
-                if (Loader.isModLoaded("dreamcraft"))
-                    tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.Quantinum"), 0);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.Quantinum"), 0);
                 tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteriods"));//Asteriods Dim
             }
     ),
     ENCELADUS(GT_BranchDefinition.PLANET, "Enceladus", true, new Color(0xD2A472), new Color(0x193fa0),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EnceladusStoneDust", 1, 0), 0.10f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.EnceladusIceDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.EnceladusIceDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setHasEffect();
@@ -2169,7 +2170,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     TITAN(GT_BranchDefinition.PLANET, "Titan", true, new Color(0xa0641b), new Color(0x7c1024),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.SATURN), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TitanStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TitanStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
             },
@@ -2184,8 +2185,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     URANUS(GT_BranchDefinition.PLANET, "Uranus", false, new Color(0x75C0C9), new Color(0x84D8EC),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.MirandaStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.OberonStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setHasEffect();
@@ -2201,7 +2202,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     MIRANDA(GT_BranchDefinition.PLANET, "Miranda", true, new Color(0x75C0C9), new Color(0x0d211c),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.MirandaStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MirandaStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -2217,7 +2218,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     OBERON(GT_BranchDefinition.PLANET, "Oberon", true, new Color(0x4A4033), new Color(0xB5A288),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.URANUS), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.OberonStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.OberonStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(ICY);
             },
@@ -2232,8 +2233,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     NEPTUNE(GT_BranchDefinition.PLANET, "Neptune", false, new Color(0x334CFF), new Color(0x576DFF),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.ProteusStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TritonStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(COLD);
                 beeSpecies.setNocturnal();
@@ -2242,15 +2243,15 @@ public enum GT_BeeDefinition implements IBeeDefinition {
             template -> AlleleHelper.instance.set(template, LIFESPAN, Lifespan.SHORTEST),
             dis -> {
                 IBeeMutationCustom tMutation = dis.registerMutation(URANUS, ORIHARUKON, 7);
-                if (Loader.isModLoaded("dreamcraft"))
-                    tMutation.requireResource(GameRegistry.findBlock("dreamcraft", "tile.MysteriousCrystal"), 0);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    tMutation.requireResource(GameRegistry.findBlock(MOD_ID_DC, "tile.MysteriousCrystal"), 0);
                 tMutation.addMutationCondition(new GT_Bees.DimensionMutationCondition(30, "Asteroids"));//Asteroids Dim
             }
     ),
     PROTEUS(GT_BranchDefinition.PLANET, "Proteus", true, new Color(0x334CFF), new Color(0x592610),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.ProteusStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.ProteusStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(EnumHumidity.NORMAL);
                 beeSpecies.setTemperature(COLD);
                 beeSpecies.setNocturnal();
@@ -2266,7 +2267,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     TRITON(GT_BranchDefinition.PLANET, "Triton", true, new Color(0x334CFF), new Color(0x421118),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.NEPTUN), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TritonStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TritonStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -2282,8 +2283,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     PLUTO(GT_BranchDefinition.PLANET, "Pluto", false, new Color(0x34271E), new Color(0x69503D),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.PLUTO), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.PlutoStoneDust", 1, 0), 0.10f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.PlutoIceDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.PlutoIceDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(ICY);
                 beeSpecies.setNocturnal();
@@ -2300,7 +2301,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     HAUMEA(GT_BranchDefinition.PLANET, "Haumea", false, new Color(0x1C1413), new Color(0x392B28),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.HAUMEA), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.HaumeaStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.HaumeaStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(ICY);
             },
@@ -2315,7 +2316,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     MAKEMAKE(GT_BranchDefinition.PLANET, "MakeMake", false, new Color(0x301811), new Color(0x120A07),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.MAKEMAKE), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.MakeMakeStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.MakeMakeStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
             },
@@ -2330,7 +2331,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     CENTAURI(GT_BranchDefinition.PLANET, "Centauri", false, new Color(0x2F2A14), new Color(0xB06B32),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CentauriASurfaceDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HELLISH);
                 beeSpecies.setHasEffect();
@@ -2346,7 +2347,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     ACENTAURI(GT_BranchDefinition.PLANET, "aCentauri", false, new Color(0x2F2A14), new Color(0xa01e14),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.CENTAURI), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.CentauriASurfaceDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.CentauriASurfaceDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HELLISH);
             },
@@ -2364,7 +2365,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     TCETI(GT_BranchDefinition.PLANET, "tCeti", false, new Color(0x46241A), new Color(0x7B412F),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TCetiEStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(EnumTemperature.NORMAL);
                 beeSpecies.setNocturnal();
@@ -2381,7 +2382,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     TCETIE(GT_BranchDefinition.PLANET, "tCetiE", false, new Color(0x2d561b), new Color(0x0c0f60),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.TCETI), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.TCetiEStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.TCetiEStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(DAMP);
                 beeSpecies.setTemperature(EnumTemperature.NORMAL);
                 beeSpecies.setHasEffect();
@@ -2397,8 +2398,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     BARNARDA(GT_BranchDefinition.PLANET, "Barnarda", false, new Color(0x0D5A0D), new Color(0xE6C18D),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.BarnardaEStoneDust", 1, 0), 0.05f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.BarnardaFStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
                 beeSpecies.setHasEffect();
@@ -2429,7 +2430,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     BARNARDAE(GT_BranchDefinition.PLANET, "BarnardaE", false, new Color(0x0D5A0D), new Color(0x4c1f0a),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.BarnardaEStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaEStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
             },
@@ -2445,7 +2446,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     BARNARDAF(GT_BranchDefinition.PLANET, "BarnardaF", false, new Color(0x0D5A0D), new Color(0x1e0b49),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.BARNARDA), 0.25f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.BarnardaFStoneDust", 1, 0), 0.10f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.BarnardaFStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(HOT);
             },
@@ -2461,7 +2462,7 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     VEGA(GT_BranchDefinition.PLANET, "Vega", false, new Color(0x1A2036), new Color(0xB5C0DE),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.50f);
-                beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.VegaBStoneDust", 1, 0), 0.05f);
+                beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.05f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(COLD);
                 beeSpecies.setHasEffect();
@@ -2478,8 +2479,8 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     VEGAB(GT_BranchDefinition.PLANET, "VegaB", false, new Color(0x1A2036), new Color(0x81e261),
             beeSpecies -> {
                 beeSpecies.addProduct(GT_Bees.combs.getStackForType(CombType.VEGA), 0.50f);
-                if (Loader.isModLoaded("dreamcraft"))
-                    beeSpecies.addSpecialty(GT_ModHandler.getModItem("dreamcraft", "item.VegaBStoneDust", 1, 0), 0.10f);
+                if (Loader.isModLoaded(MOD_ID_DC))
+                    beeSpecies.addSpecialty(GT_ModHandler.getModItem(MOD_ID_DC, "item.VegaBStoneDust", 1, 0), 0.10f);
                 beeSpecies.setHumidity(ARID);
                 beeSpecies.setTemperature(COLD);
             },
@@ -2772,4 +2773,4 @@ public enum GT_BeeDefinition implements IBeeDefinition {
     public final IBeeDefinition getRainResist() {
         return new BeeVariation.RainResist(this);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_Bees.java b/src/main/java/gregtech/loaders/misc/GT_Bees.java
index 0e08ac3de6..1d8441e4d6 100644
--- a/src/main/java/gregtech/loaders/misc/GT_Bees.java
+++ b/src/main/java/gregtech/loaders/misc/GT_Bees.java
@@ -2,6 +2,7 @@ package gregtech.loaders.misc;
 
 import cpw.mods.fml.common.Loader;
 import forestry.api.apiculture.EnumBeeChromosome;
+import forestry.api.core.IClimateProvider;
 import forestry.api.genetics.*;
 import forestry.core.genetics.alleles.Allele;
 import forestry.core.utils.StringUtil;
@@ -133,7 +134,7 @@ public class GT_Bees {
         }
 
         @Override
-        public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0,IGenome genome1) {
+        public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
             if(world.provider.dimensionId == dimID)return 1;
             return 0;
         }
@@ -156,8 +157,8 @@ public class GT_Bees {
         }
 
         @Override
-        public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0,IGenome genome1) {
-            if(world.getBiomeGenForCoords(x, z).biomeID == biomeID) return 1;
+        public float getChance(World world, int x, int y, int z, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
+            if(climate.getBiome().biomeID == biomeID) return 1;
             return 0;
         }
 
diff --git a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
index bc95782cdf..16f4b4fe59 100644
--- a/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
+++ b/src/main/java/gregtech/loaders/misc/GT_BranchDefinition.java
@@ -171,4 +171,4 @@ public enum GT_BranchDefinition {
     public final IClassification getBranch() {
         return branch;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java b/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
index 5082e20f4a..4b30517973 100644
--- a/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
+++ b/src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
@@ -1,24 +1,26 @@
 package gregtech.loaders.misc;
 
 import gregtech.api.GregTech_API;
-import gregtech.api.enums.Textures;
-import gregtech.api.objects.GT_CopiedBlockTexture;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.covers.GT_Cover_Vent;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 
+import static gregtech.api.enums.Textures.BlockIcons.VENT_ADVANCED;
+import static gregtech.api.enums.Textures.BlockIcons.VENT_NORMAL;
+
 public class GT_CoverLoader
         implements Runnable {
+    @Override
     public void run() {
         for (byte i = 0; i < 16; i = (byte) (i + 1)) {
-            GregTech_API.registerCover(new ItemStack(Blocks.carpet, 1, i), new GT_CopiedBlockTexture(Blocks.wool, 0, i), null);
+            GregTech_API.registerCover(new ItemStack(Blocks.carpet, 1, i), TextureFactory.of(Blocks.wool, i), null);
         }
-        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVent", 1L, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_NORMAL), new GT_Cover_Vent(1));
-        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_NORMAL), new GT_Cover_Vent(1));
-        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_Vent(2));
-        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentSpread", 1L), new GT_RenderedTexture(Textures.BlockIcons.VENT_NORMAL), new GT_Cover_Vent(2));
-        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_Vent(3));
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVent", 1L, 1), TextureFactory.of(VENT_NORMAL), new GT_Cover_Vent(1));
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentCore", 1L, 1), TextureFactory.of(VENT_NORMAL), new GT_Cover_Vent(1));
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentGold", 1L, 1), TextureFactory.of(VENT_ADVANCED), new GT_Cover_Vent(2));
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentSpread", 1L), TextureFactory.of(VENT_NORMAL), new GT_Cover_Vent(2));
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorVentDiamond", 1L, 1), TextureFactory.of(VENT_ADVANCED), new GT_Cover_Vent(3));
     }
 }