Fixed door orientation finally.

Limbo generates terrain under you

can use items in limbo

more voids to send you home.

update to 1.5.2

Signed-off-by: StevenRS11 <stevenrs11@aol.com>

StevenDimDoors/mod_pocketDim/EventHookContainer.java

@@ -129,7 +129,7 @@ public class EventHookContainer
      
     
     		
-    	
+    	/**
     	
     	if(event.entityPlayer.worldObj.provider.dimensionId==mod_pocketDim.limboDimID&&event.action==PlayerInteractEvent.Action.RIGHT_CLICK_BLOCK)
     	{
@@ -162,7 +162,9 @@ public class EventHookContainer
          
          
     		}
+    		
     	}
+    	**/
      
     }
      

StevenDimDoors/mod_pocketDim/LimboGenerator.java

@@ -323,7 +323,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
     {
         byte var4 = 4;
         byte var5 = 16;
-        byte var6 = 16;
+        byte var6 = 19;
         int var7 = var4 + 1;
         byte var8 = 17;
         int var9 = var4 + 1;
@@ -373,6 +373,7 @@ public class LimboGenerator extends ChunkProviderGenerate implements IChunkProvi
                                 {
                                     par3ArrayOfByte[var43 += var44] = (byte)mod_pocketDim.blockDimWallPermID;
                                 }
+                                
                                 else
                                 {
                                     par3ArrayOfByte[var43 += var44] = 0;

StevenDimDoors/mod_pocketDim/blocks/BlockDimWallPerm.java

@@ -71,8 +71,8 @@ public class BlockDimWallPerm extends Block
     			int x = (link.destXCoord + rand.nextInt(mod_pocketDim.limboExitRange)-mod_pocketDim.limboExitRange/2);
     			int z = (link.destZCoord + rand.nextInt(mod_pocketDim.limboExitRange)-mod_pocketDim.limboExitRange/2);
     			
-    			x=x+(x>> 4)+1; //make sure I am in the middle of a chunk, andnot on a boundry, so it doesnt load the chunk next to me
-    			z=z+(z>> 4)+1;
+    			x=x+(x>> 4); //make sure I am in the middle of a chunk, andnot on a boundry, so it doesnt load the chunk next to me
+    			z=z+(z>> 4);
 
     			
     			
@@ -98,7 +98,7 @@ public class BlockDimWallPerm extends Block
 					{
 						for(int yc=0;yc<200;yc++)
 						{
-							if(yc==0&&dimHelper.getWorld(0).isBlockOpaqueCube(i+xc, j-2,k +zc))
+							if(yc==0)
 							{
 								
 								if(Math.abs(xc)+Math.abs(zc)<rand.nextInt(3)+2)

StevenDimDoors/mod_pocketDim/blocks/dimDoor.java

@@ -150,6 +150,7 @@ public class dimDoor extends BlockContainer
 						var12=dimHelper.instance.flipDoorMetadata(var12);
 					}
 					par1World.setBlockMetadataWithNotify(par2, par3-1, par4, var12,2);
+					
 					if(	dimHelper.instance.getLinkDataFromCoords(par2, par3, par4, par1World)!=null)
 					{
 						dimHelper.instance.getLinkDataFromCoords(par2, par3, par4, par1World).linkOrientation= par1World.getBlockMetadata(par2, par3-1, par4);
@@ -164,10 +165,12 @@ public class dimDoor extends BlockContainer
 						var12=dimHelper.instance.flipDoorMetadata(var12);
 					}
 					par1World.setBlockMetadataWithNotify(par2, par3, par4, var12,2);
+					
 					if(	dimHelper.instance.getLinkDataFromCoords(par2, par3+1, par4, par1World)!=null)
 					{
 						dimHelper.instance.getLinkDataFromCoords(par2, par3+1, par4, par1World).linkOrientation= par1World.getBlockMetadata(par2, par3, par4);
 					}
+					
 				}
 	            par1World.playAuxSFXAtEntity(par5EntityPlayer, 1001, par2, par3, par4, 0);
 

StevenDimDoors/mod_pocketDim/dimHelper.java

@@ -343,12 +343,10 @@ public class dimHelper extends DimensionManager
 					
 			
 					
-					
 						entity = this.teleportEntity(world, entity, linkData);		
 
 					
 						
-						
 						if(entity instanceof EntityPlayerMP)
 						{
 								
@@ -392,6 +390,7 @@ public class dimHelper extends DimensionManager
     									entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, mod_pocketDim.blockDimWallID);
 
     								}
+
     								this.generateDoor(world,linkData);
 
 						
@@ -411,6 +410,7 @@ public class dimHelper extends DimensionManager
 
 							}
 						}
