Added Support for Cluster and Gateway Filters

Added a per-save config file called DimDoorsWorld.cfg. Its corresponding
class is DDWorldProperties. This class supports whitelisting and
blacklisting dimensions for Rift Cluster and Rift Gateway generation.
Note that our ban against generating gateways in the Nether and The End
still applies regardless of those settings. The new config file is
loaded before the server starts initializing terrain. Also moved
DDProperties to another package alongside DDWorldProperties - that
required updating references in most of the mod's files.

src/main/java/StevenDimDoors/experimental/SphereDecayOperation.java

@@ -12,8 +12,8 @@ import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.tileentity.TileEntityDispenser;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDLoot;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.schematic.WorldOperation;
 
 /**

src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java

@@ -1,5 +1,6 @@
 package StevenDimDoors.mod_pocketDim;
 
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/StevenDimDoors/mod_pocketDim/DDLoot.java

@@ -12,6 +12,7 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.WeightedRandom;
 import net.minecraft.util.WeightedRandomChestContent;
 import net.minecraftforge.common.ChestGenHooks;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.util.WeightedContainer;
 
 /*

src/main/java/StevenDimDoors/mod_pocketDim/DimData.java

@@ -8,6 +8,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
+
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 @Deprecated

src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java

@@ -19,6 +19,7 @@ import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.terraingen.InitMapGenEvent;
 import net.minecraftforge.event.world.WorldEvent;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java

@@ -17,8 +17,8 @@ import net.minecraft.util.Icon;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java

@@ -11,8 +11,8 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
 import StevenDimDoors.mod_pocketDim.util.Point4D;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java

@@ -4,8 +4,8 @@ import java.util.Random;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.IconFlipped;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java

@@ -1,7 +1,7 @@
 package StevenDimDoors.mod_pocketDim.blocks;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java

@@ -20,9 +20,9 @@ import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.IFluidBlock;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java

@@ -3,7 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java

@@ -6,7 +6,7 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java

@@ -3,7 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;

src/main/java/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java

@@ -3,7 +3,7 @@ package StevenDimDoors.mod_pocketDim.blocks;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java

@@ -4,7 +4,7 @@ import java.io.File;
 
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 
 public class CommandExportDungeon extends DDCommandBase

src/main/java/StevenDimDoors/mod_pocketDim/config/DDProperties.java

@@ -1,4 +1,4 @@
-package StevenDimDoors.mod_pocketDim;
+package StevenDimDoors.mod_pocketDim.config;
 
 import java.io.File;
 
@@ -87,7 +87,6 @@ public class DDProperties
 	 * Other Flags
 	 */
 
-	public final boolean WorldRiftGenerationEnabled;
 	public final boolean RiftSpreadEnabled;
 	public final boolean RiftGriefingEnabled;
 	public final boolean RiftsSpawnEndermenEnabled;
@@ -205,9 +204,6 @@ public class DDProperties
 		PocketProviderID = config.get(CATEGORY_PROVIDER, "Pocket Provider ID", 24).getInt();
 		LimboProviderID = config.get(CATEGORY_PROVIDER, "Limbo Provider ID", 13).getInt();
 		
-		WorldRiftGenerationEnabled = config.get(Configuration.CATEGORY_GENERAL, "Enable Rift World Generation", true,
-				"Sets whether dungeon rifts generate in dimensions other than Limbo").getBoolean(true);
-		
 		MonolithTeleportationEnabled = config.get(Configuration.CATEGORY_GENERAL, "Enable Monolith Teleportation", true,
 				"Sets whether Monoliths can teleport players").getBoolean(true);
 		

src/main/java/StevenDimDoors/mod_pocketDim/config/DDWorldProperties.java

