From 53ea627c573fa03e67b6a8fde9e7474a0f11c42c Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Sun, 30 Mar 2025 15:00:42 +0800 Subject: [PATCH] rename package --- .../SlimeWorldAdaptorR2.java} | 6 +++--- gradle.properties | 2 +- .../customcrops/bukkit/world/BukkitWorldManager.java | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/{asp_r1/SlimeWorldAdaptorR1.java => asp_r2/SlimeWorldAdaptorR2.java} (99%) diff --git a/compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java b/compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r2/SlimeWorldAdaptorR2.java similarity index 99% rename from compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java rename to compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r2/SlimeWorldAdaptorR2.java index 21f622d..5d35ed2 100644 --- a/compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r1/SlimeWorldAdaptorR1.java +++ b/compatibility-asp-r2/src/main/java/net/momirealms/customcrops/bukkit/integration/adaptor/asp_r2/SlimeWorldAdaptorR2.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package net.momirealms.customcrops.bukkit.integration.adaptor.asp_r1; +package net.momirealms.customcrops.bukkit.integration.adaptor.asp_r2; import com.infernalsuite.aswm.api.events.LoadSlimeWorldEvent; import com.infernalsuite.aswm.api.world.SlimeWorld; @@ -43,11 +43,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.PriorityBlockingQueue; import java.util.function.Function; -public class SlimeWorldAdaptorR1 extends AbstractWorldAdaptor implements Listener { +public class SlimeWorldAdaptorR2 extends AbstractWorldAdaptor implements Listener { private final Function getSlimeWorldFunction; - public SlimeWorldAdaptorR1(int version) { + public SlimeWorldAdaptorR2(int version) { try { if (version == 1) { Plugin plugin = Bukkit.getPluginManager().getPlugin("SlimeWorldManager"); diff --git a/gradle.properties b/gradle.properties index 5e2343f..39e784e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=3.6.33 +project_version=3.6.32 config_version=42 project_group=net.momirealms diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/world/BukkitWorldManager.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/world/BukkitWorldManager.java index 7ab124a..d3c65e4 100644 --- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/world/BukkitWorldManager.java +++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/world/BukkitWorldManager.java @@ -27,7 +27,7 @@ import net.momirealms.customcrops.api.core.world.adaptor.WorldAdaptor; import net.momirealms.customcrops.api.integration.SeasonProvider; import net.momirealms.customcrops.bukkit.config.BukkitConfigManager; import net.momirealms.customcrops.bukkit.integration.adaptor.BukkitWorldAdaptor; -import net.momirealms.customcrops.bukkit.integration.adaptor.asp_r1.SlimeWorldAdaptorR1; +import net.momirealms.customcrops.bukkit.integration.adaptor.asp_r2.SlimeWorldAdaptorR2; import net.momirealms.customcrops.common.helper.VersionHelper; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -58,14 +58,14 @@ public class BukkitWorldManager implements WorldManager, Listener { if (!VersionHelper.isVersionNewerThan1_21_4()) { try { Class.forName("com.infernalsuite.aswm.api.SlimePlugin"); - SlimeWorldAdaptorR1 adaptor = new SlimeWorldAdaptorR1(1); + SlimeWorldAdaptorR2 adaptor = new SlimeWorldAdaptorR2(1); adaptors.add(adaptor); Bukkit.getPluginManager().registerEvents(adaptor, plugin.getBootstrap()); plugin.getPluginLogger().info("SlimeWorldManager hooked!"); } catch (ClassNotFoundException ignored) { } if (Bukkit.getPluginManager().isPluginEnabled("SlimeWorldPlugin")) { - SlimeWorldAdaptorR1 adaptor = new SlimeWorldAdaptorR1(2); + SlimeWorldAdaptorR2 adaptor = new SlimeWorldAdaptorR2(2); adaptors.add(adaptor); Bukkit.getPluginManager().registerEvents(adaptor, plugin.getBootstrap()); plugin.getPluginLogger().info("AdvancedSlimePaper hooked!");