This commit is contained in:
nossr50 2019-04-04 00:39:00 -07:00
parent b8b0be71b1
commit f1d9f787f4
5 changed files with 10 additions and 3 deletions

View File

@ -7,6 +7,12 @@ Key:
! Change ! Change
- Removal - 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 Version 2.1.34
Added Llama to taming XP tables Added Llama to taming XP tables
Added Parrot to taming XP tables Added Parrot to taming XP tables

View File

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

View File

@ -500,7 +500,7 @@ public class Config extends AutoUpdateConfigLoader {
public double getFishingLureModifier() { return config.getDouble("Skills.Fishing.Lure_Modifier", 4.0D); } public double getFishingLureModifier() { return config.getDouble("Skills.Fishing.Lure_Modifier", 4.0D); }
/* Mining */ /* 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 */ /* Excavation */
public int getExcavationGate() { return config.getInt("Skills.Excavation.Ability_Activation_Level_Gate", 10); } public int getExcavationGate() { return config.getInt("Skills.Excavation.Ability_Activation_Level_Gate", 10); }

View File

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

View File

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