2.1.1 Hammer Bugfix

gradle.properties

@@ -13,6 +13,6 @@ loom_version=1.15-SNAPSHOT
 fabric_version=0.138.4+1.21.10
 
 # Mod Properties
-mod_version=2.1.0
+mod_version=2.2.0
 maven_group=com.acethewildfire.acesbs
 archives_base_name=acesbs

src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md

@@ -14,14 +14,7 @@
 - Kaupen Bow can be obtained by placing a bow in an Entropic Evicerator. It functions the same as a normal bow but is a nice reference to the YT Channel that taught me modding.
 - More Advancements!
 ## Fixes
-- Blocks of Ashen Steel now have a recipe and drop when mined. Not sure how I missed that one.
+- Hammers now reflect the correct durability.
-- Hammers are now enchantable and are compatible with pickaxe enchantments.
-- The Ashen Steel Pickaxe is no longer considered a shovel, and the Ashen Steel Shovel now IS correctly considered a shovel.
-- Lemonwood Sapling renders as an item now, rather than a block
-- Lemonwood Trapdoors face the correct direction
-- Lemonwood Logs now break at the correct speed. 
-- Lemonwood logs, stripped logs, wood, stripped wood, doors, trapdoors, pressure plates, buttons, stairs and slabs now all are assigned a correct tool (axe). Kinda embarrassing that I forgot to do that for 10/14 of the Lemonwood Blocks (And Fire Oak, but I fixed it before you noticed >:D ).
-- The crafting recipe for Lemonwood walls no longer conflict with the recipe for Lemonwood Trapdoors.
 ## Changes
 - Lemonwood saplings are now obtained through an Entropic Entangler recipe (Stable Entropy + Birch Sapling)
 - Bricked Up are now obtained through an Entropic Entangler recipe (Stable Endtropy + Brick)

src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java

