From 14cca419d739a2f1c4a4bef151b3f8947c866c15 Mon Sep 17 00:00:00 2001 From: Krakenied Date: Tue, 23 Jul 2024 15:16:09 +0200 Subject: Update CustomFishing to latest version (requires update) Temporarily include a JAR without annotations shaded as it breaks project compilation --- bukkit/build.gradle.kts | 6 +++--- bukkit/libs/Custom-Fishing-2.2.5.jar | Bin 0 -> 420901 bytes .../type/dependent/CustomFishingFishingTaskType.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 bukkit/libs/Custom-Fishing-2.2.5.jar (limited to 'bukkit') diff --git a/bukkit/build.gradle.kts b/bukkit/build.gradle.kts index 38ae338e..71470226 100644 --- a/bukkit/build.gradle.kts +++ b/bukkit/build.gradle.kts @@ -73,8 +73,8 @@ dependencies { compileOnlyPlugin("net.citizensnpcs:citizensapi:2.0.30-SNAPSHOT") // CoreProtect compileOnlyPlugin("net.coreprotect:coreprotect:21.2") - // CustomFishing - compileOnlyPlugin("com.github.Xiao-MoMi:Custom-Fishing:2.1.2") + // CustomFishing TODO fix whenever they stop shading annotations in the JAR + //compileOnlyPlugin("com.github.Xiao-MoMi:Custom-Fishing:2.2.5") // EcoBosses, EcoMobs compileOnlyPlugin("com.willfp:EcoBosses:9.14.0") compileOnlyPlugin("com.willfp:EcoMobs:10.0.0-b1") @@ -121,7 +121,7 @@ dependencies { // ZNPCsPlus compileOnlyPlugin("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") - // IridiumSkyblock, PyroFishingPro, uSkyBlock + // CustomFishing, IridiumSkyblock, PyroFishingPro, uSkyBlock compileOnlyLibs("libs", listOf("*.jar")) // bStats diff --git a/bukkit/libs/Custom-Fishing-2.2.5.jar b/bukkit/libs/Custom-Fishing-2.2.5.jar new file mode 100644 index 00000000..6d49cb0b Binary files /dev/null and b/bukkit/libs/Custom-Fishing-2.2.5.jar differ diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CustomFishingFishingTaskType.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CustomFishingFishingTaskType.java index a7b1c1cc..1fe506fe 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CustomFishingFishingTaskType.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/tasktype/type/dependent/CustomFishingFishingTaskType.java @@ -52,8 +52,8 @@ public final class CustomFishingFishingTaskType extends BukkitTaskType { return; } - String id = loot.getID(); - String[] groups = loot.getLootGroup(); + String id = loot.id(); + String[] groups = loot.lootGroup(); // Cache for performance reasons (used in debug logging) String groupsAsString = Arrays.toString(groups); -- cgit v1.2.3-70-g09d2