From aa171f36eb5cc43124987c3ecc363877dbb97b37 Mon Sep 17 00:00:00 2001
From: MrPowerGamerBR <git@mrpowergamerbr.com>
Date: Tue, 29 Jul 2025 01:37:57 -0300
Subject: [PATCH] Fix item desync bug when creating items that have custom
 colors

https://github.com/PaperMC/Paper/issues/12902
---
 .../paper/adventure/AdventureCodecs.java.patch        | 11 +++++++++++
 .../org/bukkit/craftbukkit/CraftServer.java.patch     |  6 +++---
 .../paper/adventure/AdventureCodecsTest.java.patch    | 11 +++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 sparklypaper-server/paper-patches/files/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java.patch
 create mode 100644 sparklypaper-server/paper-patches/files/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java.patch

diff --git a/sparklypaper-server/paper-patches/files/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java.patch
new file mode 100644
index 0000000..82997e0
--- /dev/null
+++ b/sparklypaper-server/paper-patches/files/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java.patch
@@ -0,0 +1,11 @@
+--- a/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
++++ b/src/main/java/io/papermc/paper/adventure/AdventureCodecs.java
+@@ -96,7 +_,7 @@
+         if (textColor instanceof NamedTextColor named) {
+             return NamedTextColor.NAMES.keyOrThrow(named);
+         } else {
+-            return textColor.asHexString();
++            return textColor.asHexString().toUpperCase(java.util.Locale.ROOT); // SparklyPaper - (Adventure Bug #1275) Fix item desyncs with items that have custom colors
+         }
+     });
+ 
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
index c185d66..b5e7ffd 100644
--- a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
+++ b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1045,6 +_,7 @@
+@@ -1048,6 +_,7 @@
  
          org.spigotmc.SpigotConfig.init((File) this.console.options.valueOf("spigot-settings")); // Spigot
          this.console.paperConfigurations.reloadConfigs(this.console);
@@ -8,7 +8,7 @@
          for (ServerLevel world : this.console.getAllLevels()) {
              // world.serverLevelData.setDifficulty(config.difficulty); // Paper - per level difficulty
              world.setSpawnSettings(world.serverLevelData.getDifficulty() != Difficulty.PEACEFUL && config.spawnMonsters); // Paper - per level difficulty (from MinecraftServer#setDifficulty(ServerLevel, Difficulty, boolean))
-@@ -1060,6 +_,7 @@
+@@ -1063,6 +_,7 @@
                  }
              }
              world.spigotConfig.init(); // Spigot
@@ -16,7 +16,7 @@
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1077,6 +_,7 @@
+@@ -1080,6 +_,7 @@
          org.spigotmc.SpigotConfig.registerCommands(); // Spigot
          io.papermc.paper.command.PaperCommands.registerCommands(this.console); // Paper
          this.spark.registerCommandBeforePlugins(this); // Paper - spark
diff --git a/sparklypaper-server/paper-patches/files/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java.patch b/sparklypaper-server/paper-patches/files/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java.patch
new file mode 100644
index 0000000..829b32f
--- /dev/null
+++ b/sparklypaper-server/paper-patches/files/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java.patch
@@ -0,0 +1,11 @@
+--- a/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
++++ b/src/test/java/io/papermc/paper/adventure/AdventureCodecsTest.java
+@@ -85,7 +_,7 @@
+     void testTextColor() {
+         final TextColor color = color(0x1d38df);
+         final Tag result = TEXT_COLOR_CODEC.encodeStart(NbtOps.INSTANCE, color).result().orElseThrow();
+-        assertEquals("\"" + color.asHexString() + "\"", result.toString());
++        assertEquals("\"" + color.asHexString().toUpperCase(java.util.Locale.ROOT) + "\"", result.toString());
+         final net.minecraft.network.chat.TextColor nms = net.minecraft.network.chat.TextColor.CODEC.decode(NbtOps.INSTANCE, result).result().orElseThrow().getFirst();
+         assertEquals(color.value(), nms.getValue());
+     }