More Blast Mining bugfixes

Changelog.txt

@@ -2,9 +2,11 @@ Version 2.1.128
     The first rank of Iron Arm for Unarmed now only gives 1.5 bonus damage instead of 4 (other ranks are the same as before)
     Blast Mining nerf reverted
     Fixed a bug where debris were not reduced from Blast Mining skills
+    Fixed a bug where certain types of ore did not receive bonuses from Blast Mining
     Fixed a few locale errors with commands
     (API) Added ExperienceAPI::addCombatXP for adding combat XP to players, signature may change so its deprecated for now
     mcMMO now logs whether or not its using FlatFile or SQL database on load
+    (1.16) Strider added to combat experience with a value of 1.2
 
     NOTES: A more thorough look at Unarmed balance will happen in the future, the intention of this nerf is to make Unarmed less rewarding until it is leveled quite a bit.
 

src/main/java/com/gmail/nossr50/skills/mining/Mining.java

@@ -24,147 +24,4 @@ public class Mining {
 
         return xp;
     }
-
-    /**
-     * Handle double drops when using Silk Touch.
-     *
-     * @param blockState The {@link BlockState} to check ability activation for
-     */
-    protected static void handleSilkTouchDrops(BlockState blockState) {
-        Material blockType = blockState.getType();
-
-        switch (blockType) {
-            case ANDESITE:
-            case DIORITE:
-            case GRANITE:
-            case END_STONE:
-            case TERRACOTTA:
-            case CLAY:
-            case IRON_ORE:
-            case MOSSY_COBBLESTONE:
-            case NETHERRACK:
-            case OBSIDIAN:
-            case SANDSTONE:
-            case BLACK_GLAZED_TERRACOTTA:
-            case BLACK_TERRACOTTA:
-            case BLUE_GLAZED_TERRACOTTA:
-            case BLUE_TERRACOTTA:
-            case BROWN_GLAZED_TERRACOTTA:
-            case BROWN_TERRACOTTA:
-            case CYAN_GLAZED_TERRACOTTA:
-            case CYAN_TERRACOTTA:
-            case GRAY_GLAZED_TERRACOTTA:
-            case GRAY_TERRACOTTA:
-            case GREEN_GLAZED_TERRACOTTA:
-            case GREEN_TERRACOTTA:
-            case LIGHT_BLUE_GLAZED_TERRACOTTA:
-            case LIGHT_BLUE_TERRACOTTA:
-            case LIGHT_GRAY_GLAZED_TERRACOTTA:
-            case LIGHT_GRAY_TERRACOTTA:
-            case LIME_GLAZED_TERRACOTTA:
-            case LIME_TERRACOTTA:
-            case MAGENTA_GLAZED_TERRACOTTA:
-            case MAGENTA_TERRACOTTA:
-            case ORANGE_GLAZED_TERRACOTTA:
-            case ORANGE_TERRACOTTA:
-            case PINK_GLAZED_TERRACOTTA:
-            case PINK_TERRACOTTA:
-            case PURPLE_GLAZED_TERRACOTTA:
-            case PURPLE_TERRACOTTA:
-            case RED_GLAZED_TERRACOTTA:
-            case RED_TERRACOTTA:
-            case WHITE_GLAZED_TERRACOTTA:
-            case WHITE_TERRACOTTA:
-            case YELLOW_GLAZED_TERRACOTTA:
-            case YELLOW_TERRACOTTA:
-                handleMiningDrops(blockState);
-                return;
-
-            case COAL_ORE:
-            case DIAMOND_ORE:
-            case EMERALD_ORE:
-            case GLOWSTONE:
-            case LAPIS_ORE:
-            case PACKED_ICE:
-            case NETHER_QUARTZ_ORE:
-            case REDSTONE_ORE:
-            case STONE:
-            case PRISMARINE:
-                Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()));
-                return;
-
-            default:
-                if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
-                    Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType()));
-                }
-                return;
-        }
-    }
-
-    /**
-     * Handle double drops from Mining & Blast Mining.
-     *
-     * @param blockState The {@link BlockState} to check ability activation for
-     */
-    protected static void handleMiningDrops(BlockState blockState) {
-        switch (blockState.getType()) {
-            case COAL_ORE:
-            case DIAMOND_ORE:
-            case EMERALD_ORE:
-            case END_STONE:
-            case GLOWSTONE:
-            case GOLD_ORE:
-            case TERRACOTTA:
-            case IRON_ORE:
-            case LAPIS_ORE:
-            case MOSSY_COBBLESTONE:
-            case NETHERRACK:
-            case OBSIDIAN:
-            case PACKED_ICE:
-            case REDSTONE_ORE:
-            case SANDSTONE:
-            case BLACK_GLAZED_TERRACOTTA:
-            case BLACK_TERRACOTTA:
-            case BLUE_GLAZED_TERRACOTTA:
-            case BLUE_TERRACOTTA:
-            case BROWN_GLAZED_TERRACOTTA:
-            case BROWN_TERRACOTTA:
-            case CYAN_GLAZED_TERRACOTTA:
-            case CYAN_TERRACOTTA:
-            case GRAY_GLAZED_TERRACOTTA:
-            case GRAY_TERRACOTTA:
-            case GREEN_GLAZED_TERRACOTTA:
-            case GREEN_TERRACOTTA:
-            case LIGHT_BLUE_GLAZED_TERRACOTTA:
-            case LIGHT_BLUE_TERRACOTTA:
-            case LIGHT_GRAY_GLAZED_TERRACOTTA:
-            case LIGHT_GRAY_TERRACOTTA:
-            case LIME_GLAZED_TERRACOTTA:
-            case LIME_TERRACOTTA:
-            case MAGENTA_GLAZED_TERRACOTTA:
-            case MAGENTA_TERRACOTTA:
-            case ORANGE_GLAZED_TERRACOTTA:
-            case ORANGE_TERRACOTTA:
-            case PINK_GLAZED_TERRACOTTA:
-            case PINK_TERRACOTTA:
-            case PURPLE_GLAZED_TERRACOTTA:
-            case PURPLE_TERRACOTTA:
-            case RED_GLAZED_TERRACOTTA:
-            case RED_TERRACOTTA:
-            case WHITE_GLAZED_TERRACOTTA:
-            case WHITE_TERRACOTTA:
-            case YELLOW_GLAZED_TERRACOTTA:
-            case YELLOW_TERRACOTTA:
-            case STONE:
-            case NETHER_QUARTZ_ORE:
-                Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops());
-                return;
-
-            default:
-                if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
-                    Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops());
-                }
-                return;
-        }
-    }
 }

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -201,7 +201,7 @@ public class MiningManager extends SkillManager {
                 if (!mcMMO.getPlaceStore().isTrue(blockState)) {
                     for (int i = 1; i < dropMultiplier; i++) {
 //                        Bukkit.broadcastMessage("Bonus Drop on Ore: "+blockState.getType().toString());
-                        Mining.handleSilkTouchDrops(blockState); // Bonus drops - should drop the block & not the items
+                        Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); // Initial block that would have been dropped
                     }
                 }
             }

src/main/resources/experience.yml

@@ -531,4 +531,5 @@ Experience_Values:
             Hoglin: 4.0
             Zombie_Pigman: 3.0
             Zombified_Piglin: 3.0
+            Strider: 1.2