Resolved Merge Conflicts

Resolved merge conflicts between recent bug fixes in DungeonSchematic
and some minor additions to the code from another branch.

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

@@ -586,6 +586,7 @@ public class PocketManager
 		//Any pocket dimension must be listed with PocketManager to have a dimension ID
 		//assigned, so it's safe to assume that any unknown dimensions don't belong to us.
 		
+		//FIXME: What's the point of this condition? Most calls to this function will crash anyway! ~SenseiKiwi
 		if(PocketManager.dimensionData == null)
 		{
 			System.out.println("Something odd happend during shutdown");

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

@@ -14,16 +14,15 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
 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.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
 import StevenDimDoors.mod_pocketDim.schematic.BlockRotator;
 import StevenDimDoors.mod_pocketDim.schematic.CompoundFilter;
 import StevenDimDoors.mod_pocketDim.schematic.InvalidSchematicException;
@@ -35,13 +34,14 @@ import StevenDimDoors.mod_pocketDim.util.Point4D;
 
 public class DungeonSchematic extends Schematic {
 
-	private static final short MAX_VANILLA_BLOCK_ID = 158;
+	private static final short MAX_VANILLA_BLOCK_ID = 173;
 	private static final short STANDARD_FABRIC_OF_REALITY_ID = 1973;
 	private static final short STANDARD_ETERNAL_FABRIC_ID = 220;
 	private static final short STANDARD_WARP_DOOR_ID = 1975;
 	private static final short STANDARD_DIMENSIONAL_DOOR_ID = 1970;
 	private static final short MONOLITH_SPAWN_MARKER_ID = (short) Block.endPortalFrame.blockID;
 	private static final short EXIT_DOOR_MARKER_ID = (short) Block.sandStone.blockID;
+	private static final int NETHER_DIMENSION_ID = -1;
 	
 	private int orientation;
 	private Point3D entranceDoorLocation;
@@ -242,12 +242,12 @@ public class DungeonSchematic extends Schematic {
 		filler.apply(world, minCorner, maxCorner);
 		
 		//Set up entrance door rift
-		createEntranceReverseLink(dimension, pocketCenter, entryLink, world);
+		createEntranceReverseLink(world, dimension, pocketCenter, entryLink);
 		
 		//Set up link data for dimensional doors
 		for (Point3D location : dimensionalDoorLocations)
 		{
-			createDimensionalDoorLink(dimension, location, entranceDoorLocation, turnAngle, pocketCenter,world);
+			createDimensionalDoorLink(world, dimension, location, entranceDoorLocation, turnAngle, pocketCenter);
 		}
 		
 		//Set up link data for exit door
@@ -262,6 +262,16 @@ public class DungeonSchematic extends Schematic {
 		{
 			spawnMonolith(world, location, entranceDoorLocation, turnAngle, pocketCenter, canSpawn);
 		}
+		
+		// If this is a Nether dungeon, search for a sign near the entry door and write the dimension's depth.
+		// Checking if this is specifically a Nether pack dungeon is a bit tricky, so I'm going to use this
+		// approach to check - if the dungeon is rooted in the Nether, then it SHOULD be a Nether dungeon.
+		// This isn't necessarily true if someone uses dd-rift to spawn a dungeon, but it should work under
+		// normal use of the mod.
+		if (dimension.root().id() == NETHER_DIMENSION_ID)
+		{
+			writeDepthSign(world, pocketCenter, dimension.depth());
+		}
 	}
 	
 	private static void transformCorners(Point3D schematicEntrance, Point3D pocketCenter, int turnAngle, Point3D minCorner, Point3D maxCorner)
@@ -289,15 +299,14 @@ public class DungeonSchematic extends Schematic {
 		}
 	}
 	
-	private static void createEntranceReverseLink(NewDimData dimension, Point3D pocketCenter, DimLink entryLink,World world)
+	private static void createEntranceReverseLink(World world, NewDimData dimension, Point3D pocketCenter, DimLink entryLink)
 	{
-		int orientation = world.getBlockMetadata(pocketCenter.getX(), pocketCenter.getY()-1, pocketCenter.getZ());
-		DimLink reverseLink = dimension.createLink(pocketCenter.getX(), pocketCenter.getY(), pocketCenter.getZ(), LinkTypes.REVERSE,orientation);
+		int orientation = world.getBlockMetadata(pocketCenter.getX(), pocketCenter.getY() - 1, pocketCenter.getZ());
+		DimLink reverseLink = dimension.createLink(pocketCenter.getX(), pocketCenter.getY(), pocketCenter.getZ(), LinkTypes.REVERSE, orientation);
 		Point4D destination = entryLink.source();
 		NewDimData prevDim = PocketManager.getDimensionData(destination.getDimension());
 		prevDim.setDestination(reverseLink, destination.getX(), destination.getY(), destination.getZ());
 		initDoorTileEntity(world, pocketCenter);
-
 	}
 	
 	private static void createExitDoorLink(World world, NewDimData dimension, Point3D point, Point3D entrance, int rotation, Point3D pocketCenter)
@@ -305,7 +314,7 @@ public class DungeonSchematic extends Schematic {
 		//Transform the door's location to the pocket coordinate system
 		Point3D location = point.clone();
 		BlockRotator.transformPoint(location, entrance, rotation, pocketCenter);
-		int orientation = world.getBlockMetadata(location.getX(), location.getY()-1, location.getZ());
+		int orientation = world.getBlockMetadata(location.getX(), location.getY() - 1, location.getZ());
 		dimension.createLink(location.getX(), location.getY(), location.getZ(), LinkTypes.DUNGEON_EXIT, orientation);
 		//Replace the sandstone block under the exit door with the same block as the one underneath it
 		int x = location.getX();
@@ -318,20 +327,17 @@ public class DungeonSchematic extends Schematic {
 			setBlockDirectly(world, x, y + 1, z, blockID, metadata);
 		}
 		initDoorTileEntity(world, location);
-
 	}
 	
-	private static void createDimensionalDoorLink(NewDimData dimension, Point3D point, Point3D entrance, int rotation, Point3D pocketCenter,World world)
+	private static void createDimensionalDoorLink(World world, NewDimData dimension, Point3D point, Point3D entrance, int rotation, Point3D pocketCenter)
 	{
 		//Transform the door's location to the pocket coordinate system
 		Point3D location = point.clone();
 		BlockRotator.transformPoint(location, entrance, rotation, pocketCenter);
-		int orientation = world.getBlockMetadata(location.getX(), location.getY()-1, location.getZ());
+		int orientation = world.getBlockMetadata(location.getX(), location.getY() - 1, location.getZ());
 
 		dimension.createLink(location.getX(), location.getY(), location.getZ(), LinkTypes.DUNGEON, orientation);
 		initDoorTileEntity(world, location);
-
-		
 	}
 	
 	private static void spawnMonolith(World world, Point3D point, Point3D entrance, int rotation, Point3D pocketCenter, boolean canSpawn)
@@ -349,21 +355,49 @@ public class DungeonSchematic extends Schematic {
 			world.spawnEntityInWorld(mob);
 		}
 	}
+
 	private static void initDoorTileEntity(World world, Point3D point)
 	{
 		Block door = Block.blocksList[world.getBlockId(point.getX(), point.getY(), point.getZ())];
-		Block door2 = Block.blocksList[world.getBlockId(point.getX(), point.getY()-1, point.getZ())];
+		Block door2 = Block.blocksList[world.getBlockId(point.getX(), point.getY() - 1, point.getZ())];
 
-		if(door instanceof IDimDoor&&door2 instanceof IDimDoor)
+		if (door instanceof IDimDoor && door2 instanceof IDimDoor)
 		{
 			((IDimDoor) door).initDoorTE(world, point.getX(), point.getY(), point.getZ());
-			((IDimDoor) door).initDoorTE(world, point.getX(), point.getY()-1, point.getZ());
-
+			((IDimDoor) door).initDoorTE(world, point.getX(), point.getY() - 1, point.getZ());
 		}
 		else
 		{
 			throw new IllegalArgumentException("Tried to init a dim door TE on a block that isnt a Dim Door!!");
 		}
+	}
+	
+	private static void writeDepthSign(World world, Point3D pocketCenter, int depth)
+	{
+		final int SEARCH_RANGE = 5;
 		
+		int x, y, z, block;
+		int dx, dy, dz;
+		
+		for (dy = SEARCH_RANGE; dy >= -SEARCH_RANGE; dy--)
+		{
+			for (dz = -SEARCH_RANGE; dz <= SEARCH_RANGE; dz++)
+			{
+				for (dx = -SEARCH_RANGE; dx <= SEARCH_RANGE; dx++)
+				{
+					x = pocketCenter.getX() + dx;
+					y = pocketCenter.getY() + dy;
+					z = pocketCenter.getZ() + dz;
+					block = world.getBlockId(x, y, z);
+					if (block == Block.signWall.blockID || block == Block.signPost.blockID)
+					{
+						TileEntitySign signEntity = new TileEntitySign();
+						signEntity.signText[1] = "Level " + depth;
+						world.setBlockTileEntity(x, y, z, signEntity);
+						return;
+					}
+				}
+			}
+		}
 	}
 }

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

