From f46bd15c94d91db9d11d69db6cd432cdefc530f3 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sat, 2 Oct 2021 12:08:13 +0100
Subject: [PATCH] Display changes

---
 build.gradle                                  |  1 -
 eco-core/core-plugin/build.gradle             |  3 +-
 .../com/willfp/reforges/gui/ReforgeGUI.java   |  1 -
 .../willfp/reforges/reforges/Reforges.java    |  2 +-
 .../reforges/display/ReforgesDisplay.kt       | 44 +++++++++++++------
 5 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2aa0a1e..06f1520 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,7 +29,6 @@ allprojects {
         mavenCentral()
         maven { url 'https://jitpack.io' }
         maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' }
-        maven { url 'https://papermc.io/repo/repository/maven-public/' }
         maven { url 'https://repo.codemc.org/repository/nms/' }
     }
 
diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle
index dbee654..bee8ec2 100644
--- a/eco-core/core-plugin/build.gradle
+++ b/eco-core/core-plugin/build.gradle
@@ -2,6 +2,7 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT'
+    compileOnly 'net.kyori:adventure-api:4.9.1'
     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 181a4da..04d525e 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
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Objects;
 
 @UtilityClass
-@SuppressWarnings("deprecation")
 public class ReforgeGUI {
     /**
      * The reforge GUI.
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/Reforges.java b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/Reforges.java
index 411f163..57a377c 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/Reforges.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/reforges/reforges/Reforges.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.Set;
 
 @UtilityClass
-@SuppressWarnings({"unused", "checkstyle:JavadocVariable"})
+@SuppressWarnings("unused")
 public class Reforges {
     private static final BiMap<String, Reforge> BY_KEY = HashBiMap.create();
 
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 aa218cb..6c1b511 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,11 @@ 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.text.TextReplacementConfig
-import net.kyori.adventure.text.format.TextDecoration
-import org.bukkit.ChatColor
+import net.kyori.adventure.translation.Translatable
 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")
 
@@ -74,19 +71,40 @@ 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 Component.translatable(itemStack)
-                displayName = displayName.replaceText(
-                    TextReplacementConfig.builder()
-                        .matchLiteral(ChatColor.stripColor(reforge.name + " "))
-                        .replacement("")
-                        .build()
+                var displayName = if (meta.hasDisplayName()) meta.displayName else StringUtils.toLegacy(
+                    Component.translatable(itemStack as Translatable)
                 )
-                val newName = StringUtils.toComponent(reforge.name).decoration(TextDecoration.ITALIC, false)
-                    .append(Component.text(" ").append(displayName))
-                meta.displayName(newName)
+                displayName = displayName.replace(
+                    reforge.name + " ",
+                    ""
+                )
+                val newName = reforge.name + " " + displayName
+                meta.setDisplayName(newName)
             }
         }
         itemStack.itemMeta = meta
         fastItemStack.lore = lore
     }
+
+    override fun revert(itemStack: ItemStack) {
+        val target = ReforgeTarget.getForItem(itemStack)
+
+        if (target == null && itemStack.type != Material.PLAYER_HEAD) {
+            return
+        }
+
+        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 + " ",
+                ""
+            )
+            meta.setDisplayName(displayName)
+        }
+
+        itemStack.itemMeta = meta
+    }
 }
\ No newline at end of file