From 6ec014c98c5fb2927728287fce587e740d8794dc Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 16 Jul 2025 02:31:49 +0800 Subject: [PATCH] update dependencies --- compatibility/build.gradle.kts | 10 +++++-- compatibility/j21/build.gradle.kts | 30 ------------------- .../integration/block/NexoBlockProvider.java | 0 .../item/CraftEngineItemProvider.java | 0 .../integration/item/NexoItemProvider.java | 0 .../season/CustomCropsSeasonProvider.java | 6 ++-- .../bukkit/item/BukkitItemFactory.java | 2 +- gradle.properties | 10 +++---- 8 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 compatibility/j21/build.gradle.kts rename compatibility/{j21 => }/src/main/java/net/momirealms/customfishing/bukkit/integration/block/NexoBlockProvider.java (100%) rename compatibility/{j21 => }/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineItemProvider.java (100%) rename compatibility/{j21 => }/src/main/java/net/momirealms/customfishing/bukkit/integration/item/NexoItemProvider.java (100%) diff --git a/compatibility/build.gradle.kts b/compatibility/build.gradle.kts index 869c3747..053f6927 100644 --- a/compatibility/build.gradle.kts +++ b/compatibility/build.gradle.kts @@ -14,7 +14,9 @@ repositories { maven("https://oss.sonatype.org/content/repositories/snapshots") maven("https://repo.opencollab.dev/main/") // geyser maven("https://repo.codemc.org/repository/maven-public/") // beauty quest - maven("https://repo.momirealms.net/releases/") + maven("https://repo.momirealms.net/releases/") // craftengine customcrops + maven("https://repo.nexomc.com/releases/") // nexo + maven("https://repo.nexomc.com/snapshots/") } dependencies { @@ -34,7 +36,7 @@ dependencies { // vault compileOnly("com.github.MilkBowl:VaultAPI:${rootProject.properties["vault_version"]}") // season - compileOnly("com.github.Xiao-MoMi:Custom-Crops:3.5.7") + compileOnly("net.momirealms:custom-crops:3.6.41") compileOnly(files("libs/RealisticSeasons-api.jar")) compileOnly(files("libs/AdvancedSeasons-API.jar")) // enchantment @@ -42,7 +44,6 @@ dependencies { // leveler compileOnly(files("libs/mcMMO-api.jar")) compileOnly("net.Indyuce:MMOCore-API:1.12.1-SNAPSHOT") -// compileOnly("dev.aurelium:auraskills-api-bukkit:2.2.7") compileOnly(files("libs/AuraSkills-2.3.4.jar")) compileOnly("com.github.Archy-X:AureliumSkills:Beta1.3.21") compileOnly("com.github.Zrips:Jobs:v5.2.2.3") @@ -64,7 +65,10 @@ dependencies { compileOnly("pers.neige.neigeitems:NeigeItems:1.17.13") compileOnly("com.willfp:EcoItems:5.61.0") compileOnly("io.th0rgal:oraxen:1.168.0") + compileOnly("com.nexomc:nexo:1.7.3") compileOnly("com.github.brcdev-minecraft:shopgui-api:3.0.0") + compileOnly("net.momirealms:craft-engine-core:0.0.60") + compileOnly("net.momirealms:craft-engine-bukkit:0.0.60") // entity compileOnly("io.lumine:Mythic-Dist:5.6.2") // eco diff --git a/compatibility/j21/build.gradle.kts b/compatibility/j21/build.gradle.kts deleted file mode 100644 index a4be882c..00000000 --- a/compatibility/j21/build.gradle.kts +++ /dev/null @@ -1,30 +0,0 @@ -repositories { - mavenCentral() - maven("https://repo.nexomc.com/releases/") - maven("https://repo.nexomc.com/snapshots/") - maven("https://repo.papermc.io/repository/maven-public/") - maven("https://repo.momirealms.net/releases/") -} - -dependencies { - compileOnly(project(":api")) - compileOnly("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") - compileOnly("com.nexomc:nexo:1.7.3") - compileOnly("net.momirealms:craft-engine-core:0.0.57") - compileOnly("net.momirealms:craft-engine-bukkit:0.0.57") - compileOnly("net.momirealms:sparrow-heart:${rootProject.properties["sparrow_heart_version"]}") - compileOnly(files("libs/AuraSkills-2.3.4.jar")) -} - -tasks.withType { - options.encoding = "UTF-8" - options.release.set(21) -} - -java { - sourceCompatibility = JavaVersion.VERSION_21 - targetCompatibility = JavaVersion.VERSION_21 - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} \ No newline at end of file diff --git a/compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/block/NexoBlockProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/block/NexoBlockProvider.java similarity index 100% rename from compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/block/NexoBlockProvider.java rename to compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/block/NexoBlockProvider.java diff --git a/compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineItemProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineItemProvider.java similarity index 100% rename from compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineItemProvider.java rename to compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/CraftEngineItemProvider.java diff --git a/compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/item/NexoItemProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/NexoItemProvider.java similarity index 100% rename from compatibility/j21/src/main/java/net/momirealms/customfishing/bukkit/integration/item/NexoItemProvider.java rename to compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/item/NexoItemProvider.java diff --git a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/season/CustomCropsSeasonProvider.java b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/season/CustomCropsSeasonProvider.java index 3b8b8b20..1eeddb86 100644 --- a/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/season/CustomCropsSeasonProvider.java +++ b/compatibility/src/main/java/net/momirealms/customfishing/bukkit/integration/season/CustomCropsSeasonProvider.java @@ -17,8 +17,8 @@ package net.momirealms.customfishing.bukkit.integration.season; -import net.momirealms.customcrops.api.CustomCropsPlugin; -import net.momirealms.customcrops.api.mechanic.world.season.Season; +import net.momirealms.customcrops.api.BukkitCustomCropsPlugin; +import net.momirealms.customcrops.api.core.world.Season; import net.momirealms.customfishing.api.integration.SeasonProvider; import org.bukkit.World; import org.jetbrains.annotations.NotNull; @@ -30,7 +30,7 @@ public class CustomCropsSeasonProvider implements SeasonProvider { @NotNull @Override public net.momirealms.customfishing.api.mechanic.misc.season.Season getSeason(@NotNull World world) { - Season season = CustomCropsPlugin.get().getIntegrationManager().getSeasonInterface().getSeason(world); + Season season = BukkitCustomCropsPlugin.getInstance().getWorldManager().getSeason(world); if (season == null) return net.momirealms.customfishing.api.mechanic.misc.season.Season.DISABLE; return net.momirealms.customfishing.api.mechanic.misc.season.Season.valueOf(season.name().toUpperCase(Locale.ENGLISH)); } diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemFactory.java b/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemFactory.java index dacb0d9e..b77f0119 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/item/BukkitItemFactory.java +++ b/core/src/main/java/net/momirealms/customfishing/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" -> { + case "1.21.5", "1.21.6", "1.21.7", "1.21.8" -> { return new ComponentItemFactory1_21_5(plugin); } default -> throw new IllegalStateException("Unsupported server version: " + plugin.getServerVersion()); diff --git a/gradle.properties b/gradle.properties index 53dfe120..c2da24a4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=2.3.13 +project_version=2.3.14 config_version=38 project_group=net.momirealms @@ -23,10 +23,10 @@ adventure_platform_version=4.4.0 sparrow_heart_version=0.58 cloud_core_version=2.0.0 cloud_services_version=2.0.0 -cloud_brigadier_version=2.0.0-beta.10 -cloud_bukkit_version=2.0.0-beta.10 -cloud_paper_version=2.0.0-beta.10 -cloud_minecraft_extras_version=2.0.0-beta.10 +cloud_brigadier_version=2.0.0-beta.11 +cloud_bukkit_version=2.0.0-beta.11 +cloud_paper_version=2.0.0-beta.11 +cloud_minecraft_extras_version=2.0.0-beta.11 boosted_yaml_version=1.3.7 mojang_brigadier_version=1.0.18 mongodb_driver_version=5.4.0