diff --git a/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java b/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java
deleted file mode 100644
index d077d43..0000000
--- a/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package StevenDimDoors.mod_pocketDim.items;
-
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemDoor;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
-
-public class ItemGoldDoor extends ItemDoor
-{
-
-	public ItemGoldDoor(int par1, Material par2Material) 
-	{
-		super(par1, par2Material);
-		// TODO Auto-generated constructor stub
-	}
-	
-	public void registerIcons(IconRegister par1IconRegister)
-	{
-		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
-	}
-	
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
-    {
-        if (par7 != 1)
-        {
-            return false;
-        }
-        else
-        {
-            ++par5;
-            Block block = mod_pocketDim.goldDoor;
-
-           
-
-            if (par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack))
-            {
-                if (!block.canPlaceBlockAt(par3World, par4, par5, par6))
-                {
-                    return false;
-                }
-                else
-                {
-                    int i1 = MathHelper.floor_double((double)((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
-                    placeDoorBlock(par3World, par4, par5, par6, i1, block);
-                    --par1ItemStack.stackSize;
-                    return true;
-                }
-            }
-            else
-            {
-                return false;
-            }
-        }
-    }
-
-	
-	
-
-}
diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
deleted file mode 100644
index eb43d24..0000000
--- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package StevenDimDoors.mod_pocketDim.tileentities;
-
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
-
-public class TileEntityDimDoor extends TileEntity
-
-{
-	public boolean openOrClosed;
-	public int orientation;
-	public boolean hasExit;
-	public boolean isDungeonChainLink;
-	public boolean hasGennedPair=false;
-	
-	
-	
-	
-	
-	 public boolean canUpdate()
-	 {
-		 return false;
-	 }
-	 
-	 public void updateEntity() 
-	 {
-     	
-
-	 }
-	 
-	 @Override
-	    public void readFromNBT(NBTTagCompound nbt)
-	    {
-	        super.readFromNBT(nbt);
-	        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");
-
-	            this.hasGennedPair = nbt.getBoolean("hasGennedPair");
-
-	          
-
-	           
-
-	        }
-	        catch (Exception e)
-	        {
-	            
-	        }
-	    }
-
-	    @Override
-	    public void writeToNBT(NBTTagCompound nbt)
-	    {
-	        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);
-
-	       	nbt.setBoolean("hasGennedPair", hasGennedPair);
-   
-	    }
-}
diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java b/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
deleted file mode 100644
index 6892d1d..0000000
--- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package StevenDimDoors.mod_pocketDim.tileentities;
-
-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;
-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;
-
-public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLoader
-{
-	
-	private Ticket chunkTicket;
-	
-	 public boolean canUpdate()
-	 {
-		 return true;
-	 }
-	 
-	  @Override
-      public void updateEntity()
-      { // every tick?
-		  if (PocketManager.getDimensionData(this.worldObj) != null &&
-				  PocketManager.getDimensionData(this.worldObj).isPocketDimension() &&
-				  !this.worldObj.isRemote)
-		  {
-			  if(PocketManager.getLink(this.xCoord,this.yCoord,this.zCoord,this.worldObj)==null)
-			  {
-				  return;
-			  }
-			  if (this.chunkTicket == null)
-			  {
-				  if(chunkTicket == null)
-				  {
-					  return;
-				  }
-				  chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL);
-				  chunkTicket.getModData().setInteger("goldDimDoorX", xCoord);
-				  chunkTicket.getModData().setInteger("goldDimDoorY", yCoord);
-				  chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord);
-				  forceChunkLoading(chunkTicket,this.xCoord,this.zCoord);
-			  }
-		  }
-      }
-
-      @Override
-      public void forceChunkLoading(Ticket chunkTicket,int x,int z)
-      {
-              Point4D origin = PocketManager.getDimensionData(this.worldObj).origin();
-              int orientation = PocketManager.getDimensionData(this.worldObj).orientation();
-              
-              int xOffset=0;
-              int zOffset=0;
-              
-              switch(orientation)
-              {
-              case 0:
-                      xOffset = PocketBuilder.DEFAULT_POCKET_SIZE/2;
-                      break;
-              case 1:
-                      zOffset = PocketBuilder.DEFAULT_POCKET_SIZE/2;
-
-                      break;
-              case 2:
-                      xOffset = -PocketBuilder.DEFAULT_POCKET_SIZE/2;
-
-                      break;
-              case 3:
-                      zOffset = -PocketBuilder.DEFAULT_POCKET_SIZE/2;
-
-                      break;
-              }
-              for(int chunkX = -1; chunkX<2;chunkX++)
-              {
-                      for(int chunkZ = -1; chunkZ<2;chunkZ++)
-                      {
-                              ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((origin.getX()+xOffset >> 4)+chunkX, (origin.getZ()+zOffset >> 4)+chunkZ));
-                      }
-              }
-      
-
-              
-      }
-	 
-	 
-	 
-		@Override
-		public void invalidate() 
-		{
-			ForgeChunkManager.releaseTicket(chunkTicket);
-			super.invalidate();
-		}
-		
-	 
-	 @Override
-	    public void readFromNBT(NBTTagCompound nbt)
-	    {
-	        super.readFromNBT(nbt);
-	        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)
-	    {
-	        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);
-
-          
-	    }
-}
diff --git a/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java b/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
deleted file mode 100644
index 5af6a45..0000000
--- a/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package StevenDimDoors.mod_pocketDim.watcher;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-import StevenDimDoors.mod_pocketDim.core.DimLink;
-import StevenDimDoors.mod_pocketDim.util.Point4D;
-
-public class ClientLinkData
-{
-	public Point4D point;
-	public int orientation;
-	
-	public ClientLinkData(DimLink link)
-	{
-		this.point= link.source();
-		this.orientation=link.orientation();
-	}
-	
-	public ClientLinkData(Point4D point, int orientation)
-	{
-		this.point = point;
-		this.orientation=orientation;
-	}
-	
-	public void write(DataOutputStream output) throws IOException
-	{
-		Point4D.write(point, output);
-		output.writeInt(orientation);
-	}
-	
-	public static ClientLinkData read(DataInputStream input) throws IOException
-	{
-		return new ClientLinkData(Point4D.read(input), input.readInt());
-	}
-	
-}
diff --git a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
deleted file mode 100644
index c88377c..0000000
--- a/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package StevenDimDoors.mod_pocketDim.world;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.client.IRenderHandler;
-
-public class CustomSkyProvider extends IRenderHandler
-{
-	
-	int starGLCallList;
-	int glSkyList;
-	int glSkyList2;
-	
-	
-	public String getMoonRenderPath()
-	{
-		return null;
-	}
-	
-	public String getSunRenderPath()
-	{
-		return null;
-	}
-
-
-	@Override
-	public void render(float par1, WorldClient world, Minecraft mc) 
-	{
-		
-		starGLCallList = GLAllocation.generateDisplayLists(3);
-		glSkyList = this.starGLCallList + 1;
-		glSkyList2 = this.starGLCallList + 2;
-		 GL11.glDisable(GL11.GL_FOG);
-         GL11.glDisable(GL11.GL_ALPHA_TEST);
-         GL11.glEnable(GL11.GL_BLEND);
-         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-         RenderHelper.disableStandardItemLighting();
-         GL11.glDepthMask(false);
-         mc.renderEngine.bindTexture("/misc/tunnel.png");
-         Tessellator tessellator = Tessellator.instance;
-        
-     if (mc.theWorld.provider.isSurfaceWorld())
-     {
-         GL11.glDisable(GL11.GL_TEXTURE_2D);
-         Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, par1);
-         float f1 = (float)vec3.xCoord;
-         float f2 = (float)vec3.yCoord;
-         float f3 = (float)vec3.zCoord;
-         float f4;
-
-         if (mc.gameSettings.anaglyph)
-         {
-             float f5 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F;
-             float f6 = (f1 * 30.0F + f2 * 70.0F) / 100.0F;
-             f4 = (f1 * 30.0F + f3 * 70.0F) / 100.0F;
-             f1 = f5;
-             f2 = f6;
-             f3 = f4;
-         }
-
-         GL11.glColor3f(f1, f2, f3);
-         Tessellator tessellator1 = Tessellator.instance;
-         GL11.glDepthMask(false);
-         GL11.glEnable(GL11.GL_FOG);
-         GL11.glColor3f(f1, f2, f3);
-         GL11.glCallList(this.glSkyList);
-         GL11.glDisable(GL11.GL_FOG);
-         GL11.glDisable(GL11.GL_ALPHA_TEST);
-         GL11.glEnable(GL11.GL_BLEND);
-         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-         RenderHelper.disableStandardItemLighting();
-         float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(par1), par1);
-         float f7;
-         float f8;
-         float f9;
-         float f10;
-
-         if (afloat != null)
-         {
-             GL11.glDisable(GL11.GL_TEXTURE_2D);
-             GL11.glShadeModel(GL11.GL_SMOOTH);
-             GL11.glPushMatrix();
-             GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
-             GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(par1)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F);
-             GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F);
-             f4 = afloat[0];
-             f7 = afloat[1];
-             f8 = afloat[2];
-             float f11;
-
-             if (mc.gameSettings.anaglyph)
-             {
-                 f9 = (f4 * 30.0F + f7 * 59.0F + f8 * 11.0F) / 100.0F;
-                 f10 = (f4 * 30.0F + f7 * 70.0F) / 100.0F;
-                 f11 = (f4 * 30.0F + f8 * 70.0F) / 100.0F;
-                 f4 = f9;
-                 f7 = f10;
-                 f8 = f11;
-             }
-
-             tessellator1.startDrawing(6);
-             tessellator1.setColorRGBA_F(f4, f7, f8, afloat[3]);
-             tessellator1.addVertex(0.0D, 100.0D, 0.0D);
-             byte b0 = 16;
-             tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F);
-
-             for (int j = 0; j <= b0; ++j)
-             {
-                 f11 = (float)j * (float)Math.PI * 2.0F / (float)b0;
-                 float f12 = MathHelper.sin(f11);
-                 float f13 = MathHelper.cos(f11);
-                 tessellator1.addVertex((double)(f12 * 120.0F), (double)(f13 * 120.0F), (double)(-f13 * 40.0F * afloat[3]));
-             }
-
-             tessellator1.draw();
-             GL11.glPopMatrix();
-             GL11.glShadeModel(GL11.GL_FLAT);
-         }
-
-         GL11.glEnable(GL11.GL_TEXTURE_2D);
-         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
-         GL11.glPushMatrix();
-         f4 = 1.0F - world.getRainStrength(par1);
-         f7 = 0.0F;
-         f8 = 0.0F;
-         f9 = 0.0F;
-         GL11.glColor4f(1.0F, 1.0F, 1.0F, f4);
-         GL11.glTranslatef(f7, f8, f9);
-         GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
-         GL11.glRotatef(world.getCelestialAngle(par1) * 360.0F, 1.0F, 0.0F, 0.0F);
-         f10 = 30.0F;
-         mc.renderEngine.bindTexture(this.getSunRenderPath());
-         tessellator1.startDrawingQuads();
-         tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)(-f10), 0.0D, 0.0D);
-         tessellator1.addVertexWithUV((double)f10, 100.0D, (double)(-f10), 1.0D, 0.0D);
-         tessellator1.addVertexWithUV((double)f10, 100.0D, (double)f10, 1.0D, 1.0D);
-         tessellator1.addVertexWithUV((double)(-f10), 100.0D, (double)f10, 0.0D, 1.0D);
-         tessellator1.draw();
-         f10 = 20.0F;
-         mc.renderEngine.bindTexture(this.getMoonRenderPath());
-         int k = world.getMoonPhase();
-         int l = k % 4;
-         int i1 = k / 4 % 2;
-         float f14 = (float)(l + 0) ;
-         float f15 = (float)(i1 + 0);
-         float f16 = (float)(l + 1) ;
-         float f17 = (float)(i1 + 1);
-         tessellator1.startDrawingQuads();
-         tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)f10, (double)f16, (double)f17);
-         tessellator1.addVertexWithUV((double)f10, -100.0D, (double)f10, (double)f14, (double)f17);
-         tessellator1.addVertexWithUV((double)f10, -100.0D, (double)(-f10), (double)f14, (double)f15);
-         tessellator1.addVertexWithUV((double)(-f10), -100.0D, (double)(-f10), (double)f16, (double)f15);
-         tessellator1.draw();
-         GL11.glDisable(GL11.GL_TEXTURE_2D);
-         float f18 = world.getStarBrightness(par1) * f4;
-
-         if (f18 > 0.0F)
-         {
-             GL11.glColor4f(f18, f18, f18, f18);
-             GL11.glCallList(this.starGLCallList);
-         }
-
-         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-         GL11.glDisable(GL11.GL_BLEND);
-         GL11.glEnable(GL11.GL_ALPHA_TEST);
-         GL11.glEnable(GL11.GL_FOG);
-         GL11.glPopMatrix();
-         GL11.glDisable(GL11.GL_TEXTURE_2D);
-         GL11.glColor3f(0.0F, 0.0F, 0.0F);
-         double d0 = mc.thePlayer.getPosition(par1).yCoord - world.getHorizon();
-
-         if (d0 < 0.0D)
-         {
-             GL11.glPushMatrix();
-             GL11.glTranslatef(0.0F, 12.0F, 0.0F);
-             GL11.glCallList(this.glSkyList2);
-             GL11.glPopMatrix();
-             f8 = 1.0F;
-             f9 = -((float)(d0 + 65.0D));
-             f10 = -f8;
-             tessellator1.startDrawingQuads();
-             tessellator1.setColorRGBA_I(0, 255);
-             tessellator1.addVertex((double)(-f8), (double)f9, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f9, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f10, (double)f8);
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)f8);
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8));
-             tessellator1.addVertex((double)f8, (double)f10, (double)(-f8));
-             tessellator1.addVertex((double)f8, (double)f9, (double)(-f8));
-             tessellator1.addVertex((double)(-f8), (double)f9, (double)(-f8));
-             tessellator1.addVertex((double)f8, (double)f10, (double)(-f8));
-             tessellator1.addVertex((double)f8, (double)f10, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f9, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f9, (double)(-f8));
-             tessellator1.addVertex((double)(-f8), (double)f9, (double)(-f8));
-             tessellator1.addVertex((double)(-f8), (double)f9, (double)f8);
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)f8);
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8));
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)(-f8));
-             tessellator1.addVertex((double)(-f8), (double)f10, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f10, (double)f8);
-             tessellator1.addVertex((double)f8, (double)f10, (double)(-f8));
-             tessellator1.draw();
-         }
-
-         if (world.provider.isSkyColored())
-         {
-             GL11.glColor3f(f1 * 0.2F + 0.04F, f2 * 0.2F + 0.04F, f3 * 0.6F + 0.1F);
-         }
-         else
-         {
-             GL11.glColor3f(f1, f2, f3);
-         }
-
-         GL11.glPushMatrix();
-         GL11.glTranslatef(0.0F, -((float)(d0 - 16.0D)), 0.0F);
-         GL11.glCallList(this.glSkyList2);
-         GL11.glPopMatrix();
-         GL11.glEnable(GL11.GL_TEXTURE_2D);
-         GL11.glDepthMask(true);
-     }
-		
-	}
-	
-}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java
deleted file mode 100644
index 4252564..0000000
--- a/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package StevenDimDoors.mod_pocketDim.world;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.client.IRenderHandler;
-
-public class LimboSkyProvider extends CustomSkyProvider
-{
-	@Override
-	public String getMoonRenderPath()
-	{
-		return "/mods/DimDoors/textures/other/limboMoon.png";
-	}
-	
-	@Override
-	public String getSunRenderPath()
-	{
-		return "/mods/DimDoors/textures/other/limboSun.png";
-	}
-}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java b/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java
deleted file mode 100644
index a3503fe..0000000
--- a/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package StevenDimDoors.mod_pocketDim.world;
-
-import org.lwjgl.opengl.GL11;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.Vec3;
-import net.minecraftforge.client.IRenderHandler;
-
-public class PocketSkyProvider extends CustomSkyProvider
-{
-	
-	public class LimboSkyProvider extends CustomSkyProvider
-	{
-		@Override
-		public String getMoonRenderPath()
-		{
-			return "/mods/DimDoors/textures/other/pocketMoon.png";
-		}
-		
-		@Override
-		public String getSunRenderPath()
-		{
-			return "/mods/DimDoors/textures/other/pocketSun.png";
-		}
-	}
-}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java b/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
deleted file mode 100644
index 2bbdbad..0000000
--- a/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package StevenDimDoors.mod_pocketDimClient;
-
-import net.minecraft.client.renderer.entity.RenderLiving;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public class RenderMobObelisk extends RenderLiving
-{
-protected ModelMobObelisk obeliskModel;
-
-    public RenderMobObelisk(float f)
-    {
-        super(new ModelMobObelisk(), f);
-        this.obeliskModel = (ModelMobObelisk)this.mainModel;
-        
-    
-    }
-    
-   
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..20df3f9
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,49 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+
+
+
+version = "2.1.1RC1"
+group= "com.stevenrs11.dimdoors" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "dimdoors"
+
+minecraft {
+	version = "1.6.4-9.11.1.964"
+}
+
+targetCompatibility = '1.7'
+sourceCompatibility = '1.7'
+
+processResources
+{
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod/info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else, thats not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+jar 
+{
+	destinationDir = new File("build/dist/")
+	archiveName = "DimensionalDoors-${version}-${BUILD_NUMBER}"
+}
\ No newline at end of file
diff --git a/build.xml b/build.xml.old
similarity index 58%
rename from build.xml
rename to build.xml.old
index 13e1c3c..fdf5d44 100644
--- a/build.xml
+++ b/build.xml.old
@@ -1,64 +1,93 @@
-
-
 <project name="DimensionalDoors" default="install" basedir=".">
-
 	<property environment="env" />
 
+	<property name="project.name" value="DimDoors" />
+	<property name="src.dir" value="StevenDimDoors" />
+	<property name="resources.dir" value="resources" />
+	<property name="schematics.dir" value="schematics" />
+	<property name="versionclass.dir" value="mod_pocketDim" />
+	<property name="versionclass.file" value="mod_pocketDim.java"/>
+
+	<property name="minecraft.version" value="1.6.4" />
+	<property name="forge.forgeversion" value="9.11.1" />
+	<property name="forge.buildnum" value="953" />
+
 	<property name="build.dir" value="build" />
 	<property name="classes.dir" value="${build.dir}/packaging" />
-	<property name="src.dir" value="src" />
-	<property name="forge.version" value="1.5.2-7.8.0.691" />
+	<property name="resourcePack.dir" value="${classes.dir}" />
+	<property name="schematicPack.dir" value="${classes.dir}/schematics/" />
+	<property name="apiclasses.dir" value="${build.dir}/api-packaging" />
+	<property name="forge.version" value="${minecraft.version}-${forge.forgeversion}.${forge.buildnum}" />
 	<property name="forge.url" value="http://files.minecraftforge.net/minecraftforge/minecraftforge-src-${forge.version}.zip" />
-	<property name="mcp.version" value="751" />
 	<property name="forge.dir" value="${build.dir}/forge" />
 	<property name="mcp.dir" value="${forge.dir}/mcp" />
-	<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
-	<property name="resources.dir" value="resources" />
-	
-	<property name="gson.url" value="https://google-gson.googlecode.com/files/google-gson-2.2.4-release.zip" />
-	<property name="gson.name" value="gson-2.2.4.zip" />
+	<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft/StevenDimDoors" />
 
 	<property name="package.meta-inf" value="META-INF" />
-	<property name="build.ver" value="1.5.2" />
 	<property name="dist.dir" value="${build.dir}/dist" />
 
-	<property name="download.dir" value="downloads" />
+	<property name="download.dir" value="${build.dir}/downloads" />
 
 	<property name="lib.dir" value="${mcp.dir}/lib" />
 
 	<property file="${forge.dir}/forgeversion.properties" />
 	<condition property="forge.already.installed">
-		<equals arg1="${forge.build.number}" arg2="691" />
+		<equals arg1="${forge.build.number}" arg2="${forge.buildnum}" />
 	</condition>
 
-	<property name="verclass.dir" value="${mcpsrc.dir}/StevenDimDoors/mod_pocketDim/" />
-	<property name="verclass.name" value="mod_pocketDim.java"/>
-
-
 	<mkdir dir="${download.dir}"/>
 	<mkdir dir="${build.dir}" />
-
-	<target name="get-version" depends="setup-forge">
-		<mkdir dir="${mcpsrc.dir}/StevenDimDoors" />
-		<copy todir="${mcpsrc.dir}/StevenDimDoors" overwrite="true">
-			<fileset dir="StevenDimDoors" />
-		</copy>	
 	
-		<exec dir="${verclass.dir}" executable="sh" osfamily="unix" outputproperty="grep.out">
-			<arg value="-c"/>
-			<arg value="grep -o -P '[0-9.]+R[0-9.]+(RC[0-9]+)?(B[0-9]+)?' ${verclass.name}"/>
-		</exec>
-		<exec executable="python" osfamily="unix">
-			<arg value="versionscript.py" />
-			<arg value="${grep.out}" />
-		</exec>
-		<echo message="Grepped version: ${grep.out}"/>
-		<copy todir="${classes.dir}" file="mcmod.info" overwrite="true"/> 
+	<target name="get-version" depends="setup-forge">
+		<!-- Copy source -->
+		<copy todir="${mcpsrc.dir}" overwrite="true">
+			<fileset dir="${src.dir}"/>
+		</copy>
+
+		<!-- Get the version from the mcmod.info -->
+		<script language="javascript">
+		    importClass(java.io.File);
+		    importClass(java.nio.file.Files)
+		    importClass(java.io.FileReader);
+		    importClass(java.io.BufferedReader);
+		    importClass(java.io.FileWriter);
+		    importClass(java.io.BufferedWriter);
+
+			echo = project.createTask("echo");
+			echo.setMessage("Parsing mcmod.info...");
+			echo.perform();
+			
+			var file = new File("./mcmod.info");
+
+			fr = new FileReader(file);
+			br = new BufferedReader(fr);
+
+			// Read the file.
+			// This assumes the file has no line
+			var line;
+			var json = "";
+			while ((line = br.readLine()) != null) {
+				json += line;
+			}
+
+			var struct = JSON.parse(json);
+			var version = struct["modlist"][0].version;
+
+			echo = project.createTask("echo");
+			echo.setMessage("Parsed version: " + version);
+			echo.perform();
+
+			project.setProperty("mod.version", version);
+		</script>
+
+		<!-- Replace the version information in the mod class -->
+		<replace file="${mcpsrc.dir}/${versionclass.dir}/${versionclass.file}">
+		    <replacefilter token="$VERSION$" value="${mod.version}"/>
+		</replace>
 	</target>
 
 	<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip" />
-	<available property="gson-exists" file="${mcpsrc.dir}/com/google/gson/Gson.java" />
-	<available property="already-compiled" file="${classes.dir}/deathrat" />
+	<available property="already-compiled" file="${classes.dir}/${src.dir}" />
 	<condition property="should-download-ant-contrib">
 		<or>
 			<available file="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
@@ -67,27 +96,16 @@
 	</condition>
 
 	<target name="install" depends="build">
-		<copy todir="${classes.dir}/schematics" overwrite="true">
-			<fileset dir="schematics" />
-		</copy>
-		<zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/>
+		<delete dir="${mcpsrc.dir}/${src.dir}" />
+		<delete dir="${dist.dir}" />
+		<jar destfile="${dist.dir}/${project.name}-${mod.version}-${build.number}.jar" basedir="${classes.dir}"/>
 		<delete dir="${classes.dir}" />
 		<delete dir="${mcp.dir}/reobf"/>
-		<delete dir="${mcpsrc.dir}/StevenDimDoors" />
-		<delete dir="${mcpsrc.dir}/Steven" />
-	</target>
-	
-	<target name="get-gson" unless="gson-exists">
-		<get src="${gson.url}" dest="${download.dir}/${gson.name}" />
-		<unzip src="${download.dir}/${gson.name}" dest="${download.dir}" />
-		<unzip src="${download.dir}/google-gson-2.2.4/gson-2.2.4-sources.jar" dest="${download.dir}/google-gson-2.2.4/"/>
-		<copy todir="${mcpsrc.dir}/com">
-			<fileset dir="${download.dir}/google-gson-2.2.4/com"/>
-		</copy>
+		<delete dir="{$apiclasses.dir}" />
+		<delete dir="${mcpsrc.dir}/${src.dir}" />
 	</target>
 
-	<target name="build" depends="get-version,get-gson" unless="already-compiled">
-		
+	<target name="build" depends="get-version" unless="already-compiled">
 		<!-- Recompile -->
 		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" failonerror="true">
 			<arg line="/c recompile.bat"/>
@@ -99,19 +117,36 @@
 
 		<!-- Reobf -->
 		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
-			<arg line="/c reobfuscate_srg.bat"/>
+			<arg line="/c reobfuscate.bat --srgnames"/>
 		</exec>
 
 		<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
-			<arg value="reobfuscate_srg.sh" />
+			<arg value="reobfuscate.sh" />
 		</exec>
 
 		<copy todir="${classes.dir}">
 			<fileset dir="${mcp.dir}/reobf/minecraft"/>
 		</copy>
-		<copy todir="${classes.dir}">
-			<fileset dir="${resources.dir}"/>
+
+		<copy todir="${resourcePack.dir}">
+			<fileset dir="${resources.dir}" />
 		</copy>
+		
+		<copy todir="${schematicPack.dir}">
+			<fileset dir="${schematics.dir}" />
+		</copy>
+		
+		<copy todir="${classes.dir}">
+			<fileset file="mcmod.info" />
+		</copy>
+		
+		<copy todir="${classes.dir}">
+			<fileset file="${resources.dir}/pack.mcmeta" />
+		</copy>
+		
+		<delete file="${resourcePack.dir}/mcmod.info" />
+		
+		<delete file="${resourcePack.dir}/pack.mcmeta" />
 	</target>
 
 	<target name="build-number-there" if="env.BUILD_NUMBER" >
@@ -121,7 +156,7 @@
 
 	<target name="build-number-not-there" unless="env.BUILD_NUMBER" >
 		<echo message="!! No build number set !!" />
-		<property name="build.number" value="CUSTOM_BUILD" />
+		<property name="build.number" value="0" />
 	</target>
 
 	<target name="setup-forge" depends="download-forge,build-number-there,build-number-not-there" unless="forge.already.installed">
@@ -132,16 +167,10 @@
 				<include name="minecraftforge-src-${forge.version}.zip"/>
 			</fileset>
 		</unzip>
-		
-		
+
 		<!-- Change executables' permitions -->
-
 		<chmod file="${forge.dir}/install.sh" perm="+x"/>
 
-		<!-- if your building on OSX these 2 should be executable -->
-
-
-
 		<!-- Install forge -->
 		<delete dir="${mcp.dir}" failonerror="no"/>
 		<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes\n">
@@ -151,29 +180,12 @@
 		<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
 			<arg value="install.sh" />
 		</exec>
-		
-		<get src="http://mirror.technicpack.net/Technic/lib/fml/fml_libs15.zip" dest="${download.dir}/fml_libs15.zip" />
-		<unzip src="${download.dir}/fml_libs15.zip" dest="${lib.dir}/" />
-		
-		<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes">
-			<arg line="/c install.cmd"/>
-		</exec>
-
-		<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes">
-			<arg value="install.sh" />
-		</exec>
 
 		<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
-		<chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/>
+		<chmod file="${mcp.dir}/reobfuscate.sh" perm="+x"/>
 		<chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" />
 		<chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" />
-		<!-- Copy libraries -->
-<!-- 		<copy todir="${mcp.dir}/lib" >
-			<fileset dir="lib" >
-				<patternset includes="*.jar" />
-			</fileset>
-		</copy> -->
 	</target>
 
 	<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
@@ -186,11 +198,10 @@
 			</classpath>
 		</taskdef>
 		<echo message="Downloading forge... " />
-		<get src="${forge.url}" dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
+		<get src="http://files.minecraftforge.net/minecraftforge-src-${forge.version}.zip"
+							dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
 	</target>
 
-
-
 	<target name="download-ant-contrib" unless="should-download-ant-contrib">
 		<echo message="Getting: ant-contrib"/>
 		<mkdir dir="${download.dir}/tmp"/>
@@ -216,5 +227,4 @@
 	</target>
 
 
-</project>
-
+</project>
\ No newline at end of file
diff --git a/buildOLD.xml b/buildOLD.xml
deleted file mode 100644
index c6bed13..0000000
--- a/buildOLD.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-
-
-<project name="DimensionalDoors" default="install" basedir=".">
-
-	<property environment="env" />
-
-	<property name="build.dir" value="build" />
-	<property name="classes.dir" value="${build.dir}/packaging" />
-	<property name="src.dir" value="src" />
-	<property name="forge.version" value="1.5.2-7.8.0.691" />
-	<property name="forge.url" value="http://files.minecraftforge.net/minecraftforge/minecraftforge-src-${forge.version}.zip" />
-	<property name="mcp.version" value="751" />
-	<property name="forge.dir" value="${build.dir}/forge" />
-	<property name="mcp.dir" value="${forge.dir}/mcp" />
-	<property name="mcpsrc.dir" value="${mcp.dir}/src/minecraft" />
-	<property name="resources.dir" value="resources" />
-
-	<property name="package.meta-inf" value="META-INF" />
-	<property name="build.ver" value="1.5.2" />
-	<property name="dist.dir" value="${build.dir}/dist" />
-
-	<property name="download.dir" value="downloads" />
-
-	<property name="lib.dir" value="${mcp.dir}/lib" />
-
-	<property file="${forge.dir}/forgeversion.properties" />
-	<condition property="forge.already.installed">
-		<equals arg1="${forge.build.number}" arg2="691" />
-	</condition>
-
-	<property name="verclass.dir" value="${mcpsrc.dir}/StevenDimDoors/mod_pocketDim/" />
-	<property name="verclass.name" value="mod_pocketDim.java"/>
-
-
-	<mkdir dir="${download.dir}"/>
-	<mkdir dir="${build.dir}" />
-
-	<target name="get-version" depends="setup-forge">
-		<mkdir dir="${mcpsrc.dir}/StevenDimDoors" />
-		<copy todir="${mcpsrc.dir}/StevenDimDoors" overwrite="true">
-			<fileset dir="StevenDimDoors" />
-		</copy>	
-	
-		
-		
-		<exec dir="${verclass.dir}" executable="sh" osfamily="unix" outputproperty="grep.out">
-			<arg value="-c"/>
-			<arg value="grep -o -P '[0-9.]+R[0-9.]+(RC[0-9]+)?(B[0-9]+)?' ${verclass.name}"/>
-		</exec>
-		<exec executable="python" osfamily="unix">
-			<arg value="versionscript.py" />
-			<arg value="${grep.out}" />
-		</exec>
-		<echo message="Grepped version: ${grep.out}"/>
-		<copy todir="${classes.dir}" file="mcmod.info" overwrite="true"/> 
-	</target>
-
-	<available property="forge-exists" file="${download.dir}/minecraftforge-src-${forge.version}.zip" />
-	<available property="already-compiled" file="${classes.dir}/deathrat" />
-	<condition property="should-download-ant-contrib">
-		<or>
-			<available file="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
-			<available file="${download.dir}/minecraftforge-src-${forge.version}.zip"/>
-		</or>
-	</condition>
-
-	<target name="install" depends="build">
-		 <copy todir="${classes.dir}/schematics" overwrite="true">
-			<fileset dir="schematics" />
-		</copy>
-		<zip destfile="${dist.dir}/DimensionalDoors-${grep.out}-${build.number}.zip" basedir="${classes.dir}"/>
-		<delete dir="${classes.dir}" />
-		<delete dir="${mcp.dir}/reobf"/>
-		<delete dir="${mcpsrc}/StevenDimDoors" />
-		<delete dir="${mcpsrc}/Steven" />
-	</target>
-
-	<target name="build" depends="get-version" unless="already-compiled">
-		<!-- Recompile -->
-		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows" failonerror="true">
-			<arg line="/c recompile.bat"/>
-		</exec>
-
-		<exec dir="${mcp.dir}" executable="sh" osfamily="unix" failonerror="true">
-			<arg value="recompile.sh" />
-		</exec>
-
-		<!-- Reobf -->
-		<exec dir="${mcp.dir}" executable="cmd" osfamily="windows">
-			<arg line="/c reobfuscate_srg.bat"/>
-		</exec>
-
-		<exec dir="${mcp.dir}" executable="sh" osfamily="unix">
-			<arg value="reobfuscate_srg.sh" />
-		</exec>
-
-		<copy todir="${classes.dir}">
-			<fileset dir="${mcp.dir}/reobf/minecraft"/>
-		</copy>
-		<copy todir="${classes.dir}">
-			<fileset dir="${resources.dir}"/>
-		</copy>
-	</target>
-
-	<target name="build-number-there" if="env.BUILD_NUMBER" >
-		<echo message="Using build number ${env.BUILD_NUMBER}..." />
-		<property name="build.number" value="${env.BUILD_NUMBER}" />
-	</target>
-
-	<target name="build-number-not-there" unless="env.BUILD_NUMBER" >
-		<echo message="!! No build number set !!" />
-		<property name="build.number" value="CUSTOM_BUILD" />
-	</target>
-
-	<target name="setup-forge" depends="download-forge,build-number-there,build-number-not-there" unless="forge.already.installed">
-
-		<property name="build.full" value="${build.number}" />
-		<unzip dest="${build.dir}">
-			<fileset dir="${download.dir}">
-				<include name="minecraftforge-src-${forge.version}.zip"/>
-			</fileset>
-		</unzip>
-		
-		
-		<!-- Change executables' permitions -->
-
-		<chmod file="${forge.dir}/install.sh" perm="+x"/>
-
-		<!-- if your building on OSX these 2 should be executable -->
-
-
-
-		<!-- Install forge -->
-		<delete dir="${mcp.dir}" failonerror="no"/>
-		<exec dir="${forge.dir}" executable="cmd" osfamily="windows" inputstring="Yes\n">
-			<arg line="/c install.cmd"/>
-		</exec>
-
-		<exec dir="${forge.dir}" executable="sh" osfamily="unix" inputstring="Yes\n">
-			<arg value="install.sh" />
-
-		</exec>
-
-
-		<chmod file="${mcp.dir}/updatemd5.sh" perm="+x"/>
-		<chmod file="${mcp.dir}/recompile.sh" perm="+x"/>
-		<chmod file="${mcp.dir}/reobfuscate_srg.sh" perm="+x"/>
-		<chmod file="${mcp.dir}/runtime/bin/astyle-osx" perm="+x" />
-		<chmod file="${mcp.dir}/runtime/bin/jad-osx" perm="+x" />
-		<!-- Copy libraries -->
-<!-- 		<copy todir="${mcp.dir}/lib" >
-			<fileset dir="lib" >
-				<patternset includes="*.jar" />
-			</fileset>
-		</copy> -->
-	</target>
-
-		<target name="download-forge" depends="download-ant-contrib" unless="forge-exists">
-			<taskdef resource="net/sf/antcontrib/antlib.xml">
-				<classpath>
-					<pathelement location="${download.dir}/ant-contrib/ant-contrib-1.0b3.jar"/>
-					<fileset dir="${download.dir}/ant-contrib/lib">
-						<include name="*.jar"/>
-					</fileset>
-				</classpath>
-			</taskdef>
-			<echo message="Downloading forge... " />
-			<get src="${forge.url}" dest="${download.dir}/minecraftforge-src-${forge.version}.zip" />
-	</target>
-
-
-
-	<target name="download-ant-contrib" unless="should-download-ant-contrib">
-		<echo message="Getting: ant-contrib"/>
-		<mkdir dir="${download.dir}/tmp"/>
-		<mkdir dir="${download.dir}/ant-contrib/lib" />
-		<get src="http://sourceforge.net/projects/ant-contrib/files/ant-contrib/1.0b3/ant-contrib-1.0b3-bin.zip/download" dest="${download.dir}/tmp/ant-contrib-1.0b3-bin.zip"/>
-		<get src="http://archive.apache.org/dist/commons/codec/binaries/commons-codec-1.6-bin.zip" dest="${download.dir}/tmp/commons-codec-1.6-bin.zip"/>
-
-		<unzip src="${download.dir}/tmp/ant-contrib-1.0b3-bin.zip" dest="${download.dir}"/>
-		<unzip src="${download.dir}/tmp/commons-codec-1.6-bin.zip" dest="${download.dir}/tmp"/>
-
-		<move todir="${download.dir}/ant-contrib/lib">
-			<fileset file="${download.dir}/tmp/commons-codec-1.6/commons-codec-1.6.jar"/>
-		</move>
-
-		<!-- Delete useless files -->
-		<delete dir="${download.dir}/ant-contrib/docs"/>
-		<delete dir="${download.dir}/tmp"/>
-
-	</target>
-
-	<target name="clean" >
-		<delete dir="${build.dir}" />
-	</target>
-
-
-</project>
-
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..667288a
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d9425c6
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Tue Oct 29 18:00:54 CDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.png b/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.png
deleted file mode 100644
index c8f4daf..0000000
Binary files a/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.png and /dev/null differ
diff --git a/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.txt b/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.txt
deleted file mode 100644
index 53c921e..0000000
--- a/resources/mods/DimDoors/textures/blocks/blockDimWallPerm.txt
+++ /dev/null
@@ -1 +0,0 @@
-0*7,1*7,2*7,3*7,4*7,5*7,6*7,5*7,4*7,3*7,2*7,1*7
\ No newline at end of file
diff --git a/StevenDimDoors/README.md b/src/main/java/StevenDimDoors/README.md
similarity index 100%
rename from StevenDimDoors/README.md
rename to src/main/java/StevenDimDoors/README.md
diff --git a/StevenDimDoors/mod_pocketDim/BlankTeleporter.java b/src/main/java/StevenDimDoors/mod_pocketDim/BlankTeleporter.java
similarity index 90%
rename from StevenDimDoors/mod_pocketDim/BlankTeleporter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/BlankTeleporter.java
index a066837..f0cebca 100644
--- a/StevenDimDoors/mod_pocketDim/BlankTeleporter.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/BlankTeleporter.java
@@ -29,7 +29,7 @@ public class BlankTeleporter extends Teleporter
 	 public void setEntityPosition(Entity entity, double x, double y, double z)
 	 {
 		 entity.lastTickPosX = entity.prevPosX = entity.posX = x;
-		 entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset;
+		 entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset;
 		 entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z;
 		 entity.setPosition(x, y, z);
 	 }
diff --git a/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java b/src/main/java/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDim/CloudRenderBlank.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java
index 74f8f2d..17d5bfe 100644
--- a/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/CloudRenderBlank.java
@@ -8,7 +8,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class CloudRenderBlank extends IRenderHandler
 {
-    @SideOnly(Side.CLIENT)
+    @Override
+	@SideOnly(Side.CLIENT)
     public void render(float partialTicks, WorldClient world, Minecraft mc)
     {
     	
diff --git a/StevenDimDoors/mod_pocketDim/CommonProxy.java b/src/main/java/StevenDimDoors/mod_pocketDim/CommonProxy.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/CommonProxy.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/CommonProxy.java
diff --git a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java b/src/main/java/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/ConnectionHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
index e29bb5a..7af69f4 100644
--- a/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ConnectionHandler.java
@@ -10,6 +10,7 @@ import net.minecraft.network.packet.NetHandler;
 import net.minecraft.network.packet.Packet1Login;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.integrated.IntegratedServer;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.common.network.IConnectionHandler;
 import cpw.mods.fml.common.network.Player;
@@ -36,7 +37,7 @@ public class ConnectionHandler implements IConnectionHandler
 		{
 			//This shouldn't happen...
 			e.printStackTrace();
-		}
+		}	
 		return null;
 	}
 
diff --git a/StevenDimDoors/mod_pocketDim/CraftingManager.java b/src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/CraftingManager.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java
index 11260ff..4ee47c3 100644
--- a/StevenDimDoors/mod_pocketDim/CraftingManager.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/CraftingManager.java
@@ -98,8 +98,8 @@ public class CraftingManager
 		{
 			GameRegistry.addRecipe(new ItemStack(itemStableFabric, 1), new Object[]
 					{
-				"yyy", "yxy", "yyy", 'x', coreCraftingItem,  'y', mod_pocketDim.itemWorldThread
-					});
+				"yyy", "yxy", "yyy", 'x', coreCraftingItem,  'y', mod_pocketDim.itemWorldThread					
+				});
 		}
 		
 		if (properties.CraftingStabilizedRiftSignatureAllowed)
