From 8e02e3165dff72036720c978c61f6b9955bfaf80 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Thu, 2 May 2024 17:22:56 +0800 Subject: [PATCH] [Update] Update dependencies --- build.gradle.kts | 2 +- plugin/build.gradle.kts | 4 +- .../libraries/dependencies/Dependency.java | 16 ++--- .../method/database/nosql/RedisManager.java | 4 +- .../resources/contents/minigame/default.yml | 64 +++++++++---------- 5 files changed, 45 insertions(+), 45 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7ed4072a..ce52373a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { allprojects { - version = "2.1.5" + version = "2.1.6" apply() apply(plugin = "java") diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 40122671..02bdde10 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -6,7 +6,7 @@ dependencies { compileOnly("com.comphenix.protocol:ProtocolLib:5.1.0") // command - compileOnly("dev.jorel:commandapi-bukkit-core:9.3.0") + compileOnly("dev.jorel:commandapi-bukkit-core:9.4.0") // nbt compileOnly("de.tr7zw:item-nbt-api:2.12.3") @@ -51,7 +51,7 @@ dependencies { compileOnly("dev.aurelium:auraskills-api-bukkit:2.0.0-SNAPSHOT") compileOnly("com.github.MilkBowl:VaultAPI:1.7") compileOnly("org.betonquest:betonquest:2.0.0") - compileOnly("xyz.xenondevs.invui:invui:1.27") + compileOnly("xyz.xenondevs.invui:invui:1.30") compileOnly("com.github.Xiao-MoMi:Custom-Crops:3.4.4.1") compileOnly("com.github.Xiao-MoMi:BiomeAPI:0.3") diff --git a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java index 95a5dd9a..605c69e9 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java +++ b/plugin/src/main/java/net/momirealms/customfishing/libraries/dependencies/Dependency.java @@ -44,14 +44,14 @@ public enum Dependency { ASM( "org.ow2.asm", "asm", - "9.1", + "9.7", null, "asm" ), ASM_COMMONS( "org.ow2.asm", "asm-commons", - "9.1", + "9.7", null, "asm-commons" ), @@ -65,7 +65,7 @@ public enum Dependency { COMMAND_API( "dev{}jorel", "commandapi-bukkit-shade", - "9.3.0", + "9.4.0", null, "commandapi-bukkit", Relocation.of("commandapi", "dev{}jorel{}commandapi") @@ -89,7 +89,7 @@ public enum Dependency { NBT_API( "de{}tr7zw", "item-nbt-api", - "2.12.3", + "2.12.4", "codemc", "item-nbt-api", Relocation.of("changeme", "de{}tr7zw{}changeme") @@ -209,7 +209,7 @@ public enum Dependency { INV_UI( "xyz{}xenondevs{}invui", "invui-core", - "1.29", + "1.30", "xenondevs", "invui-core", Relocation.of("invui", "xyz{}xenondevs{}invui"), @@ -218,7 +218,7 @@ public enum Dependency { INV_UI_ACCESS( "xyz{}xenondevs{}invui", "inventory-access", - "1.29", + "1.30", "xenondevs", "inventory-access", Relocation.of("inventoryaccess", "xyz{}xenondevs{}inventoryaccess") @@ -226,7 +226,7 @@ public enum Dependency { INV_UI_NMS( "xyz{}xenondevs{}invui", getInvUINms(), - "1.29", + "1.30", "xenondevs", getInvUINms(), Relocation.of("inventoryaccess", "xyz{}xenondevs{}inventoryaccess") @@ -336,7 +336,7 @@ public enum Dependency { case "1.20.1" -> artifact = "r16"; case "1.20.2" -> artifact = "r17"; case "1.20.3", "1.20.4" -> artifact = "r18"; - case "1.20.5" -> artifact = "r19"; + case "1.20.5", "1.20.6" -> artifact = "r19"; default -> throw new RuntimeException("Unsupported version: " + version); } return String.format("inventory-access-%s", artifact); diff --git a/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/RedisManager.java b/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/RedisManager.java index dbebba8f..7296c15b 100644 --- a/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/RedisManager.java +++ b/plugin/src/main/java/net/momirealms/customfishing/storage/method/database/nosql/RedisManager.java @@ -199,7 +199,7 @@ public class RedisManager extends AbstractStorage { return; } String action = split[1]; - CustomFishingPlugin.get().getScheduler().runTaskSync(() -> { + CustomFishingPlugin.get().getScheduler().runTaskAsync(() -> { switch (action) { case "start" -> { // start competition for all the servers that connected to redis @@ -214,7 +214,7 @@ public class RedisManager extends AbstractStorage { CustomFishingPlugin.get().getCompetitionManager().getOnGoingCompetition().stop(true); } } - }, new Location(Bukkit.getWorlds().get(0),0,0,0)); + }); } @Override diff --git a/plugin/src/main/resources/contents/minigame/default.yml b/plugin/src/main/resources/contents/minigame/default.yml index d4963566..9ccb9d75 100644 --- a/plugin/src/main/resources/contents/minigame/default.yml +++ b/plugin/src/main/resources/contents/minigame/default.yml @@ -167,7 +167,7 @@ accurate_click_bar_1_easy: accurate_click_bar_1_normal: game-type: accurate_click difficulty: 30~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -195,7 +195,7 @@ accurate_click_bar_1_normal: accurate_click_bar_1_hard: game-type: accurate_click difficulty: 60~90 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -223,7 +223,7 @@ accurate_click_bar_1_hard: accurate_click_bar_2_easy: game-type: accurate_click difficulty: 15~30 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -251,7 +251,7 @@ accurate_click_bar_2_easy: accurate_click_bar_2_normal: game-type: accurate_click difficulty: 30~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -279,7 +279,7 @@ accurate_click_bar_2_normal: accurate_click_bar_2_hard: game-type: accurate_click difficulty: 60~90 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -307,7 +307,7 @@ accurate_click_bar_2_hard: accurate_click_bar_3_easy: game-type: accurate_click difficulty: 15~30 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -335,7 +335,7 @@ accurate_click_bar_3_easy: accurate_click_bar_3_normal: game-type: accurate_click difficulty: 30~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -363,7 +363,7 @@ accurate_click_bar_3_normal: accurate_click_bar_3_hard: game-type: accurate_click difficulty: 60~90 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -391,7 +391,7 @@ accurate_click_bar_3_hard: accurate_click_bar_4_easy: game-type: accurate_click difficulty: 10~25 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -430,7 +430,7 @@ accurate_click_bar_4_easy: accurate_click_bar_4_normal: game-type: accurate_click difficulty: 25~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -469,7 +469,7 @@ accurate_click_bar_4_normal: accurate_click_bar_4_hard: game-type: accurate_click difficulty: 40~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -508,7 +508,7 @@ accurate_click_bar_4_hard: accurate_click_bar_5_easy: game-type: accurate_click difficulty: 10~25 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -547,7 +547,7 @@ accurate_click_bar_5_easy: accurate_click_bar_5_normal: game-type: accurate_click difficulty: 25~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -586,7 +586,7 @@ accurate_click_bar_5_normal: accurate_click_bar_5_hard: game-type: accurate_click difficulty: 40~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -625,7 +625,7 @@ accurate_click_bar_5_hard: accurate_click_bar_6_easy: game-type: accurate_click difficulty: 10~25 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -664,7 +664,7 @@ accurate_click_bar_6_easy: accurate_click_bar_6_normal: game-type: accurate_click difficulty: 25~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -703,7 +703,7 @@ accurate_click_bar_6_normal: accurate_click_bar_6_hard: game-type: accurate_click difficulty: 40~60 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -742,7 +742,7 @@ accurate_click_bar_6_hard: accurate_click_bar_7_easy: game-type: accurate_click difficulty: 10~20 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -803,7 +803,7 @@ accurate_click_bar_7_easy: accurate_click_bar_7_normal: game-type: accurate_click difficulty: 20~30 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -864,7 +864,7 @@ accurate_click_bar_7_normal: accurate_click_bar_7_hard: game-type: accurate_click difficulty: 30~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -925,7 +925,7 @@ accurate_click_bar_7_hard: accurate_click_bar_8_easy: game-type: accurate_click difficulty: 10~20 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -986,7 +986,7 @@ accurate_click_bar_8_easy: accurate_click_bar_8_normal: game-type: accurate_click difficulty: 20~30 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -1047,7 +1047,7 @@ accurate_click_bar_8_normal: accurate_click_bar_8_hard: game-type: accurate_click difficulty: 30~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -1108,7 +1108,7 @@ accurate_click_bar_8_hard: accurate_click_bar_9_easy: game-type: accurate_click difficulty: 10~20 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -1169,7 +1169,7 @@ accurate_click_bar_9_easy: accurate_click_bar_9_normal: game-type: accurate_click difficulty: 20~30 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -1230,7 +1230,7 @@ accurate_click_bar_9_normal: accurate_click_bar_9_hard: game-type: accurate_click difficulty: 30~40 - time: 15 + time: 30 title: - 'So close, stay cool!' - 'The fish is hooked, focus on it!' @@ -1297,7 +1297,7 @@ accurate_click_bar_9_hard: hold_game_easy: game-type: hold difficulty: 15~35 - time: 15 + time: 30 title: '{progress}' # Tip would show on the title to guide the player how to play tip: 'Press to start' @@ -1333,7 +1333,7 @@ hold_game_easy: hold_game_normal: game-type: hold difficulty: 35~60 - time: 15 + time: 30 title: '{progress}' # Tip would show on the title to guide the player how to play tip: 'Press to start' @@ -1371,7 +1371,7 @@ hold_game_normal: hold_game_hard: game-type: hold difficulty: 60~90 - time: 15 + time: 30 title: '{progress}' # Tip would show on the title to guide the player how to play tip: 'Press to start' @@ -1416,7 +1416,7 @@ hold_game_hard: tension_game_easy: game-type: tension difficulty: 20~35 - time: 15 + time: 30 title: '{tension}' # Tip would show on the title to guide the player how to play tip: 'Press to start' @@ -1453,7 +1453,7 @@ tension_game_easy: tension_game_normal: game-type: tension difficulty: 35~50 - time: 15 + time: 30 title: '{tension}' # Tip would show on the title to guide the player how to play tip: 'Press to start' @@ -1490,7 +1490,7 @@ tension_game_normal: tension_game_hard: game-type: tension difficulty: 50~65 - time: 15 + time: 30 title: '{tension}' # Tip would show on the title to guide the player how to play tip: 'Press to start'