Fixed tooltip rounding and added attack and damage calculators for di…

…fferent tools
anthonymendez · Aug 13, 2024 · 4c7edee · 4c7edee
1 parent 7a0686f
commit 4c7edee
Showing 1 changed file with 61 additions and 6 deletions.
diff --git a/common/src/main/java/com/anthonymendez/items/SimpleToolUtils.java b/common/src/main/java/com/anthonymendez/items/SimpleToolUtils.java
@@ -1,18 +1,19 @@
 package com.anthonymendez.items;
 
 import com.mojang.datafixers.util.Pair;
+import java.text.DecimalFormat;
 import java.util.List;
 import net.minecraft.component.type.AttributeModifiersComponent;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
-import net.minecraft.item.Item;
-import net.minecraft.item.MiningToolItem;
-import net.minecraft.item.SwordItem;
+import net.minecraft.item.*;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 
 public class SimpleToolUtils {
 
+  private static final DecimalFormat TOOLTIP_FORMAT = new DecimalFormat("#0.#");
+
   /**
    * Retrieves the attack damage and speed from a {@link MiningToolItem} in a {@link Pair} whereby
    * the order is:
@@ -43,7 +44,61 @@ public static Pair<Float, Float> getAttackDamageAndSpeedFromSwordItem(
       SwordItem swordItem, float baseAttackDamage, float baseAttackSpeed) {
     List<AttributeModifiersComponent.Entry> modifiers =
         SwordItem.createAttributeModifiers(
-                swordItem.getMaterial(), (int)baseAttackDamage, baseAttackSpeed)
+                swordItem.getMaterial(), (int) baseAttackDamage, baseAttackSpeed)
+            .modifiers();
+    return getAttackDamageAndSpeedFromAttributeModifiersComponentEntryList(
+        modifiers, baseAttackDamage, baseAttackSpeed);
+  }
+
+  /**
+   * Retrieves the attack damage and speed from a {@link ShovelItem} in a {@link Pair} whereby the
+   * order is:
+   *
+   * <p>* {@code Pair.of(attackDamage, attackSpeed)}
+   *
+   * <p>Base attack damage and speed need to be provided as it's dependent off the weapon.
+   */
+  public static Pair<Float, Float> getAttackDamageAndSpeedFromShovelItem(
+      ShovelItem shovelItem, float baseAttackDamage, float baseAttackSpeed) {
+    List<AttributeModifiersComponent.Entry> modifiers =
+        ShovelItem.createAttributeModifiers(
+                shovelItem.getMaterial(), (int) baseAttackDamage, baseAttackSpeed)
+            .modifiers();
+    return getAttackDamageAndSpeedFromAttributeModifiersComponentEntryList(
+        modifiers, baseAttackDamage, baseAttackSpeed);
+  }
+
+  /**
+   * Retrieves the attack damage and speed from a {@link HoeItem} in a {@link Pair} whereby the
+   * order is:
+   *
+   * <p>* {@code Pair.of(attackDamage, attackSpeed)}
+   *
+   * <p>Base attack damage and speed need to be provided as it's dependent off the weapon.
+   */
+  public static Pair<Float, Float> getAttackDamageAndSpeedFromHoeItem(
+      HoeItem hoeItem, float baseAttackDamage, float baseAttackSpeed) {
+    List<AttributeModifiersComponent.Entry> modifiers =
+        HoeItem.createAttributeModifiers(
+                hoeItem.getMaterial(), (int) baseAttackDamage, baseAttackSpeed)
+            .modifiers();
+    return getAttackDamageAndSpeedFromAttributeModifiersComponentEntryList(
+        modifiers, baseAttackDamage, baseAttackSpeed);
+  }
+
+  /**
+   * Retrieves the attack damage and speed from a {@link AxeItem} in a {@link Pair} whereby the
+   * order is:
+   *
+   * <p>* {@code Pair.of(attackDamage, attackSpeed)}
+   *
+   * <p>Base attack damage and speed need to be provided as it's dependent off the weapon.
+   */
+  public static Pair<Float, Float> getAttackDamageAndSpeedFromAxeItem(
+      AxeItem axeItem, float baseAttackDamage, float baseAttackSpeed) {
+    List<AttributeModifiersComponent.Entry> modifiers =
+        AxeItem.createAttributeModifiers(
+                axeItem.getMaterial(), (int) baseAttackDamage, baseAttackSpeed)
             .modifiers();
     return getAttackDamageAndSpeedFromAttributeModifiersComponentEntryList(
         modifiers, baseAttackDamage, baseAttackSpeed);
@@ -109,10 +164,10 @@ public static void AppendDefaultMinecraftMiningItemTooltip(
     tooltip.add(Text.of(""));
     tooltip.add(Text.translatable("When in Main Hand:").formatted(Formatting.GRAY));
     tooltip.add(
-        Text.translatable(String.format(" %.1f Attack Damage", attackDamage))
+        Text.translatable(String.format(" %s Attack Damage", TOOLTIP_FORMAT.format(attackDamage)))
             .formatted(Formatting.DARK_GREEN));
     tooltip.add(
-        Text.translatable(String.format(" %.1f Attack Speed", attackSpeed))
+        Text.translatable(String.format(" %s Attack Speed", TOOLTIP_FORMAT.format(attackSpeed)))
             .formatted(Formatting.DARK_GREEN));
   }
 }