diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item/tool')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java | 19 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java | 17 |
2 files changed, 22 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index ea59ed2b7e..1b7bf7c6c0 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -107,10 +107,10 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ Block removalist = world.getBlock(X, Y, Z); //Utils.LOG_WARNING(removalist.toString()); - bHardness = removalist.getBlockHardness(world, X, Y, Z); + bHardness = removalist.getBlockHardness(world, X, Y, Z)*100; Utils.LOG_WARNING("Hardness: "+bHardness); - bDurabilityLoss = (bDurabilityLoss + bHardness); + bDurabilityLoss = bHardness; //Utils.LOG_WARNING("Durability Loss: "+bDurabilityLoss); correctTool = canPickaxeBlock(removalist, world); @@ -127,11 +127,6 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ return bDurabilityLoss; } - @Override - public int doDurabilityDamage(int x){ - return x; - } - //Should clear up blocks quicker if I chain it. @Override public void removeBlockAndDropAsItem(World world, int X, int Y, int Z, ItemStack heldItem){ @@ -153,6 +148,9 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ world.setBlockToAir(X, Y, Z); } + else { + return; + } } } @@ -164,6 +162,13 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ } } + + + @Override + public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + item.damageItem(damage*100, localPlayer); + } + @Override @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java index a21ee7e6ad..d20ad259e7 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyPickaxe.java @@ -126,7 +126,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { float dur = calculateDurabilityLoss(world, X + i, Y, Z + j); - DURABILITY_LOSS = (DURABILITY_LOSS + calculateDurabilityLoss(world, X + i, Y, Z + j)); + DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem); } @@ -138,7 +138,7 @@ public class StaballoyPickaxe extends ItemPickaxe{ for(int i = -1; i < 2; i++) { for(int j = -1; j < 2; j++) { float dur = calculateDurabilityLoss(world, X, Y + i, Z + j); - DURABILITY_LOSS = (DURABILITY_LOSS + calculateDurabilityLoss(world, X, Y + i, Z + j)); + DURABILITY_LOSS = (DURABILITY_LOSS + dur); Utils.LOG_WARNING("Added Loss: "+dur); removeBlockAndDropAsItem(world, X , Y + i, Z + j, heldItem); } @@ -162,17 +162,20 @@ public class StaballoyPickaxe extends ItemPickaxe{ //heldItem.setDamage(heldStack, DURABILITY_LOSS); //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); //Utils.LOG_WARNING("Durability: "+heldStack.getDamage(heldStack)); - if (heldItem.getItemDamage() < (heldItem.getMaxDamage()-DURABILITY_LOSS)){ - heldItem.damageItem((int) DURABILITY_LOSS, localPlayer); + if (heldItem.getItemDamage() <= (heldItem.getMaxDamage()-DURABILITY_LOSS)){ + damageItem(heldItem, (int) DURABILITY_LOSS, localPlayer); + } + else { + damageItem(heldItem, heldItem.getMaxDamage()-heldItem.getItemDamage(), localPlayer); } //Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); DURABILITY_LOSS = 0; } } - - public int doDurabilityDamage(int x){ - return x; + + public void damageItem(ItemStack item, int damage, EntityPlayer localPlayer){ + item.damageItem(damage, localPlayer); } //Should clear up blocks quicker if I chain it. |