expand Block Cracker to other blocks with cracked variants

This commit is contained in:
nossr50
2025-08-23 13:09:52 -07:00
parent 6ba4475a77
commit 724b66afaa
4 changed files with 21 additions and 11 deletions

View File

@@ -1,5 +1,8 @@
Version 2.2.041 Version 2.2.041
Fixed Berserk failing to crack blocks 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) Optimizations for Hoppers & Alchemy (thanks Warriorrrr)
Fixed buckets being consumed by furnaces (thanks RunqRun) Fixed buckets being consumed by furnaces (thanks RunqRun)
Fixed Repair stripping unsafe enchantments from items (thanks Techirion) Fixed Repair stripping unsafe enchantments from items (thanks Techirion)

View File

@@ -872,8 +872,8 @@ public class GeneralConfig extends BukkitConfig {
} }
/* Unarmed */ /* Unarmed */
public boolean getUnarmedBlockCrackerSmoothbrickToCracked() { public boolean isBlockCrackerAllowed() {
return config.getBoolean("Skills.Unarmed.Block_Cracker.SmoothBrick_To_CrackedBrick", true); return config.getBoolean("Skills.Unarmed.Block_Cracker.Allow_Block_Cracker", true);
} }
public boolean getUnarmedItemPickupDisabled() { public boolean getUnarmedItemPickupDisabled() {

View File

@@ -83,6 +83,9 @@ public class UnarmedManager extends SkillManager {
} }
public void blockCrackerCheck(@NotNull Block block) { public void blockCrackerCheck(@NotNull Block block) {
if (!mcMMO.p.getGeneralConfig().isBlockCrackerAllowed()) {
return;
}
if (!ProbabilityUtil.isNonRNGSkillActivationSuccessful(SubSkillType.UNARMED_BLOCK_CRACKER, if (!ProbabilityUtil.isNonRNGSkillActivationSuccessful(SubSkillType.UNARMED_BLOCK_CRACKER,
mmoPlayer)) { mmoPlayer)) {
return; return;
@@ -90,19 +93,23 @@ public class UnarmedManager extends SkillManager {
switch (block.getType()) { switch (block.getType()) {
case STONE_BRICKS: case STONE_BRICKS:
if (!Unarmed.blockCrackerSmoothBrick) {
return;
}
block.setType(Material.CRACKED_STONE_BRICKS); block.setType(Material.CRACKED_STONE_BRICKS);
return; return;
case INFESTED_STONE_BRICKS: case INFESTED_STONE_BRICKS:
if (!Unarmed.blockCrackerSmoothBrick) {
return;
}
block.setType(Material.INFESTED_CRACKED_STONE_BRICKS); block.setType(Material.INFESTED_CRACKED_STONE_BRICKS);
return; 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: default:
} }
} }

View File

@@ -460,7 +460,7 @@ Skills:
Enabled_For_PVE: true Enabled_For_PVE: true
Level_Cap: 0 Level_Cap: 0
Block_Cracker: 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 # 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? # of your hand. Should item pickup be disabled when your entire inventory - except for your hand - is full?
Item_Pickup_Disabled_Full_Inventory: true Item_Pickup_Disabled_Full_Inventory: true