3.11 update

build.gradle

@@ -35,8 +35,11 @@ dependencies {
     implementation('com.github.MilkBowl:VaultAPI:1.7') {
         exclude group: 'org.bukkit'
     }
-    implementation 'me.clip:placeholderapi:2.10.6'
+    implementation ('me.clip:placeholderapi:2.10.9') {
+        exclude group: 'org.bstats'
+    }
     implementation 'com.github.pyvesb:advanced-achievements:6.7.2'
+    implementation 'com.github.astei:Superbvote:700fca43659b438cb9bb36c218a7646d2f2ef315'
     implementation('com.github.mcMMO-Dev:mcMMO:601297') {
         exclude group: 'com.sk89q.worldguard'
     }

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

@@ -3,8 +3,11 @@ package sh.okx.rankup;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
+import sh.okx.rankup.events.PlayerPrestigeEvent;
+import sh.okx.rankup.events.PlayerRankupEvent;
 import sh.okx.rankup.hook.GroupProvider;
 import sh.okx.rankup.messages.Message;
 import sh.okx.rankup.messages.Variable;
@@ -40,7 +43,9 @@ public class RankupHelper {
     }
     permissions.addGroup(player.getUniqueId(), rank.getNext().getRank().getRank());
 
-    rank.getRank().runCommands(player);
+    rank.getRank().runCommands(player, rank.getNext().getRank());
+
+    Bukkit.getPluginManager().callEvent(new PlayerRankupEvent(plugin, player, rank));
   }
 
   public void sendRankupMessages(Player player, RankElement<Rank> rank) {
@@ -65,7 +70,9 @@ public class RankupHelper {
     }
     permissions.addGroup(player.getUniqueId(), prestige.getNext().getRank().getRank());
 
-    rank.runCommands(player);
+    rank.runCommands(player, prestige.getNext().getRank());
+
+    Bukkit.getPluginManager().callEvent(new PlayerPrestigeEvent(plugin, player, prestige));
   }
 
   public void sendPrestigeMessages(Player player, RankElement<Prestige> prestige) {
@@ -95,7 +102,7 @@ public class RankupHelper {
         plugin
             .getMessage(rank, secondsLeft > 1 ? Message.COOLDOWN_PLURAL : Message.COOLDOWN_SINGULAR)
             .failIfEmpty()
-            .replaceRanks(player, rank.getRank())
+            .replaceRanks(player, rank)
             .replaceFromTo(rank)
             .replace(Variable.SECONDS, cooldownSeconds)
             .replace(Variable.SECONDS_LEFT, secondsLeft)
@@ -153,7 +160,7 @@ public class RankupHelper {
       Prestiges prestiges = plugin.getPrestiges();
       plugin.getMessage(prestiges == null || !prestiges.getByPlayer(player).hasNext() ? Message.NO_RANKUP : Message.MUST_PRESTIGE)
           .failIf(!message)
-          .replaceRanks(player, rankups.getTree().last().getRank().getRank())
+          .replaceRanks(player, rankups.getTree().last().getRank())
           .send(player);
       return false;
     } else if (!rank.hasRequirements(player)) { // check if they can afford it
@@ -200,7 +207,7 @@ public class RankupHelper {
     } else if (!prestigeElement.hasNext()) { // check if they are at the highest rank
       plugin.getMessage(prestigeElement.getRank(), Message.PRESTIGE_NO_PRESTIGE)
           .failIf(!message)
-          .replaceRanks(player, prestigeElement.getRank().getRank())
+          .replaceRanks(player, prestigeElement.getRank())
           .replaceFromTo(prestigeElement.getRank())
           .send(player);
       return false;
@@ -208,7 +215,7 @@ public class RankupHelper {
       plugin.replaceMoneyRequirements(
           plugin.getMessage(prestigeElement.getRank(), Message.PRESTIGE_REQUIREMENTS_NOT_MET)
               .failIf(!message)
-              .replaceRanks(player, prestigeElement.getRank(), prestigeElement.getNext().getRank().getRank()), player, prestigeElement.getRank())
+              .replaceRanks(player, prestigeElement.getRank(), prestigeElement.getNext().getRank()), player, prestigeElement.getRank())
           .replaceFromTo(prestigeElement.getRank())
           .send(player);
       return false;

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

@@ -29,6 +29,7 @@ import sh.okx.rankup.commands.RankupCommand;
 import sh.okx.rankup.economy.Economy;
 import sh.okx.rankup.economy.EconomyProvider;
 import sh.okx.rankup.economy.VaultEconomyProvider;
+import sh.okx.rankup.events.RankupRegisterEvent;
 import sh.okx.rankup.gui.Gui;
 import sh.okx.rankup.gui.GuiListener;
 import sh.okx.rankup.hook.GroupProvider;
@@ -70,6 +71,7 @@ import sh.okx.rankup.requirements.requirement.advancedachievements.AdvancedAchie
 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.superbvote.SuperbVoteVotesRequirement;
 import sh.okx.rankup.requirements.requirement.tokenmanager.TokensDeductibleRequirement;
 import sh.okx.rankup.requirements.requirement.tokenmanager.TokensRequirement;
 import sh.okx.rankup.requirements.requirement.towny.TownyKingNumberResidentsRequirement;
@@ -406,6 +408,9 @@ public class RankupPlugin extends JavaPlugin {
           new TokensRequirement(this, "tokenmanager-tokensh"),
           new TokensDeductibleRequirement(this, "tokenmanager-tokens"));
     }
+    if (Bukkit.getPluginManager().isPluginEnabled("SuperbVotes")) {
+      requirements.addRequirements(new SuperbVoteVotesRequirement(this));
+    }
   }
   private void setupEconomy() {
     economy = economyProvider.getEconomy();
@@ -521,7 +526,7 @@ public class RankupPlugin extends JavaPlugin {
     }
 
     return replaceMoneyRequirements(getMessage(oldRank, message)
-        .replaceRanks(player, rankName.getRank())
+        .replaceRanks(player, rankName)
         .replace(Variable.OLD_RANK, oldRankName), player, oldRank)
         .replaceFromTo(oldRank);
   }
@@ -535,7 +540,7 @@ public class RankupPlugin extends JavaPlugin {
     } else {
       builder = getMessage(rank, type)
           .failIfEmpty()
-          .replaceRanks(sender, rank.getRank())
+          .replaceRanks(sender, rank)
           .replaceFromTo(rank);
     }
     builder.send(sender);

src/main/java/sh/okx/rankup/commands/InfoCommand.java

@@ -1,5 +1,10 @@
 package sh.okx.rankup.commands;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -18,8 +23,6 @@ import sh.okx.rankup.ranks.RankElement;
 import sh.okx.rankup.ranks.Rankups;
 import sh.okx.rankup.util.UpdateNotifier;
 
-import java.util.*;
-
 public class InfoCommand implements TabExecutor {
   private final RankupPlugin plugin;
 
@@ -130,7 +133,7 @@ public class InfoCommand implements TabExecutor {
 
         if (plugin.getRankups().getFirst().equals(currentRank)) {
           sender.sendMessage(ChatColor.YELLOW + "That player is in the first rank and cannot be ranked down.");
-
+          return true;
         }
 
         RankElement<Rank> prevRankElement = plugin.getRankups().getTree().getFirst();
@@ -140,6 +143,7 @@ public class InfoCommand implements TabExecutor {
 
         if (!prevRankElement.hasNext()) {
           sender.sendMessage(ChatColor.YELLOW + "Could not match previous rank.");
+          return true;
         }
         Rank prevRank = prevRankElement.getRank();
 
@@ -214,6 +218,7 @@ public class InfoCommand implements TabExecutor {
             ChatColor.GREEN + "/" + label + " forceprestige <player> " + ChatColor.YELLOW
                 + "Force a player to prestige, bypassing requirements.");
       }
+      sender.sendMessage(ChatColor.GREEN + "/" + label + " rankdown <player> " + ChatColor.YELLOW + "Force a player to move down one rank.");
     }
 
     if (sender.hasPermission("rankup.checkversion")) {
@@ -239,7 +244,7 @@ public class InfoCommand implements TabExecutor {
     } else if (args.length == 2) {
       if (args[0].equalsIgnoreCase("forcerankup") && sender.hasPermission("rankup.force")) {
         return StringUtil.copyPartialMatches(args[1], players(), new ArrayList<>());
-      } else if (args[0].equalsIgnoreCase("forceprestige") && sender.hasPermission("rankup.force")) {
+      } else if (args[0].equalsIgnoreCase("forceprestige") && sender.hasPermission("rankup.force") && plugin.getPrestiges() != null) {
         return StringUtil.copyPartialMatches(args[1], players(), new ArrayList<>());
       } else if (args[0].equalsIgnoreCase("rankdown") && sender.hasPermission("rankup.force")) {
         return StringUtil.copyPartialMatches(args[1], players(), new ArrayList<>());

src/main/java/sh/okx/rankup/commands/PrestigeCommand.java

@@ -12,6 +12,7 @@ import sh.okx.rankup.gui.Gui;
 import sh.okx.rankup.messages.Message;
 import sh.okx.rankup.prestige.Prestige;
 import sh.okx.rankup.prestige.Prestiges;
+import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.RankElement;
 
 import java.util.Map;
@@ -55,7 +56,7 @@ public class PrestigeCommand implements CommandExecutor {
       case "text":
         confirming.put(player, System.currentTimeMillis());
         Prestige next = rankElement.getNext().getRank();
-        String nextRank = next == null ? prestiges.getTree().last().getRank().getRank() : next.getRank();
+        Rank nextRank = next == null ? prestiges.getTree().last().getRank() : next;
 
         plugin.replaceMoneyRequirements(plugin.getMessage(prestige, Message.PRESTIGE_CONFIRMATION)
             .replaceRanks(player, prestige, nextRank), player, prestige)

src/main/java/sh/okx/rankup/events/PlayerPrestigeEvent.java

@@ -0,0 +1,36 @@
+package sh.okx.rankup.events;
+
+import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+import sh.okx.rankup.RankupPlugin;
+import sh.okx.rankup.prestige.Prestige;
+import sh.okx.rankup.ranks.RankElement;
+
+/**
+ * Called when a player ranks up from one prestige to another.
+ */
+public class PlayerPrestigeEvent extends PlayerEvent {
+  private static final HandlerList handlers = new HandlerList();
+  @Getter
+  private final RankupPlugin plugin;
+  /**
+   * The prestige someone is current at. Use <code>RankElement#getNext()</code> to get the prestige
+   * a player is ranking up to.
+   */
+  @Getter
+  private final RankElement<Prestige> prestige;
+
+  public PlayerPrestigeEvent(RankupPlugin plugin, @NotNull Player who, RankElement<Prestige> prestige) {
+    super(who);
+    this.plugin = plugin;
+    this.prestige = prestige;
+  }
+
+  @Override
+  public HandlerList getHandlers() {
+    return handlers;
+  }
+}

src/main/java/sh/okx/rankup/events/PlayerRankupEvent.java

@@ -0,0 +1,36 @@
+package sh.okx.rankup.events;
+
+import lombok.Getter;
+import org.bukkit.entity.Player;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.player.PlayerEvent;
+import org.jetbrains.annotations.NotNull;
+import sh.okx.rankup.RankupPlugin;
+import sh.okx.rankup.ranks.Rank;
+import sh.okx.rankup.ranks.RankElement;
+
+/**
+ * Called when a player ranks up from one rank to another.
+ */
+public class PlayerRankupEvent extends PlayerEvent {
+  private static final HandlerList handlers = new HandlerList();
+  @Getter
+  private final RankupPlugin plugin;
+  /**
+   * The rank someone is current at. Use <code>RankElement#getNext()</code> to get the rank
+   * a player is ranking up to.
+   */
+  @Getter
+  private final RankElement<Rank> rank;
+
+  public PlayerRankupEvent(RankupPlugin plugin, @NotNull Player who, RankElement<Rank> rank) {
+    super(who);
+    this.plugin = plugin;
+    this.rank = rank;
+  }
+
+  @Override
+  public HandlerList getHandlers() {
+    return handlers;
+  }
+}

src/main/java/sh/okx/rankup/events/RankupRegisterEvent.java

@@ -1,9 +1,10 @@
-package sh.okx.rankup;
+package sh.okx.rankup.events;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
+import sh.okx.rankup.RankupPlugin;
 import sh.okx.rankup.requirements.Requirement;
 import sh.okx.rankup.requirements.RequirementRegistry;
 
@@ -27,8 +28,8 @@ public class RankupRegisterEvent extends Event {
     return plugin.getRequirements();
   }
 
-  public void addRequirement(Requirement requirement) {
+  public void addRequirement(Requirement requirement, Requirement... requirements) {
-    plugin.getRequirements().addRequirement(requirement);
+    plugin.getRequirements().addRequirements(requirement, requirements);
   }
 
   @Override

src/main/java/sh/okx/rankup/gui/Gui.java

@@ -21,6 +21,7 @@ import sh.okx.rankup.messages.MessageBuilder;
 import sh.okx.rankup.prestige.Prestige;
 import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.RankElement;
+import sh.okx.rankup.util.Colour;
 import sh.okx.rankup.util.ItemUtil;
 
 @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
@@ -62,10 +63,10 @@ public class Gui implements InventoryHolder {
     gui.cancel = cancel;
 
     Inventory inventory = Bukkit.createInventory(gui, items.length,
-        ChatColor.stripColor(ChatColor.translateAlternateColorCodes('&', plugin.replaceMoneyRequirements(
+        Colour.translate(plugin.replaceMoneyRequirements(
             plugin.getMessage(oldRank, gui.prestige ? Message.PRESTIGE_TITLE : Message.TITLE)
                 .replaceRanks(player, oldRank, rank)
-                .replaceFromTo(oldRank), player, oldRank).toString())));
+                .replaceFromTo(oldRank), player, oldRank).toString()));
     inventory.setContents(items);
     gui.inventory = inventory;
     return gui;
@@ -75,7 +76,8 @@ public class Gui implements InventoryHolder {
     if (element == null) {
       return getItem(plugin, section, player, null, null);
     } else {
-      return getItem(plugin, section, player, element.getRank(), element.getNext().getRank());
+      RankElement<Rank> next = element.getNext();
+      return getItem(plugin, section, player, element.getRank(), (next == null ? element : next).getRank());
     }
   }
 
@@ -125,7 +127,7 @@ public class Gui implements InventoryHolder {
     if (oldRank != null && rank != null) {
       builder = builder.replaceRanks(player, oldRank, rank);
     }
-    return ChatColor.translateAlternateColorCodes('&', plugin.replaceMoneyRequirements(builder, player, oldRank).toString());
+    return Colour.translate(plugin.replaceMoneyRequirements(builder, player, oldRank).toString());
   }
 
   private static void addItem(ItemStack[] items, ConfigurationSection section, ItemStack item) {

src/main/java/sh/okx/rankup/gui/GuiListener.java

@@ -37,7 +37,7 @@ public class GuiListener implements Listener {
       Bukkit.getScheduler().runTask(plugin, () -> {
         player.closeInventory();
         if (gui.isReturnToRanksGui()) {
-          Bukkit.dispatchCommand(player, "ranksgui");
+          Bukkit.dispatchCommand(player, "ranks");
         }
       });
     }

src/main/java/sh/okx/rankup/messages/MessageBuilder.java

@@ -1,18 +1,17 @@
 package sh.okx.rankup.messages;
 
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.prestige.Prestige;
 import sh.okx.rankup.prestige.Prestiges;
 import sh.okx.rankup.ranks.Rank;
-
+import sh.okx.rankup.util.Colour;
-import java.util.Objects;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class MessageBuilder {
   private String message;
@@ -28,7 +27,7 @@ public class MessageBuilder {
   private static MessageBuilder of(ConfigurationSection config, String message) {
     String string = config.getString(message);
     Objects.requireNonNull(string, "Configuration message '" + message + "' not found!");
-    return new MessageBuilder(ChatColor.translateAlternateColorCodes('&', string));
+    return new MessageBuilder(Colour.translate(string));
   }
 
   public MessageBuilder replace(Variable variable, Object value) {
@@ -36,6 +35,9 @@ public class MessageBuilder {
   }
 
   public MessageBuilder replace(String name, Object value) {
+    if (value == null) {
+      return this;
+    }
     Pattern pattern = Pattern.compile("\\{" + name + "}", Pattern.CASE_INSENSITIVE);
     Matcher matcher = pattern.matcher(message);
     this.message = matcher.replaceAll(String.valueOf(value));
@@ -49,24 +51,33 @@ public class MessageBuilder {
     return this;
   }
 
+  @Deprecated
   public MessageBuilder replaceRanks(CommandSender player, String rankName) {
     replace(Variable.PLAYER, player.getName());
     replaceRanks(rankName);
     return this;
   }
 
+  @Deprecated
   public MessageBuilder replaceRanks(CommandSender player, Rank oldRank, String rankName) {
     replace(Variable.PLAYER, player.getName());
     replaceRanks(oldRank, rankName);
     return this;
   }
 
+  public MessageBuilder replaceRanks(CommandSender player, Rank rank) {
+    replace(Variable.PLAYER, player.getName());
+    replaceRanks(rank);
+    return this;
+  }
+
   public MessageBuilder replaceRanks(CommandSender player, Rank oldRank, Rank rank) {
     replace(Variable.PLAYER, player.getName());
     replaceRanks(oldRank, rank);
     return this;
   }
 
+  @Deprecated
   public MessageBuilder replaceRanks(String rankName) {
     replace(Variable.RANK, rankName);
     return this;
@@ -74,18 +85,22 @@ public class MessageBuilder {
 
   public MessageBuilder replaceRanks(Rank rank) {
     replace(Variable.RANK, rank.getRank());
+    replace(Variable.RANK_NAME, rank.getDisplayName());
     return this;
   }
 
+  @Deprecated
   public MessageBuilder replaceRanks(Rank oldRank, String rankName) {
     replaceRanks(rankName);
     replace(Variable.OLD_RANK, oldRank.getRank());
+    replace(Variable.OLD_RANK_NAME, oldRank.getDisplayName());
     return this;
   }
 
   public MessageBuilder replaceRanks(Rank oldRank, Rank rank) {
     replaceRanks(rank);
     replace(Variable.OLD_RANK, oldRank.getRank());
+    replace(Variable.OLD_RANK_NAME, oldRank.getDisplayName());
     return this;
   }
 

src/main/java/sh/okx/rankup/messages/Variable.java

@@ -2,7 +2,9 @@ package sh.okx.rankup.messages;
 
 public enum Variable {
   PLAYER,
+  OLD_RANK_NAME,
   OLD_RANK,
+  RANK_NAME,
   RANK,
   FROM,
   TO,

src/main/java/sh/okx/rankup/placeholders/Placeholders.java

@@ -1,12 +1,10 @@
 package sh.okx.rankup.placeholders;
 
+import java.text.DecimalFormat;
 import lombok.Getter;
-import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import sh.okx.rankup.RankupPlugin;
 
-import java.text.DecimalFormat;
-
 public class Placeholders {
   private final RankupPlugin plugin;
   @Getter
@@ -17,7 +15,8 @@ public class Placeholders {
   private final DecimalFormat simpleFormat;
   @Getter
   private RankupExpansion expansion;
-  private boolean registered;
+
+  private RankupPlaceholderExpansion papiExpansion;
 
   public Placeholders(RankupPlugin plugin) {
     this.plugin = plugin;
@@ -29,17 +28,14 @@ public class Placeholders {
   public void register() {
     expansion = new RankupExpansion(plugin, this);
     if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
-      RankupPlaceholderExpansion placeholderExpansion = new RankupPlaceholderExpansion(plugin, expansion);
+      papiExpansion = new RankupPlaceholderExpansion(plugin, expansion);
-      placeholderExpansion.register();
+      papiExpansion.register();
-      registered = true;
-    } else {
-      registered = false;
     }
   }
 
   public void unregister() {
-    if (registered) {
+    if (papiExpansion != null) {
-      PlaceholderAPI.unregisterPlaceholderHook("rankup");
+      papiExpansion.unregister();
     }
   }
 }

src/main/java/sh/okx/rankup/prestige/LastPrestige.java

@@ -1,12 +1,10 @@
 package sh.okx.rankup.prestige;
 
+import java.util.Collections;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.RankupPlugin;
+import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.requirements.LastRankRequirements;
-import sh.okx.rankup.requirements.NullRequirement;
-import sh.okx.rankup.requirements.Requirement;
-
-import java.util.Collections;
 
 public class LastPrestige extends Prestige {
   public LastPrestige(RankupPlugin plugin, String name) {
@@ -23,17 +21,12 @@ public class LastPrestige extends Prestige {
     return false;
   }
 
-  @Override
-  public Requirement getRequirement(Player player, String name) {
-    return new NullRequirement();
-  }
-
   @Override
   public void applyRequirements(Player player) {
   }
 
   @Override
-  public void runCommands(Player player) {
+  public void runCommands(Player player, Rank next) {
   }
 
   @Override

src/main/java/sh/okx/rankup/prestige/Prestige.java

@@ -23,7 +23,7 @@ public class Prestige extends Rank {
   private final String to;
 
   protected Prestige(ConfigurationSection section, RankupPlugin plugin, String next, String rank, RankRequirements requirements, List<String> commands, String from, String to) {
-    super(section, plugin, next, rank, requirements, commands);
+    super(section, plugin, next, rank, rank, requirements, commands);
     this.from = from;
     this.to = to;
   }

src/main/java/sh/okx/rankup/prestige/Prestiges.java

@@ -11,7 +11,7 @@ public class Prestiges extends RankList<Prestige> {
   }
 
   @Override
-  public void addLastRank(RankupPlugin plugin) {
+  protected void addLastRank(RankupPlugin plugin) {
     RankElement<Prestige> last = getTree().last();
     last.setNext(new RankElement<>(new LastPrestige(plugin, last.getRank().getNext()), null));
   }

src/main/java/sh/okx/rankup/ranks/LastRank.java

@@ -1,16 +1,13 @@
 package sh.okx.rankup.ranks;
 
+import java.util.Collections;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.RankupPlugin;
 import sh.okx.rankup.ranks.requirements.LastRankRequirements;
-import sh.okx.rankup.requirements.NullRequirement;
-import sh.okx.rankup.requirements.Requirement;
-
-import java.util.Collections;
 
 public class LastRank extends Rank {
-  public LastRank(RankupPlugin plugin, String name) {
+  public LastRank(RankupPlugin plugin, String name, String displayName) {
-    super(null, plugin, null, name, new LastRankRequirements(), Collections.emptyList());
+    super(null, plugin, null, name, displayName, new LastRankRequirements(), Collections.emptyList());
   }
 
   @Override
@@ -18,16 +15,11 @@ public class LastRank extends Rank {
     return false;
   }
 
-  @Override
-  public Requirement getRequirement(Player player, String name) {
-    return new NullRequirement();
-  }
-
   @Override
   public void applyRequirements(Player player) {
   }
 
   @Override
-  public void runCommands(Player player) {
+  public void runCommands(Player player, Rank next) {
   }
 }

src/main/java/sh/okx/rankup/ranks/Rank.java

@@ -26,7 +26,10 @@ public class Rank {
   @Getter
   protected final String rank;
   @Getter
+  protected final String displayName;
+  @Getter
   protected final RankRequirements requirements;
+  @Getter
   protected final List<String> commands;
 
   public boolean isIn(Player player) {
@@ -45,8 +48,7 @@ public class Rank {
     requirements.applyRequirements(player);
   }
 
-
+  public void runCommands(Player player, Rank next) {
-  public void runCommands(Player player) {
     for (String command : commands) {
       String string = new MessageBuilder(command).replaceRanks(player, this, next).toString();
       if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {

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

@@ -1,14 +1,18 @@
 package sh.okx.rankup.ranks;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
 import lombok.Getter;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import sh.okx.rankup.RankupPlugin;
 
-import java.util.*;
-import java.util.function.Function;
-
 public abstract class RankList<T extends Rank> {
 
   protected RankupPlugin plugin;
@@ -45,7 +49,7 @@ public abstract class RankList<T extends Rank> {
     }
   }
 
-  public abstract void addLastRank(RankupPlugin plugin);
+  protected abstract void addLastRank(RankupPlugin plugin);
 
   private RankElement<T> findNext(T rank, List<RankElement<T>> rankElements) {
     Objects.requireNonNull(rank);

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

@@ -11,6 +11,7 @@ public class Rankup extends Rank {
   public static Rankup deserialize(RankupPlugin plugin, ConfigurationSection section) {
     String next = section.getString("next");
     String rank = section.getString("rank");
+    String displayName = section.getString("display-name");
 
     if (next == null || next.isEmpty()) {
       plugin.getLogger().warning("Having a final rank (for example: \"Z: rank: 'Z'\") from 3.4.2 or earlier should no longer be used.\n"
@@ -23,13 +24,14 @@ public class Rankup extends Rank {
         plugin,
         next,
         rank,
+        displayName,
         RankRequirementsFactory.getRequirements(plugin, section),
         section.getStringList("commands"));
   }
 
-  protected Rankup(ConfigurationSection section, RankupPlugin plugin, String next, String rank,
+  protected Rankup(ConfigurationSection section, RankupPlugin plugin, String next, String rank, String displayName,
       RankRequirements requirements,
       List<String> commands) {
-    super(section, plugin, next, rank, requirements, commands);
+    super(section, plugin, next, rank, displayName, requirements, commands);
   }
 }

src/main/java/sh/okx/rankup/ranks/Rankups.java

@@ -4,13 +4,19 @@ import org.bukkit.configuration.file.FileConfiguration;
 import sh.okx.rankup.RankupPlugin;
 
 public class Rankups extends RankList<Rank> {
+
   public Rankups(RankupPlugin plugin, FileConfiguration config) {
     super(plugin, config, section -> Rankup.deserialize(plugin, section));
   }
 
   @Override
-  public void addLastRank(RankupPlugin plugin) {
+  protected void addLastRank(RankupPlugin plugin) {
     RankElement<Rank> last = getTree().last();
-    last.setNext(new RankElement<>(new LastRank(plugin, last.getRank().getNext()), null));
+    String lastRankDisplayName = plugin.getConfig().getString("placeholders.last-rank-display-name");
+    String lastRankName = last.getRank().getNext();
+    if (lastRankDisplayName == null) {
+      lastRankDisplayName = lastRankName;
+    }
+    last.setNext(new RankElement<>(new LastRank(plugin, lastRankName, lastRankDisplayName), null));
   }
 }

src/main/java/sh/okx/rankup/ranksgui/RanksGui.java

@@ -12,6 +12,7 @@ import sh.okx.rankup.RankupPlugin;
 import sh.okx.rankup.gui.Gui;
 import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.RankElement;
+import sh.okx.rankup.util.Colour;
 
 public class RanksGui {
     private final RankupPlugin plugin;
@@ -38,7 +39,7 @@ public class RanksGui {
         int offset = get(ConfigurationSection::getInt, "offset", playerPath, basePath, 10);
         int width = get(ConfigurationSection::getInt, "width", playerPath, basePath, 7);
 
-        inventory = Bukkit.createInventory(null, rows * 9, title);
+        inventory = Bukkit.createInventory(null, rows * 9, Colour.translate(title));
 
         ItemStack fill = get((section, path) -> Gui.getItem(plugin, section.getConfigurationSection(path), player, playerRankElement), "fill", playerPath, basePath, null);
 

src/main/java/sh/okx/rankup/requirements/RequirementRegistry.java

@@ -8,11 +8,13 @@ import java.util.Set;
 public class RequirementRegistry {
   private final Set<Requirement> requirements = new HashSet<>();
 
+  @Deprecated
   public void addRequirement(Requirement requirement) {
     requirements.add(requirement);
   }
 
-  public void addRequirements(Requirement... requirements) {
+  public void addRequirements(Requirement requirement, Requirement... requirements) {
+    this.requirements.add(requirement);
     Collections.addAll(this.requirements, requirements);
   }
 

src/main/java/sh/okx/rankup/requirements/requirement/PlaceholderRequirement.java

@@ -31,8 +31,8 @@ public class PlaceholderRequirement extends ProgressiveRequirement {
     }
 
     // numeric operations
-    double p = Double.parseDouble(parsed);
+    double p = Double.parseDouble(parsed.replace(",", ""));
-    double v = Double.parseDouble(value);
+    double v = Double.parseDouble(value.replace(",", ""));
     switch (parts[1]) {
       case ">":
         return p > v ? v : 0;

src/main/java/sh/okx/rankup/requirements/requirement/superbvote/SuperbVoteVotesRequirement.java

@@ -0,0 +1,27 @@
+package sh.okx.rankup.requirements.requirement.superbvote;
+
+import io.minimum.minecraft.superbvote.SuperbVote;
+import org.bukkit.entity.Player;
+import sh.okx.rankup.RankupPlugin;
+import sh.okx.rankup.requirements.ProgressiveRequirement;
+import sh.okx.rankup.requirements.Requirement;
+
+public class SuperbVoteVotesRequirement extends ProgressiveRequirement {
+  public SuperbVoteVotesRequirement(RankupPlugin plugin) {
+    super(plugin, "superbvote-votes");
+  }
+
+  private SuperbVoteVotesRequirement(Requirement clone) {
+    super(clone);
+  }
+
+  @Override
+  public double getProgress(Player player) {
+    return SuperbVote.getPlugin().getVoteStorage().getVotes(player.getUniqueId()).getVotes();
+  }
+
+  @Override
+  public Requirement clone() {
+    return new SuperbVoteVotesRequirement(this);
+  }
+}

src/main/java/sh/okx/rankup/util/Colour.java

@@ -0,0 +1,30 @@
+package sh.okx.rankup.util;
+
+import net.md_5.bungee.api.ChatColor;
+
+public class Colour {
+
+  private static final char altColorChar = '&';
+
+  public static String translate(String string) {
+    StringBuilder result = new StringBuilder();
+    char[] b = string.toCharArray();
+    for (int i = 0; i < b.length; i++) {
+      if (b[i] == altColorChar && i < b.length - 1) {
+        if ("0123456789AaBbCcDdEeFfKkLlMmNnOoRr".indexOf(b[i + 1]) > -1) {
+          result.append(ChatColor.COLOR_CHAR).append(Character.toLowerCase(b[i + 1]));
+          i ++;
+        } else if ('#' == b[i + 1] && i < b.length - 7) {
+          String hex = string.substring(i + 1, i + 8);
+          result.append(ChatColor.of(hex));
+          i += 7;
+        } else {
+          result.append(b[i]);
+        }
+      } else {
+        result.append(b[i]);
+      }
+    }
+    return result.toString();
+  }
+}

src/main/resources/config.yml

@@ -20,7 +20,7 @@ ranks: true
 # this will also make the command not autocomplete in 1.13
 prestiges: true
 
-# whether to enabable the /ranks GUI.
+# whether to enable the /ranks GUI.
 # will override the /ranks command
 ranks-gui: false
 
@@ -93,6 +93,7 @@ placeholders:
     complete: "Complete"
     current: "Current"
     incomplete: "Incomplete"
+  last-rank-display-name: "last rank"
 
 # what to shorten money by.
 # ie 1000 -> 1k

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ version: "${version}"
 main: sh.okx.rankup.RankupPlugin
 author: Okx
 depend: [Vault]
-softdepend: [PlaceholderAPI, mcMMO, AdvancedAchievements, Towny]
+softdepend: [PlaceholderAPI, mcMMO, AdvancedAchievements, Towny, SuperbVote, VotingPlugin]
 api-version: 1.13
 
 commands:

src/test/java/sh/okx/rankup/RankupTest.java

@@ -1,5 +1,8 @@
 package sh.okx.rankup;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import be.seeseemelk.mockbukkit.MockBukkit;
 import be.seeseemelk.mockbukkit.ServerMock;
 import be.seeseemelk.mockbukkit.entity.PlayerMock;
@@ -15,9 +18,6 @@ import sh.okx.rankup.messages.Variable;
 import sh.okx.rankup.ranks.Rank;
 import sh.okx.rankup.ranks.RankElement;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 public class RankupTest {
     protected GroupProvider groupProvider;
     protected ServerMock server;
@@ -73,7 +73,7 @@ public class RankupTest {
 
         plugin.getHelper().rankup(player);
 
-        player.assertSaid(plugin.getMessage(Message.NO_RANKUP).replaceRanks(player, plugin.getRankups().getTree().last().getRank().getRank()).toString());
+        player.assertSaid(plugin.getMessage(Message.NO_RANKUP).replaceRanks(player, plugin.getRankups().getTree().last().getRank()).toString());
         player.assertNoMoreSaid();
     }