From ffa66d97ddb837817948a1048de41674ba450cfd Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Mon, 24 Oct 2016 15:24:33 +1000
Subject: $ Fixed the getItemStackInPlayersHand method, now it has variable
 server/client versions, all with various constructors. (World/String/UUID) -
 Closes #31 % Moved a heap of Code to separate Utils classes.

---
 src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java       | 4 ++--
 .../gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java    | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/block')

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
index 9ac81bffe4..22536aa19b 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_Workbench.java
@@ -5,7 +5,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.player.PlayerUtils;
 import ic2.core.item.tool.ItemToolWrench;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -70,7 +70,7 @@ public class Machine_Workbench extends BlockContainer
 	{
 		if (world.isRemote) return true;
 
-		ItemStack heldItem = UtilsItems.getItemStackInPlayersHand();
+		ItemStack heldItem = PlayerUtils.getItemStackInPlayersHand();
 		boolean holdingWrench = false;
 
 		if (heldItem != null){
diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
index ce09ddab59..2f061ea298 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_WorkbenchAdvanced.java
@@ -5,7 +5,7 @@ import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.tileentities.machines.TileEntityWorkbenchAdvanced;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.player.PlayerUtils;
 import ic2.core.item.tool.ItemToolWrench;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
@@ -68,9 +68,9 @@ public class Machine_WorkbenchAdvanced extends BlockContainer
 	@Override
 	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz)
 	{
-		if (world.isRemote) return true;
 
-		ItemStack heldItem = UtilsItems.getItemStackInPlayersHand();
+		ItemStack heldItem = PlayerUtils.getItemStackInPlayersHand(player);
+		if (world.isRemote) return true;
 		boolean holdingWrench = false;
 
 		if (heldItem != null){
-- 
cgit