diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index b0f0097a..4b630547 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -4,6 +4,7 @@ import net.minecraftforge.common.MinecraftForge; import tconstruct.client.event.EventCloakRender; import tconstruct.common.TContent; import tconstruct.common.TProxyCommon; +import tconstruct.compat.BOP; import tconstruct.compat.Tforest; import tconstruct.compat.dimensions.dimblacklist; import tconstruct.library.TConstructRegistry; @@ -151,6 +152,7 @@ public class TConstruct content.createEntities(); content.modRecipes(); Tforest.initProps(PHConstruct.cfglocation); + BOP.initProps(PHConstruct.cfglocation); dimblacklist.getbaddimensions(); } diff --git a/src/tconstruct/compat/BOP.java b/src/tconstruct/compat/BOP.java new file mode 100644 index 00000000..79bae810 --- /dev/null +++ b/src/tconstruct/compat/BOP.java @@ -0,0 +1,35 @@ +package tconstruct.compat; + +import java.io.File; +import java.io.IOException; +import net.minecraftforge.common.Configuration; + +public class BOP { + public static void initProps (File location) + { + /* Here we will set up the config file for the mod + * First: Create a folder inside the config folder + * Second: Create the actual config file + * Note: Configs are a pain, but absolutely necessary for every mod. + */ + //File file = new File(TConstruct.proxy.getLocation() + "/config"); + //file.mkdir(); + //File newFile = new File(TConstruct.proxy.getLocation() + "/config/TinkersWorkshop.txt"); + + File newFile = new File(location + "/biomesoplenty/ids.cfg"); + if( newFile.exists()){ + + /* [Forge] Configuration class, used as config method */ + Configuration config = new Configuration(newFile); + + /* Load the configuration file */ + config.load(); + + pldimid = config.get("dimension settings", "Promised Land Dimension ID", true).getInt(); + } + else { + pldimid = -100; + } + } + public static int pldimid; +} diff --git a/src/tconstruct/compat/Tforest.java b/src/tconstruct/compat/Tforest.java index c38e0199..b5b901eb 100644 --- a/src/tconstruct/compat/Tforest.java +++ b/src/tconstruct/compat/Tforest.java @@ -2,7 +2,6 @@ package tconstruct.compat; import java.io.File; import java.io.IOException; - import net.minecraftforge.common.Configuration; public class Tforest { diff --git a/src/tconstruct/compat/dimensions/dimblacklist.java b/src/tconstruct/compat/dimensions/dimblacklist.java index c656628f..3f5df943 100644 --- a/src/tconstruct/compat/dimensions/dimblacklist.java +++ b/src/tconstruct/compat/dimensions/dimblacklist.java @@ -2,11 +2,13 @@ package tconstruct.compat.dimensions; import java.util.ArrayList; +import tconstruct.compat.BOP; import tconstruct.compat.Tforest; import tconstruct.util.PHConstruct; public class dimblacklist { public static ArrayList blacklist = new ArrayList(); +public static ArrayList nopool = new ArrayList(); public static void getbaddimensions(){ blacklist.add(1); if (Tforest.tfdimid != -100){ @@ -17,7 +19,9 @@ public static void getbaddimensions(){ blacklist.add(PHConstruct.cfgDimBlackList[numdim]); } } - + if (BOP.pldimid != -100){ + nopool.add(BOP.pldimid); + } } public static boolean isDimInBlacklist(int dim){ if (dim<0) @@ -31,5 +35,13 @@ public static boolean isDimInBlacklist(int dim){ } return true; +} +public static boolean isDimPoolOnly(int dim){ + for (int len = 0;len< nopool.size(); len++){ + if (nopool.get(len) == dim) + return false; + } + return true; + } } diff --git a/src/tconstruct/worldgen/SlimeIslandGen.java b/src/tconstruct/worldgen/SlimeIslandGen.java index f552c710..1be86620 100644 --- a/src/tconstruct/worldgen/SlimeIslandGen.java +++ b/src/tconstruct/worldgen/SlimeIslandGen.java @@ -145,7 +145,9 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator public void generateSlimePool (World world, Random rand, int x, int y, int z) { - this.generate(world, rand, x, y, z); + if(dimblacklist.isDimPoolOnly(world.provider.dimensionId)){ + this.generate(world, rand, x, y, z); + } } public boolean generate (World world, Random rand, int x, int y, int z) //WorldGenerator version