feat: sound resolve, xp issues resolve

relates to: #57
relates to: #54
relates to: #52
relates to: #12
relates to: #47
realtes to: #44

Author: MichaelHillcox

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     tags:
-      - "release/1.*/*"
+      - "release/*"
 
 jobs:
   build:

CHANGELOG.md

@@ -1,55 +1,14 @@
 # Just Hammers Changelog
 
-## [21.0.3]
-
-### Changed
-
-- Added the hammers to the #minecraft:pickaxes tag
-- Hammer repair durability is now handled by a percentage based system instead of a flat amount
-
-### Fixed 
-
-- Fixed a crashing issue on fabric due to poorly registered handlers [#38](https://github.com/nanite/JustHammers/issues/38)
-- The config system will now auto repair itself if it is missing a value
-- Actually call the blockdrops event on NeoForge
-
-## [21.0.2]
+## [21.1.0]
 
 ### Added
 
-- Added a config option to disable the hammers durability from being shown in the tooltip [#22](https://github.com/nanite/JustHammers/issues/22)
-- Added a custom recipe type to allow for repairing the item in your crafting grid with the same material as the hammer
-
-### Changed
-
-- You can now enchant hammers with all the same enchantments as pickaxes [#29](https://github.com/nanite/JustHammers/issues/29)
-
-### Fixed
-
-- Hammer cores acting as hammers [#37](https://github.com/nanite/JustHammers/issues/37)
-- Hammers would apply one extra damage on break due to the hammer trying to break the same block twice [#36](https://github.com/nanite/JustHammers/issues/36)
-- Hammers will no longer void blocks like dirt and sand but will break slower like in vanilla [#35](https://github.com/nanite/JustHammers/issues/35)
-- Hammers now show in the hand correctly instead of looking like a normal item [#30](https://github.com/nanite/JustHammers/issues/30)
-- Hammers will no longer crash the client if durability goes negative (somehow) [#34](https://github.com/nanite/JustHammers/issues/34)
-
-## [21.0.1]
-
-### Fixed
-
-- Unable to craft hammers due to missing recipes
-
-## [21.0.0]
-
-### Changed
-
-- Ported to 1.21
+- 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
 
-- The hammers block outline would select fluids...
-
-## [20.6.0]
-
-### Changed
-
-- Ported to 1.20.6
+- 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

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.5.1"
     id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }

common/src/main/java/pro/mikey/justhammers/HammerItem.java

@@ -2,30 +2,41 @@
 
 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;
+import net.minecraft.core.Holder;
+import net.minecraft.core.Registry;
 import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 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.entity.item.ItemEntity;
 import net.minecraft.world.item.*;
 import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.item.enchantment.Enchantment;
+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.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import pro.mikey.justhammers.config.SimpleJsonConfig;
-
+import net.minecraft.world.phys.Vec3;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
@@ -38,17 +49,25 @@ public class HammerItem extends PickaxeItem {
     private final int radius;
 
     public HammerItem(Tier tier, int radius, int depth, int level) {
-        super(new WrappedTier(tier, computeDurability(tier, level)),
-                new Item.Properties().arch$tab(Hammers.TAB)
-                        .durability(computeDurability(tier, level))
-                        .attributes(PickaxeItem.createAttributes(tier, 1, -2.8f))
-                        .component(DataComponents.TOOL, tier.createToolProperties(BlockTags.MINEABLE_WITH_PICKAXE))
-        );
+        super(new WrappedTier(tier, computeDurability(tier, level)), computeProperties(tier, level));
 
         this.depth = depth;
         this.radius = radius;
     }
 
+    private static Item.Properties computeProperties(Tier tier, int level) {
+        Properties itemProperties = new Properties().arch$tab(Hammers.TAB)
+                .durability(computeDurability(tier, level))
+                .attributes(PickaxeItem.createAttributes(tier, 1, -2.8f))
+                .component(DataComponents.TOOL, tier.createToolProperties(BlockTags.MINEABLE_WITH_PICKAXE));
+
+        if (tier == Tiers.NETHERITE) {
+            itemProperties.fireResistant();
+        }
+
+        return itemProperties;
+    }
+
     @Override
     public void appendHoverText(ItemStack itemStack, TooltipContext tooltipContext, List<Component> list, TooltipFlag tooltipFlag) {
         list.add(Component.translatable("justhammers.tooltip.size", this.radius, this.radius, this.depth).withStyle(ChatFormatting.GRAY));
@@ -111,6 +130,10 @@ private static int computeDurability(Tier tier, int level) {
 
     @Override
     public float getDestroySpeed(ItemStack itemStack, BlockState blockState) {
+        if (SimpleJsonConfig.INSTANCE.allowHammerBreaking.get().getAsBoolean()) {
+            return super.getDestroySpeed(itemStack, blockState);
+        }
+
         if (itemStack.getMaxDamage() - itemStack.getDamageValue() <= 1) {
             return -1f;
         }
@@ -162,7 +185,12 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS
             }
 
             // 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 (SimpleJsonConfig.INSTANCE.allowHammerBreaking.get().getAsBoolean()) {
+                isBroken = hammerStack.getDamageValue() + (damage + 1) >= hammerStack.getMaxDamage();
+            }
+
+            if (!player.isCreative() && isBroken) {
                 break;
             }
 
@@ -178,27 +206,50 @@ 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);
+            final int[] xp = {HammersPlatform.getBlockXpAmount(pos, targetState, level, livingEntity, hammerStack)};
+            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 = player.hasCorrectToolForDrops(targetState);
                 if (correctToolForDrops) {
                     targetState.spawnAfterBreak((ServerLevel) level, pos, hammerStack, true);
                     List<ItemStack> drops = Block.getDrops(targetState, (ServerLevel) level, pos, level.getBlockEntity(pos), livingEntity, hammerStack);
-
                     List<ItemEntity> dropEntities = drops.stream().map(e -> new ItemEntity(level, pos.getX(), pos.getY(), pos.getZ(), e)).toList();
                     var result = HammersPlatform.blockDropsEvent((ServerLevel) level, pos, targetState, level.getBlockEntity(pos), dropEntities, livingEntity, hammerStack);
                     if (!result) {
                         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 ++;
         }
 

common/src/main/java/pro/mikey/justhammers/HammersPlatform.java

@@ -2,6 +2,8 @@
 
 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 net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
@@ -20,6 +22,11 @@ public static Path getConfigDirectory() {
         throw new AssertionError();
     }
 
+    @ExpectPlatform
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, Entity entity, ItemStack tool) {
+        throw new AssertionError();
+    }
+
     @ExpectPlatform
     public static boolean blockDropsEvent(ServerLevel level, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, List<ItemEntity> drops, @Nullable Entity breaker, ItemStack tool) {
         throw new AssertionError();

common/src/main/java/pro/mikey/justhammers/config/SimpleJsonConfig.java

@@ -46,6 +46,12 @@ public enum SimpleJsonConfig {
             "The percentage of durability restored per repair item for netherite hammers"
     );
 
+    public final CommentedEntry allowHammerBreaking = create(
+            "allowHammerBreaking",
+            new JsonPrimitive(false),
+            "Set to true to allow hammers to break when running out of durability"
+    );
+
     private JsonObject config;
 
     public void load() {

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 dev.architectury.event.EventResult;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
@@ -23,6 +26,10 @@ public static Path getConfigDirectory() {
         return FabricLoader.getInstance().getConfigDir();
     }
 
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, Entity entity, ItemStack tool) {
+        return -1;
+    }
+
     public static boolean blockDropsEvent(ServerLevel level, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, List<ItemEntity> drops, @Nullable Entity breaker, ItemStack tool) {
         return false;
     }

gradle.properties

@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.21
+minecraft_version=1.21.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=just-hammers
-mod_version=21.0.3
+mod_version=21.1.0
 maven_group=pro.mikey.mods
 
-architectury_version=13.0.1
+architectury_version=13.0.8
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.1+1.21
+fabric_loader_version=0.16.10
+fabric_api_version=0.115.4+1.21.1
 
-neoforge_version=21.0.10-beta
+neoforge_version=21.1.141
 
-rei_version=16.0.729
+rei_version=16.0.799
 
 # Publishing
 modrinth_id=edU0NbZZ

neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersPlatformImpl.java

@@ -5,6 +5,7 @@
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.fml.loading.FMLPaths;
@@ -27,4 +28,8 @@ public static Path getConfigDirectory() {
     public static boolean blockDropsEvent(ServerLevel level, BlockPos pos, BlockState state, @Nullable BlockEntity blockEntity, List<ItemEntity> drops, @Nullable Entity breaker, ItemStack tool) {
         return NeoForge.EVENT_BUS.post(new BlockDropsEvent(level, pos, state, blockEntity, drops, breaker, tool)).isCanceled();
     }
+
+    public static int getBlockXpAmount(BlockPos pos, BlockState state, Level level, Entity entity, ItemStack tool) {
+        return state.getExpDrop(level, pos, level.getBlockEntity(pos), entity, tool);
+    }
 }