From af3fc5d755f7b8b858dd857f4d57b5c40c3141ba Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Fri, 12 Dec 2025 16:36:11 +0800 Subject: [PATCH] 1.21.11 --- api/build.gradle.kts | 8 ++++---- compatibility-asp-r1/build.gradle.kts | 8 ++++---- compatibility-crucible-r1/build.gradle.kts | 2 +- compatibility-itemsadder-r1/build.gradle.kts | 8 ++++---- compatibility-oraxen-r1/build.gradle.kts | 2 +- compatibility-oraxen-r2/build.gradle.kts | 2 +- compatibility/build.gradle.kts | 8 ++++---- gradle.properties | 12 ++++++------ .../bukkit/BukkitCustomCropsPluginImpl.java | 2 +- .../customcrops/bukkit/item/BukkitItemFactory.java | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/api/build.gradle.kts b/api/build.gradle.kts index 427bc5a..10e56aa 100644 --- a/api/build.gradle.kts +++ b/api/build.gradle.kts @@ -39,17 +39,17 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } withSourcesJar() } tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) dependsOn(tasks.clean) } diff --git a/compatibility-asp-r1/build.gradle.kts b/compatibility-asp-r1/build.gradle.kts index 478584f..3b7ef8d 100644 --- a/compatibility-asp-r1/build.gradle.kts +++ b/compatibility-asp-r1/build.gradle.kts @@ -12,15 +12,15 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) dependsOn(tasks.clean) } \ No newline at end of file diff --git a/compatibility-crucible-r1/build.gradle.kts b/compatibility-crucible-r1/build.gradle.kts index 9632812..1874be7 100644 --- a/compatibility-crucible-r1/build.gradle.kts +++ b/compatibility-crucible-r1/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) } java { diff --git a/compatibility-itemsadder-r1/build.gradle.kts b/compatibility-itemsadder-r1/build.gradle.kts index 568d5ec..ca9236a 100644 --- a/compatibility-itemsadder-r1/build.gradle.kts +++ b/compatibility-itemsadder-r1/build.gradle.kts @@ -11,15 +11,15 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) dependsOn(tasks.clean) } \ No newline at end of file diff --git a/compatibility-oraxen-r1/build.gradle.kts b/compatibility-oraxen-r1/build.gradle.kts index e896439..1d8cfbd 100644 --- a/compatibility-oraxen-r1/build.gradle.kts +++ b/compatibility-oraxen-r1/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) } java { diff --git a/compatibility-oraxen-r2/build.gradle.kts b/compatibility-oraxen-r2/build.gradle.kts index efdb0b6..b087818 100644 --- a/compatibility-oraxen-r2/build.gradle.kts +++ b/compatibility-oraxen-r2/build.gradle.kts @@ -12,7 +12,7 @@ dependencies { tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) } java { diff --git a/compatibility/build.gradle.kts b/compatibility/build.gradle.kts index 3a6d007..fa11112 100644 --- a/compatibility/build.gradle.kts +++ b/compatibility/build.gradle.kts @@ -67,15 +67,15 @@ dependencies { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } tasks.withType { options.encoding = "UTF-8" - options.release.set(17) + options.release.set(21) dependsOn(tasks.clean) } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4a39e1b..88483db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.45.2 +project_version=3.6.46 config_version=43 project_group=net.momirealms @@ -18,13 +18,13 @@ asm_commons_version=9.9 jar_relocator_version=1.7 adventure_bundle_version=4.25.0 adventure_platform_version=4.4.1 -sparrow_heart_version=0.60 +sparrow_heart_version=0.62 cloud_core_version=2.0.0 cloud_services_version=2.0.0 -cloud_brigadier_version=2.0.0-beta.13 -cloud_bukkit_version=2.0.0-beta.13 -cloud_paper_version=2.0.0-beta.13 -cloud_minecraft_extras_version=2.0.0-beta.13 +cloud_brigadier_version=2.0.0-beta.14 +cloud_bukkit_version=2.0.0-beta.14 +cloud_paper_version=2.0.0-beta.14 +cloud_minecraft_extras_version=2.0.0-beta.14 boosted_yaml_version=1.3.7 mojang_brigadier_version=1.0.18 bstats_version=3.1.0 diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java index 3ccefee..bd12fee 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java @@ -167,7 +167,7 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin { boolean downloadFromBBB = buildByBit.equals("true"); this.reload(); - if (ConfigManager.metrics()) new Metrics((JavaPlugin) getBootstrap(), 16593); + if (ConfigManager.metrics()) new Metrics(getBootstrap(), 16593); if (ConfigManager.checkUpdate()) { VersionHelper.UPDATE_CHECKER.apply(this).thenAccept(result -> { String link; diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java index 34acca9..7e9d039 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/item/BukkitItemFactory.java @@ -48,7 +48,7 @@ public abstract class BukkitItemFactory extends ItemFactory { return new ComponentItemFactory(plugin); } - case "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10" -> { + case "1.21.5", "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10", "1.21.11" -> { return new ComponentItemFactory1_21_5(plugin); } default -> throw new IllegalStateException("Unsupported server version: " + plugin.getServerVersion());