Add item support

Thatsmusic99 · Thatsmusic99 · commit 6a3eb0881884 · 2022-07-29T13:59:22.000+01:00
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/commands/MyHead.java b/src/main/java/io/github/thatsmusic99/headsplus/commands/MyHead.java
@@ -54,7 +54,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     private void giveHead(Player p, String n) {
         ItemStack skull = new ItemStack(Material.PLAYER_HEAD);
         PaperUtil.get().setProfile((SkullMeta) skull.getItemMeta(), n).thenAccept(meta -> {
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', ConfigMobs.get().getPlayerDisplayName(n)));
+            PaperUtil.get().setDisplayName(meta, ChatColor.translateAlternateColorCodes('&', ConfigMobs.get().getPlayerDisplayName(n)));
             skull.setItemMeta(meta);
             p.getInventory().addItem(skull);
         });
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/config/ConfigHeadsSelector.java b/src/main/java/io/github/thatsmusic99/headsplus/config/ConfigHeadsSelector.java
@@ -8,6 +8,7 @@
 import io.github.thatsmusic99.headsplus.managers.HeadManager;
 import io.github.thatsmusic99.headsplus.managers.MaskManager;
 import io.github.thatsmusic99.headsplus.managers.PersistenceManager;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.ChatColor;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -178,7 +179,7 @@ public ItemStack buildSection() {
             if (displayName == null) return item;
             ItemMeta meta = item.getItemMeta();
             if (meta == null) return item;
-            meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', displayName));
+            PaperUtil.get().setDisplayName(meta, ChatColor.translateAlternateColorCodes('&', displayName));
             item.setItemMeta(meta);
             return item;
         }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/config/MessagesManager.java b/src/main/java/io/github/thatsmusic99/headsplus/config/MessagesManager.java
@@ -1109,10 +1109,6 @@ public static MessagesManager get() {
     public String getString(String path) {
         String str = config.getString(path);
         if (str == null) return "";
-        str = str.replaceAll("\\{header}", config.getString("prefix"));
-        str = str.replaceAll("''", "'");
-        str = str.replaceAll("^'", "");
-        str = str.replaceAll("'$", "");
         formatMsg(str, null);
 
         str = ChatColor.translateAlternateColorCodes('&', str);
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/Icon.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/Icon.java
@@ -4,6 +4,7 @@
 import io.github.thatsmusic99.headsplus.config.ConfigInventories;
 import io.github.thatsmusic99.headsplus.config.MessagesManager;
 import io.github.thatsmusic99.headsplus.managers.PersistenceManager;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -67,13 +68,13 @@ public ItemStack getItemStack() {
     public void initNameAndLore(String id, Player player) {
         ItemMeta meta = item.getItemMeta();
         try {
-            meta.setDisplayName(MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons." + id +
+            PaperUtil.get().setDisplayName(meta, MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons." + id +
                     ".display-name"), player));
             List<String> lore = new ArrayList<>();
             for (String loreStr : ConfigInventories.get().getStringList("icons." + id + ".lore")) {
                 lore.add(MessagesManager.get().formatMsg(loreStr, player));
             }
-            meta.setLore(lore);
+            PaperUtil.get().setLore(meta, lore);
         } catch (NullPointerException ex) {
             HeadsPlus.get().getLogger().warning("There was a problem setting the display name or lore for icon " + id + "! (Error code: 9)");
         }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/Challenge.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/Challenge.java
@@ -6,6 +6,7 @@
 import io.github.thatsmusic99.headsplus.config.MessagesManager;
 import io.github.thatsmusic99.headsplus.inventories.icons.Content;
 import io.github.thatsmusic99.headsplus.util.HPUtils;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -71,7 +72,7 @@ public String getId() {
     @Override
     public void initNameAndLore(String id, Player player) {
         ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenge" +
+        PaperUtil.get().setDisplayName(meta, MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenge" +
                         ".display-name")
                 .replaceAll("\\{challenge-name}", challenge.getChallengeHeader()), player));
         List<String> lore = new ArrayList<>();
@@ -105,7 +106,7 @@ public void initNameAndLore(String id, Player player) {
                                 }, true));
             }
         }
