From 724b66afaa9ab2c9b3d1df4ea956f4303070cb36 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 23 Aug 2025 13:09:52 -0700 Subject: [PATCH] expand Block Cracker to other blocks with cracked variants --- Changelog.txt | 3 +++ .../gmail/nossr50/config/GeneralConfig.java | 4 ++-- .../skills/unarmed/UnarmedManager.java | 23 ++++++++++++------- src/main/resources/config.yml | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index b89741650..4ee66f032 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,8 @@ Version 2.2.041 Fixed Berserk failing to crack blocks + Added 'Skills.Unarmed.Block_Cracker.Allow_Block_Cracker' to config.yml + Removed 'SmoothBrick_To_CrackedBrick', it has been replaced by `Allow_Block_Cracker` + Block Cracker can now crack deepslate bricks, deepslate tiles, polished blackstone bricks, and netherbricks Optimizations for Hoppers & Alchemy (thanks Warriorrrr) Fixed buckets being consumed by furnaces (thanks RunqRun) Fixed Repair stripping unsafe enchantments from items (thanks Techirion) diff --git a/src/main/java/com/gmail/nossr50/config/GeneralConfig.java b/src/main/java/com/gmail/nossr50/config/GeneralConfig.java index 7b44b52aa..dc15f412a 100644 --- a/src/main/java/com/gmail/nossr50/config/GeneralConfig.java +++ b/src/main/java/com/gmail/nossr50/config/GeneralConfig.java @@ -872,8 +872,8 @@ public class GeneralConfig extends BukkitConfig { } /* Unarmed */ - public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { - return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); + public boolean isBlockCrackerAllowed() { + return config.getBoolean("Skills.Unarmed.Block_Cracker.Allow_Block_Cracker", true); } public boolean getUnarmedItemPickupDisabled() { diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index 8651d7bc2..4b5ec698a 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -83,6 +83,9 @@ public class UnarmedManager extends SkillManager { } public void blockCrackerCheck(@NotNull Block block) { + if (!mcMMO.p.getGeneralConfig().isBlockCrackerAllowed()) { + return; + } if (!ProbabilityUtil.isNonRNGSkillActivationSuccessful(SubSkillType.UNARMED_BLOCK_CRACKER, mmoPlayer)) { return; @@ -90,19 +93,23 @@ public class UnarmedManager extends SkillManager { switch (block.getType()) { case STONE_BRICKS: - if (!Unarmed.blockCrackerSmoothBrick) { - return; - } - block.setType(Material.CRACKED_STONE_BRICKS); return; case INFESTED_STONE_BRICKS: - if (!Unarmed.blockCrackerSmoothBrick) { - return; - } - block.setType(Material.INFESTED_CRACKED_STONE_BRICKS); return; + case DEEPSLATE_BRICKS: + block.setType(Material.CRACKED_DEEPSLATE_BRICKS); + return; + case DEEPSLATE_TILES: + block.setType(Material.CRACKED_DEEPSLATE_TILES); + return; + case POLISHED_BLACKSTONE_BRICKS: + block.setType(Material.CRACKED_POLISHED_BLACKSTONE_BRICKS); + return; + case NETHER_BRICKS: + block.setType(Material.CRACKED_NETHER_BRICKS); + return; default: } } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 936ea67b7..bb204c3d1 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -460,7 +460,7 @@ Skills: Enabled_For_PVE: true Level_Cap: 0 Block_Cracker: - SmoothBrick_To_CrackedBrick: true + Allow_Block_Cracker: true # When using Unarmed, picked up items will automatically get moved to a free slot instead of going in the slot # of your hand. Should item pickup be disabled when your entire inventory - except for your hand - is full? Item_Pickup_Disabled_Full_Inventory: true