1.21.6

Author: Xiao-MoMi

api/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
     compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}")
     compileOnly("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}")
     compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}")
+    compileOnly("net.kyori:adventure-text-serializer-json-legacy-impl:${rootProject.properties["adventure_bundle_version"]}")
     // YAML
     implementation(files("libs/boosted-yaml-${rootProject.properties["boosted_yaml_version"]}.jar"))
     // Cache

api/src/main/java/net/momirealms/customnameplates/api/helper/AdventureHelper.java

@@ -23,6 +23,8 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 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.momirealms.customnameplates.api.ConfigManager;
 import net.momirealms.customnameplates.api.CustomNameplates;
 
@@ -52,7 +54,19 @@ public class AdventureHelper {
     private AdventureHelper() {
         this.miniMessage = MiniMessage.builder().build();
         this.miniMessageStrict = MiniMessage.builder().strict(true).build();
-        this.gsonComponentSerializer = GsonComponentSerializer.builder().build();
+        GsonComponentSerializer.Builder builder = GsonComponentSerializer.builder();
+        if (!VersionHelper.isVersionNewerThan1_20_5()) {
+            builder.legacyHoverEventSerializer(NBTLegacyHoverEventSerializer.get());
+            builder.editOptions((b) -> b.value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_ID_AS_INT_ARRAY, false));
+        }
+        if (!VersionHelper.isVersionNewerThan1_21_5()) {
+            builder.editOptions((b) -> {
+                b.value(JSONOptions.EMIT_CLICK_EVENT_TYPE, JSONOptions.ClickEventValueMode.CAMEL_CASE);
+                b.value(JSONOptions.EMIT_HOVER_EVENT_TYPE, JSONOptions.HoverEventValueMode.CAMEL_CASE);
+                b.value(JSONOptions.EMIT_HOVER_SHOW_ENTITY_KEY_AS_TYPE_AND_UUID_AS_ID, true);
+            });
+        }
+        this.gsonComponentSerializer = builder.build();
 
         ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(1, r -> {
             Thread thread = Executors.defaultThreadFactory().newThread(r);

api/src/main/java/net/momirealms/customnameplates/api/network/PacketEvent.java

@@ -19,18 +19,12 @@
 
 import net.momirealms.customnameplates.common.event.Cancellable;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
 /**
  * Represents a packet event, which can be cancelled and supports delayed tasks that are executed later.
  */
 public class PacketEvent implements Cancellable {
 
     private boolean cancelled;
-    private List<Runnable> delayedTasks = null;
     private final Object packet;
 
     /**
@@ -51,27 +45,6 @@ public Object getPacket() {
         return packet;
     }
 
-    /**
-     * Adds a task to be executed later, after the event has been processed.
-     *
-     * @param task the task to be added
-     */
-    public void addDelayedTask(Runnable task) {
-        if (delayedTasks == null) {
-            delayedTasks = new ArrayList<>();
-        }
-        delayedTasks.add(task);
-    }
-
-    /**
-     * Returns the list of delayed tasks to be executed.
-     *
-     * @return a list of tasks, or an empty list if no tasks are added
-     */
-    public List<Runnable> getDelayedTasks() {
-        return Optional.ofNullable(delayedTasks).orElse(Collections.emptyList());
-    }
-
     /**
      * Checks if the event has been cancelled.
      *

backend/src/main/java/net/momirealms/customnameplates/backend/feature/pack/ResourcePackManagerImpl.java

@@ -33,6 +33,7 @@
 import net.momirealms.customnameplates.api.feature.image.Image;
 import net.momirealms.customnameplates.api.feature.nameplate.Nameplate;
 import net.momirealms.customnameplates.api.feature.pack.ResourcePackManager;
+import net.momirealms.customnameplates.api.helper.AdventureHelper;
 import net.momirealms.customnameplates.api.util.CharacterUtils;
 import net.momirealms.customnameplates.api.util.ZipUtils;
 import org.apache.commons.io.FileUtils;
@@ -72,46 +73,16 @@ public void generate() {
 
         if (ConfigManager.enableShader()) {
             if (ConfigManager.minPackVersion() >= 21.4f) {
-                this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_4" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
-                try {
-                    FileUtils.copyDirectory(
-                            new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_21_4"),
-                            new File(plugin.getDataFolder(), "ResourcePack")
-                    );
-                    FileUtils.deleteDirectory(new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_21_4"));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
+                // do nothing
             } else if (ConfigManager.minPackVersion() >= 21.2f) {
                 this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_2" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
-                try {
-                    FileUtils.copyDirectory(
-                            new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_21_2"),
-                            new File(plugin.getDataFolder(), "ResourcePack")
-                    );
-                    FileUtils.deleteDirectory(new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_21_2"));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-                this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_4" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
             } else if (ConfigManager.minPackVersion() >= 20.5f) {
                 this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
-                try {
-                    FileUtils.copyDirectory(
-                            new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_20_5"),
-                            new File(plugin.getDataFolder(), "ResourcePack")
-                    );
-                    FileUtils.deleteDirectory(new File(plugin.getDataFolder(), "ResourcePack" + File.separator + "overlay_1_20_5"));
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
                 this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_2" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
-                this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_4" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
             } else {
-                this.generateShaders("ResourcePack" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, false);
+                this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_2" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, false);
                 this.generateShaders("ResourcePack" + File.separator + "overlay_1_20_5" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
                 this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_2" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
-                this.generateShaders("ResourcePack" + File.separator + "overlay_1_21_4" + File.separator + "assets" + File.separator + "minecraft" + File.separator + "shaders" + File.separator + "core" + File.separator, true);
             }
         }