Support 1.21.7+ (#113)

* Support 1.21.7, bump version to 2.10.4

* Clean Up

Author: Lumine1909

build.gradle

@@ -15,7 +15,7 @@ allprojects {
 }
 
 subprojects {
-    if (project.name != 'zmusic-nms-paper') {
+    if (!project.name.startsWith('zmusic-nms-1.21.')) {
         apply plugin: 'java'
 
         dependencies {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -11,5 +11,6 @@ include(
         "zmusic-nms:zmusic-nms-1.18",
         "zmusic-nms:zmusic-nms-1.19",
         "zmusic-nms:zmusic-nms-1.20",
-        "zmusic-nms:zmusic-nms-paper"
+        "zmusic-nms:zmusic-nms-1.21.4",
+        "zmusic-nms:zmusic-nms-1.21.7"
 )

zmusic-addon/build.gradle

@@ -11,7 +11,8 @@ dependencies {
     implementation(project(":zmusic-nms:zmusic-nms-1.18"))
     implementation(project(":zmusic-nms:zmusic-nms-1.19"))
     implementation(project(":zmusic-nms:zmusic-nms-1.20"))
-    implementation(project(":zmusic-nms:zmusic-nms-paper"))
+    implementation(project(":zmusic-nms:zmusic-nms-1.21.4"))
+    implementation(project(":zmusic-nms:zmusic-nms-1.21.7"))
 
     compileOnly libs.placeholderapi
 }

zmusic-addon/src/main/java/me/zhenxin/zmusic/ZMusicAddon.java

@@ -6,6 +6,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class ZMusicAddon extends JavaPlugin {
+
     public static JavaPlugin plugin;
     public static boolean isPapi;
     public static boolean isSupportAdv = true;

zmusic-addon/src/main/java/me/zhenxin/zmusic/api/PApiHook.java

@@ -9,6 +9,7 @@
  * PlaceholderAPI 扩展类
  */
 public class PApiHook extends PlaceholderExpansion {
+
     private static String formatTime(Long time) {
         if (time != null) {
             if (time < 60) {

zmusic-addon/src/main/java/me/zhenxin/zmusic/data/StaticData.java

@@ -1,5 +1,6 @@
 package me.zhenxin.zmusic.data;
 
 public class StaticData {
+
     public static String version;
 }

zmusic-addon/src/main/java/me/zhenxin/zmusic/proto/Toast.java

@@ -3,6 +3,7 @@
 import me.zhenxin.zmusic.ZMusicAddon;
 import me.zhenxin.zmusic.proto.packet.AdvancementPacket;
 import me.zhenxin.zmusic.proto.packet.impl.*;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
@@ -66,7 +67,13 @@ public static void sendToast(Object player, String title) {
                     packet = new AdvancementPacket_1_12_R1(bukkitPlayer, title);
                     break;
                 case "craftbukkit": // Mojang mappings server for paper 1.20.5+
-                    Class<?> clazz = Class.forName("me.zhenxin.zmusic.proto.packet.impl.paper.AdvancementPacket_Paper");
+                    String version;
+                    if (Bukkit.getUnsafe().getDataVersion() >= 4435) {
+                        version = "1_21_7";
+                    } else {
+                        version = "1_21_4";
+                    }
+                    Class<?> clazz = Class.forName("me.zhenxin.zmusic.proto.packet.impl.paper.AdvancementPacket_" + version);
                     Constructor<?> constructor = clazz.getConstructor(Player.class, String.class);
                     packet = (AdvancementPacket) constructor.newInstance(bukkitPlayer, title);
                     break;

zmusic-nms/zmusic-nms-1.17/src/main/java/me/zhenxin/zmusic/proto/packet/impl/AdvancementPacket_1_17_R1.java

@@ -22,6 +22,7 @@
  */
 @SuppressWarnings("AlibabaClassNamingShouldBeCamel")
 public class AdvancementPacket_1_17_R1 extends AdvancementPacket {
+
     MinecraftKey minecraftKey = new MinecraftKey(namespaced, key);
 
     public AdvancementPacket_1_17_R1(Player player, String message) {
@@ -55,30 +56,30 @@ public JsonObject a(LootSerializationContext lootSerializationContext) {
             String[][] requirements = Arrays.stream(fixedRequirements.toArray()).toArray(String[][]::new);
 
             AdvancementDisplay advancementDisplay = new AdvancementDisplay(
-                    CraftItemStack.asNMSCopy(new ItemStack(icon)),
-                    new ChatMessage(message),
-                    new ChatMessage(desc),
-                    null,
-                    AdvancementFrameType.a,
-                    true,
-                    false,
-                    true);
+                CraftItemStack.asNMSCopy(new ItemStack(icon)),
+                new ChatMessage(message),
+                new ChatMessage(desc),
+                null,
+                AdvancementFrameType.a,
+                true,
+                false,
+                true);
             Advancement advancement = new Advancement(
-                    minecraftKey,
-                    null,
-                    advancementDisplay,
-                    new AdvancementRewards(0, new MinecraftKey[0], new MinecraftKey[0], null),
-                    criteria,
-                    requirements
+                minecraftKey,
+                null,
+                advancementDisplay,
+                new AdvancementRewards(0, new MinecraftKey[0], new MinecraftKey[0], null),
+                criteria,
+                requirements
             );
             AdvancementProgress advancementProgress = new AdvancementProgress();
             advancementProgress.a(criteria, requirements);
             CriterionProgress criterionProgress = null;
             try {
                 criterionProgress = (CriterionProgress) advancementProgress
-                        .getClass()
-                        .getDeclaredMethod("getCriterionProgress", String.class)
-                        .invoke(advancementProgress, "1");
+                    .getClass()
+                    .getDeclaredMethod("getCriterionProgress", String.class)
+                    .invoke(advancementProgress, "1");
             } catch (Exception e) {
                 e.printStackTrace();
             }
@@ -95,8 +96,8 @@ public JsonObject a(LootSerializationContext lootSerializationContext) {
 
             PlayerConnection connection = player.getHandle().b;
             connection.getClass()
-                    .getDeclaredMethod("sendPacket", Packet.class)
-                    .invoke(connection, packet);
+                .getDeclaredMethod("sendPacket", Packet.class)
+                .invoke(connection, packet);
         } catch (Exception e) {
             e.printStackTrace();
         }

zmusic-nms/zmusic-nms-1.18/src/main/java/me/zhenxin/zmusic/proto/packet/impl/AdvancementPacket_1_18_R1.java

@@ -20,6 +20,7 @@
  */
 @SuppressWarnings("AlibabaClassNamingShouldBeCamel")
 public class AdvancementPacket_1_18_R1 extends AdvancementPacket {
+
     MinecraftKey minecraftKey = new MinecraftKey(namespaced, key);
 
     public AdvancementPacket_1_18_R1(Player player, String message) {
@@ -53,21 +54,21 @@ public JsonObject a(LootSerializationContext lootSerializationContext) {
             String[][] requirements = Arrays.stream(fixedRequirements.toArray()).toArray(String[][]::new);
 
             AdvancementDisplay advancementDisplay = new AdvancementDisplay(
-                    CraftItemStack.asNMSCopy(new ItemStack(icon)),
-                    new ChatMessage(message),
-                    new ChatMessage(desc),
-                    null,
-                    AdvancementFrameType.a,
-                    true,
-                    false,
-                    true);
+                CraftItemStack.asNMSCopy(new ItemStack(icon)),
+                new ChatMessage(message),
+                new ChatMessage(desc),
+                null,
+                AdvancementFrameType.a,
+                true,
+                false,
+                true);
             Advancement advancement = new Advancement(
-                    minecraftKey,
-                    null,
-                    advancementDisplay,
-                    new AdvancementRewards(0, new MinecraftKey[0], new MinecraftKey[0], null),
-                    criteria,
-                    requirements);
+                minecraftKey,
+                null,
+                advancementDisplay,
+                new AdvancementRewards(0, new MinecraftKey[0], new MinecraftKey[0], null),
+                criteria,
+                requirements);
             AdvancementProgress advancementProgress = new AdvancementProgress();
             advancementProgress.a(criteria, requirements);
             CriterionProgress criterionProgress = advancementProgress.c("1");