feat: sound resolve, xp issues resolve

MichaelHillcox · MichaelHillcox · commit 0163e407b918 · 2025-03-28T10:16:10.000Z
relates to: #57 relates to: #54 relates to: #52 relates to: #12 relates to: #47 realtes to: #44
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - "release/1.*/*"
+      - "release/*"
 
 jobs:
   build:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,14 @@
 # Just Hammers Changelog
 
-## [84.0.0]
+## [20.4.1]
 
-### Changed
+### Added
 
-- Ported to 1.20.4
+- Added a config to disable the no-breaking checks. This means, when enabled, hammers can break in the players inventory when their damage is depleted.
+- Added a config option to disable the "fancy" durability in the tooltip as some other mods will already provide something similar.
+
+### Fixed
+
+- XP not dropping for ores and other blocks that drop XP
+- Sound being played for all breaking blocks which caused sound engine issues
+- Make netherite hammers fire resistant
diff --git a/common/src/main/java/pro/mikey/justhammers/Config.java b/common/src/main/java/pro/mikey/justhammers/Config.java
@@ -0,0 +1,82 @@
+package pro.mikey.justhammers;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.file.Files;
+import java.util.Objects;
+
+public enum Config {
+    INSTANCE;
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(Config.class);
+
+    public ConfigData config = new ConfigData(false, false);
+
+    public void load() {
+        var configPath = HammersPlatform.getConfigDirectory().resolve("justhammers.json");
+        if (Files.notExists(configPath)) {
+            try {
+                // Write default config
+                var jsonData = new GsonBuilder().setPrettyPrinting().create().toJson(config);
+                Files.writeString(configPath, jsonData);
+            } catch (Exception e) {
+                LOGGER.error("Failed to create default config file", e);
+            }
+
+            return;
+        }
+
+        // Read config
+        try {
+            var jsonData = Files.readString(configPath);
+            config = new Gson().fromJson(jsonData, ConfigData.class);
+        } catch (Exception e) {
+            LOGGER.error("Failed to read config file", e);
+        }
+    }
+
+    public static final class ConfigData {
+        private final boolean allowBreaking;
+        private final boolean disableFancyDurability;
+
+        public ConfigData(
+                boolean allowBreaking,
+                boolean disableFancyDurability
+        ) {
+            this.allowBreaking = allowBreaking;
+            this.disableFancyDurability = disableFancyDurability;
+        }
+
+        public boolean allowBreaking() {
+            return allowBreaking;
+        }
+
+        public boolean disableFancyDurability() {
+            return disableFancyDurability;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj == this) return true;
+            if (obj == null || obj.getClass() != this.getClass()) return false;
+            var that = (ConfigData) obj;
+            return this.allowBreaking == that.allowBreaking &&
+                    this.disableFancyDurability == that.disableFancyDurability;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(allowBreaking, disableFancyDurability);
+        }
+
+        @Override
+        public String toString() {
+            return "ConfigData[" +
+                    "allowBreaking=" + allowBreaking + ", " +
+                    "disableFancyDurability=" + disableFancyDurability + ']';
+        }
+    }
+}
diff --git a/common/src/main/java/pro/mikey/justhammers/HammerItem.java b/common/src/main/java/pro/mikey/justhammers/HammerItem.java
@@ -2,6 +2,7 @@
 
 import dev.architectury.event.EventResult;
 import dev.architectury.event.events.common.BlockEvent;
+import dev.architectury.utils.value.IntValue;
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -11,15 +12,26 @@
 import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.ExperienceOrb;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.*;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
+import net.minecraft.world.item.enchantment.Enchantments;
+import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.levelgen.structure.BoundingBox;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
+import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
+import pro.mikey.justhammers.Config;
+import pro.mikey.justhammers.HammerItems;
+import pro.mikey.justhammers.HammersPlatform;
 
 import java.util.HashSet;
 import java.util.Iterator;
@@ -34,7 +46,11 @@ public class HammerItem extends PickaxeItem {
     private TagKey<Block> blocks;
 
     public HammerItem(Tier tier, int radius, int depth, int level) {
-        super(tier, 1, -2.8f, HammerItems.DEFAULT_PROPERTIES.durability(computeDurability(tier, level)));
+        super(tier, 1, -2.8f,
+                tier == Tiers.NETHERITE ?
+                        HammerItems.DEFAULT_PROPERTIES.durability(computeDurability(tier, level)).fireResistant()
+                        : HammerItems.DEFAULT_PROPERTIES.durability(computeDurability(tier, level))
+        );
 
         this.blocks = BlockTags.MINEABLE_WITH_PICKAXE;
         this.depth = depth;
@@ -45,7 +61,11 @@ public HammerItem(Tier tier, int radius, int depth, int level) {
     public void appendHoverText(ItemStack itemStack, @Nullable Level level, List<Component> list, TooltipFlag tooltipFlag) {
         list.add(Component.translatable("justhammers.tooltip.size", this.radius, this.radius, this.depth).withStyle(ChatFormatting.GRAY));
 
-        int damage = itemStack.getDamageValue();
+        if (Config.INSTANCE.config.disableFancyDurability()) {
+            return;
+        }
+
+        int damage = Math.max(0, itemStack.getDamageValue());
         int maxDamage = itemStack.getMaxDamage();
         int durabilityPercentage = (int) (((float) (maxDamage - damage) / (float) maxDamage) * 100);
 
@@ -99,6 +119,10 @@ private static int computeDurability(Tier tier, int level) {
 
     @Override
     public float getDestroySpeed(ItemStack itemStack, BlockState blockState) {
+        if (Config.INSTANCE.config.allowBreaking()) {
+            return super.getDestroySpeed(itemStack, blockState);
+        }
+
         if (itemStack.getMaxDamage() - itemStack.getDamageValue() <= 1) {
             return -1f;
         }
@@ -179,7 +203,12 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS
             var pos = iterator.next();
 
             // Prevent the hammer from breaking if the damage is too high
-            if (!player.isCreative() && (hammerStack.getDamageValue() + (damage + 1)) >= hammerStack.getMaxDamage() - 1) {
+            boolean isBroken = (hammerStack.getDamageValue() + (damage + 1)) >= hammerStack.getMaxDamage() - 1;
+            if (Config.INSTANCE.config.allowBreaking()) {
+                isBroken = hammerStack.getDamageValue() + (damage + 1) >= hammerStack.getMaxDamage();
+            }
+
+            if (!player.isCreative() && isBroken) {
                 break;
             }
 
@@ -194,29 +223,53 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS
             }
 
             // Throw event out there and let mods block us breaking this block
-            EventResult eventResult = BlockEvent.BREAK.invoker().breakBlock(level, pos, targetState, (ServerPlayer) livingEntity, null);
+            var silkTouchLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, hammerStack);
+            var fortuneLevel = EnchantmentHelper.getItemEnchantmentLevel(Enchantments.BLOCK_FORTUNE, hammerStack);
+            final int[] xp = {HammersPlatform.getBlockXpAmount(pos, targetState, level, fortuneLevel, silkTouchLevel)};
+            EventResult eventResult = BlockEvent.BREAK.invoker().breakBlock(level, pos, targetState, (ServerPlayer) livingEntity, xp[0] == -1 ? null : new IntValue() {
+                @Override
+                public void accept(int value) {
+                    xp[0] = value;
+                }
+
+                @Override
+                public int getAsInt() {
+                    return xp[0];
+                }
+            });
+
             if (eventResult.isFalse()) {
                 continue;
             }
 
-            removedPos.add(pos);
-            level.destroyBlock(pos, false, livingEntity);
+            final int outputXpLevel = xp[0];
+
             if (!player.isCreative()) {
                 boolean correctToolForDrops = hammerStack.isCorrectToolForDrops(targetState);
                 if (correctToolForDrops) {
                     targetState.spawnAfterBreak((ServerLevel) level, pos, hammerStack, true);
                     List<ItemStack> drops = Block.getDrops(targetState, (ServerLevel) level, pos, level.getBlockEntity(pos), livingEntity, hammerStack);
-                    drops.forEach(e -> Block.popResourceFromFace(level, pos, ((BlockHitResult) pick).getDirection(), e));
+                    drops.forEach(e -> Block.popResourceFromFace(level, pos, pick.getDirection(), e));
+
+                    if (outputXpLevel != -1 && level.getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
+                        ExperienceOrb.award((ServerLevel) level, Vec3.atCenterOf(blockPos), outputXpLevel);
+                    }
                 }
             }
 
+            removedPos.add(pos);
+            targetState.getBlock().destroy(level, pos, targetState);
+            BlockState newState = Blocks.AIR.defaultBlockState();
+            var setResult = level.setBlock(pos, newState, 3);
+            if (setResult) {
+                level.gameEvent(GameEvent.BLOCK_DESTROY, blockPos, GameEvent.Context.of(livingEntity, newState));
+            }
+
             damage ++;
         }
 
         if (damage != 0 && !player.isCreative()) {
-            hammerStack.hurtAndBreak(damage, livingEntity, (livingEntityx) -> {
-                livingEntityx.broadcastBreakEvent(EquipmentSlot.MAINHAND);
-            });
+            hammerStack.hurtAndBreak(damage, livingEntity, (livingEntityx) -> {});
         }
     }
 
diff --git a/common/src/main/java/pro/mikey/justhammers/Hammers.java b/common/src/main/java/pro/mikey/justhammers/Hammers.java
@@ -21,5 +21,6 @@ public static void init() {
         CREATIVE_TABS.register();
         HammerItems.ITEMS.register();
         HammerItems.init();
+        Config.INSTANCE.load();
     }
 }
diff --git a/common/src/main/java/pro/mikey/justhammers/HammersPlatform.java b/common/src/main/java/pro/mikey/justhammers/HammersPlatform.java
@@ -1,6 +1,9 @@
 package pro.mikey.justhammers;
 
 import dev.architectury.injectables.annotations.ExpectPlatform;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 
 import java.nio.file.Path;
 
@@ -10,4 +13,9 @@ public static Path getConfigDirectory() {
         // Just throw an error, the content should get replaced at runtime.
         throw new AssertionError();
     }
+
+    @ExpectPlatform
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, int fortuneLevel, int silkTouchLevel) {
+        throw new AssertionError();
+    }
 }
diff --git a/fabric/src/main/java/pro/mikey/justhammers/fabric/HammersPlatformImpl.java b/fabric/src/main/java/pro/mikey/justhammers/fabric/HammersPlatformImpl.java
@@ -1,5 +1,8 @@
 package pro.mikey.justhammers.fabric;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
 import pro.mikey.justhammers.HammersPlatform;
 import net.fabricmc.loader.api.FabricLoader;
 
@@ -12,4 +15,8 @@ public class HammersPlatformImpl {
     public static Path getConfigDirectory() {
         return FabricLoader.getInstance().getConfigDir();
     }
+
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, int fortuneLevel, int silkTouchLevel) {
+        return -1;
+    }
 }
diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java b/forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java
@@ -1,5 +1,9 @@
 package pro.mikey.justhammers.forge;
 
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.state.BlockState;
 import pro.mikey.justhammers.HammersPlatform;
 import net.minecraftforge.fml.loading.FMLPaths;
 
@@ -12,4 +16,8 @@ public class HammersPlatformImpl {
     public static Path getConfigDirectory() {
         return FMLPaths.CONFIGDIR.get();
     }
+
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, int fortuneLevel, int silkTouchLevel) {
+        return state.getExpDrop(level, level.random, pos, fortuneLevel, silkTouchLevel);
+    }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@ minecraft_version=1.20.4
 enabled_platforms=fabric,forge,neoforge
 
 archives_base_name=just-hammers
-mod_version=84.0.0
+mod_version=20.4.1
 maven_group=pro.mikey.mods
 
 architectury_version=11.0.9

Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ public static void init() {`
`21`	`21`	`CREATIVE_TABS.register();`
`22`	`22`	`HammerItems.ITEMS.register();`
`23`	`23`	`HammerItems.init();`
	`24`	`+ Config.INSTANCE.load();`
`24`	`25`	`}`
`25`	`26`	`}`