+ More Trade Table work.

1 files changed, 5 insertions, 72 deletions

diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
index fc155765c6..6af3aa36e4 100644
--- a/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
+++ b/src/Java/gtPlusPlus/core/block/machine/Machine_TradeTable.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.block.machine;
 
-import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.registry.LanguageRegistry;
 import cpw.mods.fml.relauncher.Side;
@@ -8,24 +7,16 @@ import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.creative.AddToCreativeTab;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import gtPlusPlus.core.tileentities.machines.TileEntityTradeTable;
-import gtPlusPlus.core.tileentities.machines.TileEntityWorkbench;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.util.player.PlayerUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import ic2.core.item.tool.ItemToolWrench;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-@Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")
 public class Machine_TradeTable extends BlockContainer
 {
 	@SideOnly(Side.CLIENT)
@@ -70,19 +61,7 @@ public class Machine_TradeTable extends BlockContainer
 	 * Called upon block activation (right click on the block.)
 	 */
 	@Override
-	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz)
-	{
-
-		ItemStack heldItem = null;
-		if (world.isRemote){
-			heldItem = PlayerUtils.getItemStackInPlayersHand();
-		}
-
-		boolean holdingWrench = false;
-
-		if (heldItem != null){
-			holdingWrench =  isWrench(heldItem);
-		}
+	public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, final int side, final float lx, final float ly, final float lz){
 
 		if (world.isRemote) {
 			return true;
@@ -91,11 +70,12 @@ public class Machine_TradeTable extends BlockContainer
 		final TileEntity te = world.getTileEntity(x, y, z);
 		if ((te != null) && (te instanceof TileEntityTradeTable))
 		{
-			if (!holdingWrench){
+				//Utils.LOG_INFO("Clicked on TE - ok");
 				player.openGui(GTplusplus.instance, 6, world, x, y, z);
 				return true;
-			}
-			Utils.LOG_INFO("Holding a Wrench, doing wrench things instead.");
+		}
+		else {
+			Utils.LOG_INFO("Bad TE");
 		}
 		return false;
 	}
@@ -105,51 +85,4 @@ public class Machine_TradeTable extends BlockContainer
 		return new TileEntityTradeTable();
 	}
 
-	public static boolean isWrench(final ItemStack item){
-		if (item.getItem() instanceof ItemToolWrench){
-			return true;
-		}
-		if (LoadedMods.BuildCraft){
-			return checkBuildcraftWrench(item);
-		}
-		if (LoadedMods.EnderIO){
-			return checkEnderIOWrench(item);
-		}
-		return false;
-	}
-
-	@Optional.Method(modid = "EnderIO")
-	private static boolean checkEnderIOWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("crazypants.enderio.api.tool.ITool")){
-			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("crazypants.enderio.api.tool.ITool");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
-			}
-		}
-		return false;
-	}
-
-	@Optional.Method(modid = "Buildcraft")
-	private static boolean checkBuildcraftWrench(final ItemStack item){
-		if (ReflectionUtils.doesClassExist("buildcraft.api.tools.IToolWrench")){
-			Class<?> wrenchClass;
-			try {
-				wrenchClass = Class.forName("buildcraft.api.tools.IToolWrench");
-				if (wrenchClass.isInstance(item.getItem())){
-					return true;
-				}
-			}
-			catch (final ClassNotFoundException e1) {
-				return false;
-			}
-		}
-		return false;
-	}
-
 }
\ No newline at end of file