@@ -0,0 +1,68 @@
+package StevenDimDoors.mod_pocketDim.config;
+
+import java.io.File;
+
+import net.minecraftforge.common.Configuration;
+
+public class DDWorldProperties
+{
+	/**
+	 * World Generation Settings
+	 */
+
+	public final DimensionFilter RiftClusterDimensions;
+	public final DimensionFilter RiftGatewayDimensions;
+	
+	//Names of categories
+	private static final String CATEGORY_WORLD_GENERATION = "world generation";
+	
+	public DDWorldProperties(File configFile)
+	{
+		// TODO: For the next major update (e.g. to MC 1.7), please move all world-specific settings
+		// into this config file instead of using the global ID file.
+		
+		Configuration config = new Configuration(configFile);
+		config.load();
+		
+		config.addCustomCategoryComment(CATEGORY_WORLD_GENERATION,
+				"The following settings require lists of dimensions in a specific format. " + 
+				"A list must consist of ranges separated by commas. A range may be a single number to indicate " +
+				"just one dimension or two numbers in the form \"X - Y\". Spaces are permitted " + 
+				"but not required. Example: -100, -10 - -1, 20 - 30");
+
+		RiftClusterDimensions = loadFilter(config, "Rift Cluster", "Rift Clusters");
+		RiftGatewayDimensions = loadFilter(config, "Rift Gateway", "Rift Gateways");
+		
+		config.save();
+	}
+	
+	private static DimensionFilter loadFilter(Configuration config, String prefix, String description)
+	{
+		boolean enableBlacklist = config.get(CATEGORY_WORLD_GENERATION, "Enable " + prefix + " Blacklist", true,
+				"Sets whether " + description + " will not generate in certain blacklisted dimensions. " +
+				"If set to false, then " + description + " will follow a whitelist instead.").getBoolean(true);
+		
+		String whitelist = config.get(CATEGORY_WORLD_GENERATION, prefix + " Whitelist", "",
+				"A list of the only dimensions in which " + description + " may generate.").getString();
+		
+		String blacklist = config.get(CATEGORY_WORLD_GENERATION, prefix + " Blacklist", "",
+				"A list of dimensions in which " + description + " may not generate.").getString();
+		
+		try
+		{
+			if (enableBlacklist)
+			{
+				return DimensionFilter.parseBlacklist(blacklist);
+			}
+			else
+			{
+				return DimensionFilter.parseWhitelist(whitelist);
+			}
+		}
+		catch (Exception inner)
+		{
+			throw new RuntimeException("An error occurred while loading a whitelist or blacklist setting for " +
+					description + ". Please make sure that your configuration file is set up correctly.", inner);
+		}
+	}
+}

src/main/java/StevenDimDoors/mod_pocketDim/config/DimensionFilter.java

@@ -0,0 +1,93 @@
+package StevenDimDoors.mod_pocketDim.config;
+
+import com.google.common.collect.Range;
+import com.google.common.collect.RangeSet;
+import com.google.common.collect.TreeRangeSet;
+
+public class DimensionFilter
+{
+	private RangeSet<Integer> blacklist;
+	
+	private DimensionFilter(RangeSet<Integer> blacklist)
+	{
+		this.blacklist = blacklist;
+	}
+	
+	public boolean isAccepted(int dimensionID)
+	{
+		return !blacklist.contains(dimensionID);
+	}
+	
+	public boolean isRejected(int dimensionID)
+	{
+		return blacklist.contains(dimensionID);
+	}
+	
+	private static RangeSet<Integer> parseRangeSet(String list)
+	{
+		int index;
+		int start;
+		int end;
+		String startPart;
+		String endPart;
+		String[] intervals;
+		RangeSet<Integer> ranges = TreeRangeSet.create();
+		
+		// Strip out all whitespace characters
+		list = list.replaceAll("\\s", "");
+		if (list.isEmpty())
+		{
+			return ranges;
+		}
+		intervals = list.split(",");
+
+		// Iterate over all the interval strings
+		for (String interval : intervals)
+		{
+			// Check if the interval contains a minus sign after the first character
+			// That indicates that we're dealing with an interval and not a single number
+			if (interval.length() > 1)
+			{
+				index = interval.indexOf("-", 1);
+			}
+			else
+			{
+				index = -1;
+			}
+			try
+			{
+				if (index >= 0)
+				{
+					// Parse this as a range with two values as endpoints
+					startPart = interval.substring(0, index);
+					endPart = interval.substring(index + 1);
+					start = Integer.parseInt(startPart);
+					end = Integer.parseInt(endPart);
+				}
+				else
+				{
+					// Parse this as a single value
+					start = Integer.parseInt(interval);
+					end = start;
+				}
+				// Add the interval to the set of intervals
+				ranges.add( Range.closed(start, end) );
+			}
+			catch (Exception e)
+			{
+				throw new IllegalArgumentException("\"" + interval + "\" is not a valid value or range for dimension IDs");
+			}
+		}
+		return ranges;
+	}
+	
+	public static DimensionFilter parseWhitelist(String list)
+	{
+		return new DimensionFilter(parseRangeSet(list).complement());
+	}
+	
+	public static DimensionFilter parseBlacklist(String list)
+	{
+		return new DimensionFilter(parseRangeSet(list));
+	}
+}

