Cleanup dimension blacklist.

src/main/java/tconstruct/TConstruct.java

@@ -144,9 +144,7 @@ public void init (FMLInitializationEvent event)
             MinecraftForge.EVENT_BUS.register(new EventCloakRender());
         }
 
-        TwilightForestConfig.initProps(PHConstruct.cfglocation);
-        BOPConfig.initProps(PHConstruct.cfglocation);
-        DimensionBlacklist.getbaddimensions();
+        DimensionBlacklist.getBadBimensions();
         GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool.blockID, 0));
 
         PluginController.getController().init();

src/main/java/tconstruct/util/config/DimensionBlacklist.java

@@ -1,29 +1,39 @@
 package tconstruct.util.config;
 
+import cpw.mods.fml.common.Loader;
+import net.minecraftforge.common.Configuration;
+import tconstruct.TConstruct;
+
+import java.io.File;
 import java.util.ArrayList;
 
 public class DimensionBlacklist
 {
-    public static ArrayList<Integer> blacklist = new ArrayList<Integer>();
-    public static ArrayList<Integer> nopool = new ArrayList<Integer>();
+    public static ArrayList<Integer> blacklistedDims = new ArrayList<Integer>();
+    public static ArrayList<Integer> noPoolDims = new ArrayList<Integer>();
+
+    public static int promisedLandDimensionID = -100;
+    public static int twilightForestDimensionID = -100;
 
-    public static void getbaddimensions ()
+    public static void getBadBimensions()
     {
-        blacklist.add(1);
-        if (TwilightForestConfig.twilightForestDimensionID != -100)
+        updateModDimIDs();
+
+        blacklistedDims.add(1);
+        if (twilightForestDimensionID != -100)
         {
-            blacklist.add(TwilightForestConfig.twilightForestDimensionID);
+            blacklistedDims.add(twilightForestDimensionID);
         }
         if (PHConstruct.cfgDimBlackList.length > 0)
         {
             for (int numdim = 0; numdim < PHConstruct.cfgDimBlackList.length; numdim++)
             {
-                blacklist.add(PHConstruct.cfgDimBlackList[numdim]);
+                blacklistedDims.add(PHConstruct.cfgDimBlackList[numdim]);
             }
         }
-        if (BOPConfig.promisedLandDimensionID != -100)
+        if (promisedLandDimensionID != -100)
         {
-            nopool.add(BOPConfig.promisedLandDimensionID);
+            noPoolDims.add(promisedLandDimensionID);
         }
     }
 
@@ -33,29 +43,60 @@ public static boolean isDimInBlacklist (int dim)
             return false;
         if (dim == 0)
             return PHConstruct.slimeIslGenDim0;
-        if (PHConstruct.slimeIslGenDim0Only && dim != 0)
+        if (PHConstruct.slimeIslGenDim0Only)
         {
             return false;
         }
-        for (int len = 0; len < blacklist.size(); len++)
+        for (int len = 0; len < blacklistedDims.size(); len++)
         {
-            if (blacklist.get(len) == dim)
+            if (blacklistedDims.get(len) == dim)
                 return false;
-            //TConstruct.logger.info("diminblist +" + blacklist.get(len));
         }
         return true;
 
     }
 
     public static boolean isDimNoPool (int dim)
     {
-        for (int len = 0; len < nopool.size(); len++)
+        return noPoolDims.contains(dim);
+    }
+
+    private static void updateModDimIDs()
+    {
+        updateTwiForestID();
+        updateBoPID();
+    }
+
+    private static void updateTwiForestID()
+    {
+        String location = Loader.instance().getConfigDir().getPath();
+        File newFile = new File(location + File.separator + "TwilightForest.cfg");
+        if (newFile.exists())
         {
-            if (nopool.get(len) == dim)
-                //TConstruct.logger.info("DimNoPool "+ nopool.get(len));
-                return true;
+            Configuration config = new Configuration(newFile);
+
+            config.load();
+
+            twilightForestDimensionID = config.get("dimension", "dimensionID", -100).getInt();
+            TConstruct.logger.fine("Twilight Forest Dim ID: " + twilightForestDimensionID);
         }
-        return false;
+        else twilightForestDimensionID = -100;
+    }
 
+    private static void updateBoPID()
+    {
+        String location = Loader.instance().getConfigDir().getPath();
+        File newFile = new File(location + File.separator + "biomesoplenty" + File.separator + "ids.cfg");
+        if (newFile.exists())
+        {
+            Configuration config = new Configuration(newFile);
+
+            config.load();
+
+            promisedLandDimensionID = config.get("dimension settings", "Promised Land Dimension ID", -200).getInt();
+            TConstruct.logger.fine("Promised Lands Dim ID: " + promisedLandDimensionID);
+        }
+        else promisedLandDimensionID = -100;
     }
+
 }