diff options
author | Richard Hendricks <richardhendricks@pobox.com> | 2018-05-25 23:51:03 -0500 |
---|---|---|
committer | Richard Hendricks <richardhendricks@pobox.com> | 2018-05-25 23:51:03 -0500 |
commit | 938406df560569eb8d2944324c41feda2b04a41a (patch) | |
tree | 891e987a80ee5bc7604ad7dfb145e3f54b7ea95d /src | |
parent | f5e612c96f27cfb530aac825277b26c7e4a44947 (diff) | |
download | GT5-Unofficial-938406df560569eb8d2944324c41feda2b04a41a.tar.gz GT5-Unofficial-938406df560569eb8d2944324c41feda2b04a41a.tar.bz2 GT5-Unofficial-938406df560569eb8d2944324c41feda2b04a41a.zip |
Fix for #2420. Small knife damage reduced, mob damage immunitiy implemented. Butchery knife damage buffed. Based on mining level, 5+ will instakill cows. Looting enchantment does not appear to work, filing separate ticket for that.
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tools/GT_Tool_Knife.java | 7 |
2 files changed, 7 insertions, 2 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..64f5501777 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_ButcheryKnife.java @@ -31,7 +31,7 @@ public class GT_Tool_ButcheryKnife } 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..6a381ae2d1 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; @@ -27,7 +28,11 @@ public class GT_Tool_Knife } public float getBaseDamage() { - return 2.0F; + return 1.0F; + } + + public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { + return aOriginalHurtResistance * 6; } public float getSpeedMultiplier() { |