src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java

@@ -22,10 +22,10 @@ import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.network.ForgePacket;
 import net.minecraftforge.common.network.packet.DimensionRegisterPacket;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.blocks.BaseDimDoor;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
 import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;

src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java

@@ -8,8 +8,8 @@ import java.util.TreeMap;
 
 import StevenDimDoors.mod_pocketDim.watcher.ClientLinkData;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.dungeon.DungeonData;
 import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack;
 import StevenDimDoors.mod_pocketDim.util.Point4D;

src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java

@@ -15,9 +15,9 @@ import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.helpers.Compactor;
 import StevenDimDoors.mod_pocketDim.helpers.DeleteFolder;
 import StevenDimDoors.mod_pocketDim.saving.DDSaveHandler;

src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java

@@ -16,9 +16,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntitySign;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/dungeon/FillContainersOperation.java

@@ -12,7 +12,7 @@ import net.minecraft.tileentity.TileEntityChest;
 import net.minecraft.tileentity.TileEntityDispenser;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDLoot;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.schematic.WorldOperation;
 
 public class FillContainersOperation extends WorldOperation

src/main/java/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java

@@ -19,8 +19,8 @@ import java.util.regex.Pattern;
 
 import net.minecraft.util.WeightedRandom;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java

@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;

src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java

@@ -20,8 +20,8 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import com.google.common.collect.Multimap;
 import cpw.mods.fml.relauncher.Side;

src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java

@@ -15,7 +15,6 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fluids.Fluid;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDimWall;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDimWallPerm;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDoorGold;
@@ -34,6 +33,8 @@ import StevenDimDoors.mod_pocketDim.commands.CommandDeleteRifts;
 import StevenDimDoors.mod_pocketDim.commands.CommandExportDungeon;
 import StevenDimDoors.mod_pocketDim.commands.CommandResetDungeons;
 import StevenDimDoors.mod_pocketDim.commands.CommandTeleportPlayer;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDWorldProperties;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.helpers.ChunkLoaderHelper;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
@@ -74,8 +75,9 @@ import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
-import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.common.event.FMLServerStoppedEvent;
 import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkMod.SidedPacketHandler;
 import cpw.mods.fml.common.registry.EntityRegistry;
@@ -134,6 +136,7 @@ public class mod_pocketDim
 	public static boolean isPlayerWearingGoogles = false;
 
 	public static DDProperties properties;
+	public static DDWorldProperties worldProperties;
 	public static CustomLimboPopulator spawner; //Added this field temporarily. Will be refactored out later.
 	public static FastRiftRegenerator fastRiftRegenerator;
 	public static GatewayGenerator gatewayGenerator;
@@ -296,13 +299,14 @@ public class mod_pocketDim
 	}
 	
 	@EventHandler
-	public void onServerStopping(FMLServerStoppingEvent event)
+	public void onServerStopped(FMLServerStoppedEvent event)
 	{
 		try
 		{
 			PocketManager.unload();
 			deathTracker.writeToFile();
 			deathTracker = null;
+			worldProperties = null;
 		}
 		catch (Exception e)
 		{
@@ -310,11 +314,21 @@ public class mod_pocketDim
 		}
 	}
 	
