From 2d989c66e4ccd58314efb3408430dfdf2414b8ff Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Fri, 23 Aug 2024 14:14:21 +0800 Subject: [PATCH] 2.2.19 --- .../api/mechanic/fishing/hook/VanillaMechanic.java | 8 +++++++- .../customfishing/bukkit/config/BukkitConfigManager.java | 2 +- gradle.properties | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java index 77150013..007aed64 100644 --- a/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java +++ b/api/src/main/java/net/momirealms/customfishing/api/mechanic/fishing/hook/VanillaMechanic.java @@ -26,6 +26,7 @@ import net.momirealms.customfishing.api.mechanic.effect.Effect; import net.momirealms.customfishing.api.mechanic.effect.EffectProperties; import net.momirealms.customfishing.api.mechanic.fishing.AntiAutoFishing; import net.momirealms.customfishing.api.util.EventUtils; +import net.momirealms.customfishing.common.helper.VersionHelper; import net.momirealms.customfishing.common.plugin.scheduler.SchedulerTask; import net.momirealms.customfishing.common.util.RandomUtils; import net.momirealms.sparrow.heart.SparrowHeart; @@ -99,7 +100,12 @@ public class VanillaMechanic implements HookMechanic { BukkitCustomFishingPlugin.getInstance().debug("Wait time: " + before + " -> " + after + " ticks"); } int lureTime = RandomUtils.generateRandomInt(20, 80); - hook.setLureTime(lureTime, lureTime); + if (VersionHelper.isVersionNewerThan1_19_4()) { + hook.setLureTime(lureTime, lureTime); + } else { + // the lowest value + lureTime = 20; + } if (ConfigManager.antiAutoFishingMod()) { BukkitCustomFishingPlugin.getInstance().getScheduler().sync().runLater(() -> { Player player = context.getHolder(); diff --git a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java index 05d00e0d..492cf411 100644 --- a/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java +++ b/core/src/main/java/net/momirealms/customfishing/bukkit/config/BukkitConfigManager.java @@ -479,7 +479,7 @@ public class BukkitConfigManager extends ConfigManager { String sizePair = (String) arg; String[] split = sizePair.split("~", 2); MathValue min = MathValue.auto(split[0]); - MathValue max = MathValue.auto(split[1]); + MathValue max = split.length == 2 ? MathValue.auto(split[1]) : MathValue.auto(split[0]); return (item, context) -> { double minSize = min.evaluate(context); double maxSize = max.evaluate(context); diff --git a/gradle.properties b/gradle.properties index 5d94807a..2f076fa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=2.2.18 +project_version=2.2.19 config_version=36 project_group=net.momirealms @@ -17,7 +17,7 @@ h2_driver_version=2.2.224 sqlite_driver_version=3.46.0.1 adventure_bundle_version=4.17.0 adventure_platform_version=4.3.3 -sparrow_heart_version=0.35 +sparrow_heart_version=0.36 cloud_core_version=2.0.0-rc.2 cloud_services_version=2.0.0-rc.2 cloud_brigadier_version=2.0.0-beta.9