diff options
Diffstat (limited to 'main/java/gregtech/common/tools')
6 files changed, 20 insertions, 8 deletions
diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java index 89df4bfc85..7640c4fe8a 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java @@ -13,13 +13,14 @@ import net.minecraft.util.IChatComponent; public abstract class GT_Tool_Turbine extends GT_Tool{ public abstract float getBaseDamage(); @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) {return false;} - @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? Textures.ItemIcons.TURBINE : null;} + @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? getTurbineIcon(): null;} @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;} public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + aEntity.getCommandSenderName()+"s" + EnumChatFormatting.WHITE + " head into a turbine"); } + public abstract IIconContainer getTurbineIcon(); public abstract float getSpeedMultiplier(); public abstract float getMaxDurabilityMultiplier(); public ItemStack getBrokenItem(ItemStack aStack){return null;} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java index 0bf3b783a5..f2ec5a737f 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 4.0F;} @Override public float getMaxDurabilityMultiplier() {return 4.0F;} @Override public float getBaseDamage() {return 3.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_HUGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java index 57947aea7a..ed0713cd7b 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Large extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 3.0F;} @Override public float getMaxDurabilityMultiplier() {return 3.0F;} @Override public float getBaseDamage() {return 5.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_LARGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java index 8327a74332..a29ad632d6 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 2.0F;} @Override public float getMaxDurabilityMultiplier() {return 2.0F;} @Override public float getBaseDamage() {return 2.5F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java index fb93a2b290..4292ab73fb 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java @@ -1,7 +1,12 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Small extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 1.0F;} @Override public float getMaxDurabilityMultiplier() {return 1.0F;} @Override public float getBaseDamage() {return 0.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_SMALL;} + } diff --git a/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/main/java/gregtech/common/tools/GT_Tool_Wrench.java index 8a79c96750..2b68b6eaa2 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Wrench.java +++ b/main/java/gregtech/common/tools/GT_Tool_Wrench.java @@ -141,10 +141,4 @@ public class GT_Tool_Wrench {
return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " threw a Monkey Wrench into the Plans of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE);
}
-}
-
-
-/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar
- * Qualified Name: gregtech.common.tools.GT_Tool_Wrench
- * JD-Core Version: 0.7.0.1
- */
\ No newline at end of file +}
\ No newline at end of file |