+	@EventHandler
+	public void onServerAboutToStart(FMLServerAboutToStartEvent event)
+	{
+		final String saveRootDirectory = DimensionManager.getCurrentSaveRootDirectory().getAbsolutePath();
+		
+		// Load the config file that's specific to this world
+		worldProperties = new DDWorldProperties(new File(saveRootDirectory + "/DimensionalDoors/DimDoorsWorld.cfg"));
+
+		// Initialize a new DeathTracker
+		deathTracker = new DeathTracker(saveRootDirectory + "/DimensionalDoors/data/deaths.txt");
+	}
+
 	@EventHandler
 	public void onServerStarting(FMLServerStartingEvent event)
 	{
-		//TODO- load dims with forced chunks on server startup here  
-
 		// Register commands with the server
 		event.registerServerCommand( CommandResetDungeons.instance() );
 		event.registerServerCommand( CommandCreateDungeonRift.instance() );
@@ -327,9 +341,6 @@ public class mod_pocketDim
 		event.registerServerCommand( CommandCreatePocket.instance() );
 		event.registerServerCommand( CommandTeleportPlayer.instance() );
 		
-		// Initialize a new DeathTracker
-		String deathTrackerFile = DimensionManager.getCurrentSaveRootDirectory() + "/DimensionalDoors/data/deaths.txt";
-		deathTracker = new DeathTracker(deathTrackerFile);
 		
 		try
 		{
@@ -337,7 +348,8 @@ public class mod_pocketDim
 		}
 		catch (Exception e)
 		{
-			System.out.println("Loading chunkloaders failed");
+			System.err.println("Failed to load chunk loaders for Dimensional Doors. The following error occurred:");
+			System.err.println(e.toString());
 		}
 	}
 	

src/main/java/StevenDimDoors/mod_pocketDim/ticking/CustomLimboPopulator.java

@@ -9,8 +9,8 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.GameRules;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;

src/main/java/StevenDimDoors/mod_pocketDim/ticking/LimboDecay.java

