From fd2a77a196fc2a137e0b0d81649aa07182578687 Mon Sep 17 00:00:00 2001
From: okx-code <okx@okx.sh>
Date: Sun, 20 Jan 2019 09:26:40 +0000
Subject: [PATCH] update mcmmo, closes #8

---
 build.gradle                                                | 6 +++---
 src/main/java/sh/okx/rankup/Rankup.java                     | 6 +++---
 .../requirement/mcmmo/McMMOSkillRequirement.java            | 6 +++---
 src/main/resources/plugin.yml                               | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index aea4695..ce661c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group 'sh.okx'
-version '3.3.2-beta.1'
+version '3.4'
 
 repositories {
     mavenCentral()
@@ -26,7 +26,7 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile 'org.spigotmc:spigot-api:1.12-R0.1-SNAPSHOT'
+    compile 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
 
     compile('net.milkbowl.vault:VaultAPI:1.6') {
         exclude group: 'org.bukkit'
@@ -34,5 +34,5 @@ dependencies {
     compile 'me.clip:placeholderapi:2.9.2'
     compile 'com.hm.achievement:advanced-achievements-api:1.1.0'
     // if compiling this you will have to download and install mcMMO locally
-    compile 'com.gmail.nossr50.mcMMO:mcMMO:1.6.0-SNAPSHOT'
+    compile 'com.gmail.nossr50.mcMMO:mcMMO:2.1.0-SNAPSHOT'
 }
diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java
index 91c0309..5d27bfd 100644
--- a/src/main/java/sh/okx/rankup/Rankup.java
+++ b/src/main/java/sh/okx/rankup/Rankup.java
@@ -1,6 +1,6 @@
 package sh.okx.rankup;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import lombok.Getter;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
@@ -180,7 +180,7 @@ public class Rankup extends JavaPlugin {
     saveLocales();
 
     config = loadConfig("config.yml");
-    String locale = config.getString("locale");
+    String locale = config.getString("locale", "en");
     File localeFile = new File(new File(getDataFolder(), "locale"), locale + ".yml");
     messages = YamlConfiguration.loadConfiguration(localeFile);
 
@@ -226,7 +226,7 @@ public class Rankup extends JavaPlugin {
     requirementRegistry.addRequirement(new PermissionRequirement(this));
     requirementRegistry.addRequirement(new PlaceholderRequirement(this));
     if (Bukkit.getPluginManager().isPluginEnabled("mcMMO")) {
-      for (SkillType skill : SkillType.values()) {
+      for (PrimarySkillType skill : PrimarySkillType.values()) {
         requirementRegistry.addRequirement(new McMMOSkillRequirement(this, skill));
       }
       requirementRegistry.addRequirement(new McMMOPowerLevelRequirement(this));
diff --git a/src/main/java/sh/okx/rankup/requirements/requirement/mcmmo/McMMOSkillRequirement.java b/src/main/java/sh/okx/rankup/requirements/requirement/mcmmo/McMMOSkillRequirement.java
index 98590a4..9b809c9 100644
--- a/src/main/java/sh/okx/rankup/requirements/requirement/mcmmo/McMMOSkillRequirement.java
+++ b/src/main/java/sh/okx/rankup/requirements/requirement/mcmmo/McMMOSkillRequirement.java
@@ -1,15 +1,15 @@
 package sh.okx.rankup.requirements.requirement.mcmmo;
 
-import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.util.player.UserManager;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.Rankup;
 import sh.okx.rankup.requirements.Requirement;
 
 public class McMMOSkillRequirement extends Requirement {
-  private SkillType skill;
+  private PrimarySkillType skill;
 
-  public McMMOSkillRequirement(Rankup plugin, SkillType skill) {
+  public McMMOSkillRequirement(Rankup plugin, PrimarySkillType skill) {
     super(plugin, "mcmmo-" + skill.toString().toLowerCase());
     this.skill = skill;
   }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 1c21776..519def3 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Rankup
-version: 3.3.2-beta.1
+version: 3.4
 main: sh.okx.rankup.Rankup
 author: Okx
 depend: [Vault]