From 91e5f7cdfa10b92e6cbc1aa791e56e19974b5989 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sat, 2 Oct 2021 12:41:28 +0100
Subject: [PATCH] Code cleanup

---
 eco-core/core-plugin/build.gradle             |  3 +-
 .../com/willfp/reforges/gui/ReforgeGUI.java   |  1 +
 .../reforges/reforges/util/ReforgeUtils.java  |  3 +-
 .../reforges/display/ReforgesDisplay.kt       | 42 ++++++++++---------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle
index bee8ec2..dbee654 100644
--- a/eco-core/core-plugin/build.gradle
+++ b/eco-core/core-plugin/build.gradle
@@ -2,7 +2,6 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
-    compileOnly 'net.kyori:adventure-api:4.9.1'
+    compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7'
 }
\ No newline at end of file
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java
index 04d525e..9b87faf 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/gui/ReforgeGUI.java
@@ -25,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+@SuppressWarnings("deprecation")
 @UtilityClass
 public class ReforgeGUI {
     /**
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java
index 69732d9..37f0b8d 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/util/ReforgeUtils.java
@@ -16,7 +16,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -51,7 +50,7 @@ public class ReforgeUtils {
         List<Reforge> applicable = new ArrayList<>();
 
         for (Reforge reforge : Reforges.values()) {
-            if (Arrays.asList(reforge.getTargets()).contains(target) && !reforge.getRequiresStone()) {
+            if (reforge.getTargets().contains(target) && !reforge.getRequiresStone()) {
                 applicable.add(reforge);
             }
         }
diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
index 6c1b511..4affe63 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/display/ReforgesDisplay.kt
@@ -11,14 +11,14 @@ import com.willfp.reforges.ReforgesPlugin
 import com.willfp.reforges.reforges.meta.ReforgeTarget
 import com.willfp.reforges.reforges.util.ReforgeUtils
 import net.kyori.adventure.text.Component
-import net.kyori.adventure.translation.Translatable
+import net.kyori.adventure.text.TextReplacementConfig
+import net.kyori.adventure.text.format.TextDecoration
 import org.bukkit.Material
 import org.bukkit.inventory.ItemStack
 import org.bukkit.inventory.meta.SkullMeta
 
+@Suppress("DEPRECATION")
 class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin, DisplayPriority.HIGHEST) {
-    private val shadowKey = plugin.namespacedKeyFactory.create("shadowed_name")
-
     override fun display(
         itemStack: ItemStack,
         vararg args: Any
@@ -71,15 +71,17 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
                 lore.addAll(addLore)
             }
             if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
-                var displayName = if (meta.hasDisplayName()) meta.displayName else StringUtils.toLegacy(
-                    Component.translatable(itemStack as Translatable)
-                )
-                displayName = displayName.replace(
-                    reforge.name + " ",
-                    ""
-                )
-                val newName = reforge.name + " " + displayName
-                meta.setDisplayName(newName)
+                val displayName =
+                    (if (meta.hasDisplayName()) meta.displayName()!! else Component.translatable(itemStack))
+                        .replaceText(
+                            TextReplacementConfig.builder()
+                                .match("§w(.)§w")
+                                .replacement("")
+                                .build()
+                        )
+                val newName = StringUtils.toComponent("§w${reforge.name} §w")
+                    .decoration(TextDecoration.ITALIC, false).append(displayName)
+                meta.displayName(newName)
             }
         }
         itemStack.itemMeta = meta
@@ -94,15 +96,17 @@ class ReforgesDisplay(private val plugin: ReforgesPlugin) : DisplayModule(plugin
         }
 
         val meta = itemStack.itemMeta ?: return
-        val reforge = ReforgeUtils.getReforge(meta) ?: return
 
-        if (plugin.configYml.getBool("reforge.display-in-name")) {
-            var displayName = meta.displayName
-            displayName = displayName.replace(
-                reforge.name + " ",
-                ""
+        if (plugin.configYml.getBool("reforge.display-in-name") && Prerequisite.HAS_PAPER.isMet) {
+            val displayName = meta.displayName() ?: return
+            meta.displayName(
+                displayName.replaceText(
+                    TextReplacementConfig.builder()
+                        .match("§w(.)§w")
+                        .replacement("")
+                        .build()
+                )
             )
-            meta.setDisplayName(displayName)
         }
 
         itemStack.itemMeta = meta