From 1c433d189181c6f730201b3c38cb8feb8f2ea563 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Mon, 26 Feb 2024 12:48:21 +0800 Subject: [PATCH] update to gradle 8.6 --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../paper/libraries/dependencies/Dependency.java | 2 +- .../paper/storage/method/database/nosql/RedisManager.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dd1f248..f4f4ea9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/libraries/dependencies/Dependency.java b/paper/src/main/java/net/momirealms/customnameplates/paper/libraries/dependencies/Dependency.java index 25021a0..e741e84 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/libraries/dependencies/Dependency.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/libraries/dependencies/Dependency.java @@ -279,7 +279,7 @@ public enum Dependency { COMMONS_POOL_2( "org{}apache{}commons", "commons-pool2", - "2.11.0", + "2.12.0", null, "commons-pool2", Relocation.of("commonspool2", "org{}apache{}commons{}pool2") diff --git a/paper/src/main/java/net/momirealms/customnameplates/paper/storage/method/database/nosql/RedisManager.java b/paper/src/main/java/net/momirealms/customnameplates/paper/storage/method/database/nosql/RedisManager.java index c6256e1..45766c4 100644 --- a/paper/src/main/java/net/momirealms/customnameplates/paper/storage/method/database/nosql/RedisManager.java +++ b/paper/src/main/java/net/momirealms/customnameplates/paper/storage/method/database/nosql/RedisManager.java @@ -134,7 +134,7 @@ public class RedisManager extends AbstractStorage { * @param message The message to send. */ public void sendRedisMessage(@NotNull String channel, @NotNull String message) { - try (Jedis jedis = jedisPool.getResource()) { + try (Jedis jedis = getJedis()) { jedis.publish(channel, message); plugin.debug("Sent Redis message: " + message); } @@ -149,7 +149,7 @@ public class RedisManager extends AbstractStorage { public CompletableFuture> getPlayerData(UUID uuid) { var future = new CompletableFuture>(); plugin.getScheduler().runTaskAsync(() -> { - try (Jedis jedis = jedisPool.getResource()) { + try (Jedis jedis = getJedis()) { byte[] key = getRedisKey("cn_data", uuid); byte[] data = jedis.get(key); if (data != null) { @@ -171,7 +171,7 @@ public class RedisManager extends AbstractStorage { public CompletableFuture updatePlayerData(UUID uuid, PlayerData playerData) { var future = new CompletableFuture(); plugin.getScheduler().runTaskAsync(() -> { - try (Jedis jedis = jedisPool.getResource()) { + try (Jedis jedis = getJedis()) { jedis.setex( getRedisKey("cn_data", uuid), 600,