From 240b80c81455ad90c8242b9173a51c181e2af129 Mon Sep 17 00:00:00 2001
From: okx-code <okx@okx.sh>
Date: Sun, 17 Mar 2019 23:16:17 +0000
Subject: [PATCH] support placeholder api in messages and requirement
 placeholders in the title

---
 .gitignore                                           |  2 ++
 build.gradle                                         |  6 +++---
 src/main/java/sh/okx/rankup/Rankup.java              |  2 ++
 src/main/java/sh/okx/rankup/gui/Gui.java             |  8 ++++----
 .../java/sh/okx/rankup/messages/MessageBuilder.java  | 12 ++++++++++--
 src/main/resources/plugin.yml                        |  2 +-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 302a5f2..d21c760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 .gradle
 build/
+.idea/
+*.iml
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/build.gradle b/build.gradle
index 1bf7fc0..1dd1a58 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,18 +4,18 @@ plugins {
 }
 
 group 'sh.okx'
-version '3.4.2-beta'
+version '3.4.2-beta.1'
 
 repositories {
     mavenCentral()
     jcenter()
+    mavenLocal()
     maven {
         url 'http://nexus.hc.to/content/repositories/pub_releases'
     }
     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.2.0-SNAPSHOT'
+    compile 'com.gmail.nossr50.mcMMO:mcMMO:2.1.17'
 }
diff --git a/src/main/java/sh/okx/rankup/Rankup.java b/src/main/java/sh/okx/rankup/Rankup.java
index 341f327..7f37c76 100644
--- a/src/main/java/sh/okx/rankup/Rankup.java
+++ b/src/main/java/sh/okx/rankup/Rankup.java
@@ -127,6 +127,8 @@ public class Rankup extends JavaPlugin {
       autoRankup.runTaskTimer(this, time, time);
     }
 
+
+
     if (config.getInt("version") < 3) {
       getLogger().severe("You are using an outdated config!");
       getLogger().severe("This means that some things might not work!");
diff --git a/src/main/java/sh/okx/rankup/gui/Gui.java b/src/main/java/sh/okx/rankup/gui/Gui.java
index cef6a28..0722b39 100644
--- a/src/main/java/sh/okx/rankup/gui/Gui.java
+++ b/src/main/java/sh/okx/rankup/gui/Gui.java
@@ -50,10 +50,10 @@ public class Gui implements InventoryHolder {
     gui.cancel = cancel;
 
     Inventory inventory = Bukkit.createInventory(gui, items.length,
-        plugin.getMessage(oldRank, gui.prestige ? Message.PRESTIGE_TITLE : Message.TITLE)
-            .replaceRanks(player, oldRank, rank)
-            .replaceFromTo(oldRank)
-            .toString());
+        plugin.replaceMoneyRequirements(
+            plugin.getMessage(oldRank, gui.prestige ? Message.PRESTIGE_TITLE : Message.TITLE)
+                .replaceRanks(player, oldRank, rank)
+                .replaceFromTo(oldRank), player, rank).toString());
     inventory.setContents(items);
     gui.inventory = inventory;
     return gui;
diff --git a/src/main/java/sh/okx/rankup/messages/MessageBuilder.java b/src/main/java/sh/okx/rankup/messages/MessageBuilder.java
index 2090bd9..52a606a 100644
--- a/src/main/java/sh/okx/rankup/messages/MessageBuilder.java
+++ b/src/main/java/sh/okx/rankup/messages/MessageBuilder.java
@@ -1,5 +1,7 @@
 package sh.okx.rankup.messages;
 
+import me.clip.placeholderapi.PlaceholderAPI;
+import org.apache.commons.lang3.Validate;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -24,7 +26,9 @@ public class MessageBuilder {
   }
 
   private static MessageBuilder of(ConfigurationSection config, String message) {
-    return new MessageBuilder(ChatColor.translateAlternateColorCodes('&', config.getString(message)));
+    String string = config.getString(message);
+    Validate.notNull(string, "Configuration message '" + message + "' not found!");
+    return new MessageBuilder(ChatColor.translateAlternateColorCodes('&', string));
   }
 
   public MessageBuilder replace(Variable variable, Object value) {
@@ -99,7 +103,11 @@ public class MessageBuilder {
   }
 
   public void send(CommandSender sender) {
-    sender.sendMessage(message);
+    String msg = message;
+    if (sender instanceof Player) {
+      msg = PlaceholderAPI.setPlaceholders((Player) sender, msg);
+    }
+    sender.sendMessage(msg);
   }
 
   /**
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index f2e4880..ec8186d 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,5 +1,5 @@
 name: Rankup
-version: 3.4.2-beta
+version: 3.4.2-beta.1
 main: sh.okx.rankup.Rankup
 author: Okx
 depend: [Vault]