diff --git a/StevenDimDoors/mod_pocketDim/DDLoot.java b/src/main/java/StevenDimDoors/mod_pocketDim/DDLoot.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/DDLoot.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/DDLoot.java
diff --git a/StevenDimDoors/mod_pocketDim/DDProperties.java b/src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/DDProperties.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java
diff --git a/StevenDimDoors/mod_pocketDim/DimData.java b/src/main/java/StevenDimDoors/mod_pocketDim/DimData.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/DimData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/DimData.java
diff --git a/StevenDimDoors/mod_pocketDim/DungeonGenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/DungeonGenerator.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/DungeonGenerator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/DungeonGenerator.java
diff --git a/StevenDimDoors/mod_pocketDim/EventHookContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
similarity index 64%
rename from StevenDimDoors/mod_pocketDim/EventHookContainer.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
index 26fe687..19b7b1c 100644
--- a/StevenDimDoors/mod_pocketDim/EventHookContainer.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/EventHookContainer.java
@@ -1,6 +1,8 @@
 package StevenDimDoors.mod_pocketDim;
 
 import paulscode.sound.SoundSystem;
+import net.minecraft.client.audio.SoundManager;
+import net.minecraft.client.audio.SoundPool;
 import net.minecraft.client.audio.SoundPoolEntry;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -36,15 +38,15 @@ public class EventHookContainer
 	@ForgeSubscribe
 	public void onSoundLoad(SoundLoadEvent event) 
 	{
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/monk.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/monk.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/crack.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/crack.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/tearing.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/tearing.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/rift.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/rift.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftStart.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftStart.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftEnd.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftEnd.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftClose.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftClose.ogg")));
-		event.manager.soundPoolSounds.addSound("mods/DimDoors/sfx/riftDoor.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/riftDoor.ogg")));
-		event.manager.soundPoolMusic.addSound("mods/DimDoors/sfx/creepy.ogg", (mod_pocketDim.class.getResource("/mods/DimDoors/sfx/creepy.ogg")));
+		event.manager.addSound(mod_pocketDim.modid+":monk.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":crack.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":tearing.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":rift.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":riftStart.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":riftEnd.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":riftClose.ogg");
+		event.manager.addSound(mod_pocketDim.modid+":riftDoor.ogg");
+		event.manager.addMusic(mod_pocketDim.modid+":creepy.ogg");
 
 	}
 	@SideOnly(Side.CLIENT)
@@ -93,10 +95,11 @@ public class EventHookContainer
     		{
     			player.inventory.clearInventory(-1, -1);
     		}
+    		
     		ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(player.worldObj.rand);
     		Point4D destination = new Point4D((int) (coords.posX+entity.posX), coords.posY, (int) (coords.posZ+entity.posZ ), mod_pocketDim.properties.LimboDimensionID);
     		DDTeleporter.teleportEntity(player, destination, false);
-    		player.setEntityHealth(player.getMaxHealth());
+    		player.setHealth(player.getMaxHealth());
     		event.setCanceled(true);
     		return false;
     	}
@@ -114,17 +117,24 @@ public class EventHookContainer
     
     public void playMusicForDim(World world)
     {
-    	if(world.isRemote&&world.provider instanceof LimboProvider)
+    	if(world.isRemote)
     	{
-    		SoundSystem sndSystem =  FMLClientHandler.instance().getClient().sndManager.sndSystem;
-    		sndSystem.stop("BgMusic");
-    		SoundPoolEntry soundPoolEntry = FMLClientHandler.instance().getClient().sndManager.soundPoolMusic.getRandomSoundFromSoundPool("mods.DimDoors.sfx.creepy");
-    		sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.soundUrl, soundPoolEntry.soundName, false);
-    		sndSystem.play("LimboMusic");
-    	}
-    	else if(world.isRemote && !(world.provider instanceof LimboProvider))
-    	{
-    		FMLClientHandler.instance().getClient().sndManager.sndSystem.stop("LimboMusic");
+    		SoundManager sndManager =  FMLClientHandler.instance().getClient().sndManager;
+
+	    	if(world.provider instanceof LimboProvider)
+	    	{
+	    		sndManager.sndSystem.stop("BgMusic");
+	    		SoundPoolEntry soundPoolEntry = sndManager.soundPoolMusic.getRandomSoundFromSoundPool(mod_pocketDim.modid+":creepy");
+	    		if(soundPoolEntry!=null) 
+	    		{
+	    			sndManager.sndSystem.backgroundMusic("LimboMusic", soundPoolEntry.getSoundUrl(), soundPoolEntry.getSoundName(), false);
+	    			sndManager.sndSystem.play("LimboMusic");
+	    		}
+	    	}
+	    	else if(!(world.provider instanceof LimboProvider))
+	    	{
+	    		sndManager.sndSystem.stop("LimboMusic");
+	    	}
     	}
     }
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/IChunkLoader.java b/src/main/java/StevenDimDoors/mod_pocketDim/IChunkLoader.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/IChunkLoader.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/IChunkLoader.java
diff --git a/StevenDimDoors/mod_pocketDim/LinkData.java b/src/main/java/StevenDimDoors/mod_pocketDim/LinkData.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/LinkData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/LinkData.java
diff --git a/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java b/src/main/java/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java
index a70dfa8..20b7e5e 100644
--- a/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ObjectSaveInputStream.java
@@ -1,4 +1,5 @@
 package StevenDimDoors.mod_pocketDim;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InvalidClassException;
@@ -6,7 +7,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 import java.util.logging.Logger;
 
-
+@SuppressWarnings("unused")
 public class ObjectSaveInputStream extends ObjectInputStream {
 
   //  private static Logger logger = LoggerFactory.getLogger(ObjectSaveInputStream.class);
@@ -18,7 +19,7 @@ public class ObjectSaveInputStream extends ObjectInputStream {
     @Override
     protected ObjectStreamClass readClassDescriptor() throws IOException, ClassNotFoundException {
         ObjectStreamClass resultClassDescriptor = super.readClassDescriptor(); // initially streams descriptor
-        Class localClass; // the class in the local JVM that this descriptor represents.
+        Class<?> localClass; // the class in the local JVM that this descriptor represents.
         try {
             localClass = Class.forName(resultClassDescriptor.getName()); 
         } catch (ClassNotFoundException e) {
@@ -33,7 +34,7 @@ public class ObjectSaveInputStream extends ObjectInputStream {
                 final StringBuffer s = new StringBuffer("Overriding serialized class version mismatch: ");
                 s.append("local serialVersionUID = ").append(localSUID);
                 s.append(" stream serialVersionUID = ").append(streamSUID);
-                Exception e = new InvalidClassException(s.toString());
+				Exception e = new InvalidClassException(s.toString());
            //     logger.error("Potentially Fatal Deserialization Operation.", e);
                 resultClassDescriptor = localClassDescriptor; // Use local class descriptor for deserialization
             }
diff --git a/StevenDimDoors/mod_pocketDim/PacketConstants.java b/src/main/java/StevenDimDoors/mod_pocketDim/PacketConstants.java
similarity index 88%
rename from StevenDimDoors/mod_pocketDim/PacketConstants.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/PacketConstants.java
index 847a5b0..cc17208 100644
--- a/StevenDimDoors/mod_pocketDim/PacketConstants.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/PacketConstants.java
@@ -11,4 +11,6 @@ public class PacketConstants
 	public static final byte DELETE_DIM_PACKET_ID = 3;
 	public static final byte CREATE_LINK_PACKET_ID = 4;
 	public static final byte DELETE_LINK_PACKET_ID = 5;
+	public static final byte CLIENT_LOGIN_DIM_REGISTER = 6;
+
 }
diff --git a/StevenDimDoors/mod_pocketDim/Point3D.java b/src/main/java/StevenDimDoors/mod_pocketDim/Point3D.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/Point3D.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/Point3D.java
index b9c032e..204edb8 100644
--- a/StevenDimDoors/mod_pocketDim/Point3D.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/Point3D.java
@@ -56,6 +56,7 @@ public class Point3D implements Serializable {
 		return this.z = z;
 	}
 	
+	@Override
 	public Point3D clone()
 	{
 		return new Point3D(x, y, z);
@@ -75,6 +76,7 @@ public class Point3D implements Serializable {
 		return (this.x == other.x && this.y == other.y && this.z == other.z);
 	}
 	
+	@Override
 	public boolean equals(Object other)
 	{
 		return equals((Point3D) other);
diff --git a/StevenDimDoors/mod_pocketDim/ServerPacketHandler.java b/src/main/java/StevenDimDoors/mod_pocketDim/ServerPacketHandler.java
similarity index 88%
rename from StevenDimDoors/mod_pocketDim/ServerPacketHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ServerPacketHandler.java
index e8eb51a..4735712 100644
--- a/StevenDimDoors/mod_pocketDim/ServerPacketHandler.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ServerPacketHandler.java
@@ -4,6 +4,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
+import StevenDimDoors.mod_pocketDim.watcher.ClientLinkData;
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
@@ -40,16 +41,16 @@ public class ServerPacketHandler implements IPacketHandler
 		}	
 	}
 	
-	private static class LinkWatcher implements IUpdateWatcher<Point4D>
+	private static class LinkWatcher implements IUpdateWatcher<ClientLinkData>
 	{
 		@Override
-		public void onCreated(Point4D message)
+		public void onCreated(ClientLinkData message)
 		{
 			sendLinkPacket(PacketConstants.CREATE_LINK_PACKET_ID, message);
 		}
 
 		@Override
-		public void onDeleted(Point4D message)
+		public void onDeleted(ClientLinkData message)
 		{
 			sendLinkPacket(PacketConstants.DELETE_LINK_PACKET_ID, message);
 		}
@@ -77,7 +78,7 @@ public class ServerPacketHandler implements IPacketHandler
 		}
 	}
 	
-	private static void sendLinkPacket(byte id, Point4D data)
+	private static void sendLinkPacket(byte id, ClientLinkData message)
 	{
 		try
 		{
@@ -85,7 +86,7 @@ public class ServerPacketHandler implements IPacketHandler
 			ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 			DataOutputStream writer = new DataOutputStream(buffer);
 			writer.writeByte(id);
-			Point4D.write(data, writer);
+			message.write(writer);
 			writer.close();
 			packet.channel = PacketConstants.CHANNEL_NAME;
 			packet.data = buffer.toByteArray();
diff --git a/StevenDimDoors/mod_pocketDim/Spells.java b/src/main/java/StevenDimDoors/mod_pocketDim/Spells.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/Spells.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/Spells.java
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
similarity index 93%
rename from StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
index 6537d85..54f844f 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BaseDimDoor.java
@@ -6,12 +6,10 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoor;
 import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
-import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemDoor;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Icon;
 import net.minecraft.util.MathHelper;
@@ -22,12 +20,12 @@ import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.schematic.BlockRotator;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+@SuppressWarnings("deprecation")
 public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEntityProvider
 {
 	protected final DDProperties properties;
@@ -40,13 +38,15 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 		this.properties = properties;
 	}
 
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_top");
+		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom");
 	}
 	
-    @SideOnly(Side.CLIENT)
+    @Override
+	@SideOnly(Side.CLIENT)
 
     /**
      * From the specified side and block metadata retrieves the blocks texture. Args: side, metadata
@@ -64,6 +64,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 		this.enterDimDoor(world, x, y, z, entity);
 	}
 
+	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
 	{
 
@@ -77,7 +78,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 				shouldOpen = false;
 				if (!world.isRemote && world.getBlockId(x, y-1, z) == this.blockID)
 				{
-					int var12 = (int) (MathHelper.floor_double((double)((player.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
+					int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3;
 
 					if (world.getBlockMetadata(x, y-1, z) == var12)
 					{
@@ -87,7 +88,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 				}
 				if (!world.isRemote && world.getBlockId(x, y+1, z) == this.blockID)
 				{
-					int var12 = (int) (MathHelper.floor_double((double)((player.rotationYaw+90) * 4.0F / 360.0F) + 0.5D) & 3);
+					int var12 = MathHelper.floor_double((player.rotationYaw+90) * 4.0F / 360.0F + 0.5D) & 3;
 					if(world.getBlockMetadata(x, y, z)==var12)
 					{ 
 						var12 = BlockRotator.transformMetadata(var12, 1, this.blockID);
@@ -144,6 +145,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 	/**
 	 * Retrieves the block texture to use based on the display side. Args: iBlockAccess, x, y, z, side
 	 */
+	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
 	{
@@ -175,6 +177,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 	 * Is this block (a) opaque and (b) a full 1m cube?  This determines whether or not to render the shared face of two
 	 * adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
 	 */
+	@Override
 	public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) 
 	{
 		TileEntityDimDoor tile = (TileEntityDimDoor) par1World.getBlockTileEntity(par2, par3, par4);
@@ -386,7 +389,7 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 			if (canUse && entity instanceof EntityPlayer)
 			{
 				// Dont check for non-player entites
-				canUse = isEntityFacingDoor(metadata, (EntityLiving) entity);
+				canUse = isEntityFacingDoor(metadata, (EntityLivingBase) entity);
 			}
 			if (canUse)
 			{
@@ -418,12 +421,12 @@ public abstract class BaseDimDoor extends BlockDoor implements IDimDoor, ITileEn
 		return (metadata & 4) != 0;
 	}
 	
-	protected static boolean isEntityFacingDoor(int metadata, EntityLiving entity)
+	protected static boolean isEntityFacingDoor(int metadata, EntityLivingBase entity)
 	{
 		// Although any entity has the proper fields for this check,
 		// we should only apply it to living entities since things
 		// like Minecarts might come in backwards.
-		int direction = (int) (MathHelper.floor_double((double) ((entity.rotationYaw + 90) * 4.0F / 360.0F) + 0.5D) & 3);
+		int direction = MathHelper.floor_double((entity.rotationYaw + 90) * 4.0F / 360.0F + 0.5D) & 3;
 		return ((metadata & 3) == direction);
 	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
similarity index 88%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
index 6144d4d..8d90548 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWall.java
@@ -57,10 +57,11 @@ public class BlockDimWall extends Block
 		}
     }
 	
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
     {
-        this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
-        this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2() + "Perm");
+        this.blockIcon[0] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.blockIcon[1] = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName() + "Perm");
     }
 	
 	@SideOnly(Side.CLIENT)
@@ -77,6 +78,7 @@ public class BlockDimWall extends Block
 		return 0;
 	}
 	
+	@Override
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@SideOnly(Side.CLIENT)
 	public void getSubBlocks(int unknown, CreativeTabs tab, List subItems) 
@@ -86,14 +88,17 @@ public class BlockDimWall extends Block
 			subItems.add(new ItemStack(this, 1, ix));
 		}
 	}
-    public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {}
+    @Override
+	public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {}
     
-    protected boolean canSilkHarvest()
+    @Override
+	protected boolean canSilkHarvest()
     {
         return true;
     }
     
-    public int quantityDropped(Random par1Random)
+    @Override
+	public int quantityDropped(Random par1Random)
     {
         return 0;
     }
@@ -101,7 +106,8 @@ public class BlockDimWall extends Block
     /**
      * replaces the block clicked with the held block, instead of placing the block on top of it. Shift click to disable. 
      */
-    public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
+    @Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int par6, float par7, float par8, float par9)
     {
     	//Check if the metadata value is 0 -- we don't want the user to replace Ancient Fabric
         if (entityPlayer.getCurrentEquippedItem() != null && world.getBlockMetadata(x, y, z) == 0)
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
index c635b7f..5047d9e 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java
@@ -30,21 +30,25 @@ public class BlockDimWallPerm extends Block
 			properties = DDProperties.instance();
 	}
 
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 	}
 
+	@Override
 	public int quantityDropped(Random par1Random)
 	{
 		return 0;
 	}
 
+	@Override
 	public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) {}
 
 	/**
 	 * Only matters if the player is in limbo, acts to teleport the player from limbo back to dim 0
 	 */
+	@Override
 	public void onEntityWalking(World world, int x, int y, int z, Entity entity) 
 	{
 		if (!world.isRemote && world.provider.dimensionId == properties.LimboDimensionID)
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
similarity index 85%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
index 5dead11..1cbd173 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockDoorGold.java
@@ -17,6 +17,7 @@ public class BlockDoorGold extends BlockDoor
 {
 
 	private Icon blockIconBottom;
+	@SuppressWarnings("unused") // ??
 	private DDProperties properties;
 
 	public BlockDoorGold(int par1, Material par2Material,DDProperties properties) 
@@ -26,22 +27,25 @@ public class BlockDoorGold extends BlockDoor
 
 	}
 	
-	public int idDropped(int par1, Random par2Random, int par3)
-    {
-        return mod_pocketDim.itemGoldDoor.itemID;
-    }
-	
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_top");
-		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2()+"_bottom");
-	}
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_top");
+		this.blockIconBottom = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName()+"_bottom");
+	} 
 	
+	public int idDropped(int par1, Random par2Random, int par3)
+	{
+		return mod_pocketDim.itemGoldDoor.itemID;
+	}
+	  
+	@Override
 	public Icon getIcon(int par1, int par2)
 	{
 		return this.blockIcon;
 	}
 	
+	@Override
 	@SideOnly(Side.CLIENT)
 	public Icon getBlockTexture(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
 	{
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
similarity index 83%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
index 66feccc..7753cb1 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockGoldDimDoor.java
@@ -1,27 +1,24 @@
 package StevenDimDoors.mod_pocketDim.blocks;
 
-import java.util.Random;
-
-import net.minecraft.block.material.Material;
-import net.minecraft.item.Item;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 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.tileentities.TileEntityDimDoor;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoorGold;
 
-public class BlockGoldDimDoor extends BaseDimDoor implements IDimDoor
+import net.minecraft.block.material.Material;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+@SuppressWarnings("deprecation")
+public class BlockGoldDimDoor extends BaseDimDoor
 {
 
 	public BlockGoldDimDoor(int blockID, Material material,
 			DDProperties properties) {
 		super(blockID, material, properties);
-		// TODO Auto-generated constructor stub
 	}
 
 	@Override
@@ -40,9 +37,9 @@ public class BlockGoldDimDoor extends BaseDimDoor implements IDimDoor
 	}
 	@Override
 	public int getDrops()
-	{	
+	{
 		return mod_pocketDim.itemGoldDoor.itemID;
-	}	
+	}
 	
 	@Override
 	public TileEntity createNewTileEntity(World world)
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
index 0ec6bbe..8da0dfe 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockLimbo.java
@@ -40,7 +40,7 @@ public class BlockLimbo extends Block
 	@Override
 	public void registerIcons(IconRegister iconRegister)
 	{
-		this.blockIcon = iconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
+		this.blockIcon = iconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 	}
 
 	@Override
diff --git a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
index 11fe960..780df97 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/BlockRift.java
@@ -66,7 +66,7 @@ public class BlockRift extends BlockContainer
 	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 	}
 	
 	//sends a packet informing the client that there is a link present so it renders properly. (when placed)
@@ -313,10 +313,10 @@ public class BlockRift extends BlockContainer
 			yChange=(float) ((yGrowth+yGrowthn)+rand.nextGaussian()*.05F);
 			zChange=(float) ((zGrowth+zGrowthn)+rand.nextGaussian()*.05F);
 
-			Xoffset=  (float) ((0.25F/(1+Math.abs(xChange))));
+			Xoffset=  ((0.25F/(1+Math.abs(xChange))));
 
-			Yoffset=  (float) ((0.25F/(1+Math.abs(yChange))));
-			Zoffset=  (float) ((0.25F/(1+Math.abs(zChange))));
+			Yoffset=  ((0.25F/(1+Math.abs(yChange))));
+			Zoffset=  ((0.25F/(1+Math.abs(zChange))));
 
 
 
diff --git a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
index 4722543..f75aedf 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/DimensionalDoor.java
@@ -9,6 +9,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 
+@SuppressWarnings("deprecation")
 public class DimensionalDoor extends BaseDimDoor
 {
 
diff --git a/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/IDimDoor.java
diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
index 7c62923..1ff6813 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransTrapdoor.java
@@ -8,7 +8,6 @@ import net.minecraft.block.ITileEntityProvider;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
-import net.minecraft.item.ItemDoor;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
@@ -17,9 +16,9 @@ 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.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityTransTrapdoor;
 
+@SuppressWarnings("deprecation")
 public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntityProvider
 {
 
@@ -32,7 +31,7 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit
 	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
-		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName2());
+		this.blockIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
 	}
 
 	//Teleports the player to the exit link of that dimension, assuming it is a pocket
@@ -65,6 +64,7 @@ public class TransTrapdoor extends BlockTrapDoor implements IDimDoor, ITileEntit
 		this.updateAttachedTile(world, x, y, z);
 	}
 	
