From b51d6a8528529aa2642537b836fb1e7179de5055 Mon Sep 17 00:00:00 2001 From: Vos Date: Sat, 28 Mar 2026 01:03:20 -0500 Subject: [PATCH] 2.1.1 Hammer Bugfix --- gradle.properties | 2 +- src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md | 9 +-------- .../com/acethewildfire/acesbs/item/AshenSteelItems.java | 2 +- .../acethewildfire/acesbs/item/FractalDiamondItems.java | 2 +- .../acethewildfire/acesbs/item/HellfireDiamondItems.java | 2 +- .../com/acethewildfire/acesbs/item/ModToolMaterials.java | 1 - .../com/acethewildfire/acesbs/item/PrismaSteelItems.java | 2 +- .../acethewildfire/acesbs/item/custom/HammerItem.java | 4 ++-- .../acesbs/item/custom/SmeltingHammer.java | 4 ++-- 9 files changed, 10 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index ccaf539..dc91190 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index 2738b74..71b5a26 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/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 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. +- Hammers now reflect the correct durability. ## 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) diff --git a/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java b/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java index 0f3c73a..710be90 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/AshenSteelItems.java +++ b/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", diff --git a/src/main/java/com/acethewildfire/acesbs/item/FractalDiamondItems.java b/src/main/java/com/acethewildfire/acesbs/item/FractalDiamondItems.java index 8295d40..6231940 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/FractalDiamondItems.java +++ b/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", diff --git a/src/main/java/com/acethewildfire/acesbs/item/HellfireDiamondItems.java b/src/main/java/com/acethewildfire/acesbs/item/HellfireDiamondItems.java index 1432b0e..301308a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/HellfireDiamondItems.java +++ b/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", diff --git a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java b/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java index 3569ed5..63c2c0c 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/ModToolMaterials.java +++ b/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, diff --git a/src/main/java/com/acethewildfire/acesbs/item/PrismaSteelItems.java b/src/main/java/com/acethewildfire/acesbs/item/PrismaSteelItems.java index ff7a482..9bf73bd 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/PrismaSteelItems.java +++ b/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", diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java b/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java index 0b7380c..64317a3 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/HammerItem.java +++ b/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) { - super(settings.pickaxe(material, attackDamage, attackSpeed)); + public HammerItem(ToolMaterial material, float attackDamage, float attackSpeed, int durability, Settings settings) { + super(settings.pickaxe(material, attackDamage, attackSpeed).maxDamage(durability)); } public static List getBlocksToBeDestroyed(int range, BlockPos initalBlockPos, ServerPlayerEntity player) { diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java index 20ec671..da9db0a 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java +++ b/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) { - super(material, attackDamage, attackSpeed, settings); + public SmeltingHammer(ToolMaterial material, float attackDamage, float attackSpeed, int durability, Settings settings) { + super(material, attackDamage, attackSpeed, durability, settings); } @Override