Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into DieselGenerator

2 files changed, 31 insertions, 4 deletions

diff --git a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
index ca862c2ca0..cfbf9deb7f 100644
--- a/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
+++ b/src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
@@ -4,6 +4,7 @@ import buildcraft.api.tools.IToolWrench;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import crazypants.enderio.api.tool.ITool;
 import forestry.api.arboriculture.IToolGrafter;
 import gregtech.api.GregTech_API;
 import gregtech.api.enchants.Enchantment_Radioactivity;
@@ -54,8 +55,8 @@ import static gregtech.api.enums.GT_Values.MOD_ID_RC;
  * This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
  * GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, null);
  */
-@Optional.InterfaceList(value = {@Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = MOD_ID_FR), @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = MOD_ID_RC), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft")})
-public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements IDamagableItem, IToolGrafter, IToolCrowbar, IToolWrench {
+@Optional.InterfaceList(value = {@Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = MOD_ID_FR), @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = MOD_ID_RC), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft"), @Optional.Interface(iface = "crazypants.enderio.api.tool.ITool", modid = "EnderIO")})
+public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements IDamagableItem, IToolGrafter, IToolCrowbar, IToolWrench, ITool {
     /**
      * All instances of this Item Class are listed here.
      * This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
@@ -517,7 +518,7 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
 		if(player.getCurrentEquippedItem()==null)return false;
         if (!isItemStackUsable(player.getCurrentEquippedItem())) return false;
         IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
-        return tStats != null && tStats.isCrowbar();
+        return tStats != null && tStats.isWrench();
 	}
 
 	@Override
@@ -527,6 +528,26 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
         IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
         if (tStats != null) doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack());
 	}
+	
+	@Override
+	public boolean canUse(ItemStack stack, EntityPlayer player, int x, int y, int z){
+		 return canWrench(player, x, y, z);
+	}
+
+	@Override
+	public void used(ItemStack stack, EntityPlayer player, int x, int y, int z){
+		wrenchUsed(player, x, y, z);
+	}
+	
+	@Override
+	public boolean shouldHideFacades(ItemStack stack, EntityPlayer player) {
+		if(player==null)return false;
+		if(player.getCurrentEquippedItem()==null)return false;
+        if (!isItemStackUsable(player.getCurrentEquippedItem())) return false;
+		IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
+		return tStats.isWrench();
+	}
+	
 
     @Override
     public boolean canLink(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {
diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
index 8f28854028..082dab750b 100644
--- a/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
+++ b/src/main/java/gregtech/api/items/GT_RadioactiveCell_Item.java
@@ -1,5 +1,6 @@
 package gregtech.api.items;
 
+import ic2.api.item.IBoxable;
 import ic2.core.util.StackUtil;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -8,7 +9,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import java.util.List;
 
 public class GT_RadioactiveCell_Item
-        extends GT_Generic_Item {
+        extends GT_Generic_Item  implements IBoxable{
     protected int cellCount;
     protected int maxDmg;
     protected int dura;
@@ -140,4 +141,9 @@ public class GT_RadioactiveCell_Item
         //aList.add("Time left: " + (this.maxDelay - getDurabilityOfStack(aStack)) + " secs");
         aList.add("Durability: " + (this.maxDmg - getDurabilityOfStack(aStack)) + "/" + this.maxDmg);
     }
+
+	@Override
+	public boolean canBeStoredInToolbox(ItemStack itemstack) {
+		return true;
+	}
 }