diff options
author | Richard Hendricks <richardhendricks@pobox.com> | 2018-05-26 01:08:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-26 01:08:59 -0500 |
commit | 245b8bf3d429f996c65dffffe041d450b5dad1a2 (patch) | |
tree | acee65a2ac3916603a1de9ea3cd48bfe97bc76a8 /src | |
parent | f5e612c96f27cfb530aac825277b26c7e4a44947 (diff) | |
parent | fba6f54ff98e9603445f9c05bac2b3bac24f6388 (diff) | |
download | GT5-Unofficial-245b8bf3d429f996c65dffffe041d450b5dad1a2.tar.gz GT5-Unofficial-245b8bf3d429f996c65dffffe041d450b5dad1a2.tar.bz2 GT5-Unofficial-245b8bf3d429f996c65dffffe041d450b5dad1a2.zip |
Merge pull request #122 from GTNewHorizons/feature/butchery
Feature/butchery
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java | 4 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_Knife.java | 9 |
2 files changed, 9 insertions, 4 deletions
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 8700c1835b..52994e22b2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java @@ -27,11 +27,11 @@ public class GT_Tool_ButcheryKnife } public int getToolDamagePerEntityAttack() { - return 400; + return 200; } public float getBaseDamage() { - return 1.0F; + return 3.0F; } public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java index 61e5959d5f..db49fb35df 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Knife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Knife.java @@ -2,6 +2,7 @@ package gregtech.common.tools; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; +import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ChatComponentText; @@ -23,11 +24,15 @@ public class GT_Tool_Knife } public int getToolDamagePerEntityAttack() { - return 200; + return 600; } public float getBaseDamage() { - return 2.0F; + return 0F; + } + + public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { + return aOriginalHurtResistance * 3; } public float getSpeedMultiplier() { |