Merge pull request #814 from AbhigyaKrishna/library-patching

Library patching
retrooper · Jun 6, 2024 · c385361 · c385361
2 parents e2ed78e + af3c440
commit c385361
Show file tree

Hide file tree

Showing 32 changed files with 1,886 additions and 1,226 deletions.
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -18,9 +18,14 @@ java {
 }
 
 dependencies {
-    compileOnly(libs.bundles.adventure)
+    api(libs.bundles.adventure)
+    api(project(":patch:adventure-text-serializer-gson", "shadow"))
+    api(libs.adventure.text.serializer.legacy)
+    compileOnly(libs.gson)
 
     testImplementation(libs.bundles.adventure)
+    testImplementation(project(":patch:adventure-text-serializer-gson"))
+    testImplementation(libs.adventure.text.serializer.legacy)
     testImplementation(project(":netty-common"))
     testImplementation(testlibs.mockbukkit)
     testImplementation(testlibs.slf4j)

diff --git a/...rc/main/java/com/github/retrooper/packetevents/util/adventure/AdventureNBTSerializer.java b/...rc/main/java/com/github/retrooper/packetevents/util/adventure/AdventureNBTSerializer.java
@@ -29,6 +29,7 @@
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
+import net.kyori.adventure.text.serializer.gson.BackwardCompatUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -79,7 +80,12 @@ public AdventureNBTSerializer(boolean downsampleColor) {
 
         String translate = reader.readUTF("translate", Function.identity());
         String translateFallback = reader.readUTF("fallback", Function.identity());
-        List<Component> translateWith = reader.readList("with", this::deserializeComponentList);
+        List<? extends ComponentLike> translateWith;
+        if (BackwardCompatUtil.IS_4_15_0_OR_NEWER) {
+            translateWith = reader.readList("with", this::deserializeTranslationArgumentList);
+        } else {
+            translateWith = reader.readList("with", this::deserializeComponentList);
+        }
         NBTReader score = reader.child("score");
         String selector = reader.readUTF("selector", Function.identity());
         String keybind = reader.readUTF("keybind", Function.identity());
@@ -98,7 +104,11 @@ public AdventureNBTSerializer(boolean downsampleColor) {
             builder = Component.text().content(text);
         } else if (translate != null) {
             if (translateWith != null) {
-                builder = Component.translatable().key(translate).fallback(translateFallback).arguments(translateWith);
+                if (BackwardCompatUtil.IS_4_15_0_OR_NEWER) {
+                    builder = Component.translatable().key(translate).fallback(translateFallback).arguments(translateWith);
+                } else {
+                    builder = Component.translatable().key(translate).fallback(translateFallback).args(translateWith);
+                }
             } else {
                 builder = Component.translatable().key(translate).fallback(translateFallback);
             }
@@ -168,7 +178,11 @@ public AdventureNBTSerializer(boolean downsampleColor) {
             // translation arguments
             List<Component> args = ((TranslatableComponent) component).args();
             if (!args.isEmpty()) {
-                writer.writeList("with", NBTType.COMPOUND, serializeComponentList(args));
+                if (BackwardCompatUtil.IS_4_15_0_OR_NEWER) {
+                    writer.writeList("with", NBTType.COMPOUND, serializeTranslationArgumentList(((TranslatableComponent) component).arguments()));
+                } else {
+                    writer.writeList("with", NBTType.COMPOUND, serializeComponentList(args));
+                }
             }
         } else if (component instanceof ScoreComponent) {
             // nested compound
@@ -427,6 +441,33 @@ private List<NBTCompound> serializeComponentList(List<Component> value) {
     }
     // -------------------------------------------------
 
+    // ------------ TranslationArgument List ------------
+    private @NotNull List<TranslationArgument> deserializeTranslationArgumentList(List<?> value) {
+        if (value.isEmpty()) return Collections.emptyList();
+
+        List<TranslationArgument> arguments = new ArrayList<>(value.size());
+        for (Object nbt : value) {
+            if (nbt instanceof NBTByte) {
+                arguments.add(TranslationArgument.bool(((NBTByte) nbt).getAsByte() == 1));
+            } else if (nbt instanceof NBTNumber) {
+                arguments.add(TranslationArgument.numeric(((NBTNumber) nbt).getAsInt()));
+            } else {
+                arguments.add(TranslationArgument.component(deserialize(requireType((NBT) nbt, NBTType.COMPOUND))));
+            }
+        }
+
+        return arguments;
+    }
+
+    private List<NBTCompound> serializeTranslationArgumentList(List<TranslationArgument> value) {
+        List<NBTCompound> arguments = new ArrayList<>(value.size());
+        for (TranslationArgument argument : value) {
+            arguments.add(serializeComponent(argument.asComponent()));
+        }
+        return arguments;
+    }
+    // -------------------------------------------------
+
     static class NBTReader {
         private final NBTCompound compound;
 

diff --git a/...c/main/java/com/github/retrooper/packetevents/util/adventure/AdventureReflectionUtil.java b/...c/main/java/com/github/retrooper/packetevents/util/adventure/AdventureReflectionUtil.java
diff --git a/api/src/main/java/com/github/retrooper/packetevents/util/adventure/AdventureSerializer.java b/api/src/main/java/com/github/retrooper/packetevents/util/adventure/AdventureSerializer.java
@@ -21,9 +21,12 @@
 import com.github.retrooper.packetevents.PacketEvents;
 import com.github.retrooper.packetevents.manager.server.ServerVersion;
 import com.github.retrooper.packetevents.protocol.nbt.NBT;
+import com.github.retrooper.packetevents.protocol.stats.Statistics;
 import com.google.gson.JsonElement;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
+import net.kyori.adventure.text.serializer.json.JSONOptions;
+import net.kyori.adventure.text.serializer.json.legacyimpl.NBTLegacyHoverEventSerializer;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
 public class AdventureSerializer {
@@ -35,10 +38,16 @@ public class AdventureSerializer {
     public static GsonComponentSerializer getGsonSerializer() {
         if (GSON == null) {
             ServerVersion version = PacketEvents.getAPI().getServerManager().getVersion();
-            GSON = new GsonComponentSerializerExtended(
-                    version.isOlderThan(ServerVersion.V_1_16) || PacketEvents.getAPI().getSettings().shouldDownsampleColors(),
-                    version.isOlderThanOrEquals(ServerVersion.V_1_12_2)
-            );
+            GSON = GsonComponentSerializer.builder().editOptions(builder -> {
+                boolean is_1_20_3_or_new = version.isNewerThanOrEquals(ServerVersion.V_1_20_3);
+                builder.value(JSONOptions.EMIT_RGB, version.isNewerThanOrEquals(ServerVersion.V_1_16) && !PacketEvents.getAPI().getSettings().shouldDownsampleColors());
+                builder.value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.BOTH);
+                builder.value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_ID_AS_INT_ARRAY, is_1_20_3_or_new);
+                builder.value(JSONOptions.VALIDATE_STRICT_EVENTS, is_1_20_3_or_new);
+            })
+                    .legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get())
+                    .showAchievementToComponent(input -> Statistics.getById(input).display())
+                    .build();
         }
         return GSON;
     }