Fixed Rift Signatures

Fixed Rift Signatures and Stabilized Rift Signatures. A few unexpected
MC-related issues were preventing them from working properly. Also fixed
a typo that caused us to place rift blocks at the wrong coordinates with
respect to the rift sig endpoints. Autocorrected the indentation on both
source files for aesthetics.

StevenDimDoors/mod_pocketDim/items/ItemRiftSignature.java

@@ -24,9 +24,9 @@ public class ItemRiftSignature extends Item
 	{
 		super(itemID);
 		this.setMaxStackSize(1);
-		this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
 		this.setMaxDamage(0);
 		this.hasSubtypes = true;
+		this.setCreativeTab(mod_pocketDim.dimDoorsCreativeTab);
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -43,22 +43,26 @@ public class ItemRiftSignature extends Item
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
+	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
 	{
-		tryItemUse(stack, player, world, x, y, z);
+		// We must use onItemUseFirst() instead of onItemUse() because Minecraft checks
-		return true;
+		// whether the user is in creative mode after calling onItemUse() and undoes any
+		// damage we might set to indicate the rift sig has been activated. Otherwise,
+		// we would need to rely on checking NBT tags for hasEffect() and that function
+		// gets called constantly. Avoiding NBT lookups reduces our performance impact.
+
+		// Return false on the client side to pass this request to the server
+		if (world.isRemote)
+		{
+			return false;
 		}
 
-	protected boolean tryItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z)
-	{
-		if (!world.isRemote)
-		{
 		//We don't check for replaceable blocks. The user can deal with that. <_<
 
 		y += 2; //Increase y by 2 to place the rift at head level
 		if (!player.canPlayerEdit(x, y, z, 0, stack))
 		{
-				return false;
+			return true;
 		}
 
 		Point4D source = getSource(stack);
@@ -83,7 +87,7 @@ public class ItemRiftSignature extends Item
 			if (sourceWorld != null &&
 				!mod_pocketDim.blockRift.isBlockImmune(sourceWorld, source.getX(), source.getY(), source.getZ()))
 			{
-					sourceWorld.setBlock(source.getX(), source.getY(), source.getY(), mod_pocketDim.blockRift.blockID);
+				sourceWorld.setBlock(source.getX(), source.getY(), source.getZ(), mod_pocketDim.blockRift.blockID);
 			}
 
 			if (!player.capabilities.isCreativeMode)
@@ -103,8 +107,6 @@ public class ItemRiftSignature extends Item
 		}
 		return true;
 	}
-		return false;
-	}
 
 	/**
 	 * allows items to add custom lines of information to the mouseover description

StevenDimDoors/mod_pocketDim/items/ItemStabilizedRiftSignature.java

@@ -7,7 +7,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
 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.util.Point4D;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,25 +30,68 @@ public class ItemStabilizedRiftSignature extends ItemRiftSignature
 	}
 
 	@Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
+	public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
 	{
-    	//Check if the Stabilized Rift Signature has been initialized
+		// Return false on the client side to pass this request to the server
+		if (world.isRemote)
+		{
+			return false;
+		}
+
+		// We don't check for replaceable blocks. The user can deal with that. <_<
+		y += 2; //Increase y by 2 to place the rift at head level
+		if (!player.canPlayerEdit(x, y, z, 0, stack))
+		{
+			return true;
+		}
+
+		// Check if the Stabilized Rift Signature has been initialized
 		Point4D source = getSource(stack);
 		if (source != null)
 		{
-    		//Yes, it's initialized. Check if the player can pay an Ender Pearl to create a rift.
+			// Yes, it's initialized. Check if the player is in creative
-    		if (player.inventory.hasItem(Item.enderPearl.itemID))
+			// or if the player can pay an Ender Pearl to create a rift.
+			if (!player.capabilities.isCreativeMode && !player.inventory.hasItem(Item.enderPearl.itemID))
 			{
-	    		if (tryItemUse(stack, player, world, x, y, z) && !player.capabilities.isCreativeMode)
+				player.sendChatToPlayer("You don't have any Ender Pearls!");
+				return true;
+			}
+
+			//The link was used before and already has an endpoint stored. Create links connecting the two endpoints.
+			NewDimData sourceDimension = PocketManager.getDimensionData(source.getDimension());
+			NewDimData destinationDimension = PocketManager.getDimensionData(world);
+			DimLink link = sourceDimension.createLink(source.getX(), source.getY(), source.getZ(), LinkTypes.NORMAL);
+			DimLink reverse = destinationDimension.createLink(x, y, z, LinkTypes.NORMAL);
+			destinationDimension.setDestination(link, x, y, z);
+			sourceDimension.setDestination(reverse, source.getX(), source.getY(), source.getZ());
+
+			//Try placing a rift at the destination point
+			if (!mod_pocketDim.blockRift.isBlockImmune(world, x, y, z))
+			{
+				world.setBlock(x, y, z, mod_pocketDim.blockRift.blockID);
+			}
+
+			//Try placing a rift at the source point, but check if its world is loaded first
+			World sourceWorld = DimensionManager.getWorld(sourceDimension.id());
+			if (sourceWorld != null &&
+				!mod_pocketDim.blockRift.isBlockImmune(sourceWorld, source.getX(), source.getY(), source.getZ()))
+			{
+				sourceWorld.setBlock(source.getX(), source.getY(), source.getZ(), mod_pocketDim.blockRift.blockID);
+			}
+
+			if (!player.capabilities.isCreativeMode)
 			{
 				player.inventory.consumeInventoryItem(Item.enderPearl.itemID);
 			}
-    		}
+			player.sendChatToPlayer("Rift Created");
+			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftEnd", 0.6f, 1);
 		}
 		else
 		{
-    		//Initialization doesn't cost any materials
+			//The link signature has not been used. Store its current target as the first location. 
-    		tryItemUse(stack, player, world, x, y, z);
+			setSource(stack, x, y, z, PocketManager.getDimensionData(world));
+			player.sendChatToPlayer("Location Stored in Rift Signature");
+			world.playSoundAtEntity(player,"mods.DimDoors.sfx.riftStart", 0.6f, 1);
 		}
 		return true;
 	}