StevenDimDoors/mod_pocketDim/ConnectionHandler.java

@@ -1,11 +1,5 @@
 package StevenDimDoors.mod_pocketDim;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
-import StevenDimDoors.mod_pocketDim.core.NewDimData;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-
 import net.minecraft.network.INetworkManager;
 import net.minecraft.network.NetLoginHandler;
 import net.minecraft.network.packet.NetHandler;
@@ -16,43 +10,23 @@ import cpw.mods.fml.common.network.Player;
 
 public class ConnectionHandler implements IConnectionHandler
 {
-	private static boolean connected = false;
-	private static DDProperties properties = null;
-		
-	//sends a packet to clients containing all the information about the dims and links. Lots of packets, actually. 
 	@Override
 	public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager) 
 	{
-		if (properties == null)
+		//Sends a packet to the client containing all the information about the dimensions and links.
-			properties = DDProperties.instance();
+		//Lots of packets, actually.
-		
+		PacketHandler.sendClientJoinPacket(manager);
-		PacketHandler.onClientJoinPacket(manager, PocketManager.dimList);
-		PacketHandler.onDimCreatedPacket(new NewDimData(properties.LimboDimensionID, false, 0, 0, 0, 0, 0));
 		return null;
 	}
 
 	@Override
-	public void connectionOpened(NetHandler netClientHandler, String server,int port, INetworkManager manager) 
+	public void connectionOpened(NetHandler netClientHandler, String server, int port, INetworkManager manager) { }
-	{
-		connected = true;		
-	}
 	
 	@Override
 	public void connectionOpened(NetHandler netClientHandler,MinecraftServer server, INetworkManager manager) { }
 
 	@Override
-	public void connectionClosed(INetworkManager manager) 
+	public void connectionClosed(INetworkManager manager) { }
-	{
-		if (connected)
-		{
-			System.out.println("Clearing dim cache");
-			PocketManager.instance.save();
-			PocketManager.instance.unregsisterDims();
-			PocketManager.dimList.clear();
-		    
-		}
-		connected = false;
-	}
 
 	@Override
 	public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login) { }

StevenDimDoors/mod_pocketDim/PacketHandler.java

@@ -126,7 +126,7 @@ public class PacketHandler implements IPacketHandler
 		
 	}
 	
-	public static void onClientJoinPacket(INetworkManager manager, HashMap<Integer, NewDimData> dimList)
+	public static void sendClientJoinPacket(INetworkManager manager)
 	{
 		Collection<Integer> dimIDs= dimList.keySet();
 		Collection<NewDimData> dimDataSet= dimList.values();

StevenDimDoors/mod_pocketDim/items/ItemRiftBlade.java

@@ -5,14 +5,12 @@ import java.util.List;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.EnumToolMaterial;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemSword;
 import net.minecraft.util.AxisAlignedBB;
@@ -22,7 +20,6 @@ import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import StevenDimDoors.mod_pocketDim.DDProperties;
 import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.NewLinkData;
 import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java

@@ -2,20 +2,16 @@ package StevenDimDoors.mod_pocketDim.items;
 
 import java.util.List;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.NewLinkData;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-
 import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
+import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -114,11 +110,13 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
     	return true;	
     }
     
-    @SideOnly(Side.CLIENT)
     
     /**
      * allows items to add custom lines of information to the mouseover description
      */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	@SideOnly(Side.CLIENT)
+    @Override
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
     {
     	if (par1ItemStack.hasTagCompound())
@@ -126,16 +124,14 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
     		if (par1ItemStack.stackTagCompound.getBoolean("isCreated"))
     		{
     			Integer[] coords = this.readFromNBT(par1ItemStack);
-    			par3List.add(String.valueOf("Leads to dim "+coords[3] +" with depth "+PocketManager.instance.getDimDepth(PocketManager.instance.getDimDepth(coords[3]))));
+    			par3List.add("Leads to (" + coords[0] + ", " + coords[1] + ", " + coords[2] + ") at dimension #" + coords[3]);
-        		par3List.add("at x="+coords[0]+" y="+coords[1]+" z="+coords[2]);
     		}
     	}
     	else
     	{
-    		par3List.add("First click stores location,");
+    		par3List.add("First click stores a location,");
-    		par3List.add ("second click creates two rifts,");
+    		par3List.add("second click creates two rifts");
-    		par3List.add("that link the first location");
+    		par3List.add("that link the locations together.");
-    		par3List.add("with the second location");
     	}
     }
     

StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java

@@ -2,22 +2,17 @@ package StevenDimDoors.mod_pocketDim.items;
 
 import java.util.List;
 
-import StevenDimDoors.mod_pocketDim.DDProperties;
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.NewDimData;
-import StevenDimDoors.mod_pocketDim.core.ILinkData;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-
 import net.minecraft.block.Block;
-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
+import StevenDimDoors.mod_pocketDim.DDProperties;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

StevenDimDoors/mod_pocketDim/items/itemRiftRemover.java

@@ -2,12 +2,8 @@ package StevenDimDoors.mod_pocketDim.items;
 
 import java.util.List;
 
-import StevenDimDoors.mod_pocketDim.mod_pocketDim;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.Item;
@@ -16,40 +12,25 @@ import net.minecraft.util.MathHelper;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
+import StevenDimDoors.mod_pocketDim.mod_pocketDim;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
 public class itemRiftRemover extends Item
 {
-    private Material doorMaterial;
-
     public itemRiftRemover(int par1, Material par2Material)
     {
     	 super(par1);
     	 this.setMaxStackSize(1);
-    	// this.setTextureFile("/PocketBlockTextures.png");
          this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
-
-        // this.itemIcon=6;
          this.setMaxDamage(5);
          this.hasSubtypes = true;
-    	 //TODO move to proxy
     }
     
-    
     public void registerIcons(IconRegister par1IconRegister)
     {
         this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
-
-    }
-   
-    @SideOnly(Side.CLIENT)
-    @Override
-    public boolean hasEffect(ItemStack par1ItemStack)
-    {
-    	// adds effect if item has a link stored
-    	
-       return false;
     }
     
     public static MovingObjectPosition getBlockTarget(World par1World, EntityPlayer par2EntityPlayer, boolean par3)
@@ -78,59 +59,27 @@ public class itemRiftRemover extends Item
 
     public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
     {
-    	{		
+		MovingObjectPosition hit = getBlockTarget(par3EntityPlayer.worldObj, par3EntityPlayer, false);
-    		MovingObjectPosition hit = 	this.getBlockTarget(par3EntityPlayer.worldObj, par3EntityPlayer, false );
 		if (hit != null)
 		{
-    			//System.out.println(hit.hitVec);
+			if (PocketManager.removeRift(par2World, hit.blockX, hit.blockY, hit.blockZ, 1, par3EntityPlayer, par1ItemStack))
-    			if(PocketManager.instance.removeRift(par2World, hit.blockX, hit.blockY, hit.blockZ, 1, par3EntityPlayer, par1ItemStack))
 			{
-    				par3EntityPlayer.worldObj.playSoundAtEntity(par3EntityPlayer,"mods.DimDoors.sfx.riftClose", (float) .8, 1);
+				par3EntityPlayer.worldObj.playSoundAtEntity(par3EntityPlayer,"mods.DimDoors.sfx.riftClose", 0.8f, 1);
-
 			}
-    			
-    		}
-    	//	dimHelper.removeRift( par3World,  par4,  par5,  par6,  range,  par2EntityPlayer,  par1ItemStack);
-    		
-    		
 		}
     	return par1ItemStack;
     }
     
-    
-    
-    @SideOnly(Side.CLIENT)
-
     /**
      * allows items to add custom lines of information to the mouseover description
      */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+	@SideOnly(Side.CLIENT)
     @Override
     public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4)
     {
-    	
-    
 		par3List.add("Use near exposed rift");
 		par3List.add("to remove it and");
-    		par3List.add("any nearby rifts");
+		par3List.add("any nearby rifts.");
-    	
-
-
-    	
-    }
-    @Override
-    public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) 
-    {
-    	if(!par2World.isRemote)
-    	{
-    		/**
-    		//creates the first half of the link on item creation
-    		int key= dimHelper.instance.createUniqueInterDimLinkKey();
-    		LinkData linkData= new LinkData(par2World.provider.dimensionId,MathHelper.floor_double(par3EntityPlayer.posX),MathHelper.floor_double(par3EntityPlayer.posY),MathHelper.floor_double(par3EntityPlayer.posZ));
-    		System.out.println(key);
-
-    		dimHelper.instance.interDimLinkList.put(key, linkData);
-    		par1ItemStack.setItemDamage(key);
-    		**/
-    	}
 	}
 }

