From 38e1e8104908d3ac04ebca7e2c91ae0318f54db9 Mon Sep 17 00:00:00 2001
From: Jens Bauer <j_bauer@cs.uni-kl.de>
Date: Mon, 14 Dec 2015 23:30:39 +0100
Subject: [PATCH] Wand Recharger now needs Wrench to remove

---
 .../emt/common/blocks/BlockEMTMachines.java   | 20 +++++++----
 .../emt/common/init/BlockRegistry.java        |  2 +-
 .../TileEntityIndustrialWandRecharge.java     | 35 +++++++++++++++++--
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
index 56b8f7d..1036473 100644
--- a/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
+++ b/src/main/java/tombenpotter/emt/common/blocks/BlockEMTMachines.java
@@ -1,7 +1,10 @@
 package tombenpotter.emt.common.blocks;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import ic2.api.item.IC2Items;
+
+import java.util.List;
+import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -18,9 +21,8 @@ import tombenpotter.emt.ElectroMagicTools;
 import tombenpotter.emt.ModInformation;
 import tombenpotter.emt.common.tile.TileEntityEtherealMacerator;
 import tombenpotter.emt.common.tile.TileEntityIndustrialWandRecharge;
-
-import java.util.List;
-import java.util.Random;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class BlockEMTMachines extends BlockEMT {
 
@@ -77,7 +79,13 @@ public class BlockEMTMachines extends BlockEMT {
 		return true;
 	}
 
-	@Override
+    @Override
+	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_)
+    {
+        return IC2Items.getItem("machine").getItem();
+    }
+
+    @Override
 	public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
 		dropItems(world, x, y, z);
 		world.removeTileEntity(x, y, z);
diff --git a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java
index 732b35d..2204094 100644
--- a/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java
+++ b/src/main/java/tombenpotter/emt/common/init/BlockRegistry.java
@@ -42,7 +42,7 @@ public class BlockRegistry {
 		emtSolars2 = new BlockEMTSolars2().setBlockName(ModInformation.modid + ".emtsolars2");
 		GameRegistry.registerBlock(emtSolars2, ItemBlockEMTSolars2.class, "EMTSolars2");
 
-		emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines");
+		emtMachines = new BlockEMTMachines().setBlockName(ModInformation.modid + ".emtmachines").setHardness(2.F);
 		GameRegistry.registerBlock(emtMachines, ItemBlockEMTMachines.class, "EMTMachines");
 
 		essentiaGens = new BlockEssentiaGenerators().setBlockName(ModInformation.modid + ".essentiaGens");
diff --git a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
index 7b2fb56..f8c0894 100644
--- a/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
+++ b/src/main/java/tombenpotter/emt/common/tile/TileEntityIndustrialWandRecharge.java
@@ -1,6 +1,7 @@
 package tombenpotter.emt.common.tile;
 
 import ic2.api.energy.prefab.BasicSink;
+import ic2.api.tile.IWrenchable;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
@@ -8,10 +9,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import thaumcraft.api.aspects.Aspect;
 import thaumcraft.common.items.wands.ItemWandCasting;
-import tombenpotter.emt.common.tile.TileEntityEMT;
+import tombenpotter.emt.common.init.BlockRegistry;
 import tombenpotter.emt.common.util.ConfigHandler;
 
-public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory {
+public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements IInventory, IWrenchable {
 
 	private BasicSink ic2EnergySink = new BasicSink(this, 100000, 4);
 
@@ -177,4 +178,34 @@ public class TileEntityIndustrialWandRecharge extends TileEntityEMT implements I
 	@Override
 	public void closeInventory() {
 	}
+
+	@Override
+	public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
+		return false;
+	}
+
+	@Override
+	public short getFacing() {
+		return 0;
+	}
+
+	@Override
+	public void setFacing(short facing) {
+		
+	}
+
+	@Override
+	public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
+		return true;
+	}
+
+	@Override
+	public float getWrenchDropRate() {
+		return 0.8f;
+	}
+
+	@Override
+	public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
+		 return new ItemStack(BlockRegistry.emtMachines, 1, 0);
+	}
 }