@@ -15,7 +15,7 @@ public class AshenSteelItems {
     public static final Item ASHEN_STEEL_PICKAXE = ModItems.registerItem("ashen_steel_pickaxe",
             setting -> new SmeltingPickaxe(setting.pickaxe(ModToolMaterials.ASHEN_STEEL, 1.0F, -2.8F)));
     public static final Item ASHEN_STEEL_HAMMER = ModItems.registerItem("ashen_steel_hammer",
-            setting -> new SmeltingHammer(ModToolMaterials.ASHEN_STEEL, 9.0F, -3.4F, setting.maxDamage(9886)));
+            setting -> new SmeltingHammer(ModToolMaterials.ASHEN_STEEL, 9.0F, -3.4F, 9886, setting));
     public static final Item ASHEN_STEEL_AXE = ModItems.registerItem("ashen_steel_axe",
             setting -> new SmeltingAxe(ModToolMaterials.ASHEN_STEEL, 6.0F, -3.1F, setting));
     public static final Item ASHEN_STEEL_HOE = ModItems.registerItem("ashen_steel_hoe",

src/main/java/com/acethewildfire/acesbs/item/FractalDiamondItems.java

@@ -15,7 +15,7 @@ public class FractalDiamondItems {
     public static final Item FRACTAL_DIAMOND_PICKAXE = ModItems.registerItem("fractal_diamond_pickaxe",
             setting -> new Item(setting.pickaxe(ModToolMaterials.FRACTAL_DIAMOND, 1.0F, -2.8F)));
     public static final Item FRACTAL_DIAMOND_HAMMER = ModItems.registerItem("fractal_diamond_hammer",
-            setting -> new HammerItem(ModToolMaterials.FRACTAL_DIAMOND, 7.0F, -3.4F, setting.maxDamage(12863)));
+            setting -> new HammerItem(ModToolMaterials.FRACTAL_DIAMOND, 7.0F, -3.4F, 12863, setting));
     public static final Item FRACTAL_DIAMOND_AXE = ModItems.registerItem("fractal_diamond_axe",
             setting -> new AxeItem(ModToolMaterials.FRACTAL_DIAMOND, 6.0F, -3.1F, setting));
     public static final Item FRACTAL_DIAMOND_HOE = ModItems.registerItem("fractal_diamond_hoe",

src/main/java/com/acethewildfire/acesbs/item/HellfireDiamondItems.java

@@ -14,7 +14,7 @@ public class HellfireDiamondItems {
     public static final Item HELLFIRE_DIAMOND_PICKAXE = ModItems.registerItem("hellfire_diamond_pickaxe",
             setting -> new SmeltingPickaxe(setting.pickaxe(ModToolMaterials.HELLFIRE_DIAMOND, 1.0F, -2.8F)));
     public static final Item HELLFIRE_DIAMOND_HAMMER = ModItems.registerItem("hellfire_diamond_hammer",
-            setting -> new SmeltingHammer(ModToolMaterials.HELLFIRE_DIAMOND, 7.0F, -3.4F, setting.maxDamage(12863)));
+            setting -> new SmeltingHammer(ModToolMaterials.HELLFIRE_DIAMOND, 7.0F, -3.4F, 12863, setting));
     public static final Item HELLFIRE_DIAMOND_AXE = ModItems.registerItem("hellfire_diamond_axe",
             setting -> new SmeltingAxe(ModToolMaterials.HELLFIRE_DIAMOND, 6.0F, -3.1F, setting));
     public static final Item HELLFIRE_DIAMOND_HOE = ModItems.registerItem("hellfire_diamond_hoe",

src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java

@@ -16,7 +16,6 @@ public class ModToolMaterials {
             1561, 8.0F, 3.0F, 22, ModTags.Items.PRISMA_REPAIR);
     public static ToolMaterial ASHEN_STEEL = new ToolMaterial(BlockTags.INCORRECT_FOR_IRON_TOOL,
             1561, 8.0F, 3.0F, 22, ModTags.Items.ASHEN_REPAIR);
-
     public static ToolMaterial FRACTAL_DIAMOND = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL,
             2031, 8.0F, 3.0F, 22, ModTags.Items.FRACTAL_REPAIR);
     public static ToolMaterial HELLFIRE_DIAMOND = new ToolMaterial(BlockTags.INCORRECT_FOR_DIAMOND_TOOL,

src/main/java/com/acethewildfire/acesbs/item/PrismaSteelItems.java

@@ -17,7 +17,7 @@ public class PrismaSteelItems {
     public static final Item PRISMA_STEEL_PICKAXE = ModItems.registerItem("prisma_steel_pickaxe",
             setting -> new Item(setting.pickaxe(ModToolMaterials.PRISMA_STEEL, 1.0F, -2.8F)));
     public static final Item PRISMA_STEEL_HAMMER = ModItems.registerItem("prisma_steel_hammer",
-            setting -> new HammerItem(ModToolMaterials.PRISMA_STEEL, 9.0F, -3.4F, setting.maxDamage(9886)));
+            setting -> new HammerItem(ModToolMaterials.PRISMA_STEEL, 9.0F, -3.4F, 9886, setting));
     public static final Item PRISMA_STEEL_AXE = ModItems.registerItem("prisma_steel_axe",
             setting -> new AxeItem(ModToolMaterials.PRISMA_STEEL, 6.0F, -3.1F, setting));
     public static final Item PRISMA_STEEL_HOE = ModItems.registerItem("prisma_steel_hoe",

src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java

@@ -14,8 +14,8 @@ import java.util.List;
 
 public class HammerItem extends Item {
 
-    public HammerItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+    public HammerItem(ToolMaterial material, float attackDamage, float attackSpeed, int durability, Settings settings) {
-        super(settings.pickaxe(material, attackDamage, attackSpeed));
+        super(settings.pickaxe(material, attackDamage, attackSpeed).maxDamage(durability));
     }
 
     public static List<BlockPos> getBlocksToBeDestroyed(int range, BlockPos initalBlockPos, ServerPlayerEntity player) {

src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java

@@ -15,8 +15,8 @@ import java.util.List;
 
 public class SmeltingHammer extends HammerItem {
 
-    public SmeltingHammer(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+    public SmeltingHammer(ToolMaterial material, float attackDamage, float attackSpeed, int durability, Settings settings) {
-        super(material, attackDamage, attackSpeed, settings);
+        super(material, attackDamage, attackSpeed, durability, settings);
     }
 
     @Override