+	@Override
 	public void updateTick(World world, int x, int y, int z, Random random) 
 	{
 		TileEntityTransTrapdoor tile = (TileEntityTransTrapdoor) world.getBlockTileEntity(x, y, z);
diff --git a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
index 35566b1..531d736 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/TransientDoor.java
@@ -1,21 +1,21 @@
 package StevenDimDoors.mod_pocketDim.blocks;
 
-import net.minecraft.block.material.Material;
-import net.minecraft.client.particle.EntityFX;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.item.ItemDoor;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
 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.BaseItemDoor;
 
+import net.minecraft.block.material.Material;
+import net.minecraft.client.particle.EntityFX;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.World;
+
+@SuppressWarnings("deprecation")
 public class TransientDoor extends BaseDimDoor
 {
 	public TransientDoor(int blockID, Material material, DDProperties properties) 
@@ -37,10 +37,10 @@ public class TransientDoor extends BaseDimDoor
 		{
 			boolean canUse = true;
 			int metadata = world.getBlockMetadata(x, y - 1, z);
-			if (canUse && entity instanceof EntityLiving)
+			if (canUse && entity instanceof EntityPlayer)
 			{
 				// Don't check for non-living entities since it might not work right
-				canUse = BaseDimDoor.isEntityFacingDoor(metadata, (EntityLiving) entity);
+				canUse = BaseDimDoor.isEntityFacingDoor(metadata, (EntityLivingBase) entity);
 			}
 			if (canUse)
 			{
diff --git a/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/UnstableDoor.java
diff --git a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
index f8861a5..7decebf 100644
--- a/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/blocks/WarpDoor.java
@@ -9,6 +9,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 
+@SuppressWarnings("deprecation")
 public class WarpDoor extends BaseDimDoor
 {
 	public WarpDoor(int blockID, Material material, DDProperties properties) 
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
similarity index 71%
rename from StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
index 7b24c72..44bbb98 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreateDungeonRift.java
@@ -1,9 +1,5 @@
 package StevenDimDoors.mod_pocketDim.commands;
 
-import java.util.Collection;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MathHelper;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
@@ -13,6 +9,13 @@ import StevenDimDoors.mod_pocketDim.dungeon.DungeonData;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 import StevenDimDoors.mod_pocketDim.world.PocketBuilder;
 
+import java.util.Collection;
+
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.MathHelper;
+
+@SuppressWarnings("deprecation")
 public class CommandCreateDungeonRift extends DDCommandBase
 {
 	private static CommandCreateDungeonRift instance = null;
@@ -30,6 +33,13 @@ public class CommandCreateDungeonRift extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-rift <dungeon name>\r\n" +
+				"       /dd-rift list\r\n" +
+				"       /dd-rift random";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -54,9 +64,9 @@ public class CommandCreateDungeonRift extends DDCommandBase
 			Collection<String> dungeonNames = dungeonHelper.getDungeonNames();
 			for (String name : dungeonNames)
 			{
-				sender.sendChatToPlayer(name);
+				sendChat(sender,(name));
 			}
-			sender.sendChatToPlayer("");
+			sendChat(sender,(""));
 		}
 		else
 		{
@@ -65,7 +75,7 @@ public class CommandCreateDungeonRift extends DDCommandBase
 			int x = MathHelper.floor_double(sender.posX);
 			int y = MathHelper.floor_double(sender.posY);
 			int z = MathHelper.floor_double (sender.posZ);
-			int orientation = MathHelper.floor_double((double) ((sender.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
+			int orientation = MathHelper.floor_double((sender.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3;
 
 			if (command[0].equals("random"))
 			{
@@ -74,7 +84,7 @@ public class CommandCreateDungeonRift extends DDCommandBase
 				link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,orientation);
 				sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID,0,3);
 
-				sender.sendChatToPlayer("Created a rift to a random dungeon.");
+				sendChat(sender,("Created a rift to a random dungeon."));
 			}
 			else
 			{
@@ -84,17 +94,17 @@ public class CommandCreateDungeonRift extends DDCommandBase
 					result = findDungeonByPartialName(command[0], dungeonHelper.getUntaggedDungeons());
 				}
 				//Check if we found any matches
-				if (result != null)
-				{
-					//Create a rift to our selected dungeon and notify the player
-					//TODO currently crashes, need to create the dimension first
-					dimension = PocketManager.getDimensionData(sender.worldObj);
-					link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,orientation);
-					PocketBuilder.generateSelectedDungeonPocket(link, mod_pocketDim.properties, result);
-					
-					sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID,0,3);
-					sender.sendChatToPlayer("Created a rift to \"" + result.schematicName() + "\" dungeon (Dimension ID = " + link.destination().getDimension() + ").");
-				}
+				 if (result != null)
+                 {
+                         //Create a rift to our selected dungeon and notify the player
+                         //TODO currently crashes, need to create the dimension first
+                         dimension = PocketManager.getDimensionData(sender.worldObj);
+                         link = dimension.createLink(x, y + 1, z, LinkTypes.DUNGEON,orientation);
+                         PocketBuilder.generateSelectedDungeonPocket(link, mod_pocketDim.properties, result);
+                         
+                         sender.worldObj.setBlock(x, y + 1, z,mod_pocketDim.blockRift.blockID,0,3);
+     					sendChat(sender,("Created a rift to \"" + result.schematicName() + "\" dungeon (Dimension ID = " + link.destination().getDimension() + ")."));
+                 }
 				else
 				{
 					//No matches!
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
similarity index 83%
rename from StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
index 5360cff..1081a18 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandCreatePocket.java
@@ -1,5 +1,6 @@
 package StevenDimDoors.mod_pocketDim.commands;
 
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
 
@@ -20,6 +21,11 @@ public class CommandCreatePocket extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-create";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -41,7 +47,7 @@ public class CommandCreatePocket extends DDCommandBase
 			DungeonHelper.instance().createCustomDungeonDoor(sender.worldObj, x, y, z);
 			
 			//Notify the player
-			sender.sendChatToPlayer("Created a door to a pocket dimension. Please build your dungeon there.");
+			sendChat(sender,("Created a door to a pocket dimension. Please build your dungeon there."));
 		}
 		return DDCommandResult.SUCCESS;
 	}
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
similarity index 81%
rename from StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
index 4b2cf42..2923716 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteAllLinks.java
@@ -1,14 +1,16 @@
 package StevenDimDoors.mod_pocketDim.commands;
 
-import java.util.ArrayList;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 
+import java.util.ArrayList;
+
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+
+@SuppressWarnings("deprecation")
 public class CommandDeleteAllLinks extends DDCommandBase
 {
 	private static CommandDeleteAllLinks instance = null;
@@ -26,6 +28,11 @@ public class CommandDeleteAllLinks extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-deletelinks <targetDimensionID>";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -41,7 +48,7 @@ public class CommandDeleteAllLinks extends DDCommandBase
 		{
 			targetDim=0;
 			shouldGo=false;
-			sender.sendChatToPlayer("Error-Invalid argument, delete_all_links <targetDimID>");
+			sendChat(sender, ("Error-Invalid argument, delete_all_links <targetDimID>"));
 		}
 
 		if(shouldGo)
@@ -59,7 +66,7 @@ public class CommandDeleteAllLinks extends DDCommandBase
 
 					linksRemoved++;
 				}
-				sender.sendChatToPlayer("Removed " + linksRemoved + " links.");
+				sendChat(sender,("Removed " + linksRemoved + " links."));
 			
 		}
 		return DDCommandResult.SUCCESS; //TEMPORARY HACK
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
similarity index 82%
rename from StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
index 61668d7..521672c 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandDeleteRifts.java
@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim.commands;
 
 import java.util.ArrayList;
 
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
@@ -9,6 +10,7 @@ import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 
+@SuppressWarnings("deprecation")
 public class CommandDeleteRifts extends DDCommandBase
 {
 	private static CommandDeleteRifts instance = null;
@@ -26,6 +28,11 @@ public class CommandDeleteRifts extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-??? <dimension ID>";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -41,7 +48,7 @@ public class CommandDeleteRifts extends DDCommandBase
 		{
 			targetDim=0;
 			shouldGo=false;
-			sender.sendChatToPlayer("Error-Invalid argument, delete_all_links <targetDimID>");
+			sendChat(sender,("Error-Invalid argument, delete_all_links <targetDimID>"));
 		}
 
 		if(shouldGo)
@@ -61,7 +68,7 @@ public class CommandDeleteRifts extends DDCommandBase
 						dim.deleteLink(link);
 					}
 				}
-				sender.sendChatToPlayer("Removed " + linksRemoved + " rifts.");
+				sendChat(sender,("Removed " + linksRemoved + " rifts."));
 			
 		}
 		return DDCommandResult.SUCCESS; //TEMPORARY HACK
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
similarity index 93%
rename from StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
index 8968d11..7e7df1d 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandExportDungeon.java
@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim.commands;
 
 import java.io.File;
 
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.helpers.DungeonHelper;
@@ -25,6 +26,13 @@ public class CommandExportDungeon extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-export <dungeon type> <dungeon name> open <weight>\r\n" +
+				"       /dd-export <dungeon type> <dungeon name> closed <weight>\r\n" +
+				"       /dd-export <schematic name> override";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -132,7 +140,7 @@ public class CommandExportDungeon extends DDCommandBase
 		String exportPath = properties.CustomSchematicDirectory + File.separator + name + ".schematic";
 		if (dungeonHelper.exportDungeon(player.worldObj, x, y, z, exportPath))
 		{
-			player.sendChatToPlayer("Saved dungeon schematic in " + exportPath);
+			sendChat(player,("Saved dungeon schematic in " + exportPath));
 			dungeonHelper.registerDungeon(exportPath, dungeonHelper.getDungeonPack("ruins"), false, true);
 			return DDCommandResult.SUCCESS;
 		}
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
similarity index 88%
rename from StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
index d4353fe..0f51851 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandResetDungeons.java
@@ -2,6 +2,7 @@ package StevenDimDoors.mod_pocketDim.commands;
 
 import java.util.ArrayList;
 
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.common.DimensionManager;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
@@ -9,6 +10,7 @@ import StevenDimDoors.mod_pocketDim.core.LinkTypes;
 import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 
+@SuppressWarnings("deprecation")
 public class CommandResetDungeons extends DDCommandBase
 {	
 	private static CommandResetDungeons instance = null;
@@ -26,6 +28,11 @@ public class CommandResetDungeons extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "/dd-resetdungeons";
+	}
+
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command)
 	{
@@ -84,7 +91,7 @@ public class CommandResetDungeons extends DDCommandBase
 		//TODO- for some reason the parent field of loaded dimenions get reset to null if I call .setParentToRoot() before I delete the pockets. 
 		//TODO implement blackList
 		//Notify the user of the results
-		sender.sendChatToPlayer("Reset complete. " + resetCount + " out of " + dungeonCount + " dungeons were reset.");
+		sendChat(sender,("Reset complete. " + resetCount + " out of " + dungeonCount + " dungeons were reset."));
 		return DDCommandResult.SUCCESS;
 	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
similarity index 83%
rename from StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
index c91286c..d123e19 100644
--- a/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/CommandTeleportPlayer.java
@@ -1,23 +1,16 @@
 package StevenDimDoors.mod_pocketDim.commands;
-import java.util.ArrayList;
+
+import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import StevenDimDoors.mod_pocketDim.util.Point4D;
+
 import java.util.Arrays;
 import java.util.List;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-
-import StevenDimDoors.mod_pocketDim.BlankTeleporter;
-import StevenDimDoors.mod_pocketDim.core.DDTeleporter;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
-import StevenDimDoors.mod_pocketDim.util.Point4D;
-
+import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.DimensionManager;
 
-
 public class CommandTeleportPlayer extends DDCommandBase
 {	
 	private static CommandTeleportPlayer instance = null;
@@ -36,13 +29,18 @@ public class CommandTeleportPlayer extends DDCommandBase
 		return instance;
 	}
 
+	@Override
+	public String getCommandUsage(ICommandSender sender) {
+		return "Usage: /dd-tp <player name> <dimension id> <x> <y> <z>";
+	}
+
 	/**
 	 * TODO- Change to accept variety of input, like just coords, just dim ID, or two player names. 
 	 */
 	@Override
 	protected DDCommandResult processCommand(EntityPlayer sender, String[] command) 
 	{
-		List dimensionIDs = Arrays.asList(DimensionManager.getStaticDimensionIDs()); //Gets list of all registered dimensions, regardless if loaded or not
+		List<Integer> dimensionIDs = Arrays.asList(DimensionManager.getStaticDimensionIDs()); //Gets list of all registered dimensions, regardless if loaded or not
 		EntityPlayer targetPlayer = sender;
 		int dimDestinationID = sender.worldObj.provider.dimensionId;
 		
diff --git a/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
similarity index 77%
rename from StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
index 9a7c534..87c08ed 100644
--- a/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandBase.java
@@ -3,6 +3,7 @@ package StevenDimDoors.mod_pocketDim.commands;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatMessageComponent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
 
 /*
@@ -32,6 +33,7 @@ public abstract class DDCommandBase extends CommandBase
 	 */
 	protected abstract DDCommandResult processCommand(EntityPlayer sender, String[] command);
 	
+	@Override
 	public final String getCommandName()
 	{
 		return name;
@@ -49,6 +51,7 @@ public abstract class DDCommandBase extends CommandBase
 	 * Method invoked by the server to execute a command. The call is forwarded to a derived class
 	 * to provide the sending player directly.
 	 */
+	@Override
 	public final void processCommand(ICommandSender sender, String[] command)
 	{
 		//Forward the command
@@ -63,10 +66,24 @@ public abstract class DDCommandBase extends CommandBase
 				//Send the argument formats for this command
 				for (String format : formats)
 				{
-					player.sendChatToPlayer("Usage: " + name + " " + format);
+					sendChat(player,("Usage: " + name + " " + format));
 				}
 			}
-			player.sendChatToPlayer(result.getMessage());
+			sendChat(player,(result.getMessage()));
 		}
 	}
+
+	public static void sendChat(EntityPlayer player, String message)
+	{
+		ChatMessageComponent cmp = new ChatMessageComponent();
+		cmp.addText(message);
+		player.sendChatToPlayer(cmp);
+
+	}
+	
+	@Override
+	public int compareTo(Object par1Obj)
+    {
+        return this.getCommandName().compareTo(((CommandBase)par1Obj).getCommandName());
+    }
 }
diff --git a/StevenDimDoors/mod_pocketDim/commands/DDCommandResult.java b/src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandResult.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/commands/DDCommandResult.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/commands/DDCommandResult.java
diff --git a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
index c9e9c66..4d78abf 100644
--- a/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/DDTeleporter.java
@@ -9,7 +9,6 @@ import net.minecraft.entity.EntityList;
 import net.minecraft.entity.item.EntityMinecart;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemDoor;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.packet.Packet41EntityEffect;
 import net.minecraft.network.packet.Packet43Experience;
@@ -23,8 +22,6 @@ 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.blocks.BlockRift;
-import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
 import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
 import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
@@ -34,6 +31,7 @@ import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.world.PocketBuilder;
 import cpw.mods.fml.common.registry.GameRegistry;
 
+@SuppressWarnings("deprecation")
 public class DDTeleporter
 {
 	private static final Random random = new Random();
@@ -235,7 +233,7 @@ public class DDTeleporter
 	private static void setEntityPosition(Entity entity, double x, double y, double z)
 	{
 		entity.lastTickPosX = entity.prevPosX = entity.posX = x;
-		entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset;
+		entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset;
 		entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z;
 		entity.setPosition(x, y, z);
 	}
@@ -304,7 +302,7 @@ public class DDTeleporter
 		}
 		else
 		{
-			newWorld = (WorldServer) oldWorld;
+			newWorld = oldWorld;
 		}
 		
 
@@ -327,6 +325,7 @@ public class DDTeleporter
 				// the last non-sleeping player leaves the Overworld
 				// for a pocket dimension, causing all sleeping players
 				// to remain asleep instead of progressing to day.
+				((WorldServer)entity.worldObj).getPlayerManager().removePlayer(player);
 				oldWorld.removePlayerEntityDangerously(player);
 				player.isDead = false;
 
@@ -357,13 +356,13 @@ public class DDTeleporter
 				oldWorld.getChunkFromChunkCoords(entX, entZ).isModified = true;
 			}
 			// Memory concerns.
-			oldWorld.releaseEntitySkin(entity);
+			oldWorld.onEntityRemoved(entity);
 
 			if (player == null) // Are we NOT working with a player?
 			{
 				NBTTagCompound entityNBT = new NBTTagCompound();
 				entity.isDead = false;
-				entity.addEntityID(entityNBT);
+				entity.writeMountToNBT(entityNBT);
 				entity.isDead = true;
 				entity = EntityList.createEntityFromNBT(entityNBT, newWorld);
 
@@ -399,7 +398,6 @@ public class DDTeleporter
 		if (player != null)
 		{
 			newWorld.getChunkProvider().loadChunk(MathHelper.floor_double(entity.posX) >> 4, MathHelper.floor_double(entity.posZ) >> 4);
-
 			// Tell Forge we're moving its players so everyone else knows.
 			// Let's try doing this down here in case this is what's killing NEI.
 			GameRegistry.onPlayerChangedDimension((EntityPlayer)entity);
@@ -471,7 +469,7 @@ public class DDTeleporter
 		{
 			if(PocketManager.isBlackListed(link.destination().getDimension()))
 			{
-				link=PocketManager.getDimensionData(link.source().getDimension()).createLink(link.source,LinkTypes.SAFE_EXIT,link.orientation);
+				link=PocketManager.getDimensionData(link.source().getDimension()).createLink(link.link.point,LinkTypes.SAFE_EXIT,link.link.orientation);
 			}
 			else
 			{
@@ -547,7 +545,7 @@ public class DDTeleporter
 		// To avoid loops, don't generate a destination if the player is
 		// already in a non-pocket dimension.
 		
-		NewDimData current = PocketManager.getDimensionData(link.source.getDimension());
+		NewDimData current = PocketManager.getDimensionData(link.link.point.getDimension());
 		if (current.isPocketDimension())
 		{
 			Point4D source = link.source();
@@ -571,7 +569,7 @@ public class DDTeleporter
 	{
 		World startWorld = PocketManager.loadDimension(link.source().getDimension());
 		World destWorld = PocketManager.loadDimension(link.destination().getDimension());
-		TileEntity doorTE = startWorld.getBlockTileEntity(link.source().getX(), link.source().getY(), link.source.getZ());
+		TileEntity doorTE = startWorld.getBlockTileEntity(link.source().getX(), link.source().getY(), link.link.point.getZ());
 		if(doorTE instanceof TileEntityDimDoor)
 		{
 			if((TileEntityDimDoor.class.cast(doorTE).hasGennedPair))
@@ -601,7 +599,7 @@ public class DDTeleporter
 	}
 	private static boolean generateSafeExit(DimLink link, DDProperties properties)
 	{
-		NewDimData current = PocketManager.getDimensionData(link.source.getDimension());
+		NewDimData current = PocketManager.getDimensionData(link.link.point.getDimension());
 		return generateSafeExit(current.root(), link, properties);
 	}
 	
@@ -610,7 +608,7 @@ public class DDTeleporter
 		// A dungeon exit acts the same as a safe exit, but has the chance of
 		// taking the user to any non-pocket dimension, excluding Limbo and The End.
 		
-		NewDimData current = PocketManager.getDimensionData(link.source.getDimension());
+		NewDimData current = PocketManager.getDimensionData(link.link.point.getDimension());
 		ArrayList<NewDimData> roots = PocketManager.getRootDimensions();
 		int shiftChance = START_ROOT_SHIFT_CHANCE + ROOT_SHIFT_CHANCE_PER_LEVEL * (current.packDepth() - 1);
 
diff --git a/StevenDimDoors/mod_pocketDim/core/DimLink.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
similarity index 70%
rename from StevenDimDoors/mod_pocketDim/core/DimLink.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
index 0b89b30..7b0d18a 100644
--- a/StevenDimDoors/mod_pocketDim/core/DimLink.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/DimLink.java
@@ -4,46 +4,56 @@ import java.util.LinkedList;
 import java.util.List;
 
 import StevenDimDoors.mod_pocketDim.util.Point4D;
+import StevenDimDoors.mod_pocketDim.watcher.ClientLinkData;
+
 public abstract class DimLink
 {	
-	protected Point4D source;
+	protected ClientLinkData link;
 	protected DimLink parent;
 	protected LinkTail tail;
-	protected int orientation;
 	protected List<DimLink> children;
 	
-	protected DimLink(Point4D source, DimLink parent, int orientation)
+	protected DimLink(ClientLinkData link, DimLink parent)
 	{
 		
-		if (parent.source.getDimension() != source.getDimension())
+		if (parent.link.point.getDimension() != link.point.getDimension())
 		{
 			// Ban having children in other dimensions to avoid serialization issues with cross-dimensional tails
 			throw new IllegalArgumentException("source and parent.source must have the same dimension.");
 		}
-		this.orientation=orientation;
 		this.parent = parent;
-		this.source = source;
+		this.link = link;
 		this.tail = parent.tail;
 		this.children = new LinkedList<DimLink>();
 		parent.children.add(this);
 	}
 	
-	protected DimLink(Point4D source, int linkType, int orientation)
+	protected DimLink(ClientLinkData link, int linkType)
 	{
 		if ((linkType < LinkTypes.ENUM_MIN || linkType > LinkTypes.ENUM_MAX) && linkType != LinkTypes.CLIENT_SIDE)
 		{
 			throw new IllegalArgumentException("The specified link type is invalid.");
 		}
-		this.orientation = orientation;
+
 		this.parent = null;
-		this.source = source;
+		this.link = link;
 		this.tail = new LinkTail(linkType, null);
 		this.children = new LinkedList<DimLink>();
 	}
 
 	public Point4D source()
 	{
-		return source;
+		return link.point;
+	}
+
+	public int orientation()
+	{
+		return link.orientation;
+	}
+
+	public ClientLinkData link()
+	{
+		return link;
 	}
 
 	public Point4D destination()
@@ -52,7 +62,7 @@ public abstract class DimLink
 	}
 	public int getDestinationOrientation()
 	{
-		return PocketManager.getLink(source.getX(), source.getY(), source.getZ(), source.getDimension()).orientation();
+		return PocketManager.getLink(link.point.getX(), link.point.getY(), link.point.getZ(), link.point.getDimension()).link().orientation;
 	}
 	public boolean hasDestination()
 	{
@@ -78,13 +88,9 @@ public abstract class DimLink
 	{
 		return tail.getLinkType();
 	}
-	public int orientation()
-	{
-		return orientation;
-	}
 
 	public String toString()
 	{
-		return source + " -> " + (hasDestination() ? destination() : "");
+		return link.point + " -> " + (hasDestination() ? destination() : "");
 	}
 }
diff --git a/StevenDimDoors/mod_pocketDim/core/IDimRegistrationCallback.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/IDimRegistrationCallback.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/core/IDimRegistrationCallback.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/IDimRegistrationCallback.java
diff --git a/StevenDimDoors/mod_pocketDim/core/LinkTail.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/LinkTail.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/core/LinkTail.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/LinkTail.java
diff --git a/StevenDimDoors/mod_pocketDim/core/LinkTypes.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/LinkTypes.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/core/LinkTypes.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/LinkTypes.java
diff --git a/StevenDimDoors/mod_pocketDim/core/NewDimData.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java
similarity index 93%
rename from StevenDimDoors/mod_pocketDim/core/NewDimData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java
index a91883d..2311584 100644
--- a/StevenDimDoors/mod_pocketDim/core/NewDimData.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/NewDimData.java
@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.Random;
 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;
@@ -14,18 +15,19 @@ import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonPack;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher;
 
+@SuppressWarnings("deprecation")
 public abstract class NewDimData
 {
 	private static class InnerDimLink extends DimLink
 	{
 		public InnerDimLink(Point4D source, DimLink parent,int orientation)
 		{
-			super(source, parent,orientation);
+			super(new ClientLinkData(source, orientation), parent);
 		}
 		
 		public InnerDimLink(Point4D source, int linkType, int orientation)
 		{
-			super(source, linkType,orientation);
+			super(new ClientLinkData(source, orientation), linkType);
 		}
 
 		public void setDestination(int x, int y, int z, NewDimData dimension)
@@ -49,7 +51,7 @@ public abstract class NewDimData
 			}
 			
 			parent = null;
-			source = null;
+			link = null;
 			tail = new LinkTail(0, null);
 		}
 		
@@ -64,7 +66,7 @@ public abstract class NewDimData
 				//Ignore this request silently
 				return false;
 			}
-			if (nextParent.source.getDimension() != source.getDimension())
+			if (nextParent.link.point.getDimension() != link.point.getDimension())
 			{
 				// Ban having children in other dimensions to avoid serialization issues with cross-dimensional tails
 				throw new IllegalArgumentException("source and parent.source must have the same dimension.");
@@ -87,7 +89,7 @@ public abstract class NewDimData
 			parent = nextParent;
 			tail = nextParent.tail;
 			nextParent.children.add(this);
-			this.orientation=orientation;
+			this.link.orientation=orientation;
 			return true;
 		}
 		
@@ -110,7 +112,7 @@ public abstract class NewDimData
 			parent = null;
 			tail = new LinkTail(linkType, null);
 			//Set new orientation
-			this.orientation=orientation;
+			this.link.orientation=orientation;
 		}
 	}
 	
@@ -129,10 +131,10 @@ public abstract class NewDimData
 	protected Point4D origin;
 	protected int orientation;
 	protected DungeonData dungeon;
-	protected IUpdateWatcher<Point4D> linkWatcher;
+	protected IUpdateWatcher<ClientLinkData> linkWatcher;
 	
 	protected NewDimData(int id, NewDimData parent, boolean isPocket, boolean isDungeon,
-		IUpdateWatcher<Point4D> linkWatcher)
+		IUpdateWatcher<ClientLinkData> linkWatcher)
 	{
 		// The isPocket flag is redundant. It's meant as an integrity safeguard.
 		if (isPocket && (parent == null))
@@ -244,7 +246,6 @@ public abstract class NewDimData
 	{
 		return Math.abs(i) + Math.abs(j) + Math.abs(k);
 	}
-	
 	public DimLink createLink(int x, int y, int z, int linkType,int orientation)
 	{
 		return createLink(new Point4D(x, y, z, id), linkType,orientation);
@@ -267,7 +268,7 @@ public abstract class NewDimData
 		//Link created!
 		if(linkType!=LinkTypes.CLIENT_SIDE)
 		{
-			linkWatcher.onCreated(link.source);
+			linkWatcher.onCreated(link.link);
 		}
 		return link;
 	}
@@ -290,19 +291,19 @@ public abstract class NewDimData
 		InnerDimLink link = linkMapping.get(source);
 		if (link == null)
 		{
-			link = new InnerDimLink(source, parent, parent.orientation);
+			link = new InnerDimLink(source, parent, parent.link.orientation);
 			linkMapping.put(source, link);
 			linkList.add(link);
 			
 			//Link created!
-			linkWatcher.onCreated(link.source);
+			linkWatcher.onCreated(link.link);
 		}
 		else
 		{
-			if (link.overwrite(parent, parent.orientation))
+			if (link.overwrite(parent, parent.link.orientation))
 			{
 				//Link created!
-				linkWatcher.onCreated(link.source);
+				linkWatcher.onCreated(link.link);
 			}
 		}
 		return link;
@@ -319,7 +320,7 @@ public abstract class NewDimData
 		{
 			linkList.remove(target);
 			//Raise deletion event
-			linkWatcher.onDeleted(target.source);
+			linkWatcher.onDeleted(target.link);
 			target.clear();
 		}
 		return (target != null);
@@ -333,7 +334,11 @@ public abstract class NewDimData
 		{
 			linkList.remove(target);
 			//Raise deletion event
-			linkWatcher.onDeleted(target.source);
+			//TODO why is source null here?
+			if(target.link!=null)
+			{
+				linkWatcher.onDeleted(target.link);
+			}
 			target.clear();
 		}
 		return (target != null);
diff --git a/StevenDimDoors/mod_pocketDim/core/PocketManager.java b/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
similarity index 93%
rename from StevenDimDoors/mod_pocketDim/core/PocketManager.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
index 5072c54..f24e4f3 100644
--- a/StevenDimDoors/mod_pocketDim/core/PocketManager.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/core/PocketManager.java
@@ -36,6 +36,7 @@ import StevenDimDoors.mod_pocketDim.watcher.UpdateWatcherProxy;
  * This class regulates all the operations involving the storage and manipulation of dimensions. It handles saving dim data, teleporting the player, and 
  * creating/registering new dimensions as well as loading old dimensions on startup
  */
+@SuppressWarnings("deprecation")
 public class PocketManager
 {	
 	private static class InnerDimData extends NewDimData implements IPackable<PackedDimData>
@@ -46,7 +47,7 @@ public class PocketManager
 		// that any link destinations must be real dimensions controlled by PocketManager.
 
 		public InnerDimData(int id, InnerDimData parent, boolean isPocket, boolean isDungeon,
-			IUpdateWatcher<Point4D> linkWatcher)
+			IUpdateWatcher<ClientLinkData> linkWatcher)
 		{
 			super(id, parent, isPocket, isDungeon, linkWatcher);
 		}
@@ -118,7 +119,7 @@ public class PocketManager
 				Point3D parentPoint = new Point3D(-1,-1,-1);
 				if(link.parent!=null)
 				{
-					parentPoint=link.parent.source.toPoint3D();
+					parentPoint=link.parent.link.point.toPoint3D();
 				}
 				
 				for(DimLink childLink : link.children)
@@ -126,7 +127,7 @@ public class PocketManager
 					children.add(childLink.source().toPoint3D());
 				}
 				PackedLinkTail tail = new PackedLinkTail(link.tail.getDestination(),link.tail.getLinkType());
-				Links.add(new PackedLinkData(link.source,parentPoint,tail,link.orientation,children));
+				Links.add(new PackedLinkData(link.link.point,parentPoint,tail,link.link.orientation,children));
 				
 				PackedLinkTail tempTail = new PackedLinkTail(link.tail.getDestination(),link.tail.getLinkType());
 				if(Tails.contains(tempTail))
@@ -154,24 +155,24 @@ public class PocketManager
 		}
 	}
 	
-	private static class ClientLinkWatcher implements IUpdateWatcher<ClientLinkData>
-	{
-		@Override
-		public void onCreated(ClientLinkData link)
-		{
-			Point4D source = link.point;
-			NewDimData dimension = getDimensionData(source.getDimension());
-			dimension.createLink(source.getX(), source.getY(), source.getZ(), LinkTypes.CLIENT_SIDE,link.orientation);
-		}
+	  private static class ClientLinkWatcher implements IUpdateWatcher<ClientLinkData>
+      {
+		  @Override
+		  public void onCreated(ClientLinkData link)
+		  {
+			  Point4D source = link.point;
+			  NewDimData dimension = getDimensionData(source.getDimension());
+			  dimension.createLink(source.getX(), source.getY(), source.getZ(), LinkTypes.CLIENT_SIDE,link.orientation);
+		  }
 
-		@Override
-		public void onDeleted(ClientLinkData link)
-		{
-			Point4D source = link.point;
-			NewDimData dimension = getDimensionData(source.getDimension());
-			dimension.deleteLink(source.getX(), source.getY(), source.getZ());
-		}
-	}
+		  @Override
+		  public void onDeleted(ClientLinkData link)
+		  {
+			  Point4D source = link.point;
+			  NewDimData dimension = getDimensionData(source.getDimension());
+			  dimension.deleteLink(source.getX(), source.getY(), source.getZ());
+              }
+      }
 	
 	private static class ClientDimWatcher implements IUpdateWatcher<ClientDimData>
 	{
@@ -211,7 +212,7 @@ public class PocketManager
 	 * Set as true if we are a client that has connected to a dedicated server
 	 */
 	public static volatile boolean isConnected = false;
-	private static final UpdateWatcherProxy<Point4D> linkWatcher = new UpdateWatcherProxy<Point4D>();
+	private static final UpdateWatcherProxy<ClientLinkData> linkWatcher = new UpdateWatcherProxy<ClientLinkData>();
 	private static final UpdateWatcherProxy<ClientDimData> dimWatcher = new UpdateWatcherProxy<ClientDimData>();
 	private static ArrayList<NewDimData> rootDimensions = null;
 
@@ -276,6 +277,7 @@ public class PocketManager
 			dimData.parent=dimData;
 			dimData.isFilled=packedData.IsFilled;
 			dimData.origin = new Point4D(packedData.Origin.getX(),packedData.Origin.getY(),packedData.Origin.getZ(),packedData.ID);
+
 			PocketManager.rootDimensions.add(dimData);
 		}
 		else
@@ -284,6 +286,7 @@ public class PocketManager
 			dimData =  new InnerDimData(packedData.ID, test,true, packedData.IsDungeon, linkWatcher);
 			dimData.isFilled=packedData.IsFilled;
 			dimData.origin = new Point4D(packedData.Origin.getX(),packedData.Origin.getY(),packedData.Origin.getZ(),packedData.ID);
+
 			dimData.root=PocketManager.getDimensionData(packedData.RootID);
 			
 			if(packedData.DungeonData!=null)
@@ -596,8 +599,7 @@ public class PocketManager
 
 	public static void unload()
 	{
-		System.out.println("Dimensional Doors unloading...");
-
+		System.out.println("Unloading Pocket Dimensions...");
 		if (!isLoaded)
 		{
 			throw new IllegalStateException("Pocket dimensions have already been unloaded!");
@@ -648,12 +650,12 @@ public class PocketManager
 		return dimWatcher.unregisterReceiver(watcher);
 	}
 	
-	public static void registerLinkWatcher(IUpdateWatcher<Point4D> watcher)
+	public static void registerLinkWatcher(IUpdateWatcher<ClientLinkData> watcher)
 	{
 		linkWatcher.registerReceiver(watcher);
 	}
 	
-	public static boolean unregisterLinkWatcher(IUpdateWatcher<Point4D> watcher)
+	public static boolean unregisterLinkWatcher(IUpdateWatcher<ClientLinkData> watcher)
 	{
 		return linkWatcher.unregisterReceiver(watcher);
 	}
@@ -685,9 +687,10 @@ public class PocketManager
 	}	
 	public static void readPacket(DataInputStream input) throws IOException
 	{
+		//TODO- figure out why this is getting called so frequently
 		if (isLoaded)
 		{
-			throw new IllegalStateException("Pocket dimensions have already been loaded!");
+			return;		
 		}
 		if (isLoading)
 		{
@@ -696,8 +699,12 @@ public class PocketManager
 		// Load compacted client-side dimension data
 		load();
 		Compactor.readDimensions(input, new DimRegistrationCallback());
-		isConnected = true;
+		
+		// Register pocket dimensions
+		DDProperties properties = DDProperties.instance();
+				
 		isLoaded = true;
 		isLoading = false;
+		isConnected = true;
 	}
 }
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/DungeonData.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonData.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/DungeonData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonData.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
index 053008f..a4b3d23 100644
--- a/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/DungeonSchematic.java
@@ -81,6 +81,7 @@ public class DungeonSchematic extends Schematic {
 
 	public static DungeonSchematic readFromFile(File schematicFile) throws FileNotFoundException, InvalidSchematicException
 	{
+		// TODO: fix resource leak
 		return readFromStream(new FileInputStream(schematicFile));
 	}
 
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/FillContainersOperation.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/FillContainersOperation.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/FillContainersOperation.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/FillContainersOperation.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/ModBlockFilter.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/ModBlockFilter.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/ModBlockFilter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/ModBlockFilter.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/SpecialBlockFinder.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/SpecialBlockFinder.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/SpecialBlockFinder.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/SpecialBlockFinder.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRule.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRule.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRule.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRule.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRuleDefinition.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRuleDefinition.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRuleDefinition.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonChainRuleDefinition.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPack.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPack.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPack.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPack.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfig.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfig.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfig.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfig.java
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java
index a4aae61..bbefaa7 100644
--- a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonPackConfigReader.java
@@ -49,6 +49,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor<DungeonP
 
 	public DungeonPackConfigReader() { }
 
+	@SuppressWarnings("resource")
 	@Override
 	public DungeonPackConfig readFromStream(InputStream inputStream) throws ConfigurationProcessingException
 	{
@@ -206,6 +207,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor<DungeonP
 
 	private class DungeonTypeProcessor implements ILineProcessor
 	{
+		@Override
 		public void process(String line, DungeonPackConfig config) throws ConfigurationProcessingException
 		{
 			List<String> typeNames = config.getTypeNames();
@@ -229,6 +231,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor<DungeonP
 	
 	private class DungeonSettingsParser implements ILineProcessor
 	{
+		@Override
 		public void process(String line, DungeonPackConfig config) throws ConfigurationProcessingException
 		{
 			//The various settings that we support will be hardcoded here.
@@ -295,6 +298,7 @@ public class DungeonPackConfigReader extends BaseConfigurationProcessor<DungeonP
 
 	private class RuleDefinitionParser implements ILineProcessor
 	{
+		@Override
 		public void process(String definition, DungeonPackConfig config) throws ConfigurationProcessingException
 		{
 			String[] ruleParts;
diff --git a/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonType.java b/src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonType.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonType.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/dungeon/pack/DungeonType.java
diff --git a/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java
index 8150f18..814f6f6 100644
--- a/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/BlockRotationHelper.java
@@ -17,7 +17,7 @@ public class BlockRotationHelper
 	{
 		HashMap<Integer,HashMap<Integer, Integer>> orientation0 = new HashMap<Integer,HashMap<Integer, Integer>>();
 		
-		HashMap<Integer,Integer> stairs0 = new HashMap();
+		HashMap<Integer,Integer> stairs0 = new HashMap<Integer,Integer>();
 		
 		stairs0.put(0, 2);
 		stairs0.put(1, 3);
diff --git a/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
similarity index 52%
rename from StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
index e758218..c14e955 100644
--- a/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/ChunkLoaderHelper.java
@@ -1,5 +1,12 @@
 package StevenDimDoors.mod_pocketDim.helpers;
 
+import StevenDimDoors.mod_pocketDim.IChunkLoader;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.NewDimData;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
+
+import cpw.mods.fml.common.event.FMLServerStartingEvent;
+
 import java.io.File;
 import java.util.List;
 
@@ -8,41 +15,29 @@ import net.minecraftforge.common.DimensionManager;
 import net.minecraftforge.common.ForgeChunkManager;
 import net.minecraftforge.common.ForgeChunkManager.LoadingCallback;
 import net.minecraftforge.common.ForgeChunkManager.Ticket;
-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.tileentities.TileEntityDimDoorGold;
-
-import com.google.common.collect.Lists;
-
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
-
 
 public class ChunkLoaderHelper implements LoadingCallback 
 {
 
 	@Override
-	  public void ticketsLoaded(List<Ticket> tickets, World world)
-    {
-            for (Ticket ticket : tickets)
-            {
-                    int goldDimDoorX = ticket.getModData().getInteger("goldDimDoorX");
-                    int goldDimDoorY = ticket.getModData().getInteger("goldDimDoorY");
-                    int goldDimDoorZ = ticket.getModData().getInteger("goldDimDoorZ");
-                    if(world.getBlockId(goldDimDoorX, goldDimDoorY, goldDimDoorZ)!=mod_pocketDim.properties.GoldDimDoorID)
-                    {
-                            ForgeChunkManager.releaseTicket(ticket);
-                    }
-                    else
-                    {
-                            IChunkLoader tile = (IChunkLoader) world.getBlockTileEntity(goldDimDoorX, goldDimDoorY, goldDimDoorZ);
-                            tile.forceChunkLoading(ticket,goldDimDoorX,goldDimDoorZ);
-                    }                        
-            }
-    }
-
-
+	public void ticketsLoaded(List<Ticket> tickets, World world) 
+	{
+		for (Ticket ticket : tickets) 
+		{
+			int goldDimDoorX = ticket.getModData().getInteger("goldDimDoorX");
+			int goldDimDoorY = ticket.getModData().getInteger("goldDimDoorY");
+			int goldDimDoorZ = ticket.getModData().getInteger("goldDimDoorZ");
+			if(world.getBlockId(goldDimDoorX, goldDimDoorY, goldDimDoorZ)!=mod_pocketDim.properties.GoldDimDoorID)
+			{
+				ForgeChunkManager.releaseTicket(ticket);
+			}
+			else
+			{
+				IChunkLoader tile = (IChunkLoader) world.getBlockTileEntity(goldDimDoorX, goldDimDoorY, goldDimDoorZ);
+				tile.forceChunkLoading(ticket,goldDimDoorX,goldDimDoorZ);
+			}			
+		}
+	}
 
 	public static void loadChunkForcedWorlds(FMLServerStartingEvent event)
 	{
diff --git a/StevenDimDoors/mod_pocketDim/helpers/Compactor.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/Compactor.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/helpers/Compactor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/Compactor.java
index 08ed55d..1f3d0c9 100644
--- a/StevenDimDoors/mod_pocketDim/helpers/Compactor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/Compactor.java
@@ -17,6 +17,7 @@ import StevenDimDoors.mod_pocketDim.watcher.ClientLinkData;
 public class Compactor
 {
 
+	@SuppressWarnings("unused") // ?
 	private static class DimComparator implements Comparator<NewDimData>
 	{
 		@Override
@@ -38,6 +39,7 @@ public class Compactor
 			for (DimLink link : dimension.links())
 			{
 				Point4D.write(link.source(), output);
+				output.writeInt(link.orientation());
 			}
 		}
 		
diff --git a/StevenDimDoors/mod_pocketDim/helpers/DeleteFolder.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/DeleteFolder.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/helpers/DeleteFolder.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/DeleteFolder.java
diff --git a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
index 6207f71..e6d1306 100644
--- a/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/DungeonHelper.java
@@ -140,7 +140,11 @@ public class DungeonHelper
 			config.setName(name);
 			return config;
 		}
-		catch (ConfigurationProcessingException e)
+		catch (FileNotFoundException e)
+		{
+			System.err.println("Could not find a dungeon pack config file: " + configPath);
+		}
+		catch (Exception e) // handles IOException and ConfigurationProcessingException
 		{
 			System.err.println(e.getMessage());
 			if (e.getCause() != null)
@@ -148,10 +152,6 @@ public class DungeonHelper
 				System.err.println(e.getCause());
 			}
 		}
-		catch (FileNotFoundException e)
-		{
-			System.err.println("Could not find a dungeon pack config file: " + configPath);
-		}
 		return null;
 	}
 	
@@ -442,6 +442,7 @@ public class DungeonHelper
 		System.out.println("Registering bundled dungeon pack: " + name);
 		
 		InputStream listStream = this.getClass().getResourceAsStream(listPath);
+		// chance of leak?
 		if (listStream == null)
 		{
 			System.err.println("Unable to open list of bundled dungeon schematics for " + name);
diff --git a/StevenDimDoors/mod_pocketDim/helpers/copyfile.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/copyfile.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/helpers/copyfile.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/copyfile.java
diff --git a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java b/src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java
diff --git a/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
index ea5bbec..a3863d8 100644
--- a/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/BaseItemDoor.java
@@ -29,6 +29,7 @@ public abstract class BaseItemDoor extends ItemDoor
 			properties = DDProperties.instance();
 	}
 
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
 		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
@@ -59,7 +60,7 @@ public abstract class BaseItemDoor extends ItemDoor
 				player.canPlayerEdit(x, y, z, side, stack) && player.canPlayerEdit(x, y + 1, z, side, stack) &&
 				(!requireLink || PocketManager.getLink(x, y + 1, z, world) != null)&&stack.stackSize>0)
 			{
-				int orientation = MathHelper.floor_double((double) ((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
+				int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3;
 				placeDoorBlock(world, x, y, z, orientation, doorBlock);
 
 				if (!player.capabilities.isCreativeMode && reduceStack)
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
similarity index 86%
rename from StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
index 572f506..a97d9f0 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemBlockDimWall.java
@@ -15,7 +15,8 @@ public class ItemBlockDimWall extends ItemBlock
           this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
           setHasSubtypes(true);
     }
-    public void registerIcons(IconRegister par1IconRegister)
+    @Override
+	public void registerIcons(IconRegister par1IconRegister)
     {
         this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("tile.", ""));
     }
@@ -28,6 +29,6 @@ public class ItemBlockDimWall extends ItemBlock
 	
     public String getUnlocalizedName(ItemStack par1ItemStack)
     {
-        return subNames[getItemDamageFromStack(par1ItemStack)];
+        return subNames[this.getDamage(par1ItemStack)];
     }  
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemDimensionalDoor.java
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java
index b30bd7f..2a3c08b 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDimDoor.java
@@ -2,7 +2,6 @@ package StevenDimDoors.mod_pocketDim.items;
 
 import java.util.List;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java
new file mode 100644
index 0000000..889a52d
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemGoldDoor.java
@@ -0,0 +1,58 @@
+package StevenDimDoors.mod_pocketDim.items;
+
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemDoor;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+
+public class ItemGoldDoor extends ItemDoor
+{
+	public ItemGoldDoor(int par1, Material par2Material) 
+	{
+		super(par1, par2Material);
+	}
+
+	@Override
+	public void registerIcons(IconRegister par1IconRegister)
+	{
+		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
+	}
+
+	@Override
+	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10)
+	{
+		if (par7 != 1)
+		{
+			return false;
+		}
+		else
+		{
+			++par5;
+			Block block = mod_pocketDim.goldDoor;
+
+			if (par2EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par2EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack))
+			{
+				if (!block.canPlaceBlockAt(par3World, par4, par5, par6))
+				{
+					return false;
+				}
+				else
+				{
+					int i1 = MathHelper.floor_double((par2EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3;
+					placeDoorBlock(par3World, par4, par5, par6, i1, block);
+					--par1ItemStack.stackSize;
+					return true;
+				}
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+}
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
similarity index 81%
rename from StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
index b51950c..3733ccb 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java
@@ -7,6 +7,9 @@ import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.SharedMonsterAttributes;
+import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.EnumToolMaterial;
@@ -20,6 +23,7 @@ import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
+import com.google.common.collect.Multimap;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -60,10 +64,12 @@ public class ItemRiftBlade extends ItemSword
 	}
 
 	@Override
-    public int getDamageVsEntity(Entity par1Entity)
-    {
-        return 7;
-    }
+	public Multimap getItemAttributeModifiers()
+	{
+		Multimap multimap = super.getItemAttributeModifiers();
+		multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)7, 0));
+		return multimap;
+	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
@@ -73,7 +79,7 @@ public class ItemRiftBlade extends ItemSword
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLiving par2EntityLiving, EntityLiving par3EntityLiving)
+	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLiving, EntityLivingBase par3EntityLiving)
 	{
 		par1ItemStack.damageItem(1, par3EntityLiving);
 		return true;
@@ -85,9 +91,9 @@ public class ItemRiftBlade extends ItemSword
 		float var4 = 1.0F;
 		float var5 = par2EntityPlayer.prevRotationPitch + (par2EntityPlayer.rotationPitch - par2EntityPlayer.prevRotationPitch) * var4;
 		float var6 = par2EntityPlayer.prevRotationYaw + (par2EntityPlayer.rotationYaw - par2EntityPlayer.prevRotationYaw) * var4;
-		double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * (double)var4;
-		double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * (double)var4 + 1.62D - (double)par2EntityPlayer.yOffset;
-		double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * (double)var4;
+		double var7 = par2EntityPlayer.prevPosX + (par2EntityPlayer.posX - par2EntityPlayer.prevPosX) * var4;
+		double var9 = par2EntityPlayer.prevPosY + (par2EntityPlayer.posY - par2EntityPlayer.prevPosY) * var4 + 1.62D - par2EntityPlayer.yOffset;
+		double var11 = par2EntityPlayer.prevPosZ + (par2EntityPlayer.posZ - par2EntityPlayer.prevPosZ) * var4;
 		Vec3 var13 = par1World.getWorldVec3Pool().getVecFromPool(var7, var9, var11);
 		float var14 = MathHelper.cos(-var6 * 0.017453292F - (float)Math.PI);
 		float var15 = MathHelper.sin(-var6 * 0.017453292F - (float)Math.PI);
@@ -100,13 +106,13 @@ public class ItemRiftBlade extends ItemSword
 		{
 			var21 = 7;
 		}
-		Vec3 var23 = var13.addVector((double)var18 * var21, (double)var17 * var21, (double)var20 * var21);
+		Vec3 var23 = var13.addVector(var18 * var21, var17 * var21, var20 * var21);
 		return par1World.rayTraceBlocks_do_do(var13, var23, true, false);
 	}
 
 	private boolean teleportToEntity(ItemStack item, Entity par1Entity, EntityPlayer holder)
 	{
-		Vec3 var2 = holder.worldObj.getWorldVec3Pool().getVecFromPool(holder.posX - par1Entity.posX, holder.boundingBox.minY + (double)(holder.height / 2.0F) - par1Entity.posY + (double)par1Entity.getEyeHeight(), holder.posZ - par1Entity.posZ);
+		Vec3 var2 = holder.worldObj.getWorldVec3Pool().getVecFromPool(holder.posX - par1Entity.posX, holder.boundingBox.minY + holder.height / 2.0F - par1Entity.posY + par1Entity.getEyeHeight(), holder.posZ - par1Entity.posZ);
 
 		double cooef =( var2.lengthVector()-2.5)/var2.lengthVector();
 		var2.xCoord*=cooef;
@@ -141,13 +147,13 @@ public class ItemRiftBlade extends ItemSword
 		if (!world.isRemote)
 		{
 			@SuppressWarnings("unchecked")
-			List<EntityLiving> list =  (List<EntityLiving>) world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(player.posX-8,player.posY-8, player.posZ-8, player.posX+8,player.posY+8, player.posZ+8));
+			List<EntityLiving> list =  world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(player.posX-8,player.posY-8, player.posZ-8, player.posX+8,player.posY+8, player.posZ+8));
 			list.remove(player);
 
 			for (EntityLiving ent : list)
 			{
 				Vec3 var3 = player.getLook(1.0F).normalize();
-				Vec3 var4 =  player.worldObj.getWorldVec3Pool().getVecFromPool(ent.posX -  player.posX, ent.boundingBox.minY + (double)((ent.height) / 2.0F) - ( player.posY + (double) player.getEyeHeight()), ent.posZ -  player.posZ);
+				Vec3 var4 =  player.worldObj.getWorldVec3Pool().getVecFromPool(ent.posX -  player.posX, ent.boundingBox.minY + (ent.height) / 2.0F - ( player.posY + player.getEyeHeight()), ent.posZ -  player.posZ);
 				double var5 = var4.lengthVector();
 				var4 = var4.normalize();
 				double var7 = var3.dotProduct(var4);
@@ -172,13 +178,13 @@ public class ItemRiftBlade extends ItemSword
 						if (player.canPlayerEdit(x, y, z, hit.sideHit, stack) &&
 							player.canPlayerEdit(x, y + 1, z, hit.sideHit, stack))
 						{
-							int orientation = MathHelper.floor_double((double)((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
+							int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3;
 
 							if (BaseItemDoor.canPlace(world, x, y, z) &&
 								BaseItemDoor.canPlace(world, x, y - 1, z))
 							{
 								ItemDimensionalDoor.placeDoorBlock(world, x, y - 1, z, orientation, mod_pocketDim.transientDoor);
-								player.worldObj.playSoundAtEntity(player,"mods.DimDoors.sfx.riftDoor", 0.6f, 1);
+								player.worldObj.playSoundAtEntity(player,mod_pocketDim.modid+":riftDoor", 0.6f, 1);
 								stack.damageItem(3, player);
 								return stack;
 							}
@@ -212,6 +218,7 @@ public class ItemRiftBlade extends ItemSword
 	/**
 	 * allows items to add custom lines of information to the mouseover description
 	 */
+	@Override
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@SideOnly(Side.CLIENT)
 	public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftGoggles.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftGoggles.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/items/ItemRiftGoggles.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftGoggles.java
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
index 578a71f..ee6a62f 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java
@@ -98,15 +98,15 @@ public class ItemRiftSignature extends Item
 				stack.stackSize--;
 			}
 			clearSource(stack);
-			player.sendChatToPlayer("Rift Created");
-			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1);
+			mod_pocketDim.sendChat(player,("Rift Created"));
+			world.playSoundAtEntity(player,mod_pocketDim.modid+":riftEnd", 0.6f, 1);
 		}
 		else
 		{
 			//The link signature has not been used. Store its current target as the first location. 
 			setSource(stack, x, adjustedY, z,orientation, PocketManager.getDimensionData(world));
-			player.sendChatToPlayer("Location Stored in Rift Signature");
-			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1);
+			mod_pocketDim.sendChat(player,("Location Stored in Rift Signature"));
+			world.playSoundAtEntity(player,mod_pocketDim.modid+":riftStart", 0.6f, 1);
 		}
 		return true;
 	}
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
similarity index 89%
rename from StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
index fca2c24..50b86d0 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java
@@ -25,6 +25,7 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
 		super(itemID);
 	}
 
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
 		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
@@ -49,14 +50,17 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
 		int adjustedY = adjustYForSpecialBlocks(world,x,y,z);
 		
 		// Check if the Stabilized Rift Signature has been initialized
-		int orientation = MathHelper.floor_double((double) ((player.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
+		int orientation = MathHelper.floor_double((player.rotationYaw + 180.0F) * 4.0F / 360.0F - 0.5D) & 3;
 		if (source != null)
 		{
 			// Yes, it's initialized. Check if the player is in creative
 			// or if the player can pay an Ender Pearl to create a rift.
 			if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(Item.enderPearl.itemID))
 			{
-				player.sendChatToPlayer("You don't have any Ender Pearls!");
+				mod_pocketDim.sendChat(player,"You don't have any Ender Pearls!");
+				// I won't do this, but this is the chance to localize chat 
+				// messages sent to the player; look at ChatMessageComponent 
+				// and how MFR does it with items like the safari net launcher
 				return true;
 			}
 
@@ -86,14 +90,14 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
 			{
 				player.inventory.consumeInventoryItem(Item.enderPearl.itemID);
 			}
-			player.sendChatToPlayer("Rift Created");
+			mod_pocketDim.sendChat(player,"Rift Created");
 			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1);
 		}
 		else
 		{
 			//The link signature has not been used. Store its current target as the first location. 
 			setSource(stack, x, adjustedY, z, orientation, PocketManager.getDimensionData(world));
-			player.sendChatToPlayer("Location Stored in Rift Signature");
+			mod_pocketDim.sendChat(player,"Location Stored in Rift Signature");
 			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1);
 		}
 		return true;
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
index b12d8df..3e283b4 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java
@@ -12,6 +12,7 @@ public class ItemStableFabric extends Item
         this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
 	}
 	
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
 		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemUnstableDoor.java
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWarpDoor.java
diff --git a/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java
index 0f5a10e..91162c2 100644
--- a/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/ItemWorldThread.java
@@ -12,6 +12,7 @@ public class ItemWorldThread extends Item
         this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
 	}
 	
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
 		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
diff --git a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java b/src/main/java/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
index 6d1b1ed..119e578 100644
--- a/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java
@@ -29,6 +29,7 @@ public class itemRiftRemover extends Item
 		this.setMaxDamage(4);
 	}
 
+	@Override
 	public void registerIcons(IconRegister par1IconRegister)
 	{
 		this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
@@ -114,7 +115,7 @@ public class itemRiftRemover extends Item
 					 {
 						 stack.damageItem(1, player);
 					 }
-				player.worldObj.playSoundAtEntity(player, "mods.DimDoors.sfx.riftClose", 0.8f, 1);
+				player.worldObj.playSoundAtEntity(player, mod_pocketDim.modid+":riftClose", 0.8f, 1);
 				}
 			}
 		}
diff --git a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
similarity index 93%
rename from StevenDimDoors/mod_pocketDim/mod_pocketDim.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
index 77828ba..dac4868 100644
--- a/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/mod_pocketDim.java
@@ -1,18 +1,5 @@
 package StevenDimDoors.mod_pocketDim;
 
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.EntityEggInfo;
-import net.minecraft.entity.EntityList;
-import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.common.ForgeChunkManager;
-import net.minecraftforge.common.MinecraftForge;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDimWall;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDimWallPerm;
 import StevenDimDoors.mod_pocketDim.blocks.BlockDoorGold;
@@ -62,13 +49,10 @@ import StevenDimDoors.mod_pocketDim.world.LimboProvider;
 import StevenDimDoors.mod_pocketDim.world.PocketProvider;
 import StevenDimDoors.mod_pocketDimClient.ClientPacketHandler;
 import StevenDimDoors.mod_pocketDimClient.ClientTickHandler;
+
 import cpw.mods.fml.common.Mod;
-import cpw.mods.fml.common.Mod.Init;
+import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;
-import cpw.mods.fml.common.Mod.PostInit;
-import cpw.mods.fml.common.Mod.PreInit;
-import cpw.mods.fml.common.Mod.ServerStarting;
-import cpw.mods.fml.common.Mod.ServerStopping;
 import cpw.mods.fml.common.SidedProxy;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -83,6 +67,22 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.common.registry.TickRegistry;
 import cpw.mods.fml.relauncher.Side;
 
+import java.io.File;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityEggInfo;
+import net.minecraft.entity.EntityList;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.EnumToolMaterial;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatMessageComponent;
+import net.minecraft.world.biome.BiomeGenBase;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.common.ForgeChunkManager;
+import net.minecraftforge.common.MinecraftForge;
 
 @Mod(modid = mod_pocketDim.modid, name = "Dimensional Doors", version = mod_pocketDim.version)
 
@@ -91,11 +91,10 @@ clientPacketHandlerSpec =
 @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ClientPacketHandler.class),
 serverPacketHandlerSpec =
 @SidedPacketHandler(channels = {PacketConstants.CHANNEL_NAME}, packetHandler = ServerPacketHandler.class))
-
 public class mod_pocketDim
 {
-	public static final String version = "1.5.2R2.0.1RC1";
-	public static final String modid = "DimDoors";
+	public static final String version = "$VERSION$";
+	public static final String modid = "dimdoors";
 
 	//need to clean up 
 	@SidedProxy(clientSide = "StevenDimDoors.mod_pocketDimClient.ClientProxy", serverSide = "StevenDimDoors.mod_pocketDim.CommonProxy")
@@ -103,7 +102,7 @@ public class mod_pocketDim
 
 	@Instance("PocketDimensions")
 	public static mod_pocketDim instance = new mod_pocketDim();
-	
+
 	public static Block transientDoor;
 	public static Block warpDoor;
 	public static Block goldDoor;
@@ -128,53 +127,56 @@ public class mod_pocketDim
 	public static Item itemStableFabric;
 	public static Item itemChaosDoor;
 	public static Item itemStabilizedLinkSignature;
-	
+
 	public static BiomeGenBase limboBiome;
 	public static BiomeGenBase pocketBiome;
-	
+
 	public static boolean isPlayerWearingGoogles = false;
 
 	public static DDProperties properties;
 	public static MonolithSpawner spawner; //Added this field temporarily. Will be refactored out later.
 	public static GatewayGenerator riftGen;
-	
-	 public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") 
-	 {
-		 @Override
-		 public ItemStack getIconItemStack() 
-		 {
-			 return new ItemStack(mod_pocketDim.itemDimDoor, 1, 0);
-         }
-		 
-		 @Override
-		 public String getTranslatedTabLabel()
-		 {
-			 return "Dimensional Doors";
-		 }
-	 };
-	 
-	 
 
-	@PreInit
+	public static CreativeTabs dimDoorsCreativeTab = new CreativeTabs("dimDoorsCreativeTab") 
+	{
+		@Override
+		public ItemStack getIconItemStack() 
+		{
+			return new ItemStack(mod_pocketDim.itemDimDoor, 1, 0);
+		}
+
+		@Override
+		public String getTranslatedTabLabel()
+		{
+			return "Dimensional Doors";
+		}
+	};
+
+
+
+	@EventHandler
 	public void onPreInitialization(FMLPreInitializationEvent event)
 	{
-		this.instance = this;
+		instance = this;
 		//This should be the FIRST thing that gets done.
-		properties = DDProperties.initialize(event.getSuggestedConfigurationFile());
+		String path = event.getSuggestedConfigurationFile().getAbsolutePath().replace(modid, "DimDoors");
+
+		properties = DDProperties.initialize(new File(path));
 
 		//Now do other stuff
 		MinecraftForge.EVENT_BUS.register(new EventHookContainer(properties));
-		
+
 		riftGen = new GatewayGenerator(properties);
 	}
 
-	@Init
+	@SuppressWarnings("unused")
+	@EventHandler
 	public void onInitialization(FMLInitializationEvent event)
 	{
 		CommonTickHandler commonTickHandler = new CommonTickHandler();
 		TickRegistry.registerTickHandler(new ClientTickHandler(), Side.CLIENT);
 		TickRegistry.registerTickHandler(commonTickHandler, Side.SERVER);
-		
+
 		//MonolithSpawner should be initialized before any provider instances are created
 		//Register the other regular tick receivers as well
 		spawner = new MonolithSpawner(commonTickHandler, properties);
@@ -193,7 +195,7 @@ public class mod_pocketDim
 		unstableDoor = (new UnstableDoor(properties.UnstableDoorID, Material.iron, properties).setHardness(.2F).setUnlocalizedName("chaosDoor").setLightValue(.0F) );
 		dimensionalDoor = (DimensionalDoor) (new DimensionalDoor(properties.DimensionalDoorID, Material.iron, properties).setHardness(1.0F).setResistance(2000.0F) .setUnlocalizedName("dimDoor"));
 		transTrapdoor = (TransTrapdoor) (new TransTrapdoor(properties.TransTrapdoorID, Material.wood).setHardness(1.0F) .setUnlocalizedName("dimHatch"));
-		
+
 		itemGoldDimDoor = (new ItemGoldDimDoor(properties.GoldDimDoorItemID, Material.iron)).setUnlocalizedName("itemGoldDimDoor");
 		itemGoldDoor = (new ItemGoldDoor(properties.GoldDoorID, Material.wood)).setUnlocalizedName("itemGoldDoor");
 		itemDimDoor = (new ItemDimensionalDoor(properties.DimensionalDoorItemID, Material.iron)).setUnlocalizedName("itemDimDoor");
@@ -206,7 +208,7 @@ public class mod_pocketDim
 		itemStabilizedLinkSignature = (new ItemStabilizedRiftSignature(properties.StabilizedRiftSignatureItemID)).setUnlocalizedName("itemStabilizedRiftSig");
 		itemWorldThread = (new ItemWorldThread(properties.ItemWorldThreadID)).setUnlocalizedName("itemWorldThread");
 
-		
+
 		mod_pocketDim.limboBiome= (new BiomeGenLimbo(properties.LimboBiomeID));
 		mod_pocketDim.pocketBiome= (new BiomeGenPocket(properties.PocketBiomeID));
 
@@ -222,7 +224,7 @@ public class mod_pocketDim
 		GameRegistry.registerBlock(transTrapdoor,"Transdimensional Trapdoor");
 		GameRegistry.registerBlock(blockDimWallPerm, "Fabric of RealityPerm");
 		GameRegistry.registerBlock(transientDoor, "transientDoor");
-		
+
 		GameRegistry.registerBlock(blockDimWall, ItemBlockDimWall.class, "Fabric of Reality");
 
 		DimensionManager.registerProviderType(properties.PocketProviderID, PocketProvider.class, false);
@@ -240,7 +242,7 @@ public class mod_pocketDim
 		LanguageRegistry.addName(blockDimWallPerm	, "Eternal Fabric");
 		LanguageRegistry.addName(dimensionalDoor, "Dimensional Door");
 		LanguageRegistry.addName(transTrapdoor, "Transdimensional Trapdoor");
-	
+
 		LanguageRegistry.addName(itemExitDoor, "Warp Door");
 		LanguageRegistry.addName(itemLinkSignature	, "Rift Signature");
 		LanguageRegistry.addName(itemGoldDoor, "Golden Door");
@@ -253,16 +255,16 @@ public class mod_pocketDim
 		LanguageRegistry.addName(itemRiftBlade	, "Rift Blade");
 		LanguageRegistry.addName(itemWorldThread, "World Thread");
 
-		
+
 		/**
 		 * Add names for multiblock inventory item
 		 */
 		LanguageRegistry.addName(new ItemStack(blockDimWall, 1, 0), "Fabric of Reality");
 		LanguageRegistry.addName(new ItemStack(blockDimWall, 1, 1), "Ancient Fabric");
 
-		
+
 		LanguageRegistry.instance().addStringLocalization("itemGroup.dimDoorsCustomTab", "en_US", "Dimensional Doors Items");
-		
+
 		GameRegistry.registerTileEntity(TileEntityDimDoor.class, "TileEntityDimDoor");
 		GameRegistry.registerTileEntity(TileEntityRift.class, "TileEntityRift");
 		GameRegistry.registerTileEntity(TileEntityTransTrapdoor.class, "TileEntityDimHatch");
@@ -276,20 +278,20 @@ public class mod_pocketDim
 
 		CraftingManager.registerRecipies();
 		DungeonHelper.initialize();
-		
+
 		proxy.loadTextures();
 		proxy.registerRenderers();
 	}
 
 
-	@PostInit
+	@EventHandler
 	public void onPostInitialization(FMLPostInitializationEvent event)
 	{	
 		ForgeChunkManager.setForcedChunkLoadingCallback(instance, new ChunkLoaderHelper());
 		//Register loot chests
 		DDLoot.registerInfo();
 	}
-	@ServerStopping
+	@EventHandler
 	public void onServerStopping(FMLServerStoppingEvent event)
 	{
 		try
@@ -302,12 +304,12 @@ public class mod_pocketDim
 		}
 	}
 
-	@ServerStarting
+	@EventHandler
 	public void onServerStarting(FMLServerStartingEvent event)
 	{
-		
+
 		//TODO- load dims with forced chunks on server startup here  
-		
+
 		CommandResetDungeons.instance().register(event);
 		CommandCreateDungeonRift.instance().register(event);
 		CommandDeleteAllLinks.instance().register(event);
@@ -318,7 +320,7 @@ public class mod_pocketDim
 		//CommandPruneDimensions.instance().register(event);
 		CommandCreatePocket.instance().register(event);
 		CommandTeleportPlayer.instance().register(event);
-		
+
 		try
 		{
 			ChunkLoaderHelper.loadChunkForcedWorlds(event);
@@ -328,4 +330,12 @@ public class mod_pocketDim
 			System.out.println("Loading chunkloaders failed");
 		}
 	}
+	
+	public static void sendChat(EntityPlayer player, String message)
+	{
+		ChatMessageComponent cmp = new ChatMessageComponent();
+		cmp.addText(message);
+		player.sendChatToPlayer(cmp);
+		
+	}
 }