-        meta.setLore(lore);
+        PaperUtil.get().setLore(meta, lore);
         item.setItemMeta(meta);
     }
 }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/ChallengeSection.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/ChallengeSection.java
@@ -5,6 +5,7 @@
 import io.github.thatsmusic99.headsplus.config.MessagesManager;
 import io.github.thatsmusic99.headsplus.inventories.InventoryManager;
 import io.github.thatsmusic99.headsplus.inventories.icons.Content;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
@@ -49,7 +50,7 @@ public String getId() {
     @Override
     public void initNameAndLore(String id, Player player) {
         ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenges" +
+        PaperUtil.get().setDisplayName(meta, MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenges" +
                         "-section.display-name")
                 .replaceAll("\\{section-name}", section.getDisplayName()), player));
         List<String> lore = new ArrayList<>();
@@ -63,7 +64,7 @@ public void initNameAndLore(String id, Player player) {
                         "}|\\{challenges})", String.valueOf(section.getChallenges().size())));
             }
         }
-        meta.setLore(lore);
+        PaperUtil.get().setLore(meta, lore);
         item.setItemMeta(meta);
     }
 
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/CustomHead.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/content/CustomHead.java
@@ -11,6 +11,7 @@
 import io.github.thatsmusic99.headsplus.inventories.icons.Content;
 import io.github.thatsmusic99.headsplus.managers.PersistenceManager;
 import io.github.thatsmusic99.headsplus.util.HPUtils;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.economy.EconomyResponse;
 import org.bukkit.Bukkit;
@@ -81,7 +82,7 @@ public boolean onClick(Player player, InventoryClickEvent event) {
                 List<String> lore = meta.getLore();
                 if (lore == null) lore = new ArrayList<>();
                 lore.removeAll(paymentLore);
-                meta.setLore(lore);
+                PaperUtil.get().setLore(meta, lore);
                 item.setItemMeta(meta);
                 PersistenceManager.get().removeIcon(item);
                 player.getInventory().addItem(item);
@@ -125,7 +126,7 @@ public void initNameAndLore(String id, Player player) {
             paymentLore.add(lore.get(lore.size() - 1));
         }
         ItemMeta im = item.getItemMeta();
-        im.setLore(lore);
+        PaperUtil.get().setLore(im, lore);
         item.setItemMeta(im);
     }
 
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/list/Stats.java b/src/main/java/io/github/thatsmusic99/headsplus/inventories/icons/list/Stats.java
@@ -7,6 +7,7 @@
 import io.github.thatsmusic99.headsplus.inventories.Icon;
 import io.github.thatsmusic99.headsplus.inventories.InventoryManager;
 import io.github.thatsmusic99.headsplus.util.HPUtils;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -42,7 +43,7 @@ public void initNameAndLore(String id, Player player) {
         ConfigHeadsSelector hpch = ConfigHeadsSelector.get();
         InventoryManager manager = InventoryManager.getManager(player);
         ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons." + id +
+        PaperUtil.get().setDisplayName(meta, MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons." + id +
                 ".display-name"), player));
         List<String> lore = new ArrayList<>();
         for (String loreStr : ConfigInventories.get().getStringList("icons." + id + ".lore")) {
@@ -56,7 +57,7 @@ public void initNameAndLore(String id, Player player) {
                     new HPUtils.PlaceholderInfo("{section}", manager.getSection(), manager.getSection() != null),
                     new HPUtils.PlaceholderInfo("{pages}", totalPages, true));
         }
