3.1 prestiging improvements

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

@@ -16,7 +16,7 @@ public class RankList<T extends Rank> {
   protected final FileConfiguration config;
   protected final Set<T> ranks = new HashSet<>();
 
-  public RankList(Rankup plugin, FileConfiguration config, Function<ConfigurationSection, T> deserializer) {
+  public RankList(FileConfiguration config, Function<ConfigurationSection, T> deserializer) {
     this.config = config;
     for (Map.Entry<String, Object> entry : config.getValues(false).entrySet()) {
       ConfigurationSection rankSection = (ConfigurationSection) entry.getValue();

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

@@ -58,9 +58,9 @@ public class Rankup extends JavaPlugin {
    * The registry for listing the requirements to /rankup.
    */
   @Getter
-  private RequirementRegistry requirementRegistry = new RequirementRegistry();
+  private RequirementRegistry requirementRegistry;
   @Getter
-  private OperationRegistry operationRegistry = new OperationRegistry();
+  private OperationRegistry operationRegistry;
   @Getter
   private FileConfiguration messages;
   @Getter
@@ -78,7 +78,6 @@ public class Rankup extends JavaPlugin {
 
   @Override
   public void onEnable() {
-    registerRequirements();
     setupPermissions();
     setupEconomy();
     reload();
@@ -121,10 +120,10 @@ public class Rankup extends JavaPlugin {
     closeInventories();
     loadConfigs();
 
-    if (config.getInt("version") != 0) {
+    if (config.getInt("version") < 1) {
       getLogger().severe("You are using an outdated config!");
       getLogger().severe("This means that some things might not work!");
-      getLogger().severe("To update, please rename your config files (or the folder they are in),");
+      getLogger().severe("To update, please rename ALL your config files (or the folder they are in),");
       getLogger().severe("and run /rankup3 reload to generate a new config file.");
       getLogger().severe("If that does not work, restart your server.");
       getLogger().severe("You may then copy in your config values from the old config.");
@@ -150,6 +149,11 @@ public class Rankup extends JavaPlugin {
   private void loadConfigs() {
     messages = loadConfig("messages.yml");
     config = loadConfig("config.yml");
+    refreshRanks();
+  }
+
+  public void refreshRanks() {
+    registerRequirements();
     rankups = new Rankups(this, loadConfig("rankups.yml"));
     if(config.getBoolean("prestige")) {
       prestiges = new Prestiges(this, loadConfig("prestiges.yml"));
@@ -165,16 +169,20 @@ public class Rankup extends JavaPlugin {
   }
 
   private void registerRequirements() {
+    requirementRegistry = new RequirementRegistry();
     requirementRegistry.addRequirement(new MoneyRequirement(this));
     requirementRegistry.addRequirement(new XpLevelRequirement(this));
     requirementRegistry.addRequirement(new PlaytimeMinutesRequirement(this));
     requirementRegistry.addRequirement(new GroupRequirement(this));
     requirementRegistry.addRequirement(new PermissionRequirement(this));
 
+    operationRegistry = new OperationRegistry();
     operationRegistry.addOperation("all", new AllOperation());
     operationRegistry.addOperation("none", new NoneOperation());
     operationRegistry.addOperation("one", new OneOperation());
     operationRegistry.addOperation("any", new AnyOperation());
+
+    Bukkit.getPluginManager().callEvent(new RankupRegisterEvent(this));
   }
 
   private void setupPermissions() {
@@ -330,12 +338,12 @@ public class Rankup extends JavaPlugin {
     }
     permissions.playerAddGroup(null, player, prestige.getRank());
 
-    getMessage(oldPrestige, Message.SUCCESS_PUBLIC)
+    getMessage(oldPrestige, Message.PRESTIGE_SUCCESS_PUBLIC)
         .failIfEmpty()
         .replaceRanks(player, oldPrestige, prestige)
         .replaceFromTo(oldPrestige)
         .broadcast();
-    getMessage(oldPrestige, Message.SUCCESS_PRIVATE)
+    getMessage(oldPrestige, Message.PRESTIGE_SUCCESS_PRIVATE)
         .failIfEmpty()
         .replaceRanks(player, oldPrestige, prestige)
         .replaceFromTo(oldPrestige)

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

@@ -0,0 +1,38 @@
+package sh.okx.rankup;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+import sh.okx.rankup.requirements.OperationRegistry;
+import sh.okx.rankup.requirements.RequirementRegistry;
+
+/**
+ * Called immediately before rankups and prestiges are registered,
+ * and immediately after the built-in requirements and operations are registered.
+ * This is used to register custom requirements.
+ * This is called when the plugin is enabled, and when it is reloaded from a command.
+ */
+@RequiredArgsConstructor
+public class RankupRegisterEvent extends Event {
+  private static final HandlerList handlers = new HandlerList();
+  @Getter
+  private final Rankup plugin;
+
+  public RequirementRegistry getRequirementRegistry() {
+    return plugin.getRequirementRegistry();
+  }
+
+  public OperationRegistry getOperationRegistry() {
+    return plugin.getOperationRegistry();
+  }
+
+  @Override
+  public HandlerList getHandlers() {
+    return handlers;
+  }
+
+  public static HandlerList getHandlerList() {
+    return handlers;
+  }
+}

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

@@ -47,7 +47,7 @@ public class PrestigeCommand implements CommandExecutor {
     switch (confirmationType) {
       case "text":
         confirming.put(player, System.currentTimeMillis());
-        plugin.replaceMoneyRequirements(plugin.getMessage(prestige, Message.CONFIRMATION)
+        plugin.replaceMoneyRequirements(plugin.getMessage(prestige, Message.PRESTIGE_CONFIRMATION)
             .replaceRanks(player, prestige, prestiges.next(prestige)), player, prestige)
             .replaceFromTo(prestige)
             .send(player);

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

@@ -24,7 +24,10 @@ public enum Message {
   COOLDOWN_SINGULAR("rankup.cooldown.singular"),
   COOLDOWN_PLURAL("rankup.cooldown.plural"),
   MUST_PRESTIGE("rankup.must-prestige"),
-  NOT_HIGH_ENOUGH("prestige.not-high-enough");
+  NOT_HIGH_ENOUGH("not-high-enough"),
+  PRESTIGE_SUCCESS_PUBLIC("prestige.success-public"),
+  PRESTIGE_SUCCESS_PRIVATE("prestige.success-private"),
+  PRESTIGE_CONFIRMATION("prestige.confirmation");
 
   @Getter
   private final String name;

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

@@ -57,6 +57,10 @@ public class RankupExpansion extends PlaceholderExpansion {
         return orElsePlaceholder(nextPrestige, Prestige::getRank, "highest-rank");
       case "next_prestige_name":
         return orElsePlaceholder(nextPrestige, Prestige::getName, "highest-rank");
+      case "prestige_money":
+        return String.valueOf(simplify(orElse(prestige, r -> r.isEligable(player) ? r.getRequirement("money").getValueDouble() : 0, 0)));
+      case "prestige_money_formatted":
+        return plugin.formatMoney(orElse(prestige, r -> r.isEligable(player) ? r.getRequirement("money").getValueDouble() : 0, 0D));
       case "current_rank":
         return orElsePlaceholder(rank, Rank::getRank, "not-in-ladder");
       case "current_rank_name":

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

@@ -7,7 +7,7 @@ import sh.okx.rankup.Rankup;
 
 public class Prestiges extends RankList<Prestige> {
   public Prestiges(Rankup plugin, FileConfiguration config) {
-    super(plugin, config, section -> Prestige.deserialize(plugin, section));
+    super(config, section -> Prestige.deserialize(plugin, section));
   }
 
   @Override

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

@@ -6,6 +6,6 @@ import sh.okx.rankup.Rankup;
 
 public class Rankups extends RankList<Rank> {
   public Rankups(Rankup plugin, FileConfiguration config) {
-    super(plugin, config, section -> Rank.deserialize(plugin, section));
+    super(config, section -> Rank.deserialize(plugin, section));
   }
 }