Merge pull request #5 from Xiao-MoMi/main

上游更新

bukkit-loader/src/main/resources/craft-engine.properties

@@ -22,4 +22,7 @@ slf4j-api=${slf4j_version}
 zstd-jni=${zstd_version}
 commons-io=${commons_io_version}
 byte-buddy=${byte_buddy_version}
-snake-yaml=${snake_yaml_version}
+snake-yaml=${snake_yaml_version}
+adventure-text-minimessage=${adventure_bundle_version}
+adventure-text-serializer-gson=${adventure_bundle_version}
+adventure-text-serializer-json=${adventure_bundle_version}

bukkit/build.gradle.kts

@@ -46,9 +46,9 @@ dependencies {
     implementation("com.saicone.rtag:rtag-entity:${rootProject.properties["rtag_version"]}")
     // Adventure
     implementation("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}")
-    implementation("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}")
     implementation("net.kyori:adventure-platform-bukkit:${rootProject.properties["adventure_platform_version"]}")
-    implementation("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"]}") {
         exclude("com.google.code.gson", "gson")
     }
     compileOnly("com.sk89q.worldedit:worldedit-core:7.2.19")

core/build.gradle.kts

@@ -19,8 +19,8 @@ dependencies {
     implementation("com.github.Xiao-MoMi:sparrow-nbt:${rootProject.properties["sparrow_nbt_version"]}")
     // Adventure
     implementation("net.kyori:adventure-api:${rootProject.properties["adventure_bundle_version"]}")
-    implementation("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}")
+    compileOnly("net.kyori:adventure-text-minimessage:${rootProject.properties["adventure_bundle_version"]}")
-    implementation("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}") {
+    compileOnly("net.kyori:adventure-text-serializer-gson:${rootProject.properties["adventure_bundle_version"]}") {
         exclude("com.google.code.gson", "gson")
     }
     // Command

core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java

@@ -135,7 +135,10 @@ public abstract class CraftEngine implements Plugin {
                 Dependencies.ZSTD,
                 Dependencies.BYTE_BUDDY,
                 Dependencies.SNAKE_YAML,
-                Dependencies.BOOSTED_YAML
+                Dependencies.BOOSTED_YAML,
+                Dependencies.MINIMESSAGE,
+                Dependencies.TEXT_SERIALIZER_GSON,
+                Dependencies.TEXT_SERIALIZER_JSON
         );
     }
 

core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java

@@ -179,4 +179,25 @@ public class Dependencies {
             "snakeyaml",
             List.of(Relocation.of("snakeyaml", "org{}yaml{}snakeyaml"))
     );
+    public static final Dependency MINIMESSAGE = new Dependency(
+            "adventure-text-minimessage",
+            "net{}kyori",
+            "adventure-text-minimessage",
+            "adventure-text-minimessage",
+            List.of(Relocation.of("adventure", "net{}kyori{}adventure"))
+    );
+    public static final Dependency TEXT_SERIALIZER_GSON = new Dependency(
+            "adventure-text-serializer-gson",
+            "net{}kyori",
+            "adventure-text-serializer-gson",
+            "adventure-text-serializer-gson",
+            List.of(Relocation.of("adventure", "net{}kyori{}adventure"))
+    );
+    public static final Dependency TEXT_SERIALIZER_JSON = new Dependency(
+            "adventure-text-serializer-json",
+            "net{}kyori",
+            "adventure-text-serializer-json",
+            "adventure-text-serializer-json",
+            List.of(Relocation.of("adventure", "net{}kyori{}adventure"))
+    );
 }

gradle.properties

@@ -19,7 +19,7 @@ gson_version=2.11.0
 asm_version=9.7.1
 asm_commons_version=9.7.1
 jar_relocator_version=1.7
-adventure_bundle_version=4.17.0
+adventure_bundle_version=4.18.0
 adventure_platform_version=4.3.4
 cloud_core_version=2.0.0
 cloud_services_version=2.0.0