From bfde4b953c7a3fcd6f7ab58eb7cbec745dac636d Mon Sep 17 00:00:00 2001
From: RK_01 <50594595+RaphiMC@users.noreply.github.com>
Date: Thu, 18 Apr 2024 20:45:19 +0200
Subject: [PATCH 1/2] Fix 1.11->1.12 show_achievement rewriter (#3792)

---
 .../rewriter/TranslateRewriter.java             | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java
index c90d110a5..48833459c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_12to1_11_1/rewriter/TranslateRewriter.java
@@ -24,6 +24,7 @@ import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.protocols.protocol1_12to1_11_1.data.AchievementTranslationMapping;
 import com.viaversion.viaversion.protocols.protocol1_9_3to1_9_1_2.ClientboundPackets1_9_3;
 import com.viaversion.viaversion.rewriter.ComponentRewriter;
+import com.viaversion.viaversion.util.SerializerVersion;
 import java.util.logging.Level;
 
 public class TranslateRewriter {
@@ -45,13 +46,7 @@ public class TranslateRewriter {
                 return;
             }
 
-            String textValue;
-            JsonElement value = hoverEvent.get("value");
-            if (value.isJsonObject()) {
-                textValue = value.getAsJsonObject().get("text").getAsString();
-            } else {
-                textValue = value.getAsJsonPrimitive().getAsString();
-            }
+            String textValue = SerializerVersion.V1_9.toComponent(hoverEvent.get("value")).asUnformattedString();
 
             if (AchievementTranslationMapping.get(textValue) == null) {
                 JsonObject invalidText = new JsonObject();
@@ -79,7 +74,7 @@ public class TranslateRewriter {
                     typePart.addProperty("translate", "stats.tooltip.type.achievement");
                     JsonObject description = new JsonObject();
                     typePart.addProperty("italic", true);
-                    description.addProperty("translate", value + ".desc");
+                    description.addProperty("translate", textValue + ".desc");
                     baseArray.add(newLine);
                     baseArray.add(description);
                 } else if (textValue.startsWith("stat")) {
@@ -91,7 +86,9 @@ public class TranslateRewriter {
                 hoverEvent.addProperty("action", "show_text");
                 hoverEvent.add("value", baseArray);
             } catch (Exception e) {
-                Via.getPlatform().getLogger().log(Level.WARNING, "Error rewriting show_achievement: " + hoverEvent, e);
+                if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
+                    Via.getPlatform().getLogger().log(Level.WARNING, "Error rewriting show_achievement: " + hoverEvent, e);
+                }
                 JsonObject invalidText = new JsonObject();
                 invalidText.addProperty("text", "Invalid statistic/achievement!");
                 invalidText.addProperty("color", "red");
@@ -114,4 +111,4 @@ public class TranslateRewriter {
         }
     }
 
-}
+}
\ No newline at end of file

From 128e1911328417da0df3bd12c6b81cccf8519438 Mon Sep 17 00:00:00 2001
From: AJ Ferguson <AJ-Ferguson@users.noreply.github.com>
Date: Fri, 19 Apr 2024 04:09:17 -0400
Subject: [PATCH 2/2] Fix 1.15->1.16 item attribute uuid (#3793)

---
 .../protocol1_16to1_15_2/packets/InventoryPackets.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
index 4f4451035..8047f7d31 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/packets/InventoryPackets.java
@@ -203,8 +203,10 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_15, Serve
             NumberTag leastTag = attribute.getNumberTag("UUIDLeast");
             NumberTag mostTag = attribute.getNumberTag("UUIDMost");
             if (leastTag != null && mostTag != null) {
-                int[] uuidIntArray = UUIDUtil.toIntArray(leastTag.asLong(), mostTag.asLong());
+                int[] uuidIntArray = UUIDUtil.toIntArray(mostTag.asLong(), leastTag.asLong());
                 attribute.put("UUID", new IntArrayTag(uuidIntArray));
+                attribute.remove("UUIDLeast");
+                attribute.remove("UUIDMost");
             }
         }
     }
@@ -223,6 +225,7 @@ public class InventoryPackets extends ItemRewriter<ClientboundPackets1_15, Serve
                 UUID uuid = UUIDUtil.fromIntArray(uuidTag.getValue());
                 attribute.putLong("UUIDLeast", uuid.getLeastSignificantBits());
                 attribute.putLong("UUIDMost", uuid.getMostSignificantBits());
+                attribute.remove("UUID");
             }
         }
     }