3.4.2-beta

build.gradle

@@ -4,11 +4,10 @@ plugins {
 }
 
 group 'sh.okx'
-version '3.4.1'
+version '3.4.2-beta'
 
 repositories {
     mavenCentral()
-    mavenLocal()
     jcenter()
     maven {
         url 'http://nexus.hc.to/content/repositories/pub_releases'
@@ -16,6 +15,7 @@ repositories {
     maven {
         url 'https://hub.spigotmc.org/nexus/content/groups/public/'
     }
+    mavenLocal()
     maven {
         url 'http://repo.extendedclip.com/content/repositories/placeholderapi/'
     }
@@ -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:2.1.0-SNAPSHOT'
+    compile 'com.gmail.nossr50.mcMMO:mcMMO:2.2.0-SNAPSHOT'
 }

src/main/java/sh/okx/rankup/RankList.java

@@ -59,7 +59,7 @@ public class RankList<T extends Rank> {
         return rank;
       }
     }
-    return null;
+    throw new RuntimeException("Invalid rank: " + name);
   }
 
   public T getByPlayer(Player player) {
@@ -83,7 +83,6 @@ public class RankList<T extends Rank> {
         return nextRank;
       }
     }
-    // this shouldn't happen but whatever
-    return null;
+    throw new RuntimeException(rank.getName() + " has an invalid next rank");
   }
 }

src/main/java/sh/okx/rankup/Rankup.java

@@ -13,11 +13,7 @@ import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.InventoryView;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
-import sh.okx.rankup.commands.InfoCommand;
-import sh.okx.rankup.commands.PrestigeCommand;
-import sh.okx.rankup.commands.PrestigesCommand;
-import sh.okx.rankup.commands.RanksCommand;
-import sh.okx.rankup.commands.RankupCommand;
+import sh.okx.rankup.commands.*;
 import sh.okx.rankup.gui.Gui;
 import sh.okx.rankup.gui.GuiListener;
 import sh.okx.rankup.messages.EmptyMessageBuilder;
@@ -32,21 +28,11 @@ import sh.okx.rankup.ranks.Rankups;
 import sh.okx.rankup.requirements.OperationRegistry;
 import sh.okx.rankup.requirements.Requirement;
 import sh.okx.rankup.requirements.RequirementRegistry;
-import sh.okx.rankup.requirements.operation.AllOperation;
-import sh.okx.rankup.requirements.operation.AnyOperation;
-import sh.okx.rankup.requirements.operation.NoneOperation;
-import sh.okx.rankup.requirements.operation.OneOperation;
-import sh.okx.rankup.requirements.requirement.GroupRequirement;
-import sh.okx.rankup.requirements.requirement.MoneyRequirement;
-import sh.okx.rankup.requirements.requirement.PermissionRequirement;
-import sh.okx.rankup.requirements.requirement.PlaceholderRequirement;
-import sh.okx.rankup.requirements.requirement.PlaytimeMinutesRequirement;
+import sh.okx.rankup.requirements.operation.*;
+import sh.okx.rankup.requirements.requirement.*;
 import sh.okx.rankup.requirements.requirement.XpLevelRequirement;
-import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsAchievementRequirement;
-import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchievementsTotalRequirement;
-import sh.okx.rankup.requirements.requirement.mcmmo.McMMOPowerLevelRequirement;
-import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillRequirement;
-import sh.okx.rankup.requirements.requirement.mcmmo.McMMOSkillUtil;
+import sh.okx.rankup.requirements.requirement.advancedachievements.*;
+import sh.okx.rankup.requirements.requirement.mcmmo.*;
 
 import java.io.File;
 import java.text.DecimalFormat;
@@ -363,15 +349,6 @@ public class Rankup extends JavaPlugin {
           .send(player);
       return false;
     } else if (rank.isLast()) { // check if they are at the highest rank
-//      if(prestiges != null) {
-//        Prestige prestige = prestiges.getByPlayer(player);
-//        if(prestige.isLast()) {
-//          getMessage(rank, Message.NO_RANKUP)
-//              .failIf(!message)
-//              .replaceRanks(player, prestige)
-//              .send(player);
-//        }
-//      }
       getMessage(rank, prestiges == null ? Message.NO_RANKUP : prestiges.getByPlayer(player).isLast() ? Message.NO_RANKUP : Message.MUST_PRESTIGE)
           .failIf(!message)
           .replaceRanks(player, rank)

src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: Rankup
-version: 3.4.1
+version: 3.4.2-beta
 main: sh.okx.rankup.Rankup
 author: Okx
 depend: [Vault]

src/main/resources/rankups.yml

@@ -4,6 +4,7 @@
 # eg "A" instead of "Aexample".
 Aexample:
   # the name of the rank in your permissions plugin
+  # players have to be in this rank to rankup
   rank: 'A'
   # the next rank a player can rank up to.
   # this must be the name of the configuration section, not the rank name.
@@ -25,6 +26,7 @@ Aexample:
   # none: no requirements
   operation: all
   # the console will run these commands when a player ranks up
+  # rankup will change the group for you, commands are not needed for that
   #commands:
   # this will run when a player ranks up from A to B.
   #- 'say {PLAYER} well done for ranking up from {OLD_RANK} to {RANK}!'