-        meta.setLore(lore);
+        PaperUtil.get().setLore(meta, lore);
         item.setItemMeta(meta);
     }
 
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/listeners/EntityDeathListener.java b/src/main/java/io/github/thatsmusic99/headsplus/listeners/EntityDeathListener.java
@@ -11,6 +11,7 @@
 import io.github.thatsmusic99.headsplus.util.HPUtils;
 import io.github.thatsmusic99.headsplus.util.events.HeadsPlusEventExecutor;
 import io.github.thatsmusic99.headsplus.util.events.HeadsPlusListener;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.DyeColor;
 import org.bukkit.Location;
@@ -164,7 +165,7 @@ public static void dropHead(String id, String conditions, EntityDataManager.Drop
             info.buildHead().thenAccept(head -> {
                 // Because I need to set up extra l o r e
                 ItemMeta meta = head.getItemMeta();
-                meta.setLore(ConfigMobs.get().getLore(id, conditions, info.getId(), info.getPrice(), killer == null ? null : killer.getName()));
+                PaperUtil.get().setLore(meta, ConfigMobs.get().getLore(id, conditions, info.getId(), info.getPrice(), killer == null ? null : killer.getName()));
                 head.setItemMeta(meta);
 
                 head.setAmount(amount);
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/managers/ChallengeManager.java b/src/main/java/io/github/thatsmusic99/headsplus/managers/ChallengeManager.java
@@ -5,6 +5,7 @@
 import io.github.thatsmusic99.headsplus.api.Challenge;
 import io.github.thatsmusic99.headsplus.api.ChallengeSection;
 import io.github.thatsmusic99.headsplus.config.challenges.ConfigChallenges;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -90,15 +91,15 @@ private void registerIcon(String key) {
             if (displayName != null) {
                 ItemMeta meta = item.getItemMeta();
                 if (meta != null) {
-                    meta.setDisplayName(ChatColor.translateAlternateColorCodes('&', displayName));
+                    PaperUtil.get().setDisplayName(meta, ChatColor.translateAlternateColorCodes('&', displayName));
                     item.setItemMeta(meta);
                 }
             }
             List<String> lore = section.getStringList("lore");
             if (!lore.isEmpty()) {
                 ItemMeta meta = item.getItemMeta();
                 if (meta != null) {
-                    meta.setLore(lore);
+                    PaperUtil.get().setLore(meta, lore);
                     item.setItemMeta(meta);
                 }
             }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/managers/HeadManager.java b/src/main/java/io/github/thatsmusic99/headsplus/managers/HeadManager.java
@@ -164,8 +164,8 @@ public void setLore(@Nullable List<String> lore) {
         public CompletableFuture<ItemStack> buildHead() {
             ItemStack head = new ItemStack(material);
             ItemMeta meta = head.getItemMeta();
-            meta.setDisplayName(displayName);
-            meta.setLore(lore);
+            PaperUtil.get().setDisplayName(meta, displayName);
+            PaperUtil.get().setLore(meta, lore);
             if (material != Material.PLAYER_HEAD) {
                 head.setItemMeta(meta);
                 return CompletableFuture.completedFuture(head);
@@ -192,8 +192,8 @@ public CompletableFuture<ItemStack> buildHead() {
         public ItemStack forceBuildHead() {
             ItemStack head = new ItemStack(material);
             ItemMeta meta = head.getItemMeta();
-            meta.setDisplayName(displayName);
-            meta.setLore(lore);
+            PaperUtil.get().setDisplayName(meta, displayName);
+            PaperUtil.get().setLore(meta, lore);
             if (material != Material.PLAYER_HEAD) {
                 head.setItemMeta(meta);
                 return head;
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/managers/PersistenceManager.java b/src/main/java/io/github/thatsmusic99/headsplus/managers/PersistenceManager.java
@@ -1,6 +1,7 @@
 package io.github.thatsmusic99.headsplus.managers;
 
 import io.github.thatsmusic99.headsplus.HeadsPlus;
+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;
 import org.bukkit.NamespacedKey;
 import org.bukkit.block.Skull;
 import org.bukkit.inventory.ItemStack;
@@ -140,9 +141,9 @@ public void copyStorageToItem(Skull skull, ItemStack stack) {
         PersistentDataContainer toContainer = meta.getPersistentDataContainer();
         PersistentDataContainer headsPlusStorage = fromContainer.get(HEADSPLUS_STORAGE, PersistentDataType.TAG_CONTAINER);
         if (headsPlusStorage != null) toContainer.set(HEADSPLUS_STORAGE, PersistentDataType.TAG_CONTAINER, headsPlusStorage);
-        meta.setDisplayName(fromContainer.get(HEADSPLUS_DISPLAYNAME, PersistentDataType.STRING));
+        PaperUtil.get().setDisplayName(meta, fromContainer.get(HEADSPLUS_DISPLAYNAME, PersistentDataType.STRING));
         String rawLore = fromContainer.get(HEADSPLUS_LORE, PersistentDataType.STRING);
-        if (rawLore != null && !rawLore.isEmpty()) meta.setLore(Arrays.asList(rawLore.split("\n")));
+        if (rawLore != null && !rawLore.isEmpty()) PaperUtil.get().setLore(meta, Arrays.asList(rawLore.split("\n")));
         stack.setItemMeta(meta);
     }
 }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/util/paper/ActualPaperImpl.java b/src/main/java/io/github/thatsmusic99/headsplus/util/paper/ActualPaperImpl.java
@@ -6,13 +6,19 @@
 import io.github.thatsmusic99.headsplus.managers.AutograbManager;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
+import scala.concurrent.impl.FutureConvertersImpl;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
@@ -22,6 +28,31 @@ public class ActualPaperImpl implements PaperImpl {
     private static final Executor asyncExecutor = task -> Bukkit.getScheduler().runTaskAsynchronously(HeadsPlus.get()
             , task);
     private static final Executor syncExecutor = task -> Bukkit.getScheduler().runTask(HeadsPlus.get(), task);
+    private static final HashMap<String, String> LEGACY_TO_MINIMESSAGE = new HashMap<>();
+
+    public ActualPaperImpl() {
+        LEGACY_TO_MINIMESSAGE.put("§0", "<black>");
+        LEGACY_TO_MINIMESSAGE.put("§1", "<dark_blue>");
+        LEGACY_TO_MINIMESSAGE.put("§2", "<dark_green>");
+        LEGACY_TO_MINIMESSAGE.put("§3", "<dark_aqua>");
+        LEGACY_TO_MINIMESSAGE.put("§4", "<dark_red>");
+        LEGACY_TO_MINIMESSAGE.put("§5", "<dark_purple>");
+        LEGACY_TO_MINIMESSAGE.put("§6", "<gold>");
+        LEGACY_TO_MINIMESSAGE.put("§7", "<gray>");
+        LEGACY_TO_MINIMESSAGE.put("§8", "<dark_gray>");
+        LEGACY_TO_MINIMESSAGE.put("§9", "<blue>");
+        LEGACY_TO_MINIMESSAGE.put("§a", "<green>");
+        LEGACY_TO_MINIMESSAGE.put("§b", "<aqua>");
+        LEGACY_TO_MINIMESSAGE.put("§c", "<red>");
+        LEGACY_TO_MINIMESSAGE.put("§d", "<light_purple>");
+        LEGACY_TO_MINIMESSAGE.put("§e", "<yellow>");
+        LEGACY_TO_MINIMESSAGE.put("§f", "<white>");
+        LEGACY_TO_MINIMESSAGE.put("§l", "<b>");
+        LEGACY_TO_MINIMESSAGE.put("§o", "<i>");
+        LEGACY_TO_MINIMESSAGE.put("§m", "<st>");
+        LEGACY_TO_MINIMESSAGE.put("§n", "<u>");
+        LEGACY_TO_MINIMESSAGE.put("§k", "<obf>");
+    }
 
     @Override
     public CompletableFuture<SkullMeta> setProfile(SkullMeta meta, String name) {
@@ -91,6 +122,43 @@ public String getTexture(Player player) {
 
     @Override
     public void sendMessage(CommandSender sender, String message) {
-        sender.sendMessage(MiniMessage.miniMessage().deserialize(message));
+        sender.sendMessage(MiniMessage.miniMessage().deserialize(replaceLegacy(message)));
+    }
+
+    @Override
+    public void setDisplayName(ItemMeta meta, String name) {
+        if (name == null) {
+            meta.displayName(null);
+            return;
+        }
+        meta.displayName(MiniMessage.miniMessage().deserialize(replaceLegacy(name)).decoration(TextDecoration.ITALIC, false));
+    }
+
+    @Override
+    public void setLore(ItemMeta meta, List<String> lore) {
+        List<Component> components = new ArrayList<>();
+        for (String loreStr : lore) {
+            if (loreStr == null) {
+                components.add(null);
+                return;
+            }
+            components.add(MiniMessage.miniMessage().deserialize(replaceLegacy(loreStr)).decoration(TextDecoration.ITALIC, false));
+        }
+        meta.lore(components);
+    }
+
+    private String replaceLegacy(String str) {
+        if (str == null) return null;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (c != '§') continue;
+            if (i + 1 == str.length()) continue;
+            char code = str.charAt(i + 1);
+            String result = c + "" + code;
+            if (!LEGACY_TO_MINIMESSAGE.containsKey(result)) continue;
+            int end = Math.min((i + 2), str.length());
+            str = str.substring(0, i) + LEGACY_TO_MINIMESSAGE.get(result) + str.substring(end);
+        }
+        return str;
     }
 }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/util/paper/PaperImpl.java b/src/main/java/io/github/thatsmusic99/headsplus/util/paper/PaperImpl.java
@@ -2,8 +2,10 @@
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public interface PaperImpl {
@@ -18,4 +20,8 @@ public interface PaperImpl {
     String getTexture(Player player);
 
     void sendMessage(CommandSender sender, String message);
+
+    void setDisplayName(ItemMeta meta, String name);
+
+    void setLore(ItemMeta meta, List<String> lore);
 }
diff --git a/src/main/java/io/github/thatsmusic99/headsplus/util/paper/PaperUtil.java b/src/main/java/io/github/thatsmusic99/headsplus/util/paper/PaperUtil.java

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`import io.github.thatsmusic99.headsplus.config.MessagesManager;`
`7`	`7`	`import io.github.thatsmusic99.headsplus.inventories.icons.Content;`
`8`	`8`	`import io.github.thatsmusic99.headsplus.util.HPUtils;`
	`9`	`+import io.github.thatsmusic99.headsplus.util.paper.PaperUtil;`
`9`	`10`	`import org.bukkit.entity.Player;`
`10`	`11`	`import org.bukkit.event.inventory.InventoryClickEvent;`
`11`	`12`	`import org.bukkit.inventory.meta.ItemMeta;`
`@@ -71,7 +72,7 @@ public String getId() {`
`71`	`72`	`@Override`
`72`	`73`	`public void initNameAndLore(String id, Player player) {`
`73`	`74`	`ItemMeta meta = item.getItemMeta();`
`74`		`- meta.setDisplayName(MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenge" +`
	`75`	`+ PaperUtil.get().setDisplayName(meta, MessagesManager.get().formatMsg(ConfigInventories.get().getString("icons.challenge" +`
`75`	`76`	`".display-name")`
`76`	`77`	`.replaceAll("\\{challenge-name}", challenge.getChallengeHeader()), player));`
`77`	`78`	`List<String> lore = new ArrayList<>();`
`@@ -105,7 +106,7 @@ public void initNameAndLore(String id, Player player) {`
`105`	`106`	`}, true));`
`106`	`107`	`}`
`107`	`108`	`}`
`108`		`- meta.setLore(lore);`
	`109`	`+ PaperUtil.get().setLore(meta, lore);`
`109`	`110`	`item.setItemMeta(meta);`
`110`	`111`	`}`
`111`	`112`	`}`