diff --git a/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java
index da1cb3b..9b8b44a 100644
--- a/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/BlacklistProcessor.java
@@ -25,6 +25,7 @@ public class BlacklistProcessor extends BaseConfigurationProcessor<List<Integer>
 		{
 			JsonReader reader = new JsonReader(new InputStreamReader(inputStream, "UTF-8"));
 			List<Integer> data = this.createBlacklistFromJson(reader);
+			reader.close();
 			return data;
 		}
 		catch (IOException e)
diff --git a/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java
index e821b57..c5ea571 100644
--- a/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DDSaveHandler.java
@@ -144,6 +144,7 @@ public class DDSaveHandler
 					linkType = LinkTypes.NORMAL;
 				}
 				
+				@SuppressWarnings("deprecation")
 				DimLink link = data.createLink(packedLink.source, linkType, packedLink.orientation);
 				Point4D destination = packedLink.tail.destination;
 				if(destination!=null)
diff --git a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java
similarity index 92%
rename from StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java
index 55a01d9..7b3dd39 100644
--- a/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/DimDataProcessor.java
@@ -1,24 +1,16 @@
 package StevenDimDoors.mod_pocketDim.saving;
 
-import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
-import scala.Char;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonToken;
-import com.google.gson.stream.JsonWriter;
 
 import StevenDimDoors.mod_pocketDim.Point3D;
 import StevenDimDoors.mod_pocketDim.util.BaseConfigurationProcessor;
