From a94b7d3ce8c73fb7acbe760f9a1d081fda319b08 Mon Sep 17 00:00:00 2001
From: SuperRonanCraft <superronancraft@gmail.com>
Date: Sun, 2 Apr 2023 10:48:02 -0400
Subject: [PATCH] menu supports placeholder

---
 BetterRTPAddons/pom.xml                               |  4 ++--
 .../addons/rtpmenu/RTPMenu_SelectWorld.java           | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/BetterRTPAddons/pom.xml b/BetterRTPAddons/pom.xml
index a55490c..059c843 100644
--- a/BetterRTPAddons/pom.xml
+++ b/BetterRTPAddons/pom.xml
@@ -7,7 +7,7 @@
     <groupId>me.SuperRonanCraft</groupId>
     <artifactId>BetterRTPAddons</artifactId>
     <packaging>jar</packaging>
-    <version>1.8.4</version>
+    <version>1.8.5</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
@@ -109,7 +109,7 @@
         <dependency>
             <groupId>me.SuperRonanCraft</groupId>
             <artifactId>BetterRTP</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.3</version>
             <scope>provided</scope>
         </dependency>
         <!-- ProtocolLib -->
diff --git a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java
index 13b224b..ddb17c1 100644
--- a/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java
+++ b/BetterRTPAddons/src/main/java/me/SuperRonanCraft/BetterRTPAddons/addons/rtpmenu/RTPMenu_SelectWorld.java
@@ -9,6 +9,7 @@ import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.World;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
@@ -34,7 +35,7 @@ public class RTPMenu_SelectWorld {
         }
         int size = Math.floorDiv(actual_worlds.size(), 9) * 9;
         if (size < actual_worlds.size()) size += 9;
-        Inventory inv = createInventory(color(Files.FILETYPE.CONFIG.getString(AddonRTPMenu.name + ".Title")), size);
+        Inventory inv = createInventory(color(p, Files.FILETYPE.CONFIG.getString(AddonRTPMenu.name + ".Title")), size);
 
         HashMap<Integer, World> world_slots = centerWorlds(new ArrayList<>(actual_worlds));
 
@@ -45,9 +46,9 @@ public class RTPMenu_SelectWorld {
             ItemStack item = new ItemStack(worldInfo.item, 1);
             ItemMeta meta = item.getItemMeta();
             assert meta != null;
-            meta.setDisplayName(color(worldInfo.name));
+            meta.setDisplayName(color(p, worldInfo.name));
             List<String> lore = new ArrayList<>(worldInfo.lore);
-            lore.forEach(s -> lore.set(lore.indexOf(s), color(s).replace("%world%", world.getValue().getName())));
+            lore.forEach(s -> lore.set(lore.indexOf(s), color(p, s).replace("%world%", world.getValue().getName())));
             meta.setLore(lore);
             item.setItemMeta(meta);
             inv.setItem(slot, item);
@@ -117,8 +118,8 @@ public class RTPMenu_SelectWorld {
         return 0;
     }
 
-    private static String color(String str) {
-        return ChatColor.translateAlternateColorCodes('&', str);
+    private static String color(CommandSender sendi, String str) {
+        return ChatColor.translateAlternateColorCodes('&', Message.placeholder(sendi, str));
     }
 
     private static Inventory createInventory(String title, int size) {