+						/**
 						if(entity.worldObj.getBlockId(x, y, z)==mod_pocketDim.dimDoorID||entity.worldObj.getBlockId(x, y, z)==mod_pocketDim.ExitDoorID)
 						{
 							if(this.getLinkDataFromCoords(x, y, z, entity.worldObj)!=null)
@@ -423,6 +423,7 @@ public class dimHelper extends DimensionManager
 
 					
 						}
+						**/
 			   
 			}
 		}
@@ -660,7 +661,7 @@ public class dimHelper extends DimensionManager
 				if(blockToReplace!=mod_pocketDim.dimDoorID&&blockToReplace!=mod_pocketDim.linkExitDoorID&&blockToReplace!=mod_pocketDim.linkDimDoorID&&blockToReplace!=mod_pocketDim.ExitDoorID&&blockToReplace!=mod_pocketDim.transientDoorID)
 				{
 					this.getWorld(destinationID).setBlock(destX, destY-1, destZ, doorTypeToPlace,destOrientation,2);
-					this.getWorld(destinationID).setBlock(destX, destY, destZ, doorTypeToPlace,world.getBlockMetadata(locX, locY, locZ),2);
+					this.getWorld(destinationID).setBlock(destX, destY, destZ, doorTypeToPlace,8,2);
 				//	System.out.println("Genned door");
 				}
 				

StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java

@@ -55,7 +55,7 @@ public class ItemStabilizedRiftSignature extends itemLinkSignature
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
 
     }
 

StevenDimDoors/mod_pocketDim/items/ItemStableFabric.java

@@ -32,13 +32,17 @@ public class ItemStableFabric extends Item
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        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(!par3World.isRemote)
+    	{
     		System.out.println("Block metadata is "+par3World.getBlockMetadata(par4, par5, par6));
+    		this.onItemRightClick(par1ItemStack, par3World, par2EntityPlayer);
+    	}
     	//System.out.println("Block texture data is "+Block.blocksList[par3World.getBlockId(par4, par5, par6)].getBlockTexture(par3World,par4, par5, par6,par7).getIconName());
     	//System.out.println("Block name is is "+Block.blocksList[par3World.getBlockId(par4, par5, par6)].getUnlocalizedName2());
 
@@ -76,7 +80,7 @@ public class ItemStableFabric extends Item
     	MovingObjectPosition hit = 	this.getMovingObjectPositionFromPlayer(par3EntityPlayer.worldObj, par3EntityPlayer, false );
 		if(hit!=null&&!par2World.isRemote)
 		{
-			if(par2World.getBlockId(hit.blockX, hit.blockY, hit.blockZ)==mod_pocketDim.blockRiftID)
+			//if(par2World.getBlockId(hit.blockX, hit.blockY, hit.blockZ)==mod_pocketDim.blockRiftID)
 			{
 				LinkData link = dimHelper.instance.getLinkDataFromCoords(hit.blockX, hit.blockY, hit.blockZ, par2World);
 				if(link!=null)
@@ -107,8 +111,20 @@ public class ItemStableFabric extends Item
 	               if (par3EntityPlayer.canPlayerEdit(par4, par5, par6, par7, par1ItemStack) && par3EntityPlayer.canPlayerEdit(par4, par5 + 1, par6, par7, par1ItemStack)&&!par2World.isRemote)
 	               {
 	            	   int var12 = MathHelper.floor_double((double)((par3EntityPlayer.rotationYaw + 180.0F) * 4.0F / 360.0F) - 0.5D) & 3;
+	            	   String cardinal= "default";
 
-	              System.out.println("Link orientation is " + link.linkOrientation);
+	            	   switch(link.linkOrientation)
+	            	   {
+	            	   	case 0:  cardinal = "East";
+	            	   		break;
+	            	   	case 1:  cardinal = "South";
+	            	   		break;
+	            	   	case 2:  cardinal = "West";
+	            	   		break;
+	            	   	case 3:  cardinal = "North";
+	            	   		break;
+	            	   }
+	            	   System.out.println("Link orientation is " + link.linkOrientation + "- "+cardinal);
 	               }
 				}
 			}

StevenDimDoors/mod_pocketDim/items/itemDimDoor.java

@@ -33,7 +33,7 @@ public class itemDimDoor extends ItemDoor
     }
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
 
     }
     

StevenDimDoors/mod_pocketDim/items/itemExitDoor.java

@@ -29,7 +29,7 @@ public class itemExitDoor extends itemDimDoor
     
     public void registerIcons(IconRegister par1IconRegister)
     {
-        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName());
+        this.itemIcon = par1IconRegister.registerIcon(mod_pocketDim.modid + ":" + this.getUnlocalizedName().replace("item.", ""));
 
     }
     

StevenDimDoors/mod_pocketDim/items/itemLinkSignature.java

@@ -110,9 +110,15 @@ public class itemLinkSignature extends Item
 			for(int count = 0;count<3;count++)
 			{
 				if(dimHelper.instance.getLinkDataFromCoords(par4, par5+count, par6,par3World)!=null)
+				{
+					int id= (par3World.getBlockId(par4, par5+count, par6));
+					
+					if(id == mod_pocketDim.dimDoorID||id==mod_pocketDim.ExitDoorID||id==mod_pocketDim.chaosDoorID)
 					{
 						orientation = dimHelper.instance.getLinkDataFromCoords(par4, par5+count, par6,par3World).linkOrientation;
 					}
+				}
+				
 
 			}
 			

StevenDimDoors/mod_pocketDim/pocketTeleporter.java

@@ -34,8 +34,13 @@ public class pocketTeleporter
 			this.x=link.destXCoord;
 			this.y=link.destYCoord;
 			this.z=link.destZCoord;
+			
 			this.sendingLink=link;
 			
+			int id;
+	         
+        	
+           	id=dimHelper.instance.getDestOrientation(sendingLink);
            	
        
 		 if(par1Entity instanceof EntityPlayer)
@@ -43,10 +48,8 @@ public class pocketTeleporter
 		 	EntityPlayer player = (EntityPlayer) par1Entity;
 	    
 	    	
-		 	int id;
 		 
            
-           	id=dimHelper.instance.getDestOrientation(sendingLink);
             		//System.out.println("Teleporting with link oreintation "+id);
 
        
@@ -91,9 +94,7 @@ public class pocketTeleporter
 			 par1Entity.motionX=0;
 			 par1Entity.motionZ=0;
 			 par1Entity.motionY=0;
-			 int id;
 			
-			 id=dimHelper.instance.getDestOrientation(sendingLink);
 
 			
 			 par1Entity.rotationYaw=(id*90)+90;
@@ -151,10 +152,7 @@ public class pocketTeleporter
 		 
 		 else if(par1Entity instanceof   Entity)
 		 {
-			 int id;
 			
-     	
-			 id=dimHelper.instance.getDestOrientation(sendingLink);
 			 //System.out.println("Teleporting with link oreintation "+id);