Changes tools to use gt5u style damage system (#1)

* Fix tools * implement a better Durability system
GregTechCEu · Jul 4, 2021 · 5ee5d69 · 5ee5d69
1 parent b66948c
commit 5ee5d69
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 31 deletions.
diff --git a/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java b/src/main/java/gregtech/api/items/toolitem/ToolMetaItem.java
@@ -340,31 +340,33 @@ public int damageItem(ItemStack stack, int vanillaDamage, boolean allowPartial,
                     energyAmount = (int) discharged;
                     vanillaDamage = energyAmount / ConfigHolder.energyUsageMultiplier;
                     if (energyAmount % ConfigHolder.energyUsageMultiplier != 0)
-                       ++vanillaDamage;
-                }
-                else {
+                        ++vanillaDamage;
+                } else {
                     // Can't do the operation
                     return 0;
                 }
             }
             capability.discharge(energyAmount, capability.getTier(), true, false, simulate);
         }
-        T toolMetaItem = getItem(stack);
-        if (toolMetaItem == null) {
-            return 0;
-        }
-        IToolStats toolStats = toolMetaItem.getToolStats();
-        if (!toolStats.isUsingDurability(stack)) {
-            return vanillaDamage;
-        }
-        int itemDamage = getItemDamage(stack);
-        int maxDamage = getMaxItemDamage(stack);
-        int damageRemaining = maxDamage - itemDamage;
-        int newDamageValue = itemDamage + calculateToolDamage(stack, itemRand, vanillaDamage);
-        if (!simulate && !setInternalDamage(stack, newDamageValue)) {
-            GTUtility.setItem(stack, toolStats.getBrokenStack(stack));
+        if ( capability == null || (capability.getCharge() <= 0 || GTUtility.getRandomIntXSTR(100) <= 4)) {
+            T toolMetaItem = getItem(stack);
+            if (toolMetaItem == null) {
+                return 0;
+            }
+            IToolStats toolStats = toolMetaItem.getToolStats();
+            if (!toolStats.isUsingDurability(stack)) {
+                return vanillaDamage;
+            }
+            int itemDamage = getItemDamage(stack);
+            int maxDamage = getMaxItemDamage(stack);
+            int damageRemaining = maxDamage - itemDamage;
+            int newDamageValue = itemDamage + calculateToolDamage(stack, itemRand, vanillaDamage);
+            if (!simulate && !setInternalDamage(stack, newDamageValue)) {
+                GTUtility.setItem(stack, toolStats.getBrokenStack(stack));
+            }
+            return Math.min(vanillaDamage, damageRemaining);
         }
-        return Math.min(vanillaDamage, damageRemaining);
+        return 1;
     }
 
     public int regainItemDurability(ItemStack itemStack, int maxDurabilityRegain) {

diff --git a/src/main/java/gregtech/common/tools/ToolBuzzSaw.java b/src/main/java/gregtech/common/tools/ToolBuzzSaw.java
@@ -24,7 +24,7 @@ public float getBaseDamage(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 10.0f;
+        return 1.0f;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolChainsawHV.java b/src/main/java/gregtech/common/tools/ToolChainsawHV.java
@@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 40.0F;
+        return 4.F;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolChainsawLV.java b/src/main/java/gregtech/common/tools/ToolChainsawLV.java
@@ -31,7 +31,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 10.0f;
+        return 1.0F;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolChainsawMV.java b/src/main/java/gregtech/common/tools/ToolChainsawMV.java
@@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 20.0F;
+        return 2.0F;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolDrillHV.java b/src/main/java/gregtech/common/tools/ToolDrillHV.java
@@ -43,9 +43,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
     }
 
     @Override
-    public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 40.0F;
-    }
+    public float getMaxDurabilityMultiplier(ItemStack stack) { return 4.0F; }
 
     @Override
     public ItemStack getBrokenStack(ItemStack stack) {

diff --git a/src/main/java/gregtech/common/tools/ToolDrillLV.java b/src/main/java/gregtech/common/tools/ToolDrillLV.java
@@ -39,7 +39,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 10.0f;
+        return 1.0f;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolDrillMV.java b/src/main/java/gregtech/common/tools/ToolDrillMV.java
@@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 20.0F;
+        return 2.0F;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java b/src/main/java/gregtech/common/tools/ToolScrewdriverLV.java
@@ -14,7 +14,7 @@ public int getToolDamagePerContainerCraft(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 10.0f;
+        return 2.0f;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolWrenchHV.java b/src/main/java/gregtech/common/tools/ToolWrenchHV.java
@@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 40.0F;
+        return 4.0F;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolWrenchLV.java b/src/main/java/gregtech/common/tools/ToolWrenchLV.java
@@ -19,7 +19,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 10.0f;
+        return 1.0f;
     }
 
     @Override

diff --git a/src/main/java/gregtech/common/tools/ToolWrenchMV.java b/src/main/java/gregtech/common/tools/ToolWrenchMV.java
@@ -44,7 +44,7 @@ public float getDigSpeedMultiplier(ItemStack stack) {
 
     @Override
     public float getMaxDurabilityMultiplier(ItemStack stack) {
-        return 20.0F;
+        return 2.0F;
     }
 
     @Override