@@ -35,6 +27,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		{
 			JsonReader reader = new JsonReader(new InputStreamReader(inputStream, "UTF-8"));
 			PackedDimData data = this.createDImDataFromJson(reader);
+			reader.close();
 			return data;
 		}
 		catch (IOException e)
@@ -94,7 +87,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		reader.beginObject();
 		
 		reader.nextName();
-		if(reader.nextLong()!=PackedDimData.SAVE_DATA_VERSION_ID)
+		if (reader.nextLong() != PackedDimData.SAVE_DATA_VERSION_ID)
 		{
 			throw new IOException("Save data version mismatch");
 		}
@@ -184,7 +177,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		List<Integer> list = new ArrayList<Integer>();
 		reader.beginArray();
 		
-		while(reader.peek()!= JsonToken.END_ARRAY)
+		while (reader.peek() != JsonToken.END_ARRAY)
 		{
 			list.add(reader.nextInt());
 			
@@ -199,7 +192,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		
 		reader.beginArray();
 		
-		while(reader.peek()!= JsonToken.END_ARRAY)
+		while (reader.peek() != JsonToken.END_ARRAY)
 		{
 			list.add(createLinkDataFromJson(reader));
 		}
@@ -232,7 +225,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		reader.nextName();
 		reader.beginArray();
 		
-		while(reader.peek() != JsonToken.END_ARRAY)
+		while (reader.peek() != JsonToken.END_ARRAY)
 		{
 			children.add(this.createPointFromJson(reader));
 		}
@@ -252,6 +245,7 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 		String DungeonPackName;
 		
 		reader.beginObject();
+		@SuppressWarnings("unused")
 		JsonToken test = reader.peek();
 		
 		if(reader.peek() == JsonToken.END_OBJECT)
@@ -285,13 +279,14 @@ public class DimDataProcessor extends BaseConfigurationProcessor<PackedDimData>
 	}
 	private PackedLinkTail createLinkTailFromJson(JsonReader reader) throws IOException
 	{
-		Point4D destination=null;
+		Point4D destination = null;
 		int linkType;
 		reader.beginObject();
 		reader.nextName();
 		
-		JsonToken test =reader.peek();
-		if(reader.peek()==JsonToken.BEGIN_OBJECT)
+		@SuppressWarnings("unused")
+		JsonToken test = reader.peek();
+		if (reader.peek() == JsonToken.BEGIN_OBJECT)
 		{
 			destination = this.createPoint4DFromJson(reader);
 			reader.nextName();
diff --git a/StevenDimDoors/mod_pocketDim/saving/IPackable.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/IPackable.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/saving/IPackable.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/IPackable.java
diff --git a/StevenDimDoors/mod_pocketDim/saving/OldSaveImporter.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/OldSaveImporter.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/saving/OldSaveImporter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/OldSaveImporter.java
diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedDimData.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedDimData.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/saving/PackedDimData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedDimData.java
diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java
index caa5c00..f1cdc1d 100644
--- a/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedDungeonData.java
@@ -1,10 +1,7 @@
 package StevenDimDoors.mod_pocketDim.saving;
 
-import StevenDimDoors.mod_pocketDim.dungeon.pack.DungeonType;
-
 public class PackedDungeonData 
 {
-	
 	public final int Weight;
 	public final boolean IsOpen;
 	public final boolean IsInternal;
@@ -23,7 +20,4 @@ public class PackedDungeonData
 		this.DungeonTypeName=dungeonTypeName;
 		this.DungeonPackName=dungeonPackName;
 	}
-
-
-	
 }
diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java
similarity index 92%
rename from StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java
index c1a81e0..a98b448 100644
--- a/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedLinkData.java
@@ -3,7 +3,6 @@ package StevenDimDoors.mod_pocketDim.saving;
 import java.util.List;
 
 import StevenDimDoors.mod_pocketDim.Point3D;
-import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
 
 public class PackedLinkData
diff --git a/StevenDimDoors/mod_pocketDim/saving/PackedLinkTail.java b/src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedLinkTail.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/saving/PackedLinkTail.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/saving/PackedLinkTail.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/BlockRotator.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java
index 7bb11bc..298bff5 100644
--- a/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/CompactBoundsOperation.java
@@ -47,6 +47,7 @@ public class CompactBoundsOperation extends WorldOperation
 		return true;
 	}
 	
+	@Override
 	protected boolean finish()
 	{
 		if (minX == Integer.MAX_VALUE)
diff --git a/StevenDimDoors/mod_pocketDim/schematic/CompoundFilter.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/CompoundFilter.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/CompoundFilter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/CompoundFilter.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/InvalidSchematicException.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/InvalidSchematicException.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/InvalidSchematicException.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/InvalidSchematicException.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/ReplacementFilter.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/ReplacementFilter.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/ReplacementFilter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/ReplacementFilter.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/Schematic.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/Schematic.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/schematic/Schematic.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/Schematic.java
index 4c6eee4..df75141 100644
--- a/StevenDimDoors/mod_pocketDim/schematic/Schematic.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/Schematic.java
@@ -118,6 +118,7 @@ public class Schematic {
 
 	public static Schematic readFromFile(File schematicFile) throws FileNotFoundException, InvalidSchematicException
 	{
+		// TODO: fix resource leaks here
 		return readFromStream(new FileInputStream(schematicFile));
 	}
 
@@ -329,7 +330,7 @@ public class Schematic {
 		{
 			//Used when the result of this function will be passed outside this class.
 			//Avoids exposing the private field to external modifications.
-			schematicTag.setTag("TileEntities", (NBTTagList) tileEntities.copy());
+			schematicTag.setTag("TileEntities", tileEntities.copy());
 		}
 		else
 		{
diff --git a/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java
index 7e80959..105a28c 100644
--- a/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/SchematicFilter.java
@@ -48,6 +48,7 @@ public class SchematicFilter {
 		return true;
 	}
 	
+	@Override
 	public String toString()
 	{
 		return name;
diff --git a/StevenDimDoors/mod_pocketDim/schematic/WorldCopyOperation.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/WorldCopyOperation.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/WorldCopyOperation.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/WorldCopyOperation.java
diff --git a/StevenDimDoors/mod_pocketDim/schematic/WorldOperation.java b/src/main/java/StevenDimDoors/mod_pocketDim/schematic/WorldOperation.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/schematic/WorldOperation.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/schematic/WorldOperation.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/CommonTickHandler.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/IRegularTickReceiver.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/IRegularTickReceiver.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/IRegularTickReceiver.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/IRegularTickReceiver.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/IRegularTickSender.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/IRegularTickSender.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/IRegularTickSender.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/IRegularTickSender.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/LimboDecay.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/LimboDecay.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/LimboDecay.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/LimboDecay.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
similarity index 72%
rename from StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
index 928877f..1cbb356 100644
--- a/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
@@ -2,9 +2,11 @@ package StevenDimDoors.mod_pocketDim.ticking;
 
 import java.util.List;
 
+import net.minecraft.entity.DataWatcher;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityFlying;
 import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.monster.IMob;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
@@ -13,6 +15,7 @@ import net.minecraft.util.ChunkCoordinates;
 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.core.DDTeleporter;
@@ -29,14 +32,24 @@ public class MobMonolith extends EntityFlying implements IMob
 
 	float scaleFactor = 0;
 	int aggroMax;
-	int destX=0;
-	int destY=0;
-	int destZ=0;
+	int destX = 0; // unused fields?
+	int destY = 0;
+	int destZ = 0;
 
+	@Override
+	protected void damageEntity(DamageSource par1DamageSource, float par2)
+    {
+      return;
+    }
+	
+	@Override
+	public boolean attackEntityFrom(DamageSource par1DamageSource, float par2)
+    {
+		return false;
+    }
 	public MobMonolith(World par1World) 
 	{
 		super(par1World);
-		this.texture="/mods/DimDoors/textures/mobs/Monolith0.png";
 		this.setSize(3F, 9.0F);
 		this.noClip=true;
 		this.scaleFactor= (float) ((rand.nextDouble()/2)+1);
@@ -55,10 +68,10 @@ public class MobMonolith extends EntityFlying implements IMob
 	}
 
 	@Override
-	public int getMaxHealth() 
+	protected void applyEntityAttributes()
 	{
-		// TODO Auto-generated method stub
-		return 20;
+		super.applyEntityAttributes();
+		this.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.maxHealth).setAttribute(20);
 	}
 
 	public boolean canBePushed()
@@ -66,6 +79,7 @@ public class MobMonolith extends EntityFlying implements IMob
 		return false;
 	}
 
+	@Override
 	public float getRenderSizeModifier()
 	{
 		return this.scaleFactor;
@@ -74,11 +88,12 @@ public class MobMonolith extends EntityFlying implements IMob
 	public void setEntityPosition(Entity entity, double x, double y, double z)
 	{
 		entity.lastTickPosX = entity.prevPosX = entity.posX = x;
-		entity.lastTickPosY = entity.prevPosY = entity.posY = y + (double)entity.yOffset;
+		entity.lastTickPosY = entity.prevPosY = entity.posY = y + entity.yOffset;
 		entity.lastTickPosZ = entity.prevPosZ = entity.posZ = z;
 		entity.setPosition(x, y, z);
 	}
 
+	@Override
 	protected void entityInit()
 	{
 		super.entityInit();
@@ -93,9 +108,6 @@ public class MobMonolith extends EntityFlying implements IMob
 			this.setDead();
 		}
 
-		byte b0 = this.dataWatcher.getWatchableObjectByte(16);
-
-		this.texture="/mods/DimDoors/textures/mobs/Monolith"+b0+".png";
 		super.onEntityUpdate();
 
 		if (this.isEntityAlive() && this.isEntityInsideOpaqueBlock())
@@ -109,7 +121,7 @@ public class MobMonolith extends EntityFlying implements IMob
 		{
 			if(this.soundTime<=0)
 			{
-				this.playSound("mods.DimDoors.sfx.monk",  1F, 1F);
+				this.playSound(mod_pocketDim.modid+":monk",  1F, 1F);
 				this.soundTime=100;
 			}
 
@@ -136,29 +148,29 @@ public class MobMonolith extends EntityFlying implements IMob
 					}
 					if (aggro>430&&this.soundTime<100)
 					{
-						this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",2F, 1F);
+						this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,mod_pocketDim.modid+":tearing",2F, 1F);
 						this.soundTime=100;
 					}
 					if (aggro>445&&this.soundTime<200)
 					{
-						this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,"mods.DimDoors.sfx.tearing",5F, 1F);
+						this.worldObj.playSoundEffect(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ,mod_pocketDim.modid+":tearing",5F, 1F);
 						this.soundTime=200;
 					}
 				}
 				else if (!this.worldObj.isRemote && !entityPlayer.capabilities.isCreativeMode)
 				{
 					ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entityPlayer.worldObj.rand);
-		    		Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID);
-		    		DDTeleporter.teleportEntity(entityPlayer, destination, false);
-					
-		    		this.aggro = 0;
-					entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1);
+					Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID);
+					DDTeleporter.teleportEntity(entityPlayer, destination, false);
+
+					this.aggro = 0;
+					entityPlayer.worldObj.playSoundAtEntity(entityPlayer,mod_pocketDim.modid+":crack",13, 1);
 				}
 				if (!(this.worldObj.provider instanceof LimboProvider || this.worldObj.getClosestPlayerToEntity(this, 5) != null) || this.aggro > 300)
 				{
 					for (int i = 0; i < -1+this.textureState/2; ++i)
 					{
-						entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * (double)this.width, entityPlayer.posY + this.rand.nextDouble() * (double)entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * (double)entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D);
+						entityPlayer.worldObj.spawnParticle("portal", entityPlayer.posX + (this.rand.nextDouble() - 0.5D) * this.width, entityPlayer.posY + this.rand.nextDouble() * entityPlayer.height - 0.75D, entityPlayer.posZ + (this.rand.nextDouble() - 0.5D) * entityPlayer.width, (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), (this.rand.nextDouble() - 0.5D) * 2.0D);
 					}
 				}
 			}
@@ -203,34 +215,20 @@ public class MobMonolith extends EntityFlying implements IMob
 		return par1EntityPlayer.canEntityBeSeen(this);
 	}
 
-	private boolean isCourseTraversable(double par1, double par3, double par5, double par7)
-	{
-		double d4 = (par1 - this.posX) / par7;
-		double d5 = (par3 - this.posY) / par7;
-		double d6 = (par5 - this.posZ) / par7;
-		AxisAlignedBB axisalignedbb = this.boundingBox.copy();
-
-		for (int i = 1; (double)i < par7; ++i)
-		{
-			axisalignedbb.offset(d4, d5, d6);
-
-			if (!this.worldObj.getCollidingBoundingBoxes(this, axisalignedbb).isEmpty())
-			{
-				return false;
-			}
-		}
-		return true;
-	}
-	
 	public boolean attackEntityFrom(DamageSource par1DamageSource, int par2)
 	{
-		if(!(par1DamageSource==DamageSource.inWall))
+		if(!(par1DamageSource == DamageSource.inWall))
 		{
 			this.aggro=400;
 		}
+		else
+		{
+			this.posY=posY+1;
+		}
 		return false;
 	}
-	
+
+	@Override
 	public void faceEntity(Entity par1Entity, float par2, float par3)
 	{
 		double d0 = par1Entity.posX - this.posX;
@@ -240,14 +238,14 @@ public class MobMonolith extends EntityFlying implements IMob
 		if (par1Entity instanceof EntityLiving)
 		{
 			EntityLiving entityliving = (EntityLiving)par1Entity;
-			d2 = entityliving.posY + (double)entityliving.getEyeHeight() - (this.posY + (double)this.getEyeHeight());
+			d2 = entityliving.posY + entityliving.getEyeHeight() - (this.posY + this.getEyeHeight());
 		}
 		else
 		{
-			d2 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY)  - (this.posY + (double)this.getEyeHeight());
+			d2 = (par1Entity.boundingBox.minY + par1Entity.boundingBox.maxY)  - (this.posY + this.getEyeHeight());
 		}
 
-		double d3 = (double)MathHelper.sqrt_double(d0 * d0 + d1 * d1);
+		double d3 = MathHelper.sqrt_double(d0 * d0 + d1 * d1);
 		float f2 = (float)(Math.atan2(d1, d0) * 180.0D / Math.PI) - 90.0F;
 		float f3 = (float)(-(Math.atan2(d2, d3) * 180.0D / Math.PI));
 		this.rotationPitch =  f3;
@@ -258,28 +256,13 @@ public class MobMonolith extends EntityFlying implements IMob
 		this.renderYawOffset=this.rotationYaw;
 	}
 
-	private float updateRotation(float par1, float par2, float par3)
-	{
-		float f3 = MathHelper.wrapAngleTo180_float(par2 - par1);
-
-		if (f3 > par3)
-		{
-			f3 = par3;
-		}
-
-		if (f3 < -par3)
-		{
-			f3 = -par3;
-		}
-
-		return par1 + f3;
-	}
-
+	@Override
 	public float getRotationYawHead()
 	{
 		return 0.0F;
 	}
 
+	@Override
 	public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound)
 	{
 		super.writeEntityToNBT(par1NBTTagCompound);
@@ -300,9 +283,11 @@ public class MobMonolith extends EntityFlying implements IMob
 		this.textureState = par1NBTTagCompound.getByte("textureState");
 		this.scaleFactor = par1NBTTagCompound.getFloat("scaleFactor");
 	}
-	
+
+	@Override
 	public boolean getCanSpawnHere()
 	{
+		@SuppressWarnings("rawtypes")
 		List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, AxisAlignedBB.getBoundingBox( this.posX-15, posY-4, this.posZ-15, this.posX+15, this.posY+15, this.posZ+15));
 
 		if(this.worldObj.provider.dimensionId==DDProperties.instance().LimboDimensionID)
@@ -315,11 +300,19 @@ public class MobMonolith extends EntityFlying implements IMob
 		}
 		else if(this.worldObj.provider instanceof PocketProvider)	
 		{
-			if(list.size()>5||this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ))
+			if (list.size() > 5 ||
+					this.worldObj.canBlockSeeTheSky((int)this.posX, (int)this.posY, (int)this.posZ))
 			{
 				return false;
 			}
 		}
-		return this.worldObj.checkNoEntityCollision(this.boundingBox) && this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() && !this.worldObj.isAnyLiquid(this.boundingBox);
+		return this.worldObj.checkNoEntityCollision(this.boundingBox) &&
+				this.worldObj.getCollidingBoundingBoxes(this, this.boundingBox).isEmpty() &&
+				!this.worldObj.isAnyLiquid(this.boundingBox);
+	}
+	
+	public DataWatcher getDataWatcher()
+	{
+		return this.dataWatcher;
 	}
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/MonolithSpawner.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/RegularTickReceiverInfo.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RegularTickReceiverInfo.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/ticking/RegularTickReceiverInfo.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/RegularTickReceiverInfo.java
diff --git a/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
similarity index 95%
rename from StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
index 3bcb859..2d2d368 100644
--- a/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/ticking/RiftRegenerator.java
@@ -25,6 +25,7 @@ public class RiftRegenerator implements IRegularTickReceiver {
 		regenerateRiftsInAllWorlds();
 	}
 	
+	@SuppressWarnings("deprecation")
 	public static void regenerateRiftsInAllWorlds()
 	{
 		//Regenerate rifts that have been replaced (not permanently removed) by players
@@ -40,7 +41,7 @@ public class RiftRegenerator implements IRegularTickReceiver {
 	    		{
 	    			for (int count = 0; count < RIFTS_REGENERATED_PER_DIMENSION; count++)
 	    			{
-	    				DimLink link = dimension.getRandomLink();
+						DimLink link = dimension.getRandomLink();
 	    				Point4D source = link.source();
 	    				if (!mod_pocketDim.blockRift.isBlockImmune(world, source.getX(), source.getY(), source.getZ())&& world.getChunkProvider().chunkExists(source.getX() >> 4, source.getZ() >> 4))
 	    				{
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
new file mode 100644
index 0000000..d2d8900
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoor.java
@@ -0,0 +1,57 @@
+package StevenDimDoors.mod_pocketDim.tileentities;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+
+public class TileEntityDimDoor extends TileEntity
+{
+	public boolean openOrClosed;
+	public int orientation;
+	public boolean hasExit;
+	public boolean isDungeonChainLink;
+	public boolean hasGennedPair=false;
+
+	@Override
+	public boolean canUpdate()
+	{
+		return false;
+	}
+
+	@Override
+	public void updateEntity() { }
+
+	@Override
+	public void readFromNBT(NBTTagCompound nbt)
+	{
+		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");
+			this.hasGennedPair = nbt.getBoolean("hasGennedPair");
+		}
+		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);
+		nbt.setBoolean("hasGennedPair", hasGennedPair);
+	}
+}
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
new file mode 100644
index 0000000..48f17e7
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityDimDoorGold.java
@@ -0,0 +1,132 @@
+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;
+
+public class TileEntityDimDoorGold extends TileEntityDimDoor implements IChunkLoader
+{
+	private Ticket chunkTicket;
+
+	@Override
+	public boolean canUpdate()
+	{
+		return true;
+	}
+
+	@Override
+	public void updateEntity() 
+	{ // every tick?
+		if (PocketManager.getDimensionData(this.worldObj) != null &&
+				PocketManager.getDimensionData(this.worldObj).isPocketDimension() &&
+				!this.worldObj.isRemote)
+		{ 
+			if(PocketManager.getLink(this.xCoord,this.yCoord,this.zCoord,this.worldObj)==null)
+			{
+				return;
+			}
+			if (this.chunkTicket == null)
+			{
+				chunkTicket = ForgeChunkManager.requestTicket(mod_pocketDim.instance, worldObj, Type.NORMAL);
+				if(chunkTicket == null)
+				{
+					return;
+				}
+				chunkTicket.getModData().setInteger("goldDimDoorX", xCoord);
+				chunkTicket.getModData().setInteger("goldDimDoorY", yCoord);
+				chunkTicket.getModData().setInteger("goldDimDoorZ", zCoord);
+				forceChunkLoading(chunkTicket,this.xCoord,this.zCoord);
+			}
+		}
+	}
+
+	@Override
+	public void forceChunkLoading(Ticket chunkTicket,int x,int z)
+	{
+		Point4D origin = PocketManager.getDimensionData(this.worldObj).origin();
+		int orientation = PocketManager.getDimensionData(this.worldObj).orientation();
+		
+		int xOffset=0;
+		int zOffset=0;
+		
+		switch(orientation)
+		{
+		case 0:
+			xOffset = PocketBuilder.DEFAULT_POCKET_SIZE/2;
+			break;
+		case 1: 
+			zOffset = PocketBuilder.DEFAULT_POCKET_SIZE/2;
+
+			break;
+		case 2:
+			xOffset = -PocketBuilder.DEFAULT_POCKET_SIZE/2;
+
+			break;
+		case 3:
+			zOffset = -PocketBuilder.DEFAULT_POCKET_SIZE/2;
+
+			break;
+		}
+		for(int chunkX = -1; chunkX<2;chunkX++)
+		{
+			for(int chunkZ = -1; chunkZ<2;chunkZ++)
+			{
+				ForgeChunkManager.forceChunk(chunkTicket, new ChunkCoordIntPair((origin.getX()+xOffset >> 4)+chunkX, (origin.getZ()+zOffset >> 4)+chunkZ));
+			}
+		}
+	
+
+		
+	}
+
+	@Override
+	public void invalidate() 
+	{
+		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);
+	}
+}
diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
similarity index 97%
rename from StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
index ce3e0c6..5f795e6 100644
--- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityRift.java
@@ -38,10 +38,12 @@ public class TileEntityRift extends TileEntity
 	public int age = 0;
 
 	public HashMap<Integer, double[]> renderingCenters = new HashMap<Integer, double[]>();
+	@SuppressWarnings("deprecation")
 	public DimLink nearestRiftData;
 	public int spawnedEndermenID=0;
 	DataWatcher watcher = new DataWatcher();
 
+	@Override
 	public void updateEntity() 
 	{
 		//Invalidate this tile entity if it shouldn't exist
@@ -92,6 +94,7 @@ public class TileEntityRift extends TileEntity
 		}
 	}
 
+	@Override
 	public boolean canUpdate()
 	{
 		return true;
@@ -143,7 +146,7 @@ public class TileEntityRift extends TileEntity
 			if (random.nextInt(30) == 0)
 			{
 				@SuppressWarnings("unchecked")
-				List<Entity> list =  (List<Entity>) worldObj.getEntitiesWithinAABB(EntityEnderman.class,
+				List<Entity> list =  worldObj.getEntitiesWithinAABB(EntityEnderman.class,
 						AxisAlignedBB.getBoundingBox(xCoord - 9, yCoord - 3, zCoord - 9, xCoord + 9, yCoord + 3, zCoord + 9));
 
 				if (list.isEmpty())
@@ -183,7 +186,10 @@ public class TileEntityRift extends TileEntity
 			worldObj.setBlockToAir(xCoord, yCoord, zCoord);
 			if (dimension.getLink(xCoord, yCoord, zCoord) != null)
 			{
-				dimension.deleteLink(xCoord, yCoord, zCoord);
+				if(!this.worldObj.isRemote)
+				{
+					dimension.deleteLink(xCoord, yCoord, zCoord);
+				}
 				worldObj.playSound(xCoord, yCoord, zCoord, "mods.DimDoors.sfx.riftClose", (float) .7, 1, true);
 			}	
 		}
@@ -350,13 +356,13 @@ public class TileEntityRift extends TileEntity
 
 		NBTTagCompound nbt = new NBTTagCompound();
 		writeToNBT(nbt);
-		packet.customParam1 = nbt;
+		packet.data = nbt;
 		return packet;
 	}
 
 	@Override
 	public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt)
 	{
-		readFromNBT(pkt.customParam1);
+		readFromNBT(pkt.data);
 	}
 }
diff --git a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java
similarity index 82%
rename from StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java
index 19c52eb..125a225 100644
--- a/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/tileentities/TileEntityTransTrapdoor.java
@@ -1,10 +1,7 @@
 package StevenDimDoors.mod_pocketDim.tileentities;
 
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.world.World;
 
 public class TileEntityTransTrapdoor extends TileEntity
 {
diff --git a/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java
similarity index 59%
rename from StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java
index 8fe75a2..2e493fb 100644
--- a/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/util/BaseConfigurationProcessor.java
@@ -2,8 +2,8 @@ package StevenDimDoors.mod_pocketDim.util;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
@@ -21,14 +21,17 @@ public abstract class BaseConfigurationProcessor<T>
 		return true;
 	}
 	
-	public T readFromFile(String path) throws FileNotFoundException, ConfigurationProcessingException
+	public T readFromFile(String path) throws ConfigurationProcessingException, IOException
 	{
 		return readFromFile(new File(path));
 	}
 	
-	public T readFromFile(File file) throws FileNotFoundException, ConfigurationProcessingException
+	public T readFromFile(File file) throws ConfigurationProcessingException, IOException
 	{
-		return readFromStream(new FileInputStream(file));
+		FileInputStream t = new FileInputStream(file);
+		T ret = readFromStream(t);
+		t.close();
+		return ret;
 	}
 	
 	public T readFromResource(String resourcePath) throws ConfigurationProcessingException
@@ -38,12 +41,14 @@ public abstract class BaseConfigurationProcessor<T>
 	
 	public abstract T readFromStream(InputStream inputStream) throws ConfigurationProcessingException;
 	
-	public void writeToFile(File file, T data) throws FileNotFoundException, ConfigurationProcessingException
+	public void writeToFile(File file, T data) throws ConfigurationProcessingException, IOException
 	{
-		writeToStream(new FileOutputStream(file), data);
+		FileOutputStream t = new FileOutputStream(file);
+		writeToStream(t, data);
+		t.close();
 	}
 	
-	public void writeToFile(String path, T data) throws FileNotFoundException, ConfigurationProcessingException
+	public void writeToFile(String path, T data) throws ConfigurationProcessingException, IOException
 	{
 		writeToFile(new File(path), data);
 	}
diff --git a/StevenDimDoors/mod_pocketDim/util/ChunkLocation.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/ChunkLocation.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/util/ChunkLocation.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/ChunkLocation.java
diff --git a/StevenDimDoors/mod_pocketDim/util/ConfigurationProcessingException.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/ConfigurationProcessingException.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/util/ConfigurationProcessingException.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/ConfigurationProcessingException.java
diff --git a/StevenDimDoors/mod_pocketDim/util/FileFilters.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/FileFilters.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/util/FileFilters.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/FileFilters.java
diff --git a/StevenDimDoors/mod_pocketDim/util/Pair.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/Pair.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/util/Pair.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/Pair.java
diff --git a/StevenDimDoors/mod_pocketDim/util/Point4D.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/Point4D.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/util/Point4D.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/Point4D.java
diff --git a/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java b/src/main/java/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDim/util/WeightedContainer.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java
index 71332f3..65d239c 100644
--- a/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/util/WeightedContainer.java
@@ -24,6 +24,7 @@ public class WeightedContainer<T> extends WeightedRandomItem {
 		return data;
 	}
 	