StevenDimDoors/mod_pocketDim/mod_pocketDim.java

@@ -104,7 +104,7 @@ public class mod_pocketDim
 	public static Block exitDoor;
 	public static Block unstableDoor;
 	public static Block blockLimbo;
-	public static Block dimensionalDoor;    
+	public static dimDoor dimensionalDoor;    
 	public static Block blockDimWall;   
 	public static Block dimHatch;
 	public static Block blockDimWallPerm;
@@ -188,7 +188,7 @@ public class mod_pocketDim
 		blockRift = (BlockRift) (new BlockRift(properties.RiftBlockID, 0, Material.air, properties).setHardness(1.0F) .setUnlocalizedName("rift"));
 		blockLimbo = (new BlockLimbo(properties.LimboBlockID, 15, Material.iron, properties.LimboDimensionID, decay).setHardness(.2F).setUnlocalizedName("BlockLimbo").setLightValue(.0F));
 		unstableDoor = (new ChaosDoor(properties.UnstableDoorID, Material.iron).setHardness(.2F).setUnlocalizedName("chaosDoor").setLightValue(.0F) );
-		dimensionalDoor = (new dimDoor(properties.DimensionalDoorID, Material.iron)).setHardness(1.0F).setResistance(2000.0F) .setUnlocalizedName("dimDoor");
+		dimensionalDoor = (dimDoor) (new dimDoor(properties.DimensionalDoorID, Material.iron)).setHardness(1.0F).setResistance(2000.0F) .setUnlocalizedName("dimDoor");
 		dimHatch = (new dimHatch(properties.TransTrapdoorID, 84, Material.iron)).setHardness(1.0F) .setUnlocalizedName("dimHatch");
 		//  dimRail = (new DimRail(dimRailID, 88, false)).setHardness(.5F) .setUnlocalizedName("dimRail");
 

StevenDimDoors/mod_pocketDim/ticking/LimboGatewayGenerator.java

@@ -1,26 +0,0 @@
-package StevenDimDoors.mod_pocketDim.ticking;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.GameRules;
-import net.minecraft.world.World;
-import StevenDimDoors.mod_pocketDim.DDProperties;
-import StevenDimDoors.mod_pocketDim.core.NewDimData;
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
-import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
-import StevenDimDoors.mod_pocketDim.util.ChunkLocation;
-
-public class LimboGatewayGenerator implements IRegularTickReceiver 
-{
-
-	@Override
-	public void notifyTick() 
-	{
-
-		
-	}
-	
-}

StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java

@@ -150,7 +150,7 @@ public class MobMonolith extends EntityFlying implements IMob
 						(int) this.posY + 500,
 						(int) this.posZ + MathHelper.getRandomIntegerInRange(rand, -250, 250),
 						properties.LimboDimensionID);
-					DDTeleporter.teleport(worldObj, destination, entityPlayer);
+					DDTeleporter.teleport(entityPlayer, destination);
 					this.aggro = 0;
 
 					entityPlayer.worldObj.playSoundAtEntity(entityPlayer,"mods.DimDoors.sfx.crack",13, 1);

StevenDimDoors/mod_pocketDim/world/LimboGenerator.java

@@ -12,18 +12,12 @@ import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.chunk.IChunkProvider;
 import net.minecraft.world.gen.ChunkProviderGenerate;
-import net.minecraft.world.gen.MapGenBase;
-import net.minecraft.world.gen.MapGenRavine;
 import net.minecraft.world.gen.NoiseGeneratorOctaves;
 import net.minecraft.world.gen.feature.MapGenScatteredFeature;
-import net.minecraft.world.gen.structure.MapGenMineshaft;
-import net.minecraft.world.gen.structure.MapGenStronghold;
-import net.minecraft.world.gen.structure.MapGenVillage;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.terraingen.ChunkProviderEvent;
 import StevenDimDoors.mod_pocketDim.DDProperties;
-import StevenDimDoors.mod_pocketDim.ticking.CommonTickHandler;
 import StevenDimDoors.mod_pocketDim.ticking.MonolithSpawner;
 
 public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvider
@@ -46,8 +40,6 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 	public NoiseGeneratorOctaves noiseGen5;
 
 	public World world;
-	private final byte[] field_82700_c = new byte[256];
-	private final byte[] field_82698_d = new byte[256];
 
 	/** A NoiseGeneratorOctaves used in generating terrain */
 	public NoiseGeneratorOctaves noiseGen6;
@@ -56,27 +48,11 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 	/** Reference to the World object. */
 	private World worldObj;
 
-	/** are map structures going to be generated (e.g. strongholds) */
-	private final boolean mapFeaturesEnabled = false;
-
 	/** Holds the overall noise array used in chunk generation */
 	private double[] noiseArray;
-	private double[] stoneNoise = new double[256];
-	private MapGenBase caveGenerator = new CustomCaveGen();
 	
-	/** Holds Stronghold Generator */
-	private MapGenStronghold strongholdGenerator = new MapGenStronghold();
-
-	/** Holds Village Generator */
-	private MapGenVillage villageGenerator = new MapGenVillage();
-
-	/** Holds Mineshaft Generator */
-	private MapGenMineshaft mineshaftGenerator = new MapGenMineshaft();
 	private MapGenScatteredFeature scatteredFeatureGenerator = new MapGenScatteredFeature();
 
-	/** Holds ravine generator */
-	private MapGenBase ravineGenerator = new MapGenRavine();
-
 	/** The biomes that are used to generate the chunk */
 	private BiomeGenBase[] biomesForGeneration = new BiomeGenBase[1];
 
@@ -137,10 +113,11 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
 	}
 
 	@Override
-	public boolean chunkExists(int var1, int var2) {
+	public boolean chunkExists(int var1, int var2)
-		// TODO Auto-generated method stub
+	{
 		return super.chunkExists(var1, var2);
 	}
+	
 	@Override
 	public void replaceBlocksForBiome(int par1, int par2, byte[] par3ArrayOfByte, BiomeGenBase[] par4ArrayOfBiomeGenBase)
 	{

StevenDimDoors/mod_pocketDimClient/ClosingRiftFX.java

@@ -95,22 +95,13 @@ public class ClosingRiftFX extends EntityFX
 		 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 var16 = .8F;
+		 float var16 = 0.8F;
-        try
-        {
-         if(PocketManager.instance.getDimData(this.worldObj.provider.dimensionId).isPocket)
-         {
-         var16=.4F;
-         }
-         else
-         {
 
-         }
+		 if (PocketManager.getDimensionData(worldObj).isPocketDimension())
-        }
-        catch(Exception E)
 		 {
-        
+			 var16 = 0.4F;
 		 }
+		 
 		 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);

StevenDimDoors/mod_pocketDimClient/GoggleRiftFX.java

@@ -1,12 +1,11 @@
 package StevenDimDoors.mod_pocketDimClient;
 
-import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import net.minecraft.client.particle.EffectRenderer;
-import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.particle.EntityFireworkSparkFX;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.World;
+import StevenDimDoors.mod_pocketDim.core.PocketManager;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
@@ -53,21 +52,12 @@ public class GoggleRiftFX extends EntityFireworkSparkFX
 		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 var16 = .0F;
-        try
+
-        {
+		if (PocketManager.getDimensionData(worldObj).isPocketDimension())
-         if(PocketManager.instance.getDimData(this.worldObj.provider.dimensionId).isPocket)
 		{
 			var16 = .7F;
 		}
-         else
-         {
 
-         }
-        }
-        catch(Exception E)
-        {
-        
-        }
 		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);

StevenDimDoors/mod_pocketDimClient/RenderDimDoor.java

@@ -40,12 +40,10 @@ public class RenderDimDoor extends TileEntitySpecialRenderer
     {
     	try
     	{
-    		dimDoor.class.cast(Block.blocksList[properties.DimensionalDoorID]).updateAttatchedTile(tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord).getFullMetadata(tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
+    		mod_pocketDim.dimensionalDoor.updateAttachedTile(tile.worldObj, tile.xCoord, tile.yCoord, tile.zCoord);
-
     	}
     	catch(Exception e)
     	{
-    
     		e.printStackTrace();
     	}