diff options
Diffstat (limited to 'src/main/java/gregtech/common/tools')
5 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index a99d54993a..142b0c50d2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; @@ -112,8 +111,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { if ((aBlock.getMaterial() == Material.leaves) && ((aBlock instanceof IShearable))) { aPlayer.worldObj.setBlock(aX, aY, aZ, aBlock, aMetaData, 0); if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) { - ArrayList<ItemStack> tDrops = ((IShearable) aBlock) - .onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); + ((IShearable) aBlock).onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); aDrops.clear(); } aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0); diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index fa62c99ea8..3731f578db 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -53,8 +53,8 @@ public class GT_Tool_Drill_HV extends GT_Tool_Drill_LV { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill"); - GT_Mod.instance.achievements.issueAchievement(aPlayer, "buildDDrill"); + GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill"); + GT_Mod.achievements.issueAchievement(aPlayer, "buildDDrill"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index d6c609236e..4f2c1a367b 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -105,7 +105,7 @@ public class GT_Tool_JackHammer extends GT_Tool_Drill_LV { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "hammertime"); + GT_Mod.achievements.issueAchievement(aPlayer, "hammertime"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index 71bf9cfb17..e2857e4af1 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -122,7 +122,7 @@ public class GT_Tool_Pickaxe extends GT_Tool { aPlayer.triggerAchievement(AchievementList.buildPickaxe); aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "flintpick"); + GT_Mod.achievements.issueAchievement(aPlayer, "flintpick"); } catch (Exception ignored) {} } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java index dc550989a0..76c1ccbc24 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java @@ -11,6 +11,7 @@ import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IItemBehaviour; +import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; import gregtech.api.util.GT_Utility; @@ -73,7 +74,7 @@ public class GT_Tool_Plunger extends GT_Tool { false, getToolDamagePerDropConversion()); if ((tObject instanceof IItemBehaviour)) { - aItem.addItemBehavior(aID, (IItemBehaviour) tObject); + aItem.addItemBehavior(aID, (IItemBehaviour<GT_MetaBase_Item>) tObject); } } catch (Throwable ignored) {} } |