+	@Override
 	public WeightedContainer<T> clone()
 	{
 		return new WeightedContainer<T>(data, itemWeight);
diff --git a/StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java
similarity index 88%
rename from StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java
index 7614a10..c0df886 100644
--- a/StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientDimData.java
@@ -32,6 +32,8 @@ public class ClientDimData
 	
 	public static ClientDimData read(DataInputStream input) throws IOException
 	{
-		return new ClientDimData(input.readInt(), input.readInt());
+		int id = input.readInt();
+		int rootId = input.readInt();
+		return new ClientDimData(id, rootId);
 	}
 }
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
new file mode 100644
index 0000000..5670542
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/ClientLinkData.java
@@ -0,0 +1,40 @@
+package StevenDimDoors.mod_pocketDim.watcher;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import StevenDimDoors.mod_pocketDim.core.DimLink;
+import StevenDimDoors.mod_pocketDim.util.Point4D;
+
+public class ClientLinkData
+{
+        public Point4D point;
+        public int orientation;
+        
+        public ClientLinkData(DimLink link)
+        {
+                this.point= link.source();
+                this.orientation=link.orientation();
+        }
+        
+        public ClientLinkData(Point4D point, int orientation)
+        {
+                this.point = point;
+                this.orientation=orientation;
+        }
+        
+        public void write(DataOutputStream output) throws IOException
+        {
+                Point4D.write(point, output);
+                output.writeInt(orientation);
+        }
+        
+        public static ClientLinkData read(DataInputStream input) throws IOException
+        {
+	        Point4D point = Point4D.read(input);
+	        int orientation = input.readInt();
+            return new ClientLinkData(point, orientation);
+        }
+        
+}
diff --git a/StevenDimDoors/mod_pocketDim/watcher/IUpdateSource.java b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/IUpdateSource.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/watcher/IUpdateSource.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/watcher/IUpdateSource.java
diff --git a/StevenDimDoors/mod_pocketDim/watcher/IUpdateWatcher.java b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/IUpdateWatcher.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/watcher/IUpdateWatcher.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/watcher/IUpdateWatcher.java
diff --git a/StevenDimDoors/mod_pocketDim/watcher/UpdateWatcherProxy.java b/src/main/java/StevenDimDoors/mod_pocketDim/watcher/UpdateWatcherProxy.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/watcher/UpdateWatcherProxy.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/watcher/UpdateWatcherProxy.java
diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
similarity index 96%
rename from StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
index b60eabe..243baf1 100644
--- a/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/BiomeGenLimbo.java
@@ -31,7 +31,8 @@ public class BiomeGenLimbo extends BiomeGenBase
 
     }
     
-    public float getSpawningChance()
+    @Override
+	public float getSpawningChance()
     {
         return 0.00001F;
     }
diff --git a/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/BiomeGenPocket.java
diff --git a/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java
similarity index 89%
rename from StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java
index cf3d489..3e892be 100644
--- a/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/CustomCaveGen.java
@@ -31,8 +31,8 @@ public class CustomCaveGen extends MapGenBase
      */
     protected void generateCaveNode(long par1, int par3, int par4, byte[] par5ArrayOfByte, double par6, double par8, double par10, float par12, float par13, float par14, int par15, int par16, double par17)
     {
-        double var19 = (double)(par3 * 16 + 8);
-        double var21 = (double)(par4 * 16 + 8);
+        double var19 = par3 * 16 + 8;
+        double var21 = par4 * 16 + 8;
         float var23 = 0.0F;
         float var24 = 0.0F;
         Random var25 = new Random(par1);
@@ -55,13 +55,13 @@ public class CustomCaveGen extends MapGenBase
 
         for (boolean var28 = var25.nextInt(6) == 0; par15 < par16; ++par15)
         {
-            double var29 = 1.5D + (double)(MathHelper.sin((float)par15 * (float)Math.PI / (float)par16) * par12 * 1.0F);
+            double var29 = 1.5D + MathHelper.sin(par15 * (float)Math.PI / par16) * par12 * 1.0F;
             double var31 = var29 * par17;
             float var33 = MathHelper.cos(par14);
             float var34 = MathHelper.sin(par14);
-            par6 += (double)(MathHelper.cos(par13) * var33);
-            par8 += (double)var34;
-            par10 += (double)(MathHelper.sin(par13) * var33);
+            par6 += MathHelper.cos(par13) * var33;
+            par8 += var34;
+            par10 += MathHelper.sin(par13) * var33;
 
             if (var28)
             {
@@ -90,8 +90,8 @@ public class CustomCaveGen extends MapGenBase
             {
                 double var35 = par6 - var19;
                 double var37 = par10 - var21;
-                double var39 = (double)(par16 - par15);
-                double var41 = (double)(par12 + 2.0F + 16.0F);
+                double var39 = par16 - par15;
+                double var41 = par12 + 2.0F + 16.0F;
 
                 if (var35 * var35 + var37 * var37 - var39 * var39 > var41 * var41)
                 {
@@ -169,11 +169,11 @@ public class CustomCaveGen extends MapGenBase
                     {
                         for (var42 = var55; var42 < var36; ++var42)
                         {
-                            double var59 = ((double)(var42 + par3 * 16) + 0.5D - par6) / var29;
+                            double var59 = (var42 + par3 * 16 + 0.5D - par6) / var29;
 
                             for (var45 = var56; var45 < var40; ++var45)
                             {
-                                double var46 = ((double)(var45 + par4 * 16) + 0.5D - par10) / var29;
+                                double var46 = (var45 + par4 * 16 + 0.5D - par10) / var29;
                                 int var48 = (var42 * 16 + var45) * 128 + var38;
                                 boolean var49 = false;
 
@@ -181,7 +181,7 @@ public class CustomCaveGen extends MapGenBase
                                 {
                                     for (int var50 = var38 - 1; var50 >= var57; --var50)
                                     {
-                                        double var51 = ((double)var50 + 0.5D - par8) / var31;
+                                        double var51 = (var50 + 0.5D - par8) / var31;
 
                                         if (var51 > -0.7D && var59 * var59 + var51 * var51 + var46 * var46 < 1.0D)
                                         {
@@ -229,7 +229,8 @@ public class CustomCaveGen extends MapGenBase
     /**
      * Recursively called by generate() (generate) and optionally by itself.
      */
-    protected void recursiveGenerate(World par1World, int par2, int par3, int par4, int par5, byte[] par6ArrayOfByte)
+    @Override
+	protected void recursiveGenerate(World par1World, int par2, int par3, int par4, int par5, byte[] par6ArrayOfByte)
     {
         int var7 = this.rand.nextInt(this.rand.nextInt(this.rand.nextInt(40) + 1) + 1);
 
@@ -240,9 +241,9 @@ public class CustomCaveGen extends MapGenBase
 
         for (int var8 = 0; var8 < var7; ++var8)
         {
-            double var9 = (double)(par2 * 16 + this.rand.nextInt(16));
-            double var11 = (double)this.rand.nextInt(this.rand.nextInt(120) + 8);
-            double var13 = (double)(par3 * 16 + this.rand.nextInt(16));
+            double var9 = par2 * 16 + this.rand.nextInt(16);
+            double var11 = this.rand.nextInt(this.rand.nextInt(120) + 8);
+            double var13 = par3 * 16 + this.rand.nextInt(16);
             int var15 = 1;
 
             if (this.rand.nextInt(4) == 0)
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
new file mode 100644
index 0000000..1a31386
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/CustomSkyProvider.java
@@ -0,0 +1,233 @@
+package StevenDimDoors.mod_pocketDim.world;
+
+import org.lwjgl.opengl.GL11;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.GLAllocation;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec3;
+import net.minecraftforge.client.IRenderHandler;
+
+public class CustomSkyProvider extends IRenderHandler
+{
+
+	int starGLCallList;
+	int glSkyList;
+	int glSkyList2;
+    private static final ResourceLocation locationEndSkyPng = new ResourceLocation("textures/environment/end_sky.png");
+
+
+	public ResourceLocation getMoonRenderPath()
+	{
+		return null;
+	}
+
+	public ResourceLocation getSunRenderPath()
+	{
+		return null;
+	}
+
+
+	@Override
+	public void render(float par1, WorldClient world, Minecraft mc) 
+	{
+
+		starGLCallList = GLAllocation.generateDisplayLists(3);
+		glSkyList = this.starGLCallList + 1;
+		glSkyList2 = this.starGLCallList + 2;
+		GL11.glDisable(GL11.GL_FOG);
+		GL11.glDisable(GL11.GL_ALPHA_TEST);
+		GL11.glEnable(GL11.GL_BLEND);
+		GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+		RenderHelper.disableStandardItemLighting();
+		GL11.glDepthMask(false);
+		mc.renderEngine.bindTexture((locationEndSkyPng));
+
+		if (mc.theWorld.provider.isSurfaceWorld())
+		{
+			GL11.glDisable(GL11.GL_TEXTURE_2D);
+			Vec3 vec3 = world.getSkyColor(mc.renderViewEntity, par1);
+			float f1 = (float)vec3.xCoord;
+			float f2 = (float)vec3.yCoord;
+			float f3 = (float)vec3.zCoord;
+			float f4;
+
+			if (mc.gameSettings.anaglyph)
+			{
+				float f5 = (f1 * 30.0F + f2 * 59.0F + f3 * 11.0F) / 100.0F;
+				float f6 = (f1 * 30.0F + f2 * 70.0F) / 100.0F;
+				f4 = (f1 * 30.0F + f3 * 70.0F) / 100.0F;
+				f1 = f5;
+				f2 = f6;
+				f3 = f4;
+			}
+
+			GL11.glColor3f(f1, f2, f3);
+			Tessellator tessellator1 = Tessellator.instance;
+			GL11.glDepthMask(false);
+			GL11.glEnable(GL11.GL_FOG);
+			GL11.glColor3f(f1, f2, f3);
+			GL11.glCallList(this.glSkyList);
+			GL11.glDisable(GL11.GL_FOG);
+			GL11.glDisable(GL11.GL_ALPHA_TEST);
+			GL11.glEnable(GL11.GL_BLEND);
+			GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+			RenderHelper.disableStandardItemLighting();
+			float[] afloat = world.provider.calcSunriseSunsetColors(world.getCelestialAngle(par1), par1);
+			float f7;
+			float f8;
+			float f9;
+			float f10;
+
+			if (afloat != null)
+			{
+				GL11.glDisable(GL11.GL_TEXTURE_2D);
+				GL11.glShadeModel(GL11.GL_SMOOTH);
+				GL11.glPushMatrix();
+				GL11.glRotatef(90.0F, 1.0F, 0.0F, 0.0F);
+				GL11.glRotatef(MathHelper.sin(world.getCelestialAngleRadians(par1)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F);
+				GL11.glRotatef(90.0F, 0.0F, 0.0F, 1.0F);
+				f4 = afloat[0];
+				f7 = afloat[1];
+				f8 = afloat[2];
+				float f11;
+
+				if (mc.gameSettings.anaglyph)
+				{
+					f9 = (f4 * 30.0F + f7 * 59.0F + f8 * 11.0F) / 100.0F;
+					f10 = (f4 * 30.0F + f7 * 70.0F) / 100.0F;
+					f11 = (f4 * 30.0F + f8 * 70.0F) / 100.0F;
+					f4 = f9;
+					f7 = f10;
+					f8 = f11;
+				}
+
+				tessellator1.startDrawing(6);
+				tessellator1.setColorRGBA_F(f4, f7, f8, afloat[3]);
+				tessellator1.addVertex(0.0D, 100.0D, 0.0D);
+				byte b0 = 16;
+				tessellator1.setColorRGBA_F(afloat[0], afloat[1], afloat[2], 0.0F);
+
+				for (int j = 0; j <= b0; ++j)
+				{
+					f11 = j * (float)Math.PI * 2.0F / b0;
+					float f12 = MathHelper.sin(f11);
+					float f13 = MathHelper.cos(f11);
+					tessellator1.addVertex(f12 * 120.0F, f13 * 120.0F, -f13 * 40.0F * afloat[3]);
+				}
+
+				tessellator1.draw();
+				GL11.glPopMatrix();
+				GL11.glShadeModel(GL11.GL_FLAT);
+			}
+
+			GL11.glEnable(GL11.GL_TEXTURE_2D);
+			GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
+			GL11.glPushMatrix();
+			f4 = 1.0F - world.getRainStrength(par1);
+			f7 = 0.0F;
+			f8 = 0.0F;
+			f9 = 0.0F;
+			GL11.glColor4f(1.0F, 1.0F, 1.0F, f4);
+			GL11.glTranslatef(f7, f8, f9);
+			GL11.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F);
+			GL11.glRotatef(world.getCelestialAngle(par1) * 360.0F, 1.0F, 0.0F, 0.0F);
+			f10 = 30.0F;
+			mc.renderEngine.bindTexture(this.getSunRenderPath());
+			tessellator1.startDrawingQuads();
+			tessellator1.addVertexWithUV((-f10), 100.0D, (-f10), 0.0D, 0.0D);
+			tessellator1.addVertexWithUV(f10, 100.0D, (-f10), 1.0D, 0.0D);
+			tessellator1.addVertexWithUV(f10, 100.0D, f10, 1.0D, 1.0D);
+			tessellator1.addVertexWithUV((-f10), 100.0D, f10, 0.0D, 1.0D);
+			tessellator1.draw();
+			f10 = 20.0F;
+			mc.renderEngine.bindTexture(this.getMoonRenderPath());
+			int k = world.getMoonPhase();
+			int l = k % 4;
+			int i1 = k / 4 % 2;
+			float f14 = l + 0 ;
+			float f15 = i1 + 0;
+			float f16 = l + 1 ;
+			float f17 = i1 + 1;
+			tessellator1.startDrawingQuads();
+			tessellator1.addVertexWithUV((-f10), -100.0D, f10, f16, f17);
+			tessellator1.addVertexWithUV(f10, -100.0D, f10, f14, f17);
+			tessellator1.addVertexWithUV(f10, -100.0D, (-f10), f14, f15);
+			tessellator1.addVertexWithUV((-f10), -100.0D, (-f10), f16, f15);
+			tessellator1.draw();
+			GL11.glDisable(GL11.GL_TEXTURE_2D);
+			float f18 = world.getStarBrightness(par1) * f4;
+
+			if (f18 > 0.0F)
+			{
+				GL11.glColor4f(f18, f18, f18, f18);
+				GL11.glCallList(this.starGLCallList);
+			}
+
+			GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+			GL11.glDisable(GL11.GL_BLEND);
+			GL11.glEnable(GL11.GL_ALPHA_TEST);
+			GL11.glEnable(GL11.GL_FOG);
+			GL11.glPopMatrix();
+			GL11.glDisable(GL11.GL_TEXTURE_2D);
+			GL11.glColor3f(0.0F, 0.0F, 0.0F);
+			double d0 = mc.thePlayer.getPosition(par1).yCoord - world.getHorizon();
+
+			if (d0 < 0.0D)
+			{
+				GL11.glPushMatrix();
+				GL11.glTranslatef(0.0F, 12.0F, 0.0F);
+				GL11.glCallList(this.glSkyList2);
+				GL11.glPopMatrix();
+				f8 = 1.0F;
+				f9 = -((float)(d0 + 65.0D));
+				f10 = -f8;
+				tessellator1.startDrawingQuads();
+				tessellator1.setColorRGBA_I(0, 255);
+				tessellator1.addVertex((-f8), f9, f8);
+				tessellator1.addVertex(f8, f9, f8);
+				tessellator1.addVertex(f8, f10, f8);
+				tessellator1.addVertex((-f8), f10, f8);
+				tessellator1.addVertex((-f8), f10, (-f8));
+				tessellator1.addVertex(f8, f10, (-f8));
+				tessellator1.addVertex(f8, f9, (-f8));
+				tessellator1.addVertex((-f8), f9, (-f8));
+				tessellator1.addVertex(f8, f10, (-f8));
+				tessellator1.addVertex(f8, f10, f8);
+				tessellator1.addVertex(f8, f9, f8);
+				tessellator1.addVertex(f8, f9, (-f8));
+				tessellator1.addVertex((-f8), f9, (-f8));
+				tessellator1.addVertex((-f8), f9, f8);
+				tessellator1.addVertex((-f8), f10, f8);
+				tessellator1.addVertex((-f8), f10, (-f8));
+				tessellator1.addVertex((-f8), f10, (-f8));
+				tessellator1.addVertex((-f8), f10, f8);
+				tessellator1.addVertex(f8, f10, f8);
+				tessellator1.addVertex(f8, f10, (-f8));
+				tessellator1.draw();
+			}
+
+			if (world.provider.isSkyColored())
+			{
+				GL11.glColor3f(f1 * 0.2F + 0.04F, f2 * 0.2F + 0.04F, f3 * 0.6F + 0.1F);
+			}
+			else
+			{
+				GL11.glColor3f(f1, f2, f3);
+			}
+
+			GL11.glPushMatrix();
+			GL11.glTranslatef(0.0F, -((float)(d0 - 16.0D)), 0.0F);
+			GL11.glCallList(this.glSkyList2);
+			GL11.glPopMatrix();
+			GL11.glEnable(GL11.GL_TEXTURE_2D);
+			GL11.glDepthMask(true);
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
similarity index 99%
rename from StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
index 6c788bc..fc260a8 100644
--- a/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/GatewayGenerator.java
@@ -60,6 +60,7 @@ public class GatewayGenerator implements IWorldGenerator
 		int attempts;
 		int correction;
 		boolean valid;
+		@SuppressWarnings("deprecation")
 		DimLink link;
 		NewDimData dimension;
 		
diff --git a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java
similarity index 94%
rename from StevenDimDoors/mod_pocketDim/world/LimboGenerator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java
index 33a754f..9c5a709 100644
--- a/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboGenerator.java
@@ -20,7 +20,7 @@ import net.minecraftforge.event.terraingen.ChunkProviderEvent;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner;
 
-public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvider
+public class LimboGenerator extends ChunkProviderGenerate
 {
 	private static Random rand;
 
@@ -128,7 +128,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 	public Chunk provideChunk(int chunkX, int chunkZ)
 	{
 		//TODO: Wtf? Why do you reinitialize the seed when we already initialized it in the constructor?! ~SenseiKiwi
-		LimboGenerator.rand.setSeed((long) chunkX * 341873128712L + (long) chunkZ * 132897987541L);
+		LimboGenerator.rand.setSeed(chunkX * 341873128712L + chunkZ * 132897987541L);
 		byte[] var3 = new byte[32768];
 		this.generateTerrain(chunkX, chunkZ, var3);
 		Chunk var4 = new Chunk(this.worldObj, var3, chunkX, chunkZ);
@@ -178,7 +178,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 			{
 				for (int var9 = -2; var9 <= 2; ++var9)
 				{
-					float var10 = 10.0F / MathHelper.sqrt_float((float)(var8 * var8 + var9 * var9) + 0.2F);
+					float var10 = 10.0F / MathHelper.sqrt_float(var8 * var8 + var9 * var9 + 0.2F);
 					this.parabolicField[var8 + 2 + (var9 + 2) * 5] = var10;
 				}
 			}
@@ -191,8 +191,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 		this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, par2, par3, par4, par5, par6, par7, var44 / 80.0D, var45 / 160.0D, var44 / 80.0D);
 		this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, par2, par3, par4, par5, par6, par7, var44, var45, var44);
 		this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, par2, par3, par4, par5, par6, par7, var44, var45, var44);
-		boolean var43 = false;
-		boolean var42 = false;
+
 		int var12 = 0;
 		int var13 = 0;
 
@@ -204,7 +203,6 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 				float var17 = 0.0F;
 				float var18 = 0.0F;
 				byte var19 = 2;
-				BiomeGenBase var20 = this.biomesForGeneration[var14 + 2 + (var15 + 2) * (par5 + 5)];
 
 				for (int var21 = -var19; var21 <= var19; ++var21)
 				{
@@ -260,13 +258,13 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 
 				for (int var46 = 0; var46 < par6; ++var46)
 				{
-					double var48 = (double)var17;
-					double var26 = (double)var16;
+					double var48 = var17;
+					double var26 = var16;
 					var48 += var47 * 0.2D;
-					var48 = var48 * (double)par6 / 16.0D;
-					double var28 = (double)par6 / 2.0D + var48 * 4.0D;
+					var48 = var48 * par6 / 16.0D;
+					double var28 = par6 / 2.0D + var48 * 4.0D;
 					double var30 = 0.0D;
-					double var32 = ((double)var46 - var28) * 12.0D * 128.0D / 128.0D / var26;
+					double var32 = (var46 - var28) * 12.0D * 128.0D / 128.0D / var26;
 
 					if (var32 < 0.0D)
 					{
@@ -294,7 +292,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 
 					if (var46 > par6 - 4)
 					{
-						double var40 = (double)((float)(var46 - (par6 - 4)) / 3.0F);
+						double var40 = (var46 - (par6 - 4)) / 3.0F;
 						var30 = var30 * (1.0D - var40) + -10.0D * var40;
 					}
 
@@ -306,6 +304,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 
 		return par1ArrayOfDouble;
 	}
+	@Override
 	public void generateTerrain(int par1, int par2, byte[] par3ArrayOfByte)
 	{
 		byte var4 = 4;
diff --git a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboProvider.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDim/world/LimboProvider.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/LimboProvider.java
index c0d4514..c7d6fb9 100644
--- a/StevenDimDoors/mod_pocketDim/world/LimboProvider.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboProvider.java
@@ -37,6 +37,7 @@ public class LimboProvider extends WorldProvider
 		this.properties = mod_pocketDim.properties;
 	}
 
+	@Override
 	@SideOnly(Side.CLIENT)
 	public IRenderHandler getSkyRenderer()
 	{
@@ -55,11 +56,13 @@ public class LimboProvider extends WorldProvider
 		return mod_pocketDim.limboBiome;
 	}
 
+	@Override
 	public boolean canRespawnHere()
 	{
 		return properties.HardcoreLimboEnabled && properties.LimboEnabled;
 	}
 
+	@Override
 	public boolean isBlockHighHumidity(int x, int y, int z)
 	{
 		return false;
@@ -79,22 +82,24 @@ public class LimboProvider extends WorldProvider
 
 		for (int steps = 0; steps <= 15; ++steps)
 		{
-			float var3 = 1.0F - (float)steps / 15.0F;
+			float var3 = 1.0F - steps / 15.0F;
 			this.lightBrightnessTable[steps] = ((0.0F + var3) / (var3 * 3.0F + 1.0F) * (1.0F - modifier) + modifier)*3;
 			//     System.out.println( this.lightBrightnessTable[steps]+"light");
 		}
 	}
 
+	@Override
 	public ChunkCoordinates getSpawnPoint()
 	{
 
 		return this.getRandomizedSpawnPoint();
 	}
 
+	@Override
 	public float calculateCelestialAngle(long par1, float par3)
 	{
 		int var4 = (int)(par1 % 24000L);
-		float var5 = ((float)var4 + par3) / 24000.0F - 0.25F;
+		float var5 = (var4 + par3) / 24000.0F - 0.25F;
 
 		if (var5 < 0.0F)
 		{
@@ -107,7 +112,7 @@ public class LimboProvider extends WorldProvider
 		}
 
 		float var6 = var5;
-		var5 = 1.0F - (float)((Math.cos((double)var5 * Math.PI) + 1.0D) / 2.0D);
+		var5 = 1.0F - (float)((Math.cos(var5 * Math.PI) + 1.0D) / 2.0D);
 		var5 = var6 + (var5 - var6) / 3.0F;
 		return 0;
 	}
@@ -125,6 +130,7 @@ public class LimboProvider extends WorldProvider
 		return (dimensionId == 0 ? null : "DimensionalDoors/Limbo" + dimensionId);
 	}
 
+	@Override
 	public boolean canCoordinateBeSpawn(int par1, int par2)
 	{
 		int var3 = this.worldObj.getFirstUncoveredBlock(par1, par2);
@@ -135,19 +141,21 @@ public class LimboProvider extends WorldProvider
 	{
 		return worldObj.getHeight()/4-800;
 	}
+	@Override
 	public Vec3 getSkyColor(Entity cameraEntity, float partialTicks)
 	{
 		setCloudRenderer( new CloudRenderBlank());
-		return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
+		return this.worldObj.getWorldVec3Pool().getVecFromPool(0, 0, 0);
 
 	}
 	@SideOnly(Side.CLIENT)
 	@Override
 	public Vec3 getFogColor(float par1, float par2)
 	{
-		return this.worldObj.getWorldVec3Pool().getVecFromPool((double).2, (double).2, (double).2);
+		return this.worldObj.getWorldVec3Pool().getVecFromPool(.2, .2, .2);
 
 	}
+	@Override
 	public int getRespawnDimension(EntityPlayerMP player)
 	{
 		return 0;
@@ -160,6 +168,7 @@ public class LimboProvider extends WorldProvider
 		return new LimboGenerator(worldObj, 45, spawner, properties);
 	}
 	
+	@Override
 	public boolean canBlockFreeze(int x, int y, int z, boolean byWater)
 	{
 		return false;
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java
new file mode 100644
index 0000000..943f135
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/LimboSkyProvider.java
@@ -0,0 +1,18 @@
+package StevenDimDoors.mod_pocketDim.world;
+
+import net.minecraft.util.ResourceLocation;
+
+public class LimboSkyProvider extends CustomSkyProvider
+{
+	@Override
+	public ResourceLocation getMoonRenderPath()
+	{
+		return new ResourceLocation("DimDoors:textures/other/limboMoon.png");
+	}
+	
+	@Override
+	public ResourceLocation getSunRenderPath()
+	{
+		return new ResourceLocation("DimDoors:textures/other/limboSun.png");
+	}
+}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
similarity index 75%
rename from StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
index c151ab5..0bb054c 100644
--- a/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketBuilder.java
@@ -3,7 +3,6 @@ package StevenDimDoors.mod_pocketDim.world;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.item.ItemDoor;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.chunk.Chunk;
@@ -11,7 +10,6 @@ import net.minecraft.world.chunk.storage.ExtendedBlockStorage;
 import net.minecraftforge.common.DimensionManager;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.Point3D;
-import StevenDimDoors.mod_pocketDim.blocks.DimensionalDoor;
 import StevenDimDoors.mod_pocketDim.blocks.IDimDoor;
 import StevenDimDoors.mod_pocketDim.core.DimLink;
 import StevenDimDoors.mod_pocketDim.core.LinkTypes;
@@ -25,9 +23,9 @@ import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
 import StevenDimDoors.mod_pocketDim.schematic.BlockRotator;
 import StevenDimDoors.mod_pocketDim.util.Pair;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
-import StevenDimDoors.mod_pocketDim.items.BaseItemDoor;
 import StevenDimDoors.mod_pocketDim.items.ItemDimensionalDoor;
 
+@SuppressWarnings("deprecation")
 public class PocketBuilder
 {
 	public static final int MIN_POCKET_SIZE = 5;
@@ -51,6 +49,7 @@ public class PocketBuilder
 	 * @param properties
 	 * @return 
 	 */
+	
 	public static boolean regenerateDungeonPocket(NewDimData dimension, DimLink linkIn, DDProperties properties)
 	{
 		if (linkIn == null)
@@ -79,6 +78,7 @@ public class PocketBuilder
 			dimension.createLink(oldLinkPos, LinkTypes.SAFE_EXIT, (orientation+2)%4);
 			return false;
 		}
+		@SuppressWarnings("unused") // ?
 		NewDimData parent = PocketManager.getDimensionData(incomingLink.source().getDimension());
 		
 		if (!dimension.isDungeon())
@@ -120,126 +120,127 @@ public class PocketBuilder
 	}
 	
 	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;
-		
-		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);
-		
-		//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.");
-		}
-		
+            //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);
+            
+            //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;
+            
+                    //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.");
-		}
-		
+                    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);
-	}
+            
+                    //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)
 	{
@@ -424,7 +425,7 @@ public class PocketBuilder
 			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);			
+			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
diff --git a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
similarity index 95%
rename from StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
index fd34184..6076122 100644
--- a/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketGenerator.java
@@ -12,7 +12,7 @@ import StevenDimDoors.mod_pocketDim.core.NewDimData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner;
 
-public class PocketGenerator extends ChunkProviderGenerate implements IChunkProvider
+public class PocketGenerator extends ChunkProviderGenerate
 {
 	private World worldObj;
 
@@ -32,6 +32,7 @@ public class PocketGenerator extends ChunkProviderGenerate implements IChunkProv
 
 	}
 
+	@Override
 	public boolean unloadQueuedChunks()
 	{
 		return true;
diff --git a/StevenDimDoors/mod_pocketDim/world/PocketProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java
similarity index 94%
rename from StevenDimDoors/mod_pocketDim/world/PocketProvider.java
rename to src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java
index ca51580..f80480c 100644
--- a/StevenDimDoors/mod_pocketDim/world/PocketProvider.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketProvider.java
@@ -20,6 +20,7 @@ public class PocketProvider extends WorldProvider
 {
 	private DDProperties properties;
 	private MonolithSpawner spawner;
+	@SuppressWarnings("unused") // ?
 	private IRenderHandler skyRenderer;
 
 	public PocketProvider()
@@ -47,14 +48,14 @@ public class PocketProvider extends WorldProvider
 	public Vec3 getSkyColor(Entity cameraEntity, float partialTicks)
 	{
 		setCloudRenderer( new CloudRenderBlank());
-		return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
+		return this.worldObj.getWorldVec3Pool().getVecFromPool(0d, 0d, 0d);
 	}
 
 	@SideOnly(Side.CLIENT)
 	@Override
 	public Vec3 getFogColor(float par1, float par2)
 	{
-		return this.worldObj.getWorldVec3Pool().getVecFromPool((double)0, (double)0, (double)0);
+		return this.worldObj.getWorldVec3Pool().getVecFromPool(0d, 0d, 0d);
 	}
 
 	@Override
diff --git a/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java
new file mode 100644
index 0000000..7d734fa
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDim/world/PocketSkyProvider.java
@@ -0,0 +1,18 @@
+package StevenDimDoors.mod_pocketDim.world;
+
+import net.minecraft.util.ResourceLocation;
+
+public class PocketSkyProvider extends CustomSkyProvider
+{
+	@Override
+	public ResourceLocation getMoonRenderPath()
+	{
+		return new ResourceLocation("DimDoors:textures/other/limboMoon.png");
+	}
+	
+	@Override
+	public ResourceLocation getSunRenderPath()
+	{
+		return new ResourceLocation("DimDoors:textures/other/limboSun.png");
+	}
+}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
similarity index 98%
rename from StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
index 27eea89..b9057f4 100644
--- a/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientPacketHandler.java
@@ -1,11 +1,5 @@
 package StevenDimDoors.mod_pocketDimClient;
 
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-
-import net.minecraft.network.INetworkManager;
-import net.minecraft.network.packet.Packet250CustomPayload;
-import net.minecraft.server.integrated.IntegratedServer;
 import StevenDimDoors.mod_pocketDim.PacketConstants;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import StevenDimDoors.mod_pocketDim.util.Point4D;
@@ -13,10 +7,17 @@ import StevenDimDoors.mod_pocketDim.watcher.ClientDimData;
 import StevenDimDoors.mod_pocketDim.watcher.ClientLinkData;
 import StevenDimDoors.mod_pocketDim.watcher.IUpdateSource;
 import StevenDimDoors.mod_pocketDim.watcher.IUpdateWatcher;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.network.IPacketHandler;
 import cpw.mods.fml.common.network.Player;
-import cpw.mods.fml.relauncher.Side;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+
+import net.minecraft.network.INetworkManager;
+import net.minecraft.network.packet.Packet250CustomPayload;
+import net.minecraft.server.integrated.IntegratedServer;
 
 public class ClientPacketHandler implements IPacketHandler, IUpdateSource
 {
diff --git a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDimClient/ClientProxy.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java
index bfc4140..26340c8 100644
--- a/StevenDimDoors/mod_pocketDimClient/ClientProxy.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientProxy.java
@@ -1,5 +1,4 @@
 package StevenDimDoors.mod_pocketDimClient;
-import net.minecraft.src.ModLoader;
 import StevenDimDoors.mod_pocketDim.CommonProxy;
 import StevenDimDoors.mod_pocketDim.ticking.MobMonolith;
 import StevenDimDoors.mod_pocketDim.tileentities.TileEntityDimDoor;
@@ -33,7 +32,6 @@ public class ClientProxy extends CommonProxy
 	@Override
 	public  void printStringClient(String string)
 	{	
-		ModLoader.getMinecraftInstance().ingameGUI.getChatGUI().printChatMessage(string);
 	}
 	
 }
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDimClient/ClientTickHandler.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClientTickHandler.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDimClient/ClientTickHandler.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/ClientTickHandler.java
diff --git a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
similarity index 72%
rename from StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
index f1e409c..2ea3239 100644
--- a/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java
@@ -46,25 +46,26 @@ public class ClosingRiftFX extends EntityFX
 
 	public void func_92044_a(int par1)
 	{
-		float var2 = (float)((par1 & 16711680) >> 16) / 255.0F;
-		float var3 = (float)((par1 & 65280) >> 8) / 255.0F;
-		float var4 = (float)((par1 & 255) >> 0) / 255.0F;
+		float var2 = ((par1 & 16711680) >> 16) / 255.0F;
+		float var3 = ((par1 & 65280) >> 8) / 255.0F;
+		float var4 = ((par1 & 255) >> 0) / 255.0F;
 		float var5 = 1.0F;
 		this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5);
 	}
 
 	public void func_92046_g(int par1)
 	{
-		this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F;
-		this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F;
-		this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F;
+		this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F;
+		this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F;
+		this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F;
 		this.field_92053_aD = true;
 	}
 
 	/**
 	 * returns the bounding box for this entity
 	 */
-	 public AxisAlignedBB getBoundingBox()
+	 @Override
+	public AxisAlignedBB getBoundingBox()
 	{
 		 return null;
 	}
@@ -72,12 +73,14 @@ public class ClosingRiftFX extends EntityFX
 	/**
 	 * Returns true if this entity should push and be pushed by other entities when colliding.
 	 */
-	 public boolean canBePushed()
+	 @Override
+	public boolean canBePushed()
 	 {
 		 return false;
 	 }
 
-	 public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
+	 @Override
+	public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
 	 {
 		 if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0)
 		 {
@@ -87,14 +90,14 @@ public class ClosingRiftFX extends EntityFX
 
 	 public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
 	 {
-		 float var8 = (float)(super.particleTextureIndexX % 16) / 16.0F;
+		 float var8 = super.particleTextureIndexX % 16 / 16.0F;
 		 float var9 = var8 + 0.0624375F;
-		 float var10 = (float)(this.particleTextureIndexX / 16) / 16.0F;
+		 float var10 = this.particleTextureIndexX / 16 / 16.0F;
 		 float var11 = var10 + 0.0624375F;
 		 float var12 = 0.1F * this.particleScale;
-		 float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);
-		 float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY);
-		 float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ);
+		 float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX);
+		 float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY);
+		 float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ);
 		 float var16 = 0.8F;
 
 		 if (PocketManager.getDimensionData(worldObj).isPocketDimension())
@@ -104,16 +107,17 @@ public class ClosingRiftFX extends EntityFX
 		 
 		 par1Tessellator.setColorRGBA_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16, (float) .7);
 
-		 par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var9, (double)var11);
-		 par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var9, (double)var10);
-		 par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var8, (double)var10);
-		 par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var8, (double)var11);
+		 par1Tessellator.addVertexWithUV(var13 - par3 * var12 - par6 * var12, var14 - par4 * var12, var15 - par5 * var12 - par7 * var12, var9, var11);
+		 par1Tessellator.addVertexWithUV(var13 - par3 * var12 + par6 * var12, var14 + par4 * var12, var15 - par5 * var12 + par7 * var12, var9, var10);
+		 par1Tessellator.addVertexWithUV(var13 + par3 * var12 + par6 * var12, var14 + par4 * var12, var15 + par5 * var12 + par7 * var12, var8, var10);
+		 par1Tessellator.addVertexWithUV(var13 + par3 * var12 - par6 * var12, var14 - par4 * var12, var15 + par5 * var12 - par7 * var12, var8, var11);
 	 }
 
 	 /**
 	  * Called to update the entity's position/logic.
 	  */
-	  public void onUpdate()
+	  @Override
+	public void onUpdate()
 	 {
 		 this.prevPosX = this.posX;
 		 this.prevPosY = this.posY;
@@ -126,7 +130,7 @@ public class ClosingRiftFX extends EntityFX
 
 		 if (this.particleAge > this.particleMaxAge / 2)
 		 {
-			 this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge);
+			 this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge);
 
 			 if (this.field_92053_aD)
 			 {
@@ -168,7 +172,8 @@ public class ClosingRiftFX extends EntityFX
 		 }
 	 }
 
-	  public int getBrightnessForRender(float par1)
+	  @Override
+	public int getBrightnessForRender(float par1)
 	  {
 		  return 15728880;
 	  }
@@ -176,7 +181,8 @@ public class ClosingRiftFX extends EntityFX
 	  /**
 	   * Gets how bright this entity is.
 	   */
-	  public float getBrightness(float par1)
+	  @Override
+	public float getBrightness(float par1)
 	  {
 		  return 1.0F;
 	  }
diff --git a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
similarity index 74%
rename from StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
index 339e002..069d58f 100644
--- a/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java
@@ -33,6 +33,7 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 		this.particleMaxAge = 30 + this.rand.nextInt(16);
 		this.noClip = true;
 	}
+	@Override
 	public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
 	{
 		if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0)
@@ -43,14 +44,14 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 
 	public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
 	{
-		float var8 = (float)(super.particleTextureIndexX % 16) / 16.0F;
+		float var8 = super.particleTextureIndexX % 16 / 16.0F;
 		float var9 = var8 + 0.0624375F;
-		float var10 = (float)(this.particleTextureIndexX / 16) / 16.0F;
+		float var10 = this.particleTextureIndexX / 16 / 16.0F;
 		float var11 = var10 + 0.0624375F;
 		float var12 = 0.1F * this.particleScale;
-		float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);
-		float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY);
-		float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ);
+		float var13 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX);
+		float var14 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY);
+		float var15 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ);
 		float var16 = .0F;
 
 		if (PocketManager.getDimensionData(worldObj).isPocketDimension())
@@ -60,10 +61,10 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 
 		par1Tessellator.setColorRGBA_F(this.particleRed * var16, this.particleGreen * var16, this.particleBlue * var16, (float) .7);
 
-		par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 - par5 * var12 - par7 * var12), (double)var9, (double)var11);
-		par1Tessellator.addVertexWithUV((double)(var13 - par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 - par5 * var12 + par7 * var12), (double)var9, (double)var10);
-		par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 + par6 * var12), (double)(var14 + par4 * var12), (double)(var15 + par5 * var12 + par7 * var12), (double)var8, (double)var10);
-		par1Tessellator.addVertexWithUV((double)(var13 + par3 * var12 - par6 * var12), (double)(var14 - par4 * var12), (double)(var15 + par5 * var12 - par7 * var12), (double)var8, (double)var11);
+		par1Tessellator.addVertexWithUV(var13 - par3 * var12 - par6 * var12, var14 - par4 * var12, var15 - par5 * var12 - par7 * var12, var9, var11);
+		par1Tessellator.addVertexWithUV(var13 - par3 * var12 + par6 * var12, var14 + par4 * var12, var15 - par5 * var12 + par7 * var12, var9, var10);
+		par1Tessellator.addVertexWithUV(var13 + par3 * var12 + par6 * var12, var14 + par4 * var12, var15 + par5 * var12 + par7 * var12, var8, var10);
+		par1Tessellator.addVertexWithUV(var13 + par3 * var12 - par6 * var12, var14 - par4 * var12, var15 + par5 * var12 - par7 * var12, var8, var11);
 	}
 
 
@@ -79,25 +80,26 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 
 	public void func_92044_a(int par1)
 	{
-		float var2 = (float)((par1 & 16711680) >> 16) / 255.0F;
-		float var3 = (float)((par1 & 65280) >> 8) / 255.0F;
-		float var4 = (float)((par1 & 255) >> 0) / 255.0F;
+		float var2 = ((par1 & 16711680) >> 16) / 255.0F;
+		float var3 = ((par1 & 65280) >> 8) / 255.0F;
+		float var4 = ((par1 & 255) >> 0) / 255.0F;
 		float var5 = 1.0F;
 		this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5);
 	}
 
 	public void func_92046_g(int par1)
 	{
-		this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F;
-		this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F;
-		this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F;
+		this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F;
+		this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F;
+		this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F;
 		this.field_92053_aD = true;
 	}
 
 	/**
 	 * returns the bounding box for this entity
 	 */
-	 public AxisAlignedBB getBoundingBox()
+	 @Override
+	public AxisAlignedBB getBoundingBox()
 	{
 		 return null;
 	}
@@ -105,7 +107,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 	/**
 	 * Returns true if this entity should push and be pushed by other entities when colliding.
 	 */
-	 public boolean canBePushed()
+	 @Override
+	public boolean canBePushed()
 	{
 		 return false;
 	}
@@ -115,7 +118,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 	/**
 	 * Called to update the entity's position/logic.
 	 */
-	 public void onUpdate()
+	 @Override
+	public void onUpdate()
 	{
 		this.prevPosX = this.posX;
 		this.prevPosY = this.posY;
@@ -128,7 +132,7 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 
 		if (this.particleAge > this.particleMaxAge / 2)
 		{
-			this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge);
+			this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge);
 
 			if (this.field_92053_aD)
 			{
@@ -170,7 +174,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 		}
 	}
 
-	 public int getBrightnessForRender(float par1)
+	 @Override
+	public int getBrightnessForRender(float par1)
 	 {
 		 return 15728880;
 	 }
@@ -178,7 +183,8 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 	 /**
 	  * Gets how bright this entity is.
 	  */
-	 public float getBrightness(float par1)
+	 @Override
+	public float getBrightness(float par1)
 	 {
 		 return 1.0F;
 	 }
diff --git a/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/ModelMobObelisk.java
diff --git a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
similarity index 91%
rename from StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
index 1374baf..8fd12a0 100644
--- a/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java
@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.ActiveRenderInfo;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -21,6 +22,8 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class RenderDimDoor extends TileEntitySpecialRenderer
 {
 	FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16);
+	private ResourceLocation riftPath= new ResourceLocation(mod_pocketDim.modid+":textures/other/RIFT.png");
+	private ResourceLocation warpPath= new ResourceLocation(mod_pocketDim.modid+":textures/other/WARP.png");
 
 	public RenderDimDoor()
 	{
@@ -59,13 +62,14 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
 		for (int count = 0; count < 16; ++count)
 		{
 			GL11.glPushMatrix();
-			float var15 = (float) (16 - count);
+			float var15 = 16 - count;
 			float var16 = 0.2625F;
 			float var17 = 1.0F / (var15 + .80F);
 
 			if (count == 0)
 			{
-				this.bindTextureByName("/RIFT.png");
+				this.bindTexture(riftPath);
+                // move files into assets/modid and change to new ResourceLocation(modid:/RIFT.png)
 				var17 = 0.1F;
 				var15 = 25.0F;
 				var16 = 0.125F;
@@ -75,7 +79,8 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
 
 			if (count == 1)
 			{
-				this.bindTextureByName("/WARP.png");
+				this.bindTexture(warpPath);
+                // move files into assets/modid and change to new ResourceLocation(modid:/WARP.png)
 				GL11.glEnable(GL11.GL_BLEND);
 				GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
 				var16 = .5F;
@@ -98,14 +103,14 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
 			 **/
 
 			GL11.glTranslatef(
-					(float) (Minecraft.getSystemTime() % 200000L) / 200000.0F,
+					Minecraft.getSystemTime() % 200000L / 200000.0F,
 					0, 0.0F);
 			GL11.glTranslatef(0,
-					(float) (Minecraft.getSystemTime() % 200000L) / 200000.0F,
+					Minecraft.getSystemTime() % 200000L / 200000.0F,
 					0.0F);
 
 			GL11.glTranslatef(0, 0,
-					(float) (Minecraft.getSystemTime() % 200000L) / 200000.0F);
+					Minecraft.getSystemTime() % 200000L / 200000.0F);
 
 			GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE,
 					GL11.GL_OBJECT_LINEAR);
@@ -172,11 +177,11 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
 			GL11.glPushMatrix();
 			GL11.glLoadIdentity();
 			GL11.glTranslatef(0.0F,
-					(float) (Minecraft.getSystemTime() % 200000L) / 200000.0F
+					Minecraft.getSystemTime() % 200000L / 200000.0F
 							* var15, 0.0F);
 			GL11.glScalef(var16, var16, var16);
 			GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-			GL11.glRotatef((float) (count * count * 4321 + count * 9) * 2.0F,
+			GL11.glRotatef((count * count * 4321 + count * 9) * 2.0F,
 					0.0F, 0.0F, 1.0F);
 			GL11.glTranslatef(0.5F, 0.5F, 0.5F);
 
diff --git a/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
new file mode 100644
index 0000000..cd43fe6
--- /dev/null
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderMobObelisk.java
@@ -0,0 +1,30 @@
+package StevenDimDoors.mod_pocketDimClient;
+
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import net.minecraft.client.renderer.entity.RenderLiving;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.ResourceLocation;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+@SideOnly(Side.CLIENT)
+public class RenderMobObelisk extends RenderLiving
+{
+	protected ModelMobObelisk obeliskModel;
+
+	public RenderMobObelisk(float f)
+	{
+		super(new ModelMobObelisk(), f);
+		this.obeliskModel = (ModelMobObelisk)this.mainModel;
+	}
+	
+
+
+	@Override
+	protected ResourceLocation getEntityTexture(Entity entity) 
+	{
+		byte b0 = entity.getDataWatcher().getWatchableObjectByte(16);
+
+		return new ResourceLocation(mod_pocketDim.modid+":textures/mobs/Monolith"+b0+".png");
+	}
+}
\ No newline at end of file
diff --git a/StevenDimDoors/mod_pocketDimClient/RenderRift.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderRift.java
similarity index 100%
rename from StevenDimDoors/mod_pocketDimClient/RenderRift.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/RenderRift.java
diff --git a/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
similarity index 87%
rename from StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
index 68fe35c..dc65e57 100644
--- a/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/RenderTransTrapdoor.java
@@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
@@ -22,6 +23,9 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer
 {
     private FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16);
 	private static DDProperties properties = null;
+	private ResourceLocation riftPath= new ResourceLocation(mod_pocketDim.modid+":textures/other/RIFT.png");
+	private ResourceLocation warpPath= new ResourceLocation(mod_pocketDim.modid+":textures/other/WARP.png");
+
 	
     public RenderTransTrapdoor()
     {
@@ -56,13 +60,13 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer
         for (int count = 0; count < 16; ++count)
         {
             GL11.glPushMatrix();
-            float var15 = (float)(16 - count);
+            float var15 = 16 - count;
             float var16 = 0.2625F;
             float var17 = 1.0F / (var15 + 1.0F);
 
             if (count == 0)
             {
-                this.bindTextureByName("/RIFT.png");
+                this.bindTexture(riftPath);
                 var17 = 0.1F;
                 var15 = 25.0F;
                 var16 = 0.125F;
@@ -72,16 +76,17 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer
 
             if (count == 1)
             {
-                this.bindTextureByName("/WARP.png");
+                this.bindTexture(warpPath);
+                // move files into assets/modid and change to new ResourceLocation(modid:/WARP.png)
                 GL11.glEnable(GL11.GL_BLEND);
                 GL11.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
                 var16 = .5F;
             }
 
-            GL11.glTranslatef( (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F,0, 0.0F);
-            GL11.glTranslatef(0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F, 0.0F);
+            GL11.glTranslatef( Minecraft.getSystemTime() % 200000L / 200000.0F,0, 0.0F);
+            GL11.glTranslatef(0, Minecraft.getSystemTime() % 200000L / 200000.0F, 0.0F);
 
-            GL11.glTranslatef(0,0, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F);
+            GL11.glTranslatef(0,0, Minecraft.getSystemTime() % 200000L / 200000.0F);
 
             GL11.glTexGeni(GL11.GL_S, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR);
             GL11.glTexGeni(GL11.GL_T, GL11.GL_TEXTURE_GEN_MODE, GL11.GL_OBJECT_LINEAR);
@@ -102,10 +107,10 @@ public class RenderTransTrapdoor extends TileEntitySpecialRenderer
             GL11.glMatrixMode(GL11.GL_TEXTURE);
             GL11.glPushMatrix();
             GL11.glLoadIdentity();
-            GL11.glTranslatef(0.0F, (float)(Minecraft.getSystemTime() % 200000L) / 200000.0F*var15, 0.0F);
+            GL11.glTranslatef(0.0F, Minecraft.getSystemTime() % 200000L / 200000.0F*var15, 0.0F);
             GL11.glScalef(var16, var16, var16);
             GL11.glTranslatef(0.5F, 0.5F, 0.5F);
-            GL11.glRotatef((float)(count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
+            GL11.glRotatef((count * count * 4321 + count * 9) * 2.0F, 0.0F, 0.0F, 1.0F);
             GL11.glTranslatef(0.5F, 0.5F, 0.5F);
         
             GL11.glBegin(GL11.GL_QUADS);
diff --git a/StevenDimDoors/mod_pocketDimClient/RiftFX.java b/src/main/java/StevenDimDoors/mod_pocketDimClient/RiftFX.java
similarity index 75%
rename from StevenDimDoors/mod_pocketDimClient/RiftFX.java
rename to src/main/java/StevenDimDoors/mod_pocketDimClient/RiftFX.java
index 06a9c31..7f4dc94 100644
--- a/StevenDimDoors/mod_pocketDimClient/RiftFX.java
+++ b/src/main/java/StevenDimDoors/mod_pocketDimClient/RiftFX.java
@@ -46,25 +46,26 @@ public class RiftFX extends EntityFX
 
     public void func_92044_a(int par1)
     {
-        float var2 = (float)((par1 & 16711680) >> 16) / 255.0F;
-        float var3 = (float)((par1 & 65280) >> 8) / 255.0F;
-        float var4 = (float)((par1 & 255) >> 0) / 255.0F;
+        float var2 = ((par1 & 16711680) >> 16) / 255.0F;
+        float var3 = ((par1 & 65280) >> 8) / 255.0F;
+        float var4 = ((par1 & 255) >> 0) / 255.0F;
         float var5 = 1.0F;
         this.setRBGColorF(var2 * var5, var3 * var5, var4 * var5);
     }
 
     public void func_92046_g(int par1)
     {
-        this.field_92050_aA = (float)((par1 & 16711680) >> 16) / 255.0F;
-        this.field_92051_aB = (float)((par1 & 65280) >> 8) / 255.0F;
-        this.field_92052_aC = (float)((par1 & 255) >> 0) / 255.0F;
+        this.field_92050_aA = ((par1 & 16711680) >> 16) / 255.0F;
+        this.field_92051_aB = ((par1 & 65280) >> 8) / 255.0F;
+        this.field_92052_aC = ((par1 & 255) >> 0) / 255.0F;
         this.field_92053_aD = true;
     }
 
     /**
      * returns the bounding box for this entity
      */
-    public AxisAlignedBB getBoundingBox()
+    @Override
+	public AxisAlignedBB getBoundingBox()
     {
         return null;
     }
@@ -72,12 +73,14 @@ public class RiftFX extends EntityFX
     /**
      * Returns true if this entity should push and be pushed by other entities when colliding.
      */
-    public boolean canBePushed()
+    @Override
+	public boolean canBePushed()
     {
         return false;
     }
 
-    public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
+    @Override
+	public void renderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
     {
         if (!this.field_92048_ay || this.particleAge < this.particleMaxAge / 3 || (this.particleAge + this.particleMaxAge) / 3 % 2 == 0)
         {
@@ -89,9 +92,9 @@ public class RiftFX extends EntityFX
     
     public void doRenderParticle(Tessellator par1Tessellator, float par2, float par3, float par4, float par5, float par6, float par7)
     {
-        float f6 = (float)this.particleTextureIndexX / 16.0F;
+        float f6 = this.particleTextureIndexX / 16.0F;
         float f7 = f6 + 0.0624375F;
-        float f8 = (float)this.particleTextureIndexY / 16.0F;
+        float f8 = this.particleTextureIndexY / 16.0F;
         float f9 = f8 + 0.0624375F;
         float f10 = 0.1F * this.particleScale;
 
@@ -103,9 +106,9 @@ public class RiftFX extends EntityFX
             f9 = this.particleIcon.getMaxV();
         }
 
-        float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * (double)par2 - interpPosX);
-        float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * (double)par2 - interpPosY);
-        float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * (double)par2 - interpPosZ);
+        float f11 = (float)(this.prevPosX + (this.posX - this.prevPosX) * par2 - interpPosX);
+        float f12 = (float)(this.prevPosY + (this.posY - this.prevPosY) * par2 - interpPosY);
+        float f13 = (float)(this.prevPosZ + (this.posZ - this.prevPosZ) * par2 - interpPosZ);
         float f14 = 0F;
         
         if (PocketManager.getDimensionData(worldObj).isPocketDimension())
@@ -114,16 +117,17 @@ public class RiftFX extends EntityFX
     	}
         
         par1Tessellator.setColorRGBA_F(this.particleRed * f14, this.particleGreen * f14, this.particleBlue * f14, (float) .7);
-        par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 - par5 * f10 - par7 * f10), (double)f7, (double)f9);
-        par1Tessellator.addVertexWithUV((double)(f11 - par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 - par5 * f10 + par7 * f10), (double)f7, (double)f8);
-        par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 + par6 * f10), (double)(f12 + par4 * f10), (double)(f13 + par5 * f10 + par7 * f10), (double)f6, (double)f8);
-        par1Tessellator.addVertexWithUV((double)(f11 + par3 * f10 - par6 * f10), (double)(f12 - par4 * f10), (double)(f13 + par5 * f10 - par7 * f10), (double)f6, (double)f9);
+        par1Tessellator.addVertexWithUV(f11 - par3 * f10 - par6 * f10, f12 - par4 * f10, f13 - par5 * f10 - par7 * f10, f7, f9);
+        par1Tessellator.addVertexWithUV(f11 - par3 * f10 + par6 * f10, f12 + par4 * f10, f13 - par5 * f10 + par7 * f10, f7, f8);
+        par1Tessellator.addVertexWithUV(f11 + par3 * f10 + par6 * f10, f12 + par4 * f10, f13 + par5 * f10 + par7 * f10, f6, f8);
+        par1Tessellator.addVertexWithUV(f11 + par3 * f10 - par6 * f10, f12 - par4 * f10, f13 + par5 * f10 - par7 * f10, f6, f9);
     }
 
     /**
      * Called to update the entity's position/logic.
      */
-    public void onUpdate()
+    @Override
+	public void onUpdate()
     {
         this.prevPosX = this.posX;
         this.prevPosY = this.posY;
@@ -136,7 +140,7 @@ public class RiftFX extends EntityFX
 
         if (this.particleAge > this.particleMaxAge / 2)
         {
-            this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / (float)this.particleMaxAge);
+            this.setAlphaF(1.0F - ((float)this.particleAge - (float)(this.particleMaxAge / 2)) / this.particleMaxAge);
 
             if (this.field_92053_aD)
             {
@@ -178,7 +182,8 @@ public class RiftFX extends EntityFX
         }
     }
 
-    public int getBrightnessForRender(float par1)
+    @Override
+	public int getBrightnessForRender(float par1)
     {
         return 15728880;
     }
@@ -186,7 +191,8 @@ public class RiftFX extends EntityFX
     /**
      * Gets how bright this entity is.
      */
-    public float getBrightness(float par1)
+    @Override
+	public float getBrightness(float par1)
     {
         return 1.0F;
     }
diff --git a/resources/RIFT.png b/src/main/resources/assets/dimdoors/RIFT.png
similarity index 100%
rename from resources/RIFT.png
rename to src/main/resources/assets/dimdoors/RIFT.png
diff --git a/resources/WARP.png b/src/main/resources/assets/dimdoors/WARP.png
similarity index 100%
rename from resources/WARP.png
rename to src/main/resources/assets/dimdoors/WARP.png
diff --git a/resources/dimdoors_logo.png b/src/main/resources/assets/dimdoors/dimdoors_logo.png
similarity index 100%
rename from resources/dimdoors_logo.png
rename to src/main/resources/assets/dimdoors/dimdoors_logo.png
diff --git a/resources/mods/DimDoors/sfx/creepy.ogg b/src/main/resources/assets/dimdoors/music/creepy.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/creepy.ogg
rename to src/main/resources/assets/dimdoors/music/creepy.ogg
diff --git a/resources/mods/DimDoors/sfx/crack.ogg b/src/main/resources/assets/dimdoors/sound/crack.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/crack.ogg
rename to src/main/resources/assets/dimdoors/sound/crack.ogg
diff --git a/resources/mods/DimDoors/sfx/monk.ogg b/src/main/resources/assets/dimdoors/sound/monk.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/monk.ogg
rename to src/main/resources/assets/dimdoors/sound/monk.ogg
diff --git a/resources/mods/DimDoors/sfx/monkLarge.ogg b/src/main/resources/assets/dimdoors/sound/monkLarge.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/monkLarge.ogg
rename to src/main/resources/assets/dimdoors/sound/monkLarge.ogg
diff --git a/resources/mods/DimDoors/sfx/rift.ogg b/src/main/resources/assets/dimdoors/sound/rift.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/rift.ogg
rename to src/main/resources/assets/dimdoors/sound/rift.ogg
diff --git a/resources/mods/DimDoors/sfx/riftClose.ogg b/src/main/resources/assets/dimdoors/sound/riftClose.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/riftClose.ogg
rename to src/main/resources/assets/dimdoors/sound/riftClose.ogg
diff --git a/resources/mods/DimDoors/sfx/riftDoor.ogg b/src/main/resources/assets/dimdoors/sound/riftDoor.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/riftDoor.ogg
rename to src/main/resources/assets/dimdoors/sound/riftDoor.ogg
diff --git a/resources/mods/DimDoors/sfx/riftEnd.ogg b/src/main/resources/assets/dimdoors/sound/riftEnd.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/riftEnd.ogg
rename to src/main/resources/assets/dimdoors/sound/riftEnd.ogg
diff --git a/resources/mods/DimDoors/sfx/riftStart.ogg b/src/main/resources/assets/dimdoors/sound/riftStart.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/riftStart.ogg
rename to src/main/resources/assets/dimdoors/sound/riftStart.ogg
diff --git a/resources/mods/DimDoors/sfx/tearing.ogg b/src/main/resources/assets/dimdoors/sound/tearing.ogg
similarity index 100%
rename from resources/mods/DimDoors/sfx/tearing.ogg
rename to src/main/resources/assets/dimdoors/sound/tearing.ogg
diff --git a/resources/mods/DimDoors/text/How_to_add_dungeons.txt b/src/main/resources/assets/dimdoors/text/How_to_add_dungeons.txt
similarity index 100%
rename from resources/mods/DimDoors/text/How_to_add_dungeons.txt
rename to src/main/resources/assets/dimdoors/text/How_to_add_dungeons.txt
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo.psd b/src/main/resources/assets/dimdoors/textures/blocks/BlockLimbo.psd
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo.psd
rename to src/main/resources/assets/dimdoors/textures/blocks/BlockLimbo.psd
diff --git a/resources/mods/DimDoors/textures/blocks/blockDimWall.png b/src/main/resources/assets/dimdoors/textures/blocks/blockDimWall.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/blockDimWall.png
rename to src/main/resources/assets/dimdoors/textures/blocks/blockDimWall.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy (2).png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy (2).png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy (2).png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy (2).png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy (3).png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy (3).png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy (3).png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy (3).png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo - Copy.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo - Copy.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo0.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo0.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo0.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo0.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo1.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo1.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo1.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo1.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo2.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo2.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo2.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo2.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimbo3.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo3.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimbo3.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimbo3.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimboGOOD.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimboGOOD.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimboGOOD.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimboGOOD.png
diff --git a/resources/mods/DimDoors/textures/blocks/BlockLimboLIGHT.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimboLIGHT.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/BlockLimboLIGHT.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.BlockLimboLIGHT.png
diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWall.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWall.png
new file mode 100644
index 0000000..4967de8
Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWall.png differ
diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png
new file mode 100644
index 0000000..31806d4
Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png differ
diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta
new file mode 100644
index 0000000..7511680
--- /dev/null
+++ b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.png.mcmeta
@@ -0,0 +1,62 @@
+{
+	"animation": 
+	{
+		"frametime": 2,
+		"frames": 
+		[
+			
+			
+			0
+,1
+,2
+,3
+,4
+,5
+,6
+,7
+,8
+,9
+,10
+,11
+,13
+,14
+,15
+,16
+,17
+,18
+,19
+,20
+,21
+,22
+,23
+,24
+,25
+,16
+,17
+,28
+,29
+,30
+,31
+,32
+,33
+,34
+,35
+,36
+,37
+,38
+,39
+,40
+,41
+,42
+,43
+,44
+,45
+,46
+,47
+,48
+,49
+
+
+		]
+	}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.psd b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.psd
new file mode 100644
index 0000000..d37e313
Binary files /dev/null and b/src/main/resources/assets/dimdoors/textures/blocks/tile.blockDimWallPerm.psd differ
diff --git a/resources/mods/DimDoors/textures/blocks/chaosDoor_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.chaosDoor_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/chaosDoor_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.chaosDoor_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/chaosDoor_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.chaosDoor_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/chaosDoor_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.chaosDoor_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorGold_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorGold_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorGold_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorGold_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorGold_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorLink_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorLink_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorLink_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorLink_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorLink_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorLink_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorLink_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorLink_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorWarp_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorWarp_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorWarp_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorWarp_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorWarp_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorWarp_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorWarp_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorWarp_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoor_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoor_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoor_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoor_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoor_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoor_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoor_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoor_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorexitlink_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorexitlink_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorexitlink_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorexitlink_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimDoorexitlink_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorexitlink_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimDoorexitlink_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimDoorexitlink_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/dimHatch.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.dimHatch.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/dimHatch.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.dimHatch.png
diff --git a/resources/mods/DimDoors/textures/blocks/doorGold_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.doorGold_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/doorGold_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.doorGold_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/doorGold_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.doorGold_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/doorGold_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.doorGold_top.png
diff --git a/resources/mods/DimDoors/textures/blocks/rift.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.rift.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/rift.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.rift.png
diff --git a/resources/mods/DimDoors/textures/blocks/transientDoor - Copy.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor - Copy.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/transientDoor - Copy.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor - Copy.png
diff --git a/resources/mods/DimDoors/textures/blocks/transientDoor_bottom.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor_bottom.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/transientDoor_bottom.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor_bottom.png
diff --git a/resources/mods/DimDoors/textures/blocks/transientDoor_top.png b/src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor_top.png
similarity index 100%
rename from resources/mods/DimDoors/textures/blocks/transientDoor_top.png
rename to src/main/resources/assets/dimdoors/textures/blocks/tile.transientDoor_top.png
diff --git a/resources/mods/DimDoors/textures/items/ItemRiftBlade.png b/src/main/resources/assets/dimdoors/textures/items/ItemRiftBlade.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/ItemRiftBlade.png
rename to src/main/resources/assets/dimdoors/textures/items/ItemRiftBlade.png
diff --git a/resources/mods/DimDoors/textures/items/dimDoorexit.png b/src/main/resources/assets/dimdoors/textures/items/dimDoorexit.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/dimDoorexit.png
rename to src/main/resources/assets/dimdoors/textures/items/dimDoorexit.png
diff --git a/resources/mods/DimDoors/textures/items/item.ItemRiftBlade.png b/src/main/resources/assets/dimdoors/textures/items/item.ItemRiftBlade.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.ItemRiftBlade.png
rename to src/main/resources/assets/dimdoors/textures/items/item.ItemRiftBlade.png
diff --git a/resources/mods/DimDoors/textures/items/item.dimDoorexit.png b/src/main/resources/assets/dimdoors/textures/items/item.dimDoorexit.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.dimDoorexit.png
rename to src/main/resources/assets/dimdoors/textures/items/item.dimDoorexit.png
diff --git a/resources/mods/DimDoors/textures/items/item.itemChaosDoor.png b/src/main/resources/assets/dimdoors/textures/items/item.itemChaosDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.itemChaosDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/item.itemChaosDoor.png
diff --git a/resources/mods/DimDoors/textures/items/item.itemDimDoor.png b/src/main/resources/assets/dimdoors/textures/items/item.itemDimDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.itemDimDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/item.itemDimDoor.png
diff --git a/resources/mods/DimDoors/textures/items/item.itemLinkSignature.png b/src/main/resources/assets/dimdoors/textures/items/item.itemLinkSignature.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.itemLinkSignature.png
rename to src/main/resources/assets/dimdoors/textures/items/item.itemLinkSignature.png
diff --git a/resources/mods/DimDoors/textures/items/item.itemRiftRemover.png b/src/main/resources/assets/dimdoors/textures/items/item.itemRiftRemover.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.itemRiftRemover.png
rename to src/main/resources/assets/dimdoors/textures/items/item.itemRiftRemover.png
diff --git a/resources/mods/DimDoors/textures/items/item.itemStableFabric.png b/src/main/resources/assets/dimdoors/textures/items/item.itemStableFabric.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/item.itemStableFabric.png
rename to src/main/resources/assets/dimdoors/textures/items/item.itemStableFabric.png
diff --git a/resources/mods/DimDoors/textures/items/itemChaosDoor.png b/src/main/resources/assets/dimdoors/textures/items/itemChaosDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemChaosDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/itemChaosDoor.png
diff --git a/resources/mods/DimDoors/textures/items/itemDimDoor.png b/src/main/resources/assets/dimdoors/textures/items/itemDimDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemDimDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/itemDimDoor.png
diff --git a/resources/mods/DimDoors/textures/items/itemDimDoorWarp.png b/src/main/resources/assets/dimdoors/textures/items/itemDimDoorWarp.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemDimDoorWarp.png
rename to src/main/resources/assets/dimdoors/textures/items/itemDimDoorWarp.png
diff --git a/resources/mods/DimDoors/textures/items/itemGoldDimDoor.png b/src/main/resources/assets/dimdoors/textures/items/itemGoldDimDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemGoldDimDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/itemGoldDimDoor.png
diff --git a/resources/mods/DimDoors/textures/items/itemGoldDoor.png b/src/main/resources/assets/dimdoors/textures/items/itemGoldDoor.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemGoldDoor.png
rename to src/main/resources/assets/dimdoors/textures/items/itemGoldDoor.png
diff --git a/resources/mods/DimDoors/textures/items/itemLinkSignature.png b/src/main/resources/assets/dimdoors/textures/items/itemLinkSignature.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemLinkSignature.png
rename to src/main/resources/assets/dimdoors/textures/items/itemLinkSignature.png
diff --git a/resources/mods/DimDoors/textures/items/itemRiftRemover.png b/src/main/resources/assets/dimdoors/textures/items/itemRiftRemover.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemRiftRemover.png
rename to src/main/resources/assets/dimdoors/textures/items/itemRiftRemover.png
diff --git a/resources/mods/DimDoors/textures/items/itemStabilizedRiftSig.png b/src/main/resources/assets/dimdoors/textures/items/itemStabilizedRiftSig.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemStabilizedRiftSig.png
rename to src/main/resources/assets/dimdoors/textures/items/itemStabilizedRiftSig.png
diff --git a/resources/mods/DimDoors/textures/items/itemStableFabric.png b/src/main/resources/assets/dimdoors/textures/items/itemStableFabric.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/itemStableFabric.png
rename to src/main/resources/assets/dimdoors/textures/items/itemStableFabric.png
diff --git a/resources/mods/DimDoors/textures/items/ItemWorldThread.png b/src/main/resources/assets/dimdoors/textures/items/itemWorldThread.png
similarity index 100%
rename from resources/mods/DimDoors/textures/items/ItemWorldThread.png
rename to src/main/resources/assets/dimdoors/textures/items/itemWorldThread.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith.psd b/src/main/resources/assets/dimdoors/textures/mobs/Monolith.psd
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith.psd
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith.psd
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith0.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith0.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith0.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith0.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith1.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith1.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith1.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith1.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith10.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith10.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith10.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith10.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith11.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith11.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith11.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith11.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith12.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith12.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith12.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith12.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith13.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith13.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith13.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith13.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith14.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith14.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith14.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith14.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith15.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith15.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith15.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith15.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith16.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith16.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith16.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith16.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith17.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith17.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith17.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith17.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith18.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith18.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith18.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith18.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith2.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith2.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith2.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith2.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith3.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith3.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith3.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith3.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith4.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith4.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith4.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith4.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith5.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith5.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith5.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith5.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith6.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith6.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith6.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith6.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith7.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith7.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith7.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith7.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith8.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith8.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith8.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith8.png
diff --git a/resources/mods/DimDoors/textures/mobs/Monolith9.png b/src/main/resources/assets/dimdoors/textures/mobs/Monolith9.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/Monolith9.png
rename to src/main/resources/assets/dimdoors/textures/mobs/Monolith9.png
diff --git a/resources/mods/DimDoors/textures/mobs/eye.psd b/src/main/resources/assets/dimdoors/textures/mobs/eye.psd
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/eye.psd
rename to src/main/resources/assets/dimdoors/textures/mobs/eye.psd
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith10.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith10.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith10.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith10.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith11.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith11.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith11.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith11.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith12.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith12.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith12.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith12.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith13.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith13.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith13.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith13.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith14.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith14.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith14.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith14.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith15.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith15.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith15.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith15.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith16.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith16.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith16.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith16.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith17.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith17.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith17.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith17.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith18.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith18.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith18.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith18.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith2.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith2.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith2.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith2.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith3.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith3.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith3.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith3.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith4.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith4.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith4.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith4.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith5.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith5.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith5.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith5.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith6.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith6.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith6.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith6.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith7.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith7.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith7.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith7.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith8.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith8.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith8.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith8.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/Monolith9.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith9.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/Monolith9.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/Monolith9.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/monolith0.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/monolith0.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/monolith0.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/monolith0.png
diff --git a/resources/mods/DimDoors/textures/mobs/testMonolith/monolith1.png b/src/main/resources/assets/dimdoors/textures/mobs/testMonolith/monolith1.png
similarity index 100%
rename from resources/mods/DimDoors/textures/mobs/testMonolith/monolith1.png
rename to src/main/resources/assets/dimdoors/textures/mobs/testMonolith/monolith1.png
diff --git a/resources/mods/DimDoors/textures/other/RIFT.png b/src/main/resources/assets/dimdoors/textures/other/RIFT.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/RIFT.png
rename to src/main/resources/assets/dimdoors/textures/other/RIFT.png
diff --git a/resources/mods/DimDoors/textures/other/WARP.png b/src/main/resources/assets/dimdoors/textures/other/WARP.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/WARP.png
rename to src/main/resources/assets/dimdoors/textures/other/WARP.png
diff --git a/resources/mods/DimDoors/textures/other/dimdoors_logo.png b/src/main/resources/assets/dimdoors/textures/other/dimdoors_logo.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/dimdoors_logo.png
rename to src/main/resources/assets/dimdoors/textures/other/dimdoors_logo.png
diff --git a/resources/mods/DimDoors/textures/other/limboMoon.png b/src/main/resources/assets/dimdoors/textures/other/limboMoon.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/limboMoon.png
rename to src/main/resources/assets/dimdoors/textures/other/limboMoon.png
diff --git a/resources/mods/DimDoors/textures/other/limboSun.png b/src/main/resources/assets/dimdoors/textures/other/limboSun.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/limboSun.png
rename to src/main/resources/assets/dimdoors/textures/other/limboSun.png
diff --git a/resources/mods/DimDoors/textures/other/pocketMoon.png b/src/main/resources/assets/dimdoors/textures/other/pocketMoon.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/pocketMoon.png
rename to src/main/resources/assets/dimdoors/textures/other/pocketMoon.png
diff --git a/resources/mods/DimDoors/textures/other/pocketSun.png b/src/main/resources/assets/dimdoors/textures/other/pocketSun.png
similarity index 100%
rename from resources/mods/DimDoors/textures/other/pocketSun.png
rename to src/main/resources/assets/dimdoors/textures/other/pocketSun.png
diff --git a/src/main/resources/dimdoors_logo.png b/src/main/resources/dimdoors_logo.png
new file mode 100644
index 0000000..6828be8
Binary files /dev/null and b/src/main/resources/dimdoors_logo.png differ
diff --git a/mcmod.info b/src/main/resources/mcmod.info
similarity index 89%
rename from mcmod.info
rename to src/main/resources/mcmod.info
index 89eaa2b..1557290 100644
--- a/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,9 +1,12 @@
+{
+"modinfoversion":2,
+"modlist":
 [
 {
 "modid": "DimDoors",
 "name": "Dimensional Doors",
 "description": "Bend and twist reality itself, creating pocket dimensions, rifts, and much more",
-"version": "1.5.2R1.4.1RC1",
+"version": "1.6.4R2.1.2RC1",
 "credits": "Created by StevenRS11, Coded by StevenRS11 and SenseiKiwi, Logo and Testing by Jaitsu",
 "logoFile": "/dimdoors_logo.png",
 "mcversion": "",
@@ -15,3 +18,4 @@
 "dependencies": [ "Forge"]
 }
 ]
+}
\ No newline at end of file
diff --git a/src/main/resources/schematics/How_to_add_dungeons.txt b/src/main/resources/schematics/How_to_add_dungeons.txt
new file mode 100644
index 0000000..c361d91
--- /dev/null
+++ b/src/main/resources/schematics/How_to_add_dungeons.txt
@@ -0,0 +1,51 @@
+Adding dungeons is pretty simple, but you have to know the various flags and stuff I use to read them in and build them. Ill walk you through the process here, and provide all the flags and a breif description of what they mean here.
+
+To get started, run Minecraft with DimDoors installed and use the "/dd-create" command.
+
+This will generate an empty pocket dim for you to build with that is in the proper orientation (north). If you do not use this command, you WILL run into issues later.
+
+So on to the building- You can ONLY use vanilla blocks in the dungeons. Everything that is not vanilla MC will be turned into fabric of reality when I gen them, or it will crash horribly. The only exceptions to this are DimDoors doors, which will be treated like mundane, vanilla doors of the same material. 
+
+The first step is to make your entrance door. This is where the player will appear when they teleport in for the first time. It is marked by a vanilla wooden door. It will be replaced by a wooden warp door on generation, and by default is set as the door you entered from. 
+
+As you build your dungeon, there are a few restrictions. Any chests you place will get filled with random loot, and not what you place in them. Any dispensers will get a few stacks of arrows. Other than that, any vanilla mechanics should work fine, except rails. I'm working on that now, as well as saving inventories.
+
+Any iron doors you place will become iron dim doors, and link to more dungeon pockets, so use these to make your dungeon lead farther into a dungeon chain.
+
+If you want your dungeon to link back the Overworld, place a wooden door on top of a Sandstone block. This will mark it as an exit door, and it will generate as a wooden Dim door leading to the Overworld (or whatever dim this chain started in). The sandstone block will become whatever is under it. 
+
+Once you have finished creating your dungeon, you need to use the command "/dd-export <fileName>"
+
+To name it, use the following format:
+
+<DungeonType>_<DungeonName>_<IsOpen>_<SpawnWeight>
+
+DungeonType: The dungeon types are "Hub", "SimpleHall", "ComplexHall", "Trap', "Maze", "Exit", and "DeadEnd'.
+
+	Hub: Dungeons that have 4 or more iron doors in them should be labeled as hubs, so they don't generate one after another.
+
+	SimpleHall: Dungeons that contain a single iron door or two, but no more than that, and don't contain traps. These are the halls that separate rooms and should generally be tagged as 'closed'.
+
+	ComplexHall: These dungeons are more like rooms and can be open. They can have piston puzzles or locks, and up to three iron doors. In addition, they can contain wooden doors to link to the surface. 
+
+	Trap: These dungeons are primarily traps and often contain only a single iron door. The traps should never instantly kill the player, and it should be possible to beat them. They can contain either a reward/chest, or simply allow progress. Piston traps are very fun for these. 
+
+	Maze: These dungeons can contain up to 3 iron doors. They can be simple labyrinths or full of changing walls, etc. They should not, however, be primarily trying to kill the player, though they can have possibly lethal elements. In the worst case, think of it as half trap and half hub.
+
+	Exit: The main purpose of these dungeons is to link back to Overworld with a wooden door. They should never contain iron doors.
+
+	DeadEnd: Dungeons that have no other doors except the entrance. Usually contain some sort of treasure. 
+
+IsOpen: Indicates whether the dungeon is an open-air structure or a closed structure that should be surrounded by Monoliths. Monoliths prevent players from breaking out of closed structures to avoid puzzles or traps. The only valid values are "open" or "closed".
+
+SpawnWeight: An optional integer that determines how frequently you want the dungeon to appear relative to others of the same type. The default weight is 100. Higher values cause a dungeon to generate more often, while lower values cause it to be less common. The minimum weight is 0 and the maximum weight is 10,000.
+
+
+Examples:
+	Hub_RuinsWithDoors_Open_100
+	SimpleHall_WindingHallway_Closed_50
+	Trap_CleverTrap_Closed
+
+Although you can deviate from the format above, the current dungeon generation system requires that format to work properly. It will not select schematics that do not follow those naming rules.
+
+Congratulations! You have added your own dungeon. You can use the command "/dd-rift <dungeonName>" to generate it, or use "/dd-rift list" to list all available dungeons. Finally, "/dd-rift random" will select a dungeon at random.
\ No newline at end of file
diff --git a/schematics/core/somethingBroke.schematic b/src/main/resources/schematics/core/somethingBroke.schematic
similarity index 100%
rename from schematics/core/somethingBroke.schematic
rename to src/main/resources/schematics/core/somethingBroke.schematic
diff --git a/schematics/ruins.txt b/src/main/resources/schematics/ruins.txt
similarity index 100%
rename from schematics/ruins.txt
rename to src/main/resources/schematics/ruins.txt
diff --git a/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic b/src/main/resources/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic
similarity index 100%
rename from schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic
rename to src/main/resources/schematics/ruins/ComplexHall_SK-AnchoredDescent_Open_50.schematic
diff --git a/schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic b/src/main/resources/schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic
similarity index 100%
rename from schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic
rename to src/main/resources/schematics/ruins/ComplexHall_SK-HiddenStairs_Open_100.schematic
diff --git a/schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic b/src/main/resources/schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic
similarity index 100%
rename from schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic
rename to src/main/resources/schematics/ruins/ComplexHall_SK-LostGarden_Open_10.schematic
diff --git a/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic b/src/main/resources/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic
similarity index 100%
rename from schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic
rename to src/main/resources/schematics/ruins/DeadEnd_SK-EyesOfTricksters_Open_50.schematic
diff --git a/schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic b/src/main/resources/schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic
similarity index 100%
rename from schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic
rename to src/main/resources/schematics/ruins/DeadEnd_SK-FarAwayInTheDark_Open_100.schematic
diff --git a/schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic b/src/main/resources/schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic
similarity index 100%
rename from schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic
rename to src/main/resources/schematics/ruins/DeadEnd_SK-UnstableDesert_Open_50.schematic
diff --git a/schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic b/src/main/resources/schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic
similarity index 100%
rename from schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic
rename to src/main/resources/schematics/ruins/Hub_SK-Claustrophobia_Open_10.schematic
diff --git a/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic b/src/main/resources/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic
similarity index 100%
rename from schematics/ruins/Hub_SK-FractalCage_Open_20.schematic
rename to src/main/resources/schematics/ruins/Hub_SK-FractalCage_Open_20.schematic
diff --git a/schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic b/src/main/resources/schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic
similarity index 100%
rename from schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic
rename to src/main/resources/schematics/ruins/Hub_SK-HeartOfDisorder_Open_50.schematic
diff --git a/schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic b/src/main/resources/schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic
similarity index 100%
rename from schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic
rename to src/main/resources/schematics/ruins/SimpleHall_SK-LeftDownStairs_Open_50.schematic
diff --git a/schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic b/src/main/resources/schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic
similarity index 100%
rename from schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic
rename to src/main/resources/schematics/ruins/SimpleHall_SK-LeftUpPath_Open_50.schematic
diff --git a/schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic b/src/main/resources/schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic
similarity index 100%
rename from schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic
rename to src/main/resources/schematics/ruins/SimpleHall_SK-RightDownStairs_Open_50.schematic
diff --git a/schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic b/src/main/resources/schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic
similarity index 100%
rename from schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic
rename to src/main/resources/schematics/ruins/SimpleHall_SK-RightUpPath_Open_50.schematic
diff --git a/schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic b/src/main/resources/schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic
similarity index 100%
rename from schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic
rename to src/main/resources/schematics/ruins/SimpleHall_SK-SpiralHallway_Open_100.schematic
diff --git a/schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic b/src/main/resources/schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic
similarity index 100%
rename from schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic
rename to src/main/resources/schematics/ruins/Trap_SK-RestlessCorridor_Open_10.schematic
diff --git a/schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic b/src/main/resources/schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_buggyTopEntry1_open_100.schematic
diff --git a/schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic b/src/main/resources/schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_exitRuinsWithHiddenDoor_open_100.schematic
diff --git a/schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic b/src/main/resources/schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_hallwayHiddenTreasure_closed_100.schematic
diff --git a/schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic b/src/main/resources/schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_largeBrokenHall_closed_100.schematic
diff --git a/schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic b/src/main/resources/schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_mediumPillarStairs_open_100.schematic
diff --git a/schematics/ruins/complexHall_pitStairs_open_100.schematic b/src/main/resources/schematics/ruins/complexHall_pitStairs_open_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_pitStairs_open_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_pitStairs_open_100.schematic
diff --git a/schematics/ruins/complexHall_ruinsO_open_100.schematic b/src/main/resources/schematics/ruins/complexHall_ruinsO_open_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_ruinsO_open_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_ruinsO_open_100.schematic
diff --git a/schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic b/src/main/resources/schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_smallBranchWithExit_closed_100.schematic
diff --git a/schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic b/src/main/resources/schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic
similarity index 100%
rename from schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic
rename to src/main/resources/schematics/ruins/complexHall_smallRotundaWithExit_closed_100.schematic
diff --git a/schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic b/src/main/resources/schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic
similarity index 100%
rename from schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic
rename to src/main/resources/schematics/ruins/complexHall_tntPuzzleTrap_closed_50.schematic
diff --git a/schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic b/src/main/resources/schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_azersDungeonO_closed_100.schematic
diff --git a/schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_brokenPillarsO_open_100.schematic
diff --git a/schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_diamondTowerTemple1_open_100.schematic
diff --git a/schematics/ruins/deadEnd_fallingTrapO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_fallingTrapO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_fallingTrapO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_fallingTrapO_open_100.schematic
diff --git a/schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_hiddenStaircaseO_open_100.schematic
diff --git a/schematics/ruins/deadEnd_lavaTrapO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_lavaTrapO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_lavaTrapO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_lavaTrapO_open_100.schematic
diff --git a/schematics/ruins/deadEnd_randomTree_open_75.schematic b/src/main/resources/schematics/ruins/deadEnd_randomTree_open_75.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_randomTree_open_75.schematic
rename to src/main/resources/schematics/ruins/deadEnd_randomTree_open_75.schematic
diff --git a/schematics/ruins/deadEnd_smallDesert_open_75.schematic b/src/main/resources/schematics/ruins/deadEnd_smallDesert_open_75.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_smallDesert_open_75.schematic
rename to src/main/resources/schematics/ruins/deadEnd_smallDesert_open_75.schematic
diff --git a/schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_smallHiddenTowerO_open_100.schematic
diff --git a/schematics/ruins/deadEnd_smallPond_open_75.schematic b/src/main/resources/schematics/ruins/deadEnd_smallPond_open_75.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_smallPond_open_75.schematic
rename to src/main/resources/schematics/ruins/deadEnd_smallPond_open_75.schematic
diff --git a/schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic b/src/main/resources/schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_smallSilverfishRoom_closed_100.schematic
diff --git a/schematics/ruins/deadEnd_tntTrapO_open_100.schematic b/src/main/resources/schematics/ruins/deadEnd_tntTrapO_open_100.schematic
similarity index 100%
rename from schematics/ruins/deadEnd_tntTrapO_open_100.schematic
rename to src/main/resources/schematics/ruins/deadEnd_tntTrapO_open_100.schematic
diff --git a/schematics/ruins/exit_exitCube_open_100.schematic b/src/main/resources/schematics/ruins/exit_exitCube_open_100.schematic
similarity index 100%
rename from schematics/ruins/exit_exitCube_open_100.schematic
rename to src/main/resources/schematics/ruins/exit_exitCube_open_100.schematic
diff --git a/schematics/ruins/exit_lockingExitHall_closed_100.schematic b/src/main/resources/schematics/ruins/exit_lockingExitHall_closed_100.schematic
similarity index 100%
rename from schematics/ruins/exit_lockingExitHall_closed_100.schematic
rename to src/main/resources/schematics/ruins/exit_lockingExitHall_closed_100.schematic
diff --git a/schematics/ruins/exit_smallExitPrison_open_100.schematic b/src/main/resources/schematics/ruins/exit_smallExitPrison_open_100.schematic
similarity index 100%
rename from schematics/ruins/exit_smallExitPrison_open_100.schematic
rename to src/main/resources/schematics/ruins/exit_smallExitPrison_open_100.schematic
diff --git a/schematics/ruins/hub_4WayBasicHall_closed_200.schematic b/src/main/resources/schematics/ruins/hub_4WayBasicHall_closed_200.schematic
similarity index 100%
rename from schematics/ruins/hub_4WayBasicHall_closed_200.schematic
rename to src/main/resources/schematics/ruins/hub_4WayBasicHall_closed_200.schematic
diff --git a/schematics/ruins/hub_4WayHallExit_closed_200.schematic b/src/main/resources/schematics/ruins/hub_4WayHallExit_closed_200.schematic
similarity index 100%
rename from schematics/ruins/hub_4WayHallExit_closed_200.schematic
rename to src/main/resources/schematics/ruins/hub_4WayHallExit_closed_200.schematic
diff --git a/schematics/ruins/hub_doorTotemRuins_open_100.schematic b/src/main/resources/schematics/ruins/hub_doorTotemRuins_open_100.schematic
similarity index 100%
rename from schematics/ruins/hub_doorTotemRuins_open_100.schematic
rename to src/main/resources/schematics/ruins/hub_doorTotemRuins_open_100.schematic
diff --git a/schematics/ruins/hub_fortRuins_open_100.schematic b/src/main/resources/schematics/ruins/hub_fortRuins_open_100.schematic
similarity index 100%
rename from schematics/ruins/hub_fortRuins_open_100.schematic
rename to src/main/resources/schematics/ruins/hub_fortRuins_open_100.schematic
diff --git a/schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic b/src/main/resources/schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic
similarity index 100%
rename from schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic
rename to src/main/resources/schematics/ruins/hub_hallwayTrapRooms1_closed_100.schematic
diff --git a/schematics/ruins/hub_longDoorHallway_closed_100.schematic b/src/main/resources/schematics/ruins/hub_longDoorHallway_closed_100.schematic
similarity index 100%
rename from schematics/ruins/hub_longDoorHallway_closed_100.schematic
rename to src/main/resources/schematics/ruins/hub_longDoorHallway_closed_100.schematic
diff --git a/schematics/ruins/maze_smallMaze1_closed_100.schematic b/src/main/resources/schematics/ruins/maze_smallMaze1_closed_100.schematic
similarity index 100%
rename from schematics/ruins/maze_smallMaze1_closed_100.schematic
rename to src/main/resources/schematics/ruins/maze_smallMaze1_closed_100.schematic
diff --git a/schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic b/src/main/resources/schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic
similarity index 100%
rename from schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic
rename to src/main/resources/schematics/ruins/maze_smallMultilevelMaze_closed_100.schematic
diff --git a/schematics/ruins/rules.txt b/src/main/resources/schematics/ruins/rules.txt
similarity index 100%
rename from schematics/ruins/rules.txt
rename to src/main/resources/schematics/ruins/rules.txt
diff --git a/schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_collapsedSingleTunnel1_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_simpleDropHall_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_simpleSmallT1_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_simpleStairsDown_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_simpleStairsUp_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_singleStraightHall1_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_smallSimpleLeft_closed_100.schematic
diff --git a/schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic b/src/main/resources/schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic
similarity index 100%
rename from schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic
rename to src/main/resources/schematics/ruins/simpleHall_smallSimpleRight_closed_100.schematic
diff --git a/schematics/ruins/trap_fakeTNTTrap_closed_100.schematic b/src/main/resources/schematics/ruins/trap_fakeTNTTrap_closed_100.schematic
similarity index 100%
rename from schematics/ruins/trap_fakeTNTTrap_closed_100.schematic
rename to src/main/resources/schematics/ruins/trap_fakeTNTTrap_closed_100.schematic
diff --git a/schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic b/src/main/resources/schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic
similarity index 100%
rename from schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic
rename to src/main/resources/schematics/ruins/trap_hallwayPitFallTrap_closed_200.schematic
diff --git a/schematics/ruins/trap_lavaPyramid_open_100.schematic b/src/main/resources/schematics/ruins/trap_lavaPyramid_open_100.schematic
similarity index 100%
rename from schematics/ruins/trap_lavaPyramid_open_100.schematic
rename to src/main/resources/schematics/ruins/trap_lavaPyramid_open_100.schematic
diff --git a/schematics/ruins/trap_pistonFallRuins_open_100.schematic b/src/main/resources/schematics/ruins/trap_pistonFallRuins_open_100.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonFallRuins_open_100.schematic
rename to src/main/resources/schematics/ruins/trap_pistonFallRuins_open_100.schematic
diff --git a/schematics/ruins/trap_pistonFloorHall_closed_150.schematic b/src/main/resources/schematics/ruins/trap_pistonFloorHall_closed_150.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonFloorHall_closed_150.schematic
rename to src/main/resources/schematics/ruins/trap_pistonFloorHall_closed_150.schematic
diff --git a/schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic b/src/main/resources/schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic
rename to src/main/resources/schematics/ruins/trap_pistonFloorPlatform2_closed_100.schematic
diff --git a/schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic b/src/main/resources/schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic
rename to src/main/resources/schematics/ruins/trap_pistonFloorPlatform_closed_100.schematic
diff --git a/schematics/ruins/trap_pistonHallway_closed_100.schematic b/src/main/resources/schematics/ruins/trap_pistonHallway_closed_100.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonHallway_closed_100.schematic
rename to src/main/resources/schematics/ruins/trap_pistonHallway_closed_100.schematic
diff --git a/schematics/ruins/trap_pistonSmasherHall_closed_100.schematic b/src/main/resources/schematics/ruins/trap_pistonSmasherHall_closed_100.schematic
similarity index 100%
rename from schematics/ruins/trap_pistonSmasherHall_closed_100.schematic
rename to src/main/resources/schematics/ruins/trap_pistonSmasherHall_closed_100.schematic
diff --git a/schematics/ruins/trap_raceTheTNTHall_closed_50.schematic b/src/main/resources/schematics/ruins/trap_raceTheTNTHall_closed_50.schematic
similarity index 100%
rename from schematics/ruins/trap_raceTheTNTHall_closed_50.schematic
rename to src/main/resources/schematics/ruins/trap_raceTheTNTHall_closed_50.schematic
diff --git a/schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic b/src/main/resources/schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic
similarity index 100%
rename from schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic
rename to src/main/resources/schematics/ruins/trap_wallFallcomboPistonHall_closed_200.schematic
diff --git a/versionscript.py b/versionscript.py
deleted file mode 100644
index d86282a..0000000
--- a/versionscript.py
+++ /dev/null
@@ -1,29 +0,0 @@
-import sys
-import json
-import string
-
-
-argversion = sys.argv
-
-versionlist = argversion[1].split('R')
-
-mcversion = versionlist[0]
-mfrversion = versionlist[1]
-if(len(versionlist) > 2):
-	mfrversion = versionlist[1]+"R"+versionlist[2]
-
-mcmod=open('mcmod.info', 'r')
-
-data = json.load(mcmod)
-
-for mod in data:
-	for attribute, value in mod.iteritems():
-		if (attribute == 'version'):
-			mod[attribute] = mfrversion
-		if (attribute == 'mcversion'):
-			mod[attribute] = mcversion
-			
-mcmod=open('mcmod.info', 'w')
-json.dump(data, mcmod, indent=4)
-
-print (mfrversion)
\ No newline at end of file