From 88e809395d9a252ea0e69eedc3f945d5c3179186 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 12 Feb 2025 00:56:19 +0800 Subject: [PATCH] Reduce plugin size --- .../main/resources/craft-engine.properties | 5 ++++- bukkit/build.gradle.kts | 4 ++-- core/build.gradle.kts | 4 ++-- .../craftengine/core/plugin/CraftEngine.java | 5 ++++- .../core/plugin/dependency/Dependencies.java | 21 +++++++++++++++++++ gradle.properties | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/bukkit-loader/src/main/resources/craft-engine.properties b/bukkit-loader/src/main/resources/craft-engine.properties index d166130f1..cef3e4fdb 100644 --- a/bukkit-loader/src/main/resources/craft-engine.properties +++ b/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} \ No newline at end of file +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} \ No newline at end of file diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index dd124f9be..573ed72d9 100644 --- a/bukkit/build.gradle.kts +++ b/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") diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 66a230cce..1a4ab4519 100644 --- a/core/build.gradle.kts +++ b/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"]}") - 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") } // Command diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java index 208372c32..d1f832aba 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/CraftEngine.java +++ b/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 ); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java index 115368464..eee72da2d 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/dependency/Dependencies.java +++ b/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")) + ); } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b66b1fd62..da3a96aab 100644 --- a/gradle.properties +++ b/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