@@ -7,7 +7,7 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 
 /**
  * Provides methods for applying Limbo decay. Limbo decay refers to the effect that most blocks placed in Limbo

src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java

@@ -18,8 +18,8 @@ import net.minecraft.util.DamageSource;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeHooks;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.world.LimboProvider;

src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java

@@ -25,9 +25,9 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.ServerPacketHandler;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;

src/main/java/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java

@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.MapGenBase;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 
 public class CustomCaveGen extends MapGenBase
 {

src/main/java/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java

@@ -17,7 +17,7 @@ import net.minecraft.world.gen.feature.MapGenScatteredFeature;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.terraingen.ChunkProviderEvent;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.ticking.CustomLimboPopulator;
 
 public class LimboGenerator extends ChunkProviderGenerate

src/main/java/StevenDimDoors/mod_pocketDim/world/LimboProvider.java

@@ -12,8 +12,8 @@ import net.minecraft.world.biome.WorldChunkManagerHell;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.client.IRenderHandler;
 import StevenDimDoors.mod_pocketDim.CloudRenderBlank;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.ticking.CustomLimboPopulator;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java

@@ -9,9 +9,9 @@ import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 import net.minecraftforge.common.DimensionManager;
 import StevenDimDoors.experimental.MazeBuilder;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java

@@ -9,8 +9,8 @@ import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.client.IRenderHandler;
 import net.minecraftforge.common.DimensionManager;
 import StevenDimDoors.mod_pocketDim.CloudRenderBlank;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.ticking.CustomLimboPopulator;
 import cpw.mods.fml.relauncher.Side;

src/main/java/StevenDimDoors/mod_pocketDim/world/fortresses/DDNetherFortressGenerator.java

@@ -1,6 +1,6 @@
 package StevenDimDoors.mod_pocketDim.world.fortresses;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import net.minecraft.world.gen.structure.MapGenNetherBridge;
 import net.minecraft.world.gen.structure.MapGenStructureIO;
 import net.minecraft.world.gen.structure.StructureStart;

src/main/java/StevenDimDoors/mod_pocketDim/world/fortresses/DDStructureNetherBridgeStart.java

@@ -10,7 +10,7 @@ import net.minecraft.world.gen.structure.ComponentNetherBridgeThrone;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 import net.minecraft.world.gen.structure.StructureComponent;
 import net.minecraft.world.gen.structure.StructureNetherBridgeStart;
-import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 
 public class DDStructureNetherBridgeStart extends StructureNetherBridgeStart
 {

src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/BaseGateway.java

@@ -6,9 +6,9 @@ import java.util.Random;
 import java.util.TreeMap;
 import java.util.Map.Entry;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;

src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayGenerator.java

@@ -8,8 +8,8 @@ import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraftforge.common.DimensionManager;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
@@ -58,11 +58,13 @@ public class GatewayGenerator implements IWorldGenerator
 	@Override
 	public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider)
 	{
-		//Don't generate rifts or gateways if the rift generation flag is disabled,
+		// Don't generate rifts or gateways if the current world is a pocket dimension or the world is remote.
-		//the current world is a pocket dimension, or the world is remote.
+		// Also don't generate anything in the Nether or The End.
-		//Also don't generate anything in The End.
+		int dimensionID = world.provider.dimensionId;
-		if (world.isRemote || (!properties.WorldRiftGenerationEnabled) ||
+		if (world.isRemote
-			(world.provider instanceof PocketProvider) || (world.provider.dimensionId == END_DIMENSION_ID)||(world.provider.dimensionId == NETHER_DIMENSION_ID))
+			|| (world.provider instanceof PocketProvider)
+			|| (dimensionID == END_DIMENSION_ID)
+			|| (dimensionID == NETHER_DIMENSION_ID))
 		{
 			return;
 		}
@@ -78,8 +80,10 @@ public class GatewayGenerator implements IWorldGenerator
 		DimLink link;
 		NewDimData dimension;
 
-		//Randomly decide whether to place a cluster of rifts here
+		// Check if we're allowed to generate rift clusters in this dimension.
-		if (random.nextInt(MAX_CLUSTER_GENERATION_CHANCE) < properties.ClusterGenerationChance)
+		// If so, randomly decide whether to one.
+		if (mod_pocketDim.worldProperties.RiftClusterDimensions.isAccepted(dimensionID)
+				&& random.nextInt(MAX_CLUSTER_GENERATION_CHANCE) < properties.ClusterGenerationChance)
 		{
 			link = null;
 			dimension = null;
@@ -113,9 +117,10 @@ public class GatewayGenerator implements IWorldGenerator
 			while (random.nextInt(MAX_CLUSTER_GROWTH_CHANCE) < CLUSTER_GROWTH_CHANCE);
 		}
 		
-		// Randomly decide whether to place a Rift Gateway here.
+		// Check if we can place a Rift Gateway in this dimension, then randomly decide whether to place one.
 		// This only happens if a rift cluster was NOT generated.
-		else if (random.nextInt(MAX_GATEWAY_GENERATION_CHANCE) < properties.GatewayGenerationChance)
+		else if (mod_pocketDim.worldProperties.RiftGatewayDimensions.isAccepted(dimensionID) &&
+				random.nextInt(MAX_GATEWAY_GENERATION_CHANCE) < properties.GatewayGenerationChance)
 		{
 			valid = false;
 			x = y = z = 0; //Stop the compiler from freaking out

src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayLimbo.java

@@ -1,8 +1,8 @@
 package StevenDimDoors.mod_pocketDim.world.gateways;
 
 import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;

src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewaySandstonePillars.java

@@ -3,8 +3,8 @@ package StevenDimDoors.mod_pocketDim.world.gateways;
 import java.util.ArrayList;
 import java.util.Random;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 import net.minecraft.block.Block;

src/main/java/StevenDimDoors/mod_pocketDim/world/gateways/GatewayTwoPillars.java

@@ -2,8 +2,8 @@ package StevenDimDoors.mod_pocketDim.world.gateways;
 
 import java.util.ArrayList;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 import StevenDimDoors.mod_pocketDim.world.LimboProvider;

src/main/java/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java

@@ -11,8 +11,8 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;

src/main/java/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java

@@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.blocks.TransTrapdoor;
+import StevenDimDoors.mod_pocketDim.config.DDProperties;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityTransTrapdoor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;