@@ -50,6 +50,8 @@ public class DungeonHelper
 	private static final String DUNGEON_CREATION_GUIDE_SOURCE_PATH = "/mods/DimDoors/text/How_to_add_dungeons.txt";
 	private static final String RUINS_PACK_PATH = "/schematics/ruins";
 	private static final String BUNDLED_RUINS_LIST_PATH = "/schematics/ruins.txt";
+	private static final String NETHER_PACK_PATH = "/schematics/nether";
+	private static final String BUNDLED_NETHER_LIST_PATH = "/schematics/nether.txt";
 	private static final String STANDARD_CONFIG_FILE_NAME = "rules.txt";
 	
 	private static final int NETHER_DIMENSION_ID = -1;
@@ -72,6 +74,7 @@ public class DungeonHelper
 	private ArrayList<DungeonData> registeredDungeons = new ArrayList<DungeonData>();
  
 	private DungeonPack RuinsPack;
+	private DungeonPack NetherPack;
 	private HashMap<String, DungeonPack> dungeonPackMapping = new HashMap<String, DungeonPack>();
 	private ArrayList<DungeonPack> dungeonPackList = new ArrayList<DungeonPack>();
 	
@@ -246,8 +249,7 @@ public class DungeonHelper
 		{
 			if (data.id() == NETHER_DIMENSION_ID)
 			{
-				//TODO: Change this to the nether-side pack later ^_^
-				pack = RuinsPack;
+				pack = NetherPack;
 			}
 			else
 			{
@@ -261,7 +263,7 @@ public class DungeonHelper
 	{
 		//Create a link above the specified position. Link to a new pocket dimension.
 		NewDimData dimension = PocketManager.getDimensionData(world);
-		DimLink link = dimension.createLink(x, y + 1, z, LinkTypes.POCKET,3);
+		DimLink link = dimension.createLink(x, y + 1, z, LinkTypes.POCKET, 3);
 		
 		//Place a Warp Door linked to that pocket
 		ItemDimensionalDoor.placeDoorBlock(world, x, y, z, 3, mod_pocketDim.warpDoor);
@@ -434,6 +436,9 @@ public class DungeonHelper
 		registerBundledPack(BUNDLED_RUINS_LIST_PATH, RUINS_PACK_PATH, "Ruins", reader);
 		RuinsPack = getDungeonPack("Ruins");
 		
+		registerBundledPack(BUNDLED_NETHER_LIST_PATH, NETHER_PACK_PATH, "Nether", reader);
+		NetherPack = getDungeonPack("Nether");
+		
 		System.out.println("Finished registering bundled dungeon packs");
 	}
 	
@@ -497,7 +502,7 @@ public class DungeonHelper
 
 	public DungeonData selectDungeon(NewDimData dimension, Random random)
 	{
-		DungeonPack pack = getDimDungeonPack(dimension);
+		DungeonPack pack = getDimDungeonPack(dimension.parent());
 		DungeonData selection;
 		DungeonPackConfig config;
 		DungeonPack selectedPack;

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

@@ -40,8 +40,6 @@ public class TileEntityDimDoor extends TileEntity
 	public void readFromNBT(NBTTagCompound nbt)
 	{
 		super.readFromNBT(nbt);
-		@SuppressWarnings("unused") // ???
-		int i = nbt.getInteger(("Size"));
 
 		try
 		{
@@ -60,8 +58,6 @@ public class TileEntityDimDoor extends TileEntity
 	@Override
 	public void writeToNBT(NBTTagCompound nbt)
 	{
-		@SuppressWarnings("unused") // ?????
-		int i = 0;
 		super.writeToNBT(nbt);
 		
 		nbt.setBoolean("openOrClosed", this.openOrClosed);

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

@@ -1,19 +1,14 @@
 package StevenDimDoors.mod_pocketDim.tileentities;
 
-import java.awt.List;
-
-import StevenDimDoors.mod_pocketDim.IChunkLoader;
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.NewDimData;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import StevenDimDoors.mod_pocketDim.util.Point4D;
-import StevenDimDoors.mod_pocketDim.world.PocketBuilder;
-import net.minecraft.block.Block;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.ChunkCoordIntPair;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.ForgeChunkManager.Ticket;
 import net.minecraftforge.common.ForgeChunkManager.Type;
+import StevenDimDoors.mod_pocketDim.IChunkLoader;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import StevenDimDoors.mod_pocketDim.util.Point4D;
+import StevenDimDoors.mod_pocketDim.world.PocketBuilder;
 
 public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLoader
 {
@@ -85,9 +80,6 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo
 				ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((origin.getX()+xOffset >> 4)+chunkX, (origin.getZ()+zOffset >> 4)+chunkZ));
 			}
 		}
-	
-
-		
 	}
 
 	@Override
@@ -96,37 +88,4 @@ public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLo
 		ForgeChunkManager.releaseTicket(chunkTicket);
 		super.invalidate();
 	}
-
-	@Override
-	public void readFromNBT(NBTTagCompound nbt)
-	{ // this and write both call user, and super saves/reads all the same data. why override at all?
-		super.readFromNBT(nbt);
-		@SuppressWarnings("unused") // ???
-		int i = nbt.getInteger(("Size"));
-
-		try
-		{
-			this.openOrClosed = nbt.getBoolean("openOrClosed");
-			this.orientation = nbt.getInteger("orientation");
-			this.hasExit = nbt.getBoolean("hasExit");
-			this.isDungeonChainLink = nbt.getBoolean("isDungeonChainLink");
-		}
-		catch (Exception e) // ???
-		{
-
-		}
-	}
-
-	@Override
-	public void writeToNBT(NBTTagCompound nbt)
-	{
-		@SuppressWarnings("unused") // ?????
-		int i = 0;
-		super.writeToNBT(nbt);
-		
-		nbt.setBoolean("openOrClosed", this.openOrClosed);
-		nbt.setBoolean("hasExit", this.hasExit);
-		nbt.setInteger("orientation", this.orientation);
-		nbt.setBoolean("isDungeonChainLink", isDungeonChainLink);
-	}
 }

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

@@ -136,7 +136,7 @@ public class GatewayGenerator implements IWorldGenerator
 			{
 				//Create a partial link to a dungeon.
 				dimension = PocketManager.getDimensionData(world);
-				link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,0);
+				link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON, 0);
 
 				//If the current dimension isn't Limbo, build a Rift Gateway out of Stone Bricks
 				if (dimension.id() != properties.LimboDimensionID)

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

@@ -31,11 +31,11 @@ public class PocketBuilder
 	public static final int MIN_POCKET_SIZE = 5;
 	public static final int MAX_POCKET_SIZE = 51;
 	public static final int DEFAULT_POCKET_SIZE = 39;
-	
+
 	public static final int MIN_POCKET_WALL_THICKNESS = 1;
 	public static final int MAX_POCKET_WALL_THICKNESS = 10;
 	public static final int DEFAULT_POCKET_WALL_THICKNESS = 5;
-	
+
 	private static final Random random = new Random();
 
 	private PocketBuilder() { }
@@ -49,7 +49,7 @@ public class PocketBuilder
 	 * @param properties
 	 * @return 
 	 */
-	
+
 	public static boolean regenerateDungeonPocket(NewDimData dimension, DimLink linkIn, DDProperties properties)
 	{
 		if (linkIn == null)
@@ -79,7 +79,7 @@ public class PocketBuilder
 			return false;
 		}
 		NewDimData parent = PocketManager.getDimensionData(incomingLink.source().getDimension());
-		
+
 		if (!dimension.isDungeon())
 		{
 			throw new IllegalArgumentException("destination must be dungeon");
@@ -92,18 +92,18 @@ public class PocketBuilder
 		{
 			throw new IllegalArgumentException("destination must already exist");
 		}
-		
+
 		try
 		{
 			//Load a world
 			World world = PocketManager.loadDimension(dimension.id());
-			
+
 			if (world == null || world.provider == null)
 			{
 				System.err.println("Could not initialize dimension for a dungeon!");
 				return false;
 			}
-			
+
 			Point3D destination = new Point3D(incomingLink.destination());
 			loadAndValidateDungeon(dimension.dungeon(), properties).copyToWorld(world, destination, originLink.orientation(), incomingLink, random, properties);
 			dimension.setFilled(true);
@@ -115,130 +115,126 @@ public class PocketBuilder
 			return false;
 		}
 	}
-	
+
 	private static boolean buildDungeonPocket(DungeonData dungeon, NewDimData dimension, DimLink link, DungeonSchematic schematic,World world, DDProperties properties)
-    {
+	{
+		//Calculate the destination point
+		DungeonPackConfig packConfig = dungeon.dungeonType().Owner != null ? dungeon.dungeonType().Owner.getConfig() : null;
+		Point4D source = link.source();
+		int orientation = link.orientation();
+		Point3D destination;
 
-            //Calculate the destination point
-            DungeonPackConfig packConfig = dungeon.dungeonType().Owner != null ? dungeon.dungeonType().Owner.getConfig() : null;
-            Point4D source = link.source();
-            int orientation = link.orientation();
-            Point3D destination;
-            
-            if (packConfig != null && packConfig.doDistortDoorCoordinates())
-            {
-                    destination = calculateNoisyDestination(source, dimension, dungeon, orientation);
-            }
-            else
-            {
-                    destination = new Point3D(source.getX(), source.getY(), source.getZ());
-            }
-            
-            destination.setY( yCoordHelper.adjustDestinationY(destination.getY(), world.getHeight(), schematic.getEntranceDoorLocation().getY(), schematic.getHeight()) );
-            
-            //Generate the dungeon
-            schematic.copyToWorld(world, destination, orientation, link, random, properties);
-            
-            //Finish up destination initialization
-            dimension.initializeDungeon(destination.getX(), destination.getY(), destination.getZ(), orientation, link, dungeon);
-            dimension.setFilled(true);
-            return true;
-    
-    
-    }
-    
-    public static boolean generateSelectedDungeonPocket(DimLink link, DDProperties properties,DungeonData data)
-    {
-            if (link == null)
-            {
-                    throw new IllegalArgumentException("link cannot be null.");
-            }
-            if (properties == null)
-            {
-                    throw new IllegalArgumentException("properties cannot be null.");
-            }
-    
-            if (link.hasDestination())
-            {
-                    throw new IllegalArgumentException("link cannot have a destination assigned already.");
-            }
-            
+		if (packConfig != null && packConfig.doDistortDoorCoordinates())
+		{
+			destination = calculateNoisyDestination(source, dimension, dungeon, orientation);
+		}
+		else
+		{
+			destination = new Point3D(source.getX(), source.getY(), source.getZ());
+		}
 
-            
-                    //Register a new dimension
-                    NewDimData parent = PocketManager.getDimensionData(link.source().getDimension());
-                    NewDimData dimension = PocketManager.registerPocket(parent, true);
-                    
-                    //Load a world
-                    World world = PocketManager.loadDimension(dimension.id());
-                    
-                    if (world == null || world.provider == null)
-                    {
-                            System.err.println("Could not initialize dimension for a dungeon!");
-                            return false;
-                    }
-                    
-                    DungeonData dungeon = null;
-                    DungeonSchematic schematic = null;
+		destination.setY( yCoordHelper.adjustDestinationY(destination.getY(), world.getHeight(), schematic.getEntranceDoorLocation().getY(), schematic.getHeight()) );
+
+		//Generate the dungeon
+		schematic.copyToWorld(world, destination, orientation, link, random, properties);
+
+		//Finish up destination initialization
+		dimension.initializeDungeon(destination.getX(), destination.getY(), destination.getZ(), orientation, link, dungeon);
+		dimension.setFilled(true);
+		
+		return true;    
+	}
+
+	public static boolean generateSelectedDungeonPocket(DimLink link, DDProperties properties,DungeonData data)
+	{
+		if (link == null)
+		{
+			throw new IllegalArgumentException("link cannot be null.");
+		}
+		if (properties == null)
+		{
+			throw new IllegalArgumentException("properties cannot be null.");
+		}
+
+		if (link.hasDestination())
+		{
+			throw new IllegalArgumentException("link cannot have a destination assigned already.");
+		}
+
+		//Register a new dimension
+		NewDimData parent = PocketManager.getDimensionData(link.source().getDimension());
+		NewDimData dimension = PocketManager.registerPocket(parent, true);
+
+		//Load a world
+		World world = PocketManager.loadDimension(dimension.id());
+
+		if (world == null || world.provider == null)
+		{
+			System.err.println("Could not initialize dimension for a dungeon!");
+			return false;
+		}
+
+		DungeonData dungeon = null;
+		DungeonSchematic schematic = null;
+
+		dungeon = data;
+		if (data == null)
+		{
+			System.err.println("Could not select a dungeon for generation!");
+			return false;
+		}
+		schematic = loadAndValidateDungeon(dungeon,properties);
+
+		return PocketBuilder.buildDungeonPocket(dungeon, dimension, link, schematic, world, properties);
+
+	}
+
+
+	public static boolean generateNewDungeonPocket(DimLink link, DDProperties properties)
+	{
+		if (link == null)
+		{
+			throw new IllegalArgumentException("link cannot be null.");
+		}
+		if (properties == null)
+		{
+			throw new IllegalArgumentException("properties cannot be null.");
+		}
+
+		if (link.hasDestination())
+		{
+			throw new IllegalArgumentException("link cannot have a destination assigned already.");
+		}
+
+
+
+		//Register a new dimension
+		NewDimData parent = PocketManager.getDimensionData(link.source().getDimension());
+		NewDimData dimension = PocketManager.registerPocket(parent, true);
+
+		//Load a world
+		World world = PocketManager.loadDimension(dimension.id());
+
+		if (world == null || world.provider == null)
+		{
+			System.err.println("Could not initialize dimension for a dungeon!");
+			return false;
+		}
+
+		//Choose a dungeon to generate
+		Pair<DungeonData, DungeonSchematic> pair = selectDungeon(dimension, random, properties);
+		if (pair == null)
+		{
+			System.err.println("Could not select a dungeon for generation!");
+			return false;
+		}
+		DungeonData dungeon = pair.getFirst();
+		DungeonSchematic schematic = pair.getSecond();
+
+		return buildDungeonPocket(dungeon, dimension, link, schematic, world, properties);
+	}
 
-                    dungeon = data;
-                    if (data == null)
-                    {
-                            System.err.println("Could not select a dungeon for generation!");
-                            return false;
-                    }
-                    schematic = loadAndValidateDungeon(dungeon,properties);
-                    
-                    return PocketBuilder.buildDungeonPocket(dungeon, dimension, link, schematic, world, properties);
-                    
-    }
-    
-    
-    public static boolean generateNewDungeonPocket(DimLink link, DDProperties properties)
-    {
-            if (link == null)
-            {
-                    throw new IllegalArgumentException("link cannot be null.");
-            }
-            if (properties == null)
-            {
-                    throw new IllegalArgumentException("properties cannot be null.");
-            }
-    
-            if (link.hasDestination())
-            {
-                    throw new IllegalArgumentException("link cannot have a destination assigned already.");
-            }
-            
 
-            
-                    //Register a new dimension
-                    NewDimData parent = PocketManager.getDimensionData(link.source().getDimension());
-                    NewDimData dimension = PocketManager.registerPocket(parent, true);
-                    
-                    //Load a world
-                    World world = PocketManager.loadDimension(dimension.id());
-                    
-                    if (world == null || world.provider == null)
-                    {
-                            System.err.println("Could not initialize dimension for a dungeon!");
-                            return false;
-                    }
-                    
-                    //Choose a dungeon to generate
-                    Pair<DungeonData, DungeonSchematic> pair = selectDungeon(dimension, random, properties);
-                    if (pair == null)
-                    {
-                            System.err.println("Could not select a dungeon for generation!");
-                            return false;
-                    }
-                    DungeonData dungeon = pair.getFirst();
-                    DungeonSchematic schematic = pair.getSecond();
-                    
-                    return buildDungeonPocket(dungeon, dimension, link, schematic, world, properties);
-    }
-    
-	
 	private static Point3D calculateNoisyDestination(Point4D source, NewDimData dimension, DungeonData dungeon, int orientation)
 	{
 		int depth = NewDimData.calculatePackDepth(dimension.parent(), dungeon);
@@ -262,12 +258,12 @@ public class PocketBuilder
 		{
 			throw new IllegalArgumentException("dimension cannot have a dungeon assigned already.");
 		}
-		
+
 		DungeonData dungeon = null;
 		DungeonSchematic schematic = null;
 
 		dungeon = DungeonHelper.instance().selectDungeon(dimension, random);
-		
+
 		if (dungeon != null)
 		{
 			schematic = loadAndValidateDungeon(dungeon, properties);
@@ -276,7 +272,7 @@ public class PocketBuilder
 		{
 			System.err.println("Could not select a dungeon at all!");
 		}
-		
+
 		if (schematic == null)
 		{
 			//TODO: In the future, remove this dungeon from the generation lists altogether.
@@ -295,13 +291,13 @@ public class PocketBuilder
 		}
 		return new Pair<DungeonData, DungeonSchematic>(dungeon, schematic);
 	}
-	
+
 	private static DungeonSchematic loadAndValidateDungeon(DungeonData dungeon, DDProperties properties)
 	{
 		try
 		{
 			DungeonSchematic schematic = dungeon.loadSchematic();
-			
+
 			//Validate the dungeon's dimensions
 			if (hasValidDimensions(schematic))
 			{
@@ -328,19 +324,19 @@ public class PocketBuilder
 			return null;
 		}
 	}
-	
+
 	private static boolean hasValidDimensions(DungeonSchematic schematic)
 	{
 		return (schematic.getWidth() <= DungeonHelper.MAX_DUNGEON_WIDTH &&
-			schematic.getHeight() <= DungeonHelper.MAX_DUNGEON_HEIGHT &&
-			schematic.getLength() <= DungeonHelper.MAX_DUNGEON_LENGTH);
+				schematic.getHeight() <= DungeonHelper.MAX_DUNGEON_HEIGHT &&
+				schematic.getLength() <= DungeonHelper.MAX_DUNGEON_LENGTH);
 	}
 
 	public static boolean generateNewPocket(DimLink link, DDProperties properties, Block door)
 	{
 		return generateNewPocket(link, DEFAULT_POCKET_SIZE, DEFAULT_POCKET_WALL_THICKNESS, properties, door);
 	}
-	
+
 	private static int getDoorOrientation(Point4D source, DDProperties properties)
 	{
 		World world = DimensionManager.getWorld(source.getDimension());
@@ -352,12 +348,12 @@ public class PocketBuilder
 		//Check if the block below that point is actually a door
 		int blockID = world.getBlockId(source.getX(), source.getY() - 1, source.getZ());
 		if (blockID != properties.DimensionalDoorID && blockID != properties.WarpDoorID &&
-			blockID != properties.TransientDoorID &&
-			blockID != properties.GoldDimDoorID)
+				blockID != properties.TransientDoorID &&
+				blockID != properties.GoldDimDoorID)
 		{
 			throw new IllegalStateException("The link's source is not a door block. It should be impossible to traverse a rift without a door!");
 		}
-		
+
 		//Return the orientation portion of its metadata
 		int orientation = world.getBlockMetadata(source.getX(), source.getY() - 1, source.getZ()) & 3;
 		return orientation;
@@ -377,13 +373,13 @@ public class PocketBuilder
 		{
 			throw new IllegalArgumentException("link cannot have a destination assigned already.");
 		}
-		
+
 		if(door==null)
 		{
 			throw new IllegalArgumentException("Must have a doorItem to gen one!!");
 
 		}
-		
+
 		if (size < MIN_POCKET_SIZE || size > MAX_POCKET_SIZE)
 		{
 			throw new IllegalArgumentException("size must be between " + MIN_POCKET_SIZE + " and " + MAX_POCKET_SIZE + ", inclusive.");
@@ -400,34 +396,34 @@ public class PocketBuilder
 		{
 			throw new IllegalArgumentException("size must be large enough to fit the specified wall thickness and some air space.");
 		}
-		
+
 		try
 		{
 			//Register a new dimension
 			NewDimData parent = PocketManager.getDimensionData(link.source().getDimension());
 			NewDimData dimension = PocketManager.registerPocket(parent, false);
-			
+
 			//Load a world
 			World world = PocketManager.loadDimension(dimension.id());
-			
+
 			if (world == null || world.provider == null)
 			{
 				System.err.println("Could not initialize dimension for a pocket!");
 				return false;
 			}
-			
+
 			//Calculate the destination point
 			Point4D source = link.source();
 			int destinationY = yCoordHelper.adjustDestinationY(source.getY(), world.getHeight(), wallThickness + 1, size);
 			int orientation = getDoorOrientation(source, properties);
-			
+
 			//Place a link leading back out of the pocket
 			DimLink reverseLink = dimension.createLink(source.getX(), destinationY, source.getZ(), LinkTypes.REVERSE,(link.orientation()+2)%4);
 			parent.setDestination(reverseLink, source.getX(), source.getY(), source.getZ());
-			
+
 			//Build the actual pocket area
 			buildPocket(world, source.getX(), destinationY, source.getZ(), orientation, size, wallThickness, properties, door);
-			
+
 			//Finish up destination initialization
 			dimension.initializePocket(source.getX(), destinationY, source.getZ(), orientation, link);
 			dimension.setFilled(true);
@@ -466,13 +462,12 @@ public class PocketBuilder
 		{
 			throw new IllegalArgumentException("Door must implement IDimDoor");
 		}
-		
-		
+
+
 		Point3D center = new Point3D(x - wallThickness + 1 + (size / 2), y - wallThickness - 1 + (size / 2), z);
 		Point3D door = new Point3D(x, y, z);
 		BlockRotator.transformPoint(center, door, orientation - BlockRotator.EAST_DOOR_METADATA, door);
-		
-		
+
 		//Build the outer layer of Eternal Fabric
 		buildBox(world, center.getX(), center.getY(), center.getZ(), (size / 2), properties.PermaFabricBlockID, false, 0);
 
@@ -480,12 +475,11 @@ public class PocketBuilder
 		for (int layer = 1; layer < wallThickness; layer++)
 		{
 			buildBox(world, center.getX(), center.getY(), center.getZ(), (size / 2) - layer, properties.FabricBlockID,
-				layer < (wallThickness - 1) && properties.TNFREAKINGT_Enabled, properties.NonTntWeight);
+					layer < (wallThickness - 1) && properties.TNFREAKINGT_Enabled, properties.NonTntWeight);
 		}
 		
-		
 		//MazeBuilder.generate(world, x, y, z, random);
-		
+
 		//Build the door
 		int doorOrientation = BlockRotator.transformMetadata(BlockRotator.EAST_DOOR_METADATA, orientation - BlockRotator.EAST_DOOR_METADATA + 2, properties.DimensionalDoorID);
 		ItemDimensionalDoor.placeDoorBlock(world, x, y - 1, z, doorOrientation, doorBlock);
@@ -494,15 +488,15 @@ public class PocketBuilder
 	private static void buildBox(World world, int centerX, int centerY, int centerZ, int radius, int blockID, boolean placeTnt, int nonTntWeight)
 	{
 		int x, y, z;
-		
+
 		final int startX = centerX - radius;
 		final int startY = centerY - radius;
 		final int startZ = centerZ - radius;
-		
+
 		final int endX = centerX + radius;
 		final int endY = centerY + radius;
 		final int endZ = centerZ + radius;
-		
+
 		//Build faces of the box
 		for (x = startX; x <= endX; x++)
 		{
@@ -511,14 +505,14 @@ public class PocketBuilder
 				setBlockDirectlySpecial(world, x, startY, z, blockID, 0, placeTnt, nonTntWeight);
 				setBlockDirectlySpecial(world, x, endY, z, blockID, 0, placeTnt, nonTntWeight);
 			}
-			
+
 			for (y = startY; y <= endY; y++)
 			{
 				setBlockDirectlySpecial(world, x, y, startZ, blockID, 0, placeTnt, nonTntWeight);
 				setBlockDirectlySpecial(world, x, y, endZ, blockID, 0, placeTnt, nonTntWeight);
 			}
 		}
-		
+
 		for (y = startY; y <= endY; y++)
 		{
 			for (z = startZ; z <= endZ; z++)
@@ -540,7 +534,7 @@ public class PocketBuilder
 			setBlockDirectly(world, x, y, z, blockID, metadata);
 		}
 	}
-	
+
 	private static void setBlockDirectly(World world, int x, int y, int z, int blockID, int metadata)
 	{
 		if (blockID != 0 && Block.blocksList[blockID] == null)
@@ -549,8 +543,8 @@ public class PocketBuilder
 		}
 
 		int cX = x >> 4;
-		int cZ = z >> 4;
-		int cY = y >> 4;
+			int cZ = z >> 4;
+			int cY = y >> 4;
 		Chunk chunk;
 
 		int localX = (x % 16) < 0 ? (x % 16) + 16 : (x % 16);