From 123aa6ed288b2f67b0d47177f4d27cd6893daf3a Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Wed, 21 Oct 2015 22:15:09 -0400 Subject: Reformat code --- src/main/java/gregtech/common/tools/GT_Tool.java | 270 +++++++++---------- .../java/gregtech/common/tools/GT_Tool_Axe.java | 226 +++++++--------- .../common/tools/GT_Tool_BranchCutter.java | 131 ++++----- .../common/tools/GT_Tool_ButcheryKnife.java | 147 +++++----- .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 114 ++++---- .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 83 +++--- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 175 ++++++------ .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 83 +++--- .../gregtech/common/tools/GT_Tool_Crowbar.java | 224 +++++++--------- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 96 +++---- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 203 +++++++------- .../gregtech/common/tools/GT_Tool_Drill_MV.java | 84 +++--- .../java/gregtech/common/tools/GT_Tool_File.java | 193 ++++++------- .../gregtech/common/tools/GT_Tool_HardHammer.java | 297 +++++++++------------ .../java/gregtech/common/tools/GT_Tool_Hoe.java | 196 ++++++-------- .../gregtech/common/tools/GT_Tool_JackHammer.java | 176 ++++++------ .../java/gregtech/common/tools/GT_Tool_Knife.java | 83 +++--- .../java/gregtech/common/tools/GT_Tool_Mortar.java | 191 ++++++------- .../gregtech/common/tools/GT_Tool_Pickaxe.java | 200 +++++++------- .../java/gregtech/common/tools/GT_Tool_Plow.java | 103 +++---- .../gregtech/common/tools/GT_Tool_Plunger.java | 122 ++++----- .../gregtech/common/tools/GT_Tool_RollingPin.java | 89 +++--- .../java/gregtech/common/tools/GT_Tool_Saw.java | 216 +++++++-------- .../java/gregtech/common/tools/GT_Tool_Scoop.java | 205 ++++++-------- .../gregtech/common/tools/GT_Tool_Screwdriver.java | 219 +++++++-------- .../common/tools/GT_Tool_Screwdriver_LV.java | 39 ++- .../java/gregtech/common/tools/GT_Tool_Sense.java | 103 +++---- .../java/gregtech/common/tools/GT_Tool_Shovel.java | 181 ++++++------- .../gregtech/common/tools/GT_Tool_SoftHammer.java | 212 +++++++-------- .../common/tools/GT_Tool_Soldering_Iron.java | 216 +++++++-------- .../java/gregtech/common/tools/GT_Tool_Sword.java | 190 ++++++------- .../gregtech/common/tools/GT_Tool_Turbine.java | 47 ++-- .../common/tools/GT_Tool_Turbine_Huge.java | 23 +- .../common/tools/GT_Tool_Turbine_Large.java | 23 +- .../common/tools/GT_Tool_Turbine_Normal.java | 23 +- .../common/tools/GT_Tool_Turbine_Small.java | 25 +- .../common/tools/GT_Tool_UniversalSpade.java | 212 +++++++-------- .../gregtech/common/tools/GT_Tool_WireCutter.java | 184 ++++++------- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 219 +++++++-------- .../gregtech/common/tools/GT_Tool_Wrench_HV.java | 102 +++---- .../gregtech/common/tools/GT_Tool_Wrench_LV.java | 111 ++++---- .../gregtech/common/tools/GT_Tool_Wrench_MV.java | 102 +++---- 42 files changed, 2729 insertions(+), 3409 deletions(-) (limited to 'src/main/java/gregtech/common/tools') diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java index 30995b6dc9..054aafb439 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool.java +++ b/src/main/java/gregtech/common/tools/GT_Tool.java @@ -4,10 +4,6 @@ import gregtech.api.GregTech_API; import gregtech.api.damagesources.GT_DamageSources; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; - -import java.util.List; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.Entity; @@ -19,152 +15,126 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EntityDamageSource; import net.minecraft.util.IChatComponent; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; + +import java.util.List; public abstract class GT_Tool - implements IToolStats -{ - public static final Enchantment[] FORTUNE_ENCHANTMENT = { Enchantment.fortune }; - public static final Enchantment[] LOOTING_ENCHANTMENT = { Enchantment.looting }; - public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0]; - public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0]; - - public int getToolDamagePerBlockBreak() - { - return 100; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 800; - } - - public int getToolDamagePerEntityAttack() - { - return 200; - } - - public float getSpeedMultiplier() - { - return 1.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) - { - return aOriginalHurtResistance; - } - - public String getMiningSound() - { - return null; - } - - public String getCraftingSound() - { - return null; - } - - public String getEntityHitSound() - { - return null; - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public int getBaseQuality() - { - return 0; - } - - public boolean canBlock() - { - return false; - } - - public boolean isCrowbar() - { - return false; - } - - public boolean isGrafter() - { - return false; - } - - public boolean isWeapon() - { - return false; - } - - public boolean isRangedWeapon() - { - return false; - } - - public boolean isMiningTool() - { - return true; - } - - public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) - { - return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase)aEntity) : null); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity); - } - - public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) - { - return 0; - } - - public ItemStack getBrokenItem(ItemStack aStack) - { - return null; - } - - public Enchantment[] getEnchantments(ItemStack aStack) - { - return ZERO_ENCHANTMENTS; - } - - public int[] getEnchantmentLevels(ItemStack aStack) - { - return ZERO_ENCHANTMENT_LEVELS; - } - - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) - { - aPlayer.triggerAchievement(AchievementList.openInventory); - aPlayer.triggerAchievement(AchievementList.mineWood); - aPlayer.triggerAchievement(AchievementList.buildWorkBench); - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {} - - public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) - { - return aOriginalDamage; - } - - public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) - { - return aOriginalDamage; - } + implements IToolStats { + public static final Enchantment[] FORTUNE_ENCHANTMENT = {Enchantment.fortune}; + public static final Enchantment[] LOOTING_ENCHANTMENT = {Enchantment.looting}; + public static final Enchantment[] ZERO_ENCHANTMENTS = new Enchantment[0]; + public static final int[] ZERO_ENCHANTMENT_LEVELS = new int[0]; + + public int getToolDamagePerBlockBreak() { + return 100; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 800; + } + + public int getToolDamagePerEntityAttack() { + return 200; + } + + public float getSpeedMultiplier() { + return 1.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { + return aOriginalHurtResistance; + } + + public String getMiningSound() { + return null; + } + + public String getCraftingSound() { + return null; + } + + public String getEntityHitSound() { + return null; + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public int getBaseQuality() { + return 0; + } + + public boolean canBlock() { + return false; + } + + public boolean isCrowbar() { + return false; + } + + public boolean isGrafter() { + return false; + } + + public boolean isWeapon() { + return false; + } + + public boolean isRangedWeapon() { + return false; + } + + public boolean isMiningTool() { + return true; + } + + public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) { + return GT_DamageSources.getCombatDamage((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer, (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null); + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new EntityDamageSource((aPlayer instanceof EntityPlayer) ? "player" : "mob", aPlayer).func_151519_b(aEntity); + } + + public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { + return 0; + } + + public ItemStack getBrokenItem(ItemStack aStack) { + return null; + } + + public Enchantment[] getEnchantments(ItemStack aStack) { + return ZERO_ENCHANTMENTS; + } + + public int[] getEnchantmentLevels(ItemStack aStack) { + return ZERO_ENCHANTMENT_LEVELS; + } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { + aPlayer.triggerAchievement(AchievementList.openInventory); + aPlayer.triggerAchievement(AchievementList.mineWood); + aPlayer.triggerAchievement(AchievementList.buildWorkBench); + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + } + + public float getNormalDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { + return aOriginalDamage; + } + + public float getMagicDamageAgainstEntity(float aOriginalDamage, Entity aEntity, ItemStack aStack, EntityPlayer aPlayer) { + return aOriginalDamage; + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java index 28cd415aed..f74aeca505 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java @@ -1,14 +1,9 @@ package gregtech.common.tools; import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; - -import java.util.List; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -17,130 +12,107 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; + +import java.util.List; public class GT_Tool_Axe - extends GT_Tool -{ - public int getToolDamagePerBlockBreak() - { - return 50; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 100; - } - - public int getToolDamagePerEntityAttack() - { - return 200; - } - - public int getBaseQuality() - { - return 0; - } - - public float getBaseDamage() - { - return 3.0F; - } - - public float getSpeedMultiplier() - { - return 2.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public String getCraftingSound() - { - return null; - } - - public String getEntityHitSound() - { - return null; - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() - { - return null; - } - - public boolean canBlock() - { - return false; - } - - public boolean isCrowbar() - { - return false; - } - - public boolean isWeapon() - { - return true; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - String tTool = aBlock.getHarvestTool(aMetaData); - return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood); - } - - public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) - { - int rAmount = 0; - if ((GregTech_API.sTimber) && (!aPlayer.isSneaking()) && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) - { - int tY = aY + 1; - for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) - { - if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) { - break; + extends GT_Tool { + public int getToolDamagePerBlockBreak() { + return 50; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 200; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 3.0F; + } + + public float getSpeedMultiplier() { + return 2.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public String getCraftingSound() { + return null; + } + + public String getEntityHitSound() { + return null; + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getMiningSound() { + return null; + } + + public boolean canBlock() { + return false; + } + + public boolean isCrowbar() { + return false; + } + + public boolean isWeapon() { + return true; + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + String tTool = aBlock.getHarvestTool(aMetaData); + return ((tTool != null) && (tTool.equals("axe"))) || (aBlock.getMaterial() == Material.wood); + } + + public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { + int rAmount = 0; + if ((GregTech_API.sTimber) && (!aPlayer.isSneaking()) && (OrePrefixes.log.contains(new ItemStack(aBlock, 1, aMetaData)))) { + int tY = aY + 1; + for (int tH = aPlayer.worldObj.getHeight(); tY < tH; tY++) { + if ((aPlayer.worldObj.getBlock(aX, tY, aZ) != aBlock) || (!aPlayer.worldObj.func_147480_a(aX, tY, aZ, true))) { + break; + } + rAmount++; + } } - rAmount++; - } - } - return rAmount; - } - - public ItemStack getBrokenItem(ItemStack aStack) - { - return null; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex]; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {} - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been chopped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } + return rAmount; + } + + public ItemStack getBrokenItem(ItemStack aStack) { + return null; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.toolHeadAxe.mTextureIndex] : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mIconSet.mTextures[OrePrefixes.stick.mTextureIndex]; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been chopped by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java index a1e2921153..7cefcdfd8d 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_BranchCutter.java @@ -1,100 +1,77 @@ package gregtech.common.tools; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; - -import java.util.List; -import java.util.Random; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; import net.minecraftforge.event.world.BlockEvent; -import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent; + +import java.util.List; public class GT_Tool_BranchCutter - extends GT_Tool -{ - public float getBaseDamage() - { - return 2.5F; - } - - public float getSpeedMultiplier() - { - return 0.25F; - } - - public float getMaxDurabilityMultiplier() - { - return 0.25F; - } - - public boolean isGrafter() - { - return true; - } - - public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) - { - if (aBlock.getMaterial() == Material.leaves) - { - aEvent.dropChance = Math.min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F)); - if (aBlock == Blocks.leaves) - { - aDrops.clear(); - if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) { - aDrops.add(new ItemStack(Items.apple, 1, 0)); - } else { - aDrops.add(new ItemStack(Blocks.sapling, 1, aMetaData & 0x3)); + extends GT_Tool { + public float getBaseDamage() { + return 2.5F; + } + + public float getSpeedMultiplier() { + return 0.25F; + } + + public float getMaxDurabilityMultiplier() { + return 0.25F; + } + + public boolean isGrafter() { + return true; + } + + public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { + if (aBlock.getMaterial() == Material.leaves) { + aEvent.dropChance = Math.min(1.0F, Math.max(aEvent.dropChance, (aStack.getItem().getHarvestLevel(aStack, "") + 1) * 0.2F)); + if (aBlock == Blocks.leaves) { + aDrops.clear(); + if (((aMetaData & 0x3) == 0) && (aPlayer.worldObj.rand.nextInt(9) <= aFortune * 2)) { + aDrops.add(new ItemStack(Items.apple, 1, 0)); + } else { + aDrops.add(new ItemStack(Blocks.sapling, 1, aMetaData & 0x3)); + } + } else if (aBlock == Blocks.leaves2) { + aDrops.clear(); + aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4)); + } else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) { + aDrops.clear(); + aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L)); + } } - } - else if (aBlock == Blocks.leaves2) - { - aDrops.clear(); - aDrops.add(new ItemStack(Blocks.sapling, 1, (aMetaData & 0x3) + 4)); - } - else if (aBlock == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("rubberLeaves", 1L))) - { - aDrops.clear(); - aDrops.add(GT_ModHandler.getIC2Item("rubberSapling", 1L)); - } + return 0; + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + String tTool = aBlock.getHarvestTool(aMetaData); + return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves); + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? Textures.ItemIcons.GRAFTER : null; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been trimmed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); } - return 0; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - String tTool = aBlock.getHarvestTool(aMetaData); - return ((tTool != null) && (tTool.equals("grafter"))) || (aBlock.getMaterial() == Material.leaves); - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? Textures.ItemIcons.GRAFTER : null; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " has been trimmed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java index 5c96cbb38e..9208079520 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java @@ -1,8 +1,6 @@ package gregtech.common.tools; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import net.minecraft.block.Block; @@ -15,85 +13,68 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; public class GT_Tool_ButcheryKnife - extends GT_Tool -{ - public int getToolDamagePerBlockBreak() - { - return 200; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 100; - } - - public int getToolDamagePerEntityAttack() - { - return 400; - } - - public float getBaseDamage() - { - return 1.0F; - } - - public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) - { - return aOriginalHurtResistance * 2; - } - - public float getSpeedMultiplier() - { - return 0.1F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public boolean isWeapon() - { - return true; - } - - public boolean isMiningTool() - { - return false; - } - - public Enchantment[] getEnchantments(ItemStack aStack) - { - return LOOTING_ENCHANTMENT; - } - - public int[] getEnchantmentLevels(ItemStack aStack) - { - return new int[] { (2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 }; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? Textures.ItemIcons.BUTCHERYKNIFE : null; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " has butchered " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE); - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - return false; - } + extends GT_Tool { + public int getToolDamagePerBlockBreak() { + return 200; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 400; + } + + public float getBaseDamage() { + return 1.0F; + } + + public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { + return aOriginalHurtResistance * 2; + } + + public float getSpeedMultiplier() { + return 0.1F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public boolean isWeapon() { + return true; + } + + public boolean isMiningTool() { + return false; + } + + public Enchantment[] getEnchantments(ItemStack aStack) { + return LOOTING_ENCHANTMENT; + } + + public int[] getEnchantmentLevels(ItemStack aStack) { + return new int[]{(2 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2}; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? Textures.ItemIcons.BUTCHERYKNIFE : null; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " has butchered " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE); + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + return false; + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java index 1db0c0be0a..d92baa7f98 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java @@ -1,14 +1,9 @@ package gregtech.common.tools; import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; - -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -17,65 +12,52 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; public class GT_Tool_BuzzSaw - extends GT_Tool_Saw -{ - public int getToolDamagePerContainerCraft() - { - return 100; - } - - public int getToolDamagePerEntityAttack() - { - return 300; - } - - public float getBaseDamage() - { - return 1.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public String getCraftingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(104)); - } - - public String getEntityHitSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(105)); - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(104)); - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - return false; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex] : Textures.ItemIcons.HANDLE_BUZZSAW; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got buzzed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } + extends GT_Tool_Saw { + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 300; + } + + public float getBaseDamage() { + return 1.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public String getCraftingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(104)); + } + + public String getEntityHitSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(105)); + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getMiningSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(104)); + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + return false; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadBuzzSaw.mTextureIndex] : Textures.ItemIcons.HANDLE_BUZZSAW; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got buzzed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java index 0847a6dbb4..d5f86f4b0a 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_HV.java @@ -1,55 +1,44 @@ package gregtech.common.tools; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import net.minecraft.item.ItemStack; public class GT_Tool_Chainsaw_HV - extends GT_Tool_Chainsaw_LV -{ - public int getToolDamagePerBlockBreak() - { - return 800; - } - - public int getToolDamagePerDropConversion() - { - return 1600; - } - - public int getToolDamagePerContainerCraft() - { - return 12800; - } - - public int getToolDamagePerEntityAttack() - { - return 3200; - } - - public int getBaseQuality() - { - return 1; - } - - public float getBaseDamage() - { - return 4.0F; - } - - public float getSpeedMultiplier() - { - return 4.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 4.0F; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV; - } + extends GT_Tool_Chainsaw_LV { + public int getToolDamagePerBlockBreak() { + return 800; + } + + public int getToolDamagePerDropConversion() { + return 1600; + } + + public int getToolDamagePerContainerCraft() { + return 12800; + } + + public int getToolDamagePerEntityAttack() { + return 3200; + } + + public int getBaseQuality() { + return 1; + } + + public float getBaseDamage() { + return 4.0F; + } + + public float getSpeedMultiplier() { + return 4.0F; + } + + public float getMaxDurabilityMultiplier() { + return 4.0F; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV; + } } 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 987ec8be11..2e32c5eab8 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 @@ -2,14 +2,9 @@ package gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; - -import java.util.Map; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -18,97 +13,81 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; public class GT_Tool_Chainsaw_LV - extends GT_Tool_Saw -{ - public int getToolDamagePerBlockBreak() - { - return 50; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 800; - } - - public int getToolDamagePerEntityAttack() - { - return 200; - } - - public int getBaseQuality() - { - return 0; - } - - public float getBaseDamage() - { - return 3.0F; - } - - public float getSpeedMultiplier() - { - return 2.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public String getCraftingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(104)); - } - - public String getEntityHitSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(105)); - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(104)); - } - - public boolean canBlock() - { - return false; - } - - public boolean isWeapon() - { - return true; - } - - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) - { - super.onToolCrafted(aStack, aPlayer); - try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "brrrr");}catch(Exception e){} - } - - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was massacred by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } + extends GT_Tool_Saw { + public int getToolDamagePerBlockBreak() { + return 50; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 800; + } + + public int getToolDamagePerEntityAttack() { + return 200; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 3.0F; + } + + public float getSpeedMultiplier() { + return 2.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public String getCraftingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(104)); + } + + public String getEntityHitSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(105)); + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getMiningSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(104)); + } + + public boolean canBlock() { + return false; + } + + public boolean isWeapon() { + return true; + } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { + super.onToolCrafted(aStack, aPlayer); + try { + GT_Mod.instance.achievements.issueAchievement(aPlayer, "brrrr"); + } catch (Exception e) { + } + } + + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was massacred by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java index 2c46049a98..303420f0ba 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_MV.java @@ -1,55 +1,44 @@ package gregtech.common.tools; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import net.minecraft.item.ItemStack; public class GT_Tool_Chainsaw_MV - extends GT_Tool_Chainsaw_LV -{ - public int getToolDamagePerBlockBreak() - { - return 200; - } - - public int getToolDamagePerDropConversion() - { - return 400; - } - - public int getToolDamagePerContainerCraft() - { - return 3200; - } - - public int getToolDamagePerEntityAttack() - { - return 800; - } - - public int getBaseQuality() - { - return 1; - } - - public float getBaseDamage() - { - return 3.5F; - } - - public float getSpeedMultiplier() - { - return 3.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 2.0F; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV; - } + extends GT_Tool_Chainsaw_LV { + public int getToolDamagePerBlockBreak() { + return 200; + } + + public int getToolDamagePerDropConversion() { + return 400; + } + + public int getToolDamagePerContainerCraft() { + return 3200; + } + + public int getToolDamagePerEntityAttack() { + return 800; + } + + public int getBaseQuality() { + return 1; + } + + public float getBaseDamage() { + return 3.5F; + } + + public float getSpeedMultiplier() { + return 3.0F; + } + + public float getMaxDurabilityMultiplier() { + return 2.0F; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadChainsaw.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV; + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java index 87c30b4a50..185f34b714 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java @@ -1,20 +1,12 @@ package gregtech.common.tools; import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.common.items.GT_MetaGenerated_Tool_01; import gregtech.common.items.behaviors.Behaviour_Crowbar; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -23,123 +15,103 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; +import java.util.Iterator; + public class GT_Tool_Crowbar - extends GT_Tool -{ - public int getToolDamagePerBlockBreak() - { - return 50; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 100; - } - - public int getToolDamagePerEntityAttack() - { - return 200; - } - - public int getBaseQuality() - { - return 0; - } - - public float getBaseDamage() - { - return 2.0F; - } - - public float getSpeedMultiplier() - { - return 1.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public String getCraftingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getEntityHitSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public String getMiningSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(0)); - } - - public boolean canBlock() - { - return true; - } - - public boolean isCrowbar() - { - return true; - } - - public boolean isWeapon() - { - return true; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - if (aBlock.getMaterial() == Material.circuits) { - return true; - } - String tTool = aBlock.getHarvestTool(aMetaData); - if ((tTool == null) || (tTool.equals(""))) - { - for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$.next()) - { - if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats)i$).isMinableBlock(aBlock, aMetaData))) {return false;} - } - return true; - } - return tTool.equals("crowbar"); - } - - public ItemStack getBrokenItem(ItemStack aStack) - { - return null; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? Textures.ItemIcons.CROWBAR : null; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) - { - aItem.addItemBehavior(aID, new Behaviour_Crowbar(1, 1000)); - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was removed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); - } + extends GT_Tool { + public int getToolDamagePerBlockBreak() { + return 50; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 200; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 2.0F; + } + + public float getSpeedMultiplier() { + return 1.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public String getCraftingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getEntityHitSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public String getMiningSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + } + + public boolean canBlock() { + return true; + } + + public boolean isCrowbar() { + return true; + } + + public boolean isWeapon() { + return true; + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + if (aBlock.getMaterial() == Material.circuits) { + return true; + } + String tTool = aBlock.getHarvestTool(aMetaData); + if ((tTool == null) || (tTool.equals(""))) { + for (Iterator i$ = GT_MetaGenerated_Tool_01.INSTANCE.mToolStats.values().iterator(); i$.hasNext(); i$.next()) { + if (((i$ instanceof GT_Tool_Crowbar)) && (!((IToolStats) i$).isMinableBlock(aBlock, aMetaData))) { + return false; + } + } + return true; + } + return tTool.equals("crowbar"); + } + + public ItemStack getBrokenItem(ItemStack aStack) { + return null; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? Textures.ItemIcons.CROWBAR : null; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + aItem.addItemBehavior(aID, new Behaviour_Crowbar(1, 1000)); + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was removed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); + } } 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 03167c1665..d51644f5f6 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 @@ -2,63 +2,53 @@ package gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; -import gregtech.common.GT_Proxy; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; public class GT_Tool_Drill_HV - extends GT_Tool_Drill_LV -{ - public int getToolDamagePerBlockBreak() - { - return GT_Mod.gregtechproxy.mHardRock ? 400 : 800; - } - - public int getToolDamagePerDropConversion() - { - return 1600; - } - - public int getToolDamagePerContainerCraft() - { - return 12800; - } - - public int getToolDamagePerEntityAttack() - { - return 3200; - } - - public int getBaseQuality() - { - return 1; - } - - public float getBaseDamage() - { - return 3.0F; - } - - public float getSpeedMultiplier() - { - return 9.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 4.0F; - } + extends GT_Tool_Drill_LV { + public int getToolDamagePerBlockBreak() { + return GT_Mod.gregtechproxy.mHardRock ? 400 : 800; + } - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) - { - super.onToolCrafted(aStack, aPlayer); - try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill");}catch(Exception e){} - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV; - } + public int getToolDamagePerDropConversion() { + return 1600; + } + + public int getToolDamagePerContainerCraft() { + return 12800; + } + + public int getToolDamagePerEntityAttack() { + return 3200; + } + + public int getBaseQuality() { + return 1; + } + + public float getBaseDamage() { + return 3.0F; + } + + public float getSpeedMultiplier() { + return 9.0F; + } + + public float getMaxDurabilityMultiplier() { + return 4.0F; + } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { + super.onToolCrafted(aStack, aPlayer); + try { + GT_Mod.instance.achievements.issueAchievement(aPlayer, "highpowerdrill"); + } catch (Exception e) { + } + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_HV; + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 852910948d..f816768757 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -2,15 +2,9 @@ package gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.GT_Proxy; - -import java.util.Map; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -22,111 +16,94 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IChatComponent; public class GT_Tool_Drill_LV - extends GT_Tool -{ - public int getToolDamagePerBlockBreak() - { - return GT_Mod.gregtechproxy.mHardRock ? 25 : 50; - } - - public int getToolDamagePerDropConversion() - { - return 100; - } - - public int getToolDamagePerContainerCraft() - { - return 100; - } - - public int getToolDamagePerEntityAttack() - { - return 200; - } - - public int getBaseQuality() - { - return 0; - } - - public float getBaseDamage() - { - return 2.0F; - } - - public float getSpeedMultiplier() - { - return 3.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 1.0F; - } - - public String getCraftingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(106)); - } - - public String getEntityHitSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(106)); - } - - public String getBreakingSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(106)); - } - - public String getMiningSound() - { - return (String)GregTech_API.sSoundList.get(Integer.valueOf(106)); - } - - public boolean canBlock() - { - return false; - } - - public boolean isCrowbar() - { - return false; - } - - public boolean isMinableBlock(Block aBlock, byte aMetaData) - { - String tTool = aBlock.getHarvestTool(aMetaData); - return ((tTool != null) && ((tTool.equals("pickaxe")) || (tTool.equals("shovel")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.iron) || (aBlock.getMaterial() == Material.anvil) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.glass); - } - - public ItemStack getBrokenItem(ItemStack aStack) - { - return null; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV; - } - - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; - } - - public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) {} - - public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) - { - super.onToolCrafted(aStack, aPlayer); - aPlayer.triggerAchievement(AchievementList.buildPickaxe); - aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); - try{GT_Mod.instance.achievements.issueAchievement(aPlayer, "driltime");}catch(Exception e){} - } - - public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) - { - return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got the Drill! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")"); - } + extends GT_Tool { + public int getToolDamagePerBlockBreak() { + return GT_Mod.gregtechproxy.mHardRock ? 25 : 50; + } + + public int getToolDamagePerDropConversion() { + return 100; + } + + public int getToolDamagePerContainerCraft() { + return 100; + } + + public int getToolDamagePerEntityAttack() { + return 200; + } + + public int getBaseQuality() { + return 0; + } + + public float getBaseDamage() { + return 2.0F; + } + + public float getSpeedMultiplier() { + return 3.0F; + } + + public float getMaxDurabilityMultiplier() { + return 1.0F; + } + + public String getCraftingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(106)); + } + + public String getEntityHitSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(106)); + } + + public String getBreakingSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(106)); + } + + public String getMiningSound() { + return (String) GregTech_API.sSoundList.get(Integer.valueOf(106)); + } + + public boolean canBlock() { + return false; + } + + public boolean isCrowbar() { + return false; + } + + public boolean isMinableBlock(Block aBlock, byte aMetaData) { + String tTool = aBlock.getHarvestTool(aMetaData); + return ((tTool != null) && ((tTool.equals("pickaxe")) || (tTool.equals("shovel")))) || (aBlock.getMaterial() == Material.rock) || (aBlock.getMaterial() == Material.iron) || (aBlock.getMaterial() == Material.anvil) || (aBlock.getMaterial() == Material.sand) || (aBlock.getMaterial() == Material.grass) || (aBlock.getMaterial() == Material.ground) || (aBlock.getMaterial() == Material.snow) || (aBlock.getMaterial() == Material.clay) || (aBlock.getMaterial() == Material.glass); + } + + public ItemStack getBrokenItem(ItemStack aStack) { + return null; + } + + public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_LV; + } + + public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { + return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + } + + public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { + } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { + super.onToolCrafted(aStack, aPlayer); + aPlayer.triggerAchievement(AchievementList.buildPickaxe); + aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + try { + GT_Mod.instance.achievements.issueAchievement(aPlayer, "driltime"); + } catch (Exception e) { + } + } + + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { + return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " got the Drill! (by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + ")"); + } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java index 4548e4632b..05c62579d0 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_MV.java @@ -2,56 +2,44 @@ package gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.ItemIcons; import gregtech.api.interfaces.IIconContainer; -import gregtech.common.GT_Proxy; import net.minecraft.item.ItemStack; public class GT_Tool_Drill_MV - extends GT_Tool_Drill_LV -{ - public int getToolDamagePerBlockBreak() - { - return GT_Mod.gregtechproxy.mHardRock ? 100 : 200; - } - - public int getToolDamagePerDropConversion() - { - return 400; - } - - public int getToolDamagePerContainerCraft() - { - return 3200; - } - - public int getToolDamagePerEntityAttack() - { - return 800; - } - - public int getBaseQuality() - { - return 1; - } - - public float getBaseDamage() - { - return 2.5F; - } - - public float getSpeedMultiplier() - { - return 6.0F; - } - - public float getMaxDurabilityMultiplier() - { - return 2.0F; - } - - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) - { - return aIsToolHead ? gregtech.api.items.GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mIconSet.mTextures[gregtech.api.enums.OrePrefixes.toolHeadDrill.mTextureIndex] : Textures.ItemIcons.POWER_UNIT_MV; - } + extends GT_Tool_Drill_LV { + public int ge