diff options
author | draknyte1 <draknyte1@hotmail.com> | 2016-10-02 18:47:23 +1000 |
---|---|---|
committer | draknyte1 <draknyte1@hotmail.com> | 2016-10-02 18:47:23 +1000 |
commit | d0f3249a4758a57ee46cffd09a586cd276ffcd98 (patch) | |
tree | 2962d06505dcd04f9a5a48b7dd20099eaf481fb6 /src/Java/gtPlusPlus/xmod/gregtech/api/items | |
parent | e56e3fa33d84ca19a3fb0c5e72a60212f30660a7 (diff) | |
download | GT5-Unofficial-d0f3249a4758a57ee46cffd09a586cd276ffcd98.tar.gz GT5-Unofficial-d0f3249a4758a57ee46cffd09a586cd276ffcd98.tar.bz2 GT5-Unofficial-d0f3249a4758a57ee46cffd09a586cd276ffcd98.zip |
+ Added missing dependencies.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/items')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java | 9 | ||||
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java | 16 |
2 files changed, 11 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index c27d4a9949..7f2042e05d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -9,6 +9,7 @@ import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; import java.util.ArrayList; import java.util.HashMap; @@ -249,13 +250,13 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements } @Override - public IToolStats getToolStats(ItemStack aStack) { + public Interface_ToolStats getToolStats(ItemStack aStack) { isItemStackUsable(aStack); return getToolStatsInternal(aStack); } - private IToolStats getToolStatsInternal(ItemStack aStack) { - return aStack == null ? null : mToolStats.get((short) aStack.getItemDamage()); + private Interface_ToolStats getToolStatsInternal(ItemStack aStack) { + return (Interface_ToolStats) (aStack == null ? null : mToolStats.get((short) aStack.getItemDamage())); } @Override @@ -277,7 +278,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements if(player==null)return false; if(player.getCurrentEquippedItem()==null)return false; if (!isItemStackUsable(player.getCurrentEquippedItem())) return false; - IToolStats tStats = getToolStats(player.getCurrentEquippedItem()); + Interface_ToolStats tStats = getToolStats(player.getCurrentEquippedItem()); return tStats != null && tStats.isWrench(); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java index c27ee601cb..d1158c08c2 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java @@ -10,6 +10,7 @@ import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; +import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_ToolStats; import java.util.ArrayList; import java.util.HashMap; @@ -265,13 +266,13 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool { return aStack; } - public IToolStats getToolStats(ItemStack aStack) { + public Interface_ToolStats getToolStats(ItemStack aStack) { isItemStackUsable(aStack); return getToolStatsInternal(aStack); } - private IToolStats getToolStatsInternal(ItemStack aStack) { - return aStack == null ? null : mToolStats.get((short) aStack.getItemDamage()); + private Interface_ToolStats getToolStatsInternal(ItemStack aStack) { + return (Interface_ToolStats) (aStack == null ? null : mToolStats.get((short) aStack.getItemDamage())); } @Override @@ -293,17 +294,15 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool { if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack()); } - @Override public boolean canWrench(EntityPlayer player, int x, int y, int z) { System.out.println("canWrench"); if(player==null)return false; if(player.getCurrentEquippedItem()==null)return false; if (!isItemStackUsable(player.getCurrentEquippedItem())) return false; - IToolStats tStats = getToolStats(player.getCurrentEquippedItem()); + Interface_ToolStats tStats = getToolStats(player.getCurrentEquippedItem()); return tStats != null && tStats.isWrench(); } - @Override public void wrenchUsed(EntityPlayer player, int x, int y, int z) { if(player==null)return; if(player.getCurrentEquippedItem()==null)return; @@ -311,22 +310,19 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool { 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()); + Interface_ToolStats tStats = getToolStats(player.getCurrentEquippedItem()); return tStats.isWrench(); } |