From 31ff948c6dbb103dd96a87de30104e1790e30552 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Sun, 6 Oct 2013 12:26:24 -0700 Subject: [PATCH] Cleaning up some old commented crap. --- magicbees_src/magicbees/main/Config.java | 11 +++++------ .../main/utils/compat/ForestryHelper.java | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/magicbees_src/magicbees/main/Config.java b/magicbees_src/magicbees/main/Config.java index 4a70073..9e38213 100644 --- a/magicbees_src/magicbees/main/Config.java +++ b/magicbees_src/magicbees/main/Config.java @@ -332,9 +332,9 @@ public class Config nuggets = new ItemNugget(configuration.getItem("beeNuggets", itemIDBase++).getInt() - 256); magnet = new ItemMysteriousMagnet(configuration.getItem("magicMagnet", itemIDBase++).getInt() - 256); - magnet.setBaseRange(3f); // magnet.setBaseRange(MagnetBaseRange); - magnet.setLevelMultiplier(0.75f); // magnet.setLevelMultiplier(MagnetLevelMultiplier); - magnet.setMaximumLevel(8); // magnet.setMaxiumumLevel(MagnetMaxLevel); + magnet.setBaseRange(MagnetBaseRange); + magnet.setLevelMultiplier(MagnetLevelMultiplier); + magnet.setMaximumLevel(MagnetMaxLevel); for (int level = 0; level <= 8; level++) { @@ -421,8 +421,7 @@ public class Config FMLLog.info("Magic Bees will attempt to regenerate hives in chunks that were generated before the mod was added."); } - // TODO: Determine optimal settings, then uncomment. - /*p = configuration.get("general", "magnetRangeBase", 3.0); + p = configuration.get("general", "magnetRangeBase", 3.0); p.comment = "Base range (in blocks) of the Mysterious Magnet"; this.MagnetBaseRange = (float)p.getDouble(3.0); @@ -432,7 +431,7 @@ public class Config p = configuration.get("general", "magnetMaximumLevel", 8); p.comment = "Maximum level of the magnets."; - this.MagnetMaxLevel = p.getInt();*/ + this.MagnetMaxLevel = p.getInt(); } } diff --git a/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java b/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java index 600be6a..697f6e7 100644 --- a/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java +++ b/magicbees_src/magicbees/main/utils/compat/ForestryHelper.java @@ -133,20 +133,6 @@ public class ForestryHelper public static IAllele[] getTemplateForestryForSpecies(String speciesName) { - /*IAllele[] template = null; - try - { - //BeeTemplates.getValiantTemplate() - Class c = Class.forName("forestry.apiculture.genetics.BeeTemplates"); - Method m = c.getMethod("get" + speciesName + "Template"); - template = (IAllele[])(m.invoke(null)); - } - catch (Exception e) - { - FMLLog.severe("Could not get Forestry template for %s.", speciesName); - e.printStackTrace(); - } - return template;*/ return BeeManager.beeRoot.getTemplate("forestry.species" + speciesName); }