update mcmmo, closes #8

This commit is contained in:
okx-code
2019-01-20 09:26:40 +00:00
parent 47280de759
commit fd2a77a196
4 changed files with 10 additions and 10 deletions
+3 -3
View File
@@ -4,7 +4,7 @@ plugins {
} }
group 'sh.okx' group 'sh.okx'
version '3.3.2-beta.1' version '3.4'
repositories { repositories {
mavenCentral() mavenCentral()
@@ -26,7 +26,7 @@ repositories {
dependencies { dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12' 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') { compile('net.milkbowl.vault:VaultAPI:1.6') {
exclude group: 'org.bukkit' exclude group: 'org.bukkit'
@@ -34,5 +34,5 @@ dependencies {
compile 'me.clip:placeholderapi:2.9.2' compile 'me.clip:placeholderapi:2.9.2'
compile 'com.hm.achievement:advanced-achievements-api:1.1.0' compile 'com.hm.achievement:advanced-achievements-api:1.1.0'
// if compiling this you will have to download and install mcMMO locally // 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'
} }
+3 -3
View File
@@ -1,6 +1,6 @@
package sh.okx.rankup; package sh.okx.rankup;
import com.gmail.nossr50.datatypes.skills.SkillType; import com.gmail.nossr50.datatypes.skills.PrimarySkillType;
import lombok.Getter; import lombok.Getter;
import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.permission.Permission; import net.milkbowl.vault.permission.Permission;
@@ -180,7 +180,7 @@ public class Rankup extends JavaPlugin {
saveLocales(); saveLocales();
config = loadConfig("config.yml"); 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"); File localeFile = new File(new File(getDataFolder(), "locale"), locale + ".yml");
messages = YamlConfiguration.loadConfiguration(localeFile); messages = YamlConfiguration.loadConfiguration(localeFile);
@@ -226,7 +226,7 @@ public class Rankup extends JavaPlugin {
requirementRegistry.addRequirement(new PermissionRequirement(this)); requirementRegistry.addRequirement(new PermissionRequirement(this));
requirementRegistry.addRequirement(new PlaceholderRequirement(this)); requirementRegistry.addRequirement(new PlaceholderRequirement(this));
if (Bukkit.getPluginManager().isPluginEnabled("mcMMO")) { if (Bukkit.getPluginManager().isPluginEnabled("mcMMO")) {
for (SkillType skill : SkillType.values()) { for (PrimarySkillType skill : PrimarySkillType.values()) {
requirementRegistry.addRequirement(new McMMOSkillRequirement(this, skill)); requirementRegistry.addRequirement(new McMMOSkillRequirement(this, skill));
} }
requirementRegistry.addRequirement(new McMMOPowerLevelRequirement(this)); requirementRegistry.addRequirement(new McMMOPowerLevelRequirement(this));
@@ -1,15 +1,15 @@
package sh.okx.rankup.requirements.requirement.mcmmo; 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 com.gmail.nossr50.util.player.UserManager;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import sh.okx.rankup.Rankup; import sh.okx.rankup.Rankup;
import sh.okx.rankup.requirements.Requirement; import sh.okx.rankup.requirements.Requirement;
public class McMMOSkillRequirement extends 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()); super(plugin, "mcmmo-" + skill.toString().toLowerCase());
this.skill = skill; this.skill = skill;
} }
+1 -1
View File
@@ -1,5 +1,5 @@
name: Rankup name: Rankup
version: 3.3.2-beta.1 version: 3.4
main: sh.okx.rankup.Rankup main: sh.okx.rankup.Rankup
author: Okx author: Okx
depend: [Vault] depend: [Vault]