nossr50 6 anni fa
parent
commit
f1d9f787f4

+ 6 - 0
Changelog.txt

@@ -7,6 +7,12 @@ Key:
   ! Change
   - Removal
 
+Version 2.1.35
+    Readded the detonator config option
+
+    NOTE: I decided to make the detonator configurable again because 2.2 is some ways off. Sorry for the inconvenience.
+    NOTE: Pickaxes are now usable for blast mining, this is in addition to the detonator that you can specify in the config. This will be more configurable in the upcoming 2.2 update.
+
 Version 2.1.34
     Added Llama to taming XP tables
     Added Parrot to taming XP tables

+ 1 - 1
pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.34</version>
+    <version>2.1.35</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>

+ 1 - 1
src/main/java/com/gmail/nossr50/config/Config.java

@@ -500,7 +500,7 @@ public class Config extends AutoUpdateConfigLoader {
     public double getFishingLureModifier() { return config.getDouble("Skills.Fishing.Lure_Modifier", 4.0D); }
 
     /* Mining */
-    public int getMiningGate() { return config.getInt("Skills.Mining.Ability_Activation_Level_Gate", 10); }
+    public Material getDetonatorItem() { return Material.matchMaterial(config.getString("Skills.Mining.Detonator_Name", "FLINT_AND_STEEL")); }
 
     /* Excavation */
     public int getExcavationGate() { return config.getInt("Skills.Excavation.Ability_Activation_Level_Gate", 10); }

+ 1 - 1
src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -43,7 +43,7 @@ public class MiningManager extends SkillManager {
         Player player = getPlayer();
 
         return canUseBlastMining() && player.isSneaking()
-                && ItemUtils.isPickaxe(getPlayer().getInventory().getItemInMainHand())
+                && (ItemUtils.isPickaxe(getPlayer().getInventory().getItemInMainHand()) || player.getInventory().getItemInMainHand().getType() == Config.getInstance().getDetonatorItem())
                 && Permissions.remoteDetonation(player);
     }
 

+ 1 - 0
src/main/resources/config.yml

@@ -348,6 +348,7 @@ Skills:
         Prevent_AFK_Leveling: true
     Mining:
         Level_Cap: 0
+        Detonator_Name: FLINT_AND_STEEL
         Ability_Activation_Level_Gate: 10
     Repair:
         Level_Cap: 0