From ac18e73c5e0f9fb6eb0a8ffaff5f3bd2f5bf1f45 Mon Sep 17 00:00:00 2001 From: MiniDay <372403923@qq.com> Date: Wed, 13 Mar 2024 20:51:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=B8=85=E7=90=86=E6=97=A0=E6=95=88?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core-bukkit/build.gradle.kts | 24 ++++---------- .../core/bukkit/command/ParentCommand.java | 21 +----------- .../core/bukkit/util/CoreBukkitUtils.java | 2 -- core-bungee/build.gradle.kts | 12 ++----- core-common/build.gradle.kts | 4 +-- .../mc/plugin/core/common/api/CoreAPI.java | 10 +++--- .../mc/plugin/core/common/util/CoreUtils.java | 25 -------------- .../mc/plugin/core/common/util/Pair.java | 33 ------------------- 8 files changed, 16 insertions(+), 115 deletions(-) delete mode 100644 core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java diff --git a/core-bukkit/build.gradle.kts b/core-bukkit/build.gradle.kts index 31ed883..0fb84b3 100644 --- a/core-bukkit/build.gradle.kts +++ b/core-bukkit/build.gradle.kts @@ -3,21 +3,13 @@ evaluationDependsOn(":core-common") dependencies { - implementation(project(":core-common")) { - isTransitive = false - } + implementation(project(":core-common")) { isTransitive = false } compileOnly("org.spigotmc:spigot-api:1.18.2-R0.1-SNAPSHOT") implementation("de.tr7zw:item-nbt-api:2.12.3-SNAPSHOT") - compileOnly("net.milkbowl.vault:VaultAPI:1.7") { - isTransitive = false - } - compileOnly("org.black_ixx:playerpoints:3.2.6") { - isTransitive = false - } - compileOnly("me.clip:placeholderapi:2.11.5") { - isTransitive = false - } + compileOnly("net.milkbowl.vault:VaultAPI:1.7") { isTransitive = false } + compileOnly("org.black_ixx:playerpoints:3.2.6") { isTransitive = false } + compileOnly("me.clip:placeholderapi:2.11.5") { isTransitive = false } implementation("net.kyori:adventure-platform-bukkit:4.3.2") { exclude(group = "org.jetbrains") @@ -27,18 +19,14 @@ dependencies { exclude(module = "adventure-api") exclude(group = "org.jetbrains") } - implementation("com.zaxxer:HikariCP:4.0.3") { - exclude(group = "org.slf4j") - } + implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/redis.clients/jedis implementation("redis.clients:jedis:5.1.2") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz - implementation("org.quartz-scheduler:quartz:2.3.2") { - isTransitive = false - } + implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } } tasks { diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java index 77af938..5764792 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java @@ -13,19 +13,10 @@ import java.util.stream.Collectors; @SuppressWarnings("unused") public abstract class ParentCommand extends ChildCommand { - @NotNull - private final String name; @NotNull private final List childCommands; public ParentCommand() { - name = "unset"; - childCommands = new ArrayList<>(); - } - - @Deprecated - public ParentCommand(@NotNull String name) { - this.name = name; childCommands = new ArrayList<>(); } @@ -34,9 +25,7 @@ public abstract class ParentCommand extends ChildCommand { @NotNull @Override - public String getName() { - return name; - } + public abstract String getName(); @Nullable public ParentCommand getParent() { @@ -79,14 +68,6 @@ public abstract class ParentCommand extends ChildCommand { plugin.getLogger().info("已注册指令 " + getUsage()); } - /** - * 建议使用 {@link #register()} - */ - @Deprecated - public void hook() { - register(); - } - /** * 获取所有子命令 *

diff --git a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java index 9bcf789..1a0a58a 100644 --- a/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java +++ b/core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/util/CoreBukkitUtils.java @@ -367,7 +367,6 @@ public final class CoreBukkitUtils { } @NotNull - @SuppressWarnings("deprecation") public static JsonObject serializePotionEffect(@NotNull PotionEffect effect) { JsonObject object = new JsonObject(); object.addProperty("type", effect.getType().getName()); @@ -377,7 +376,6 @@ public final class CoreBukkitUtils { } @NotNull - @SuppressWarnings("deprecation") public static PotionEffect deserializePotionEffect(@NotNull JsonObject object) { //noinspection ConstantConditions return new PotionEffect( diff --git a/core-bungee/build.gradle.kts b/core-bungee/build.gradle.kts index 3bfce7d..5eac686 100644 --- a/core-bungee/build.gradle.kts +++ b/core-bungee/build.gradle.kts @@ -3,9 +3,7 @@ evaluationDependsOn(":core-common") dependencies { - implementation(project(":core-common")) { - isTransitive = false - } + implementation(project(":core-common")) { isTransitive = false } compileOnly("net.md-5:bungeecord-api:1.20-R0.1") implementation("net.kyori:adventure-platform-bungeecord:4.3.2") { @@ -17,18 +15,14 @@ dependencies { exclude(group = "org.jetbrains") } - implementation("com.zaxxer:HikariCP:4.0.3") { - exclude(group = "org.slf4j") - } + implementation("com.zaxxer:HikariCP:4.0.3") { exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/redis.clients/jedis implementation("redis.clients:jedis:5.1.2") { exclude(group = "com.google.code.gson") exclude(group = "org.slf4j") } // https://mvnrepository.com/artifact/org.quartz-scheduler/quartz - implementation("org.quartz-scheduler:quartz:2.3.2") { - isTransitive = false - } + implementation("org.quartz-scheduler:quartz:2.3.2") { isTransitive = false } } tasks { diff --git a/core-common/build.gradle.kts b/core-common/build.gradle.kts index d2fb41a..fee78d8 100644 --- a/core-common/build.gradle.kts +++ b/core-common/build.gradle.kts @@ -5,9 +5,7 @@ dependencies { // https://mvnrepository.com/artifact/org.yaml/snakeyaml compileOnly("org.yaml:snakeyaml:1.19") - implementation("net.kyori:adventure-platform-api:4.3.2") { - exclude(group = "org.jetbrains") - } + implementation("net.kyori:adventure-platform-api:4.3.2") { exclude(group = "org.jetbrains") } implementation("net.kyori:adventure-text-serializer-gson:4.13.1") { exclude(group = "org.jetbrains") exclude(group = "com.google.code.gson") diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java index e2f2068..5f65c47 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java @@ -8,7 +8,7 @@ import com.zaxxer.hikari.HikariDataSource; import lombok.Getter; import net.kyori.adventure.platform.AudienceProvider; import org.jetbrains.annotations.NotNull; -import redis.clients.jedis.JedisPool; +import redis.clients.jedis.JedisPooled; import javax.sql.DataSource; import java.sql.Connection; @@ -27,7 +27,7 @@ public abstract class CoreAPI { */ @Getter @NotNull - private final JedisPool jedisPool; + private final JedisPooled jedisPool; /** * HamsterCore 公用数据库连接池 */ @@ -49,9 +49,9 @@ public abstract class CoreAPI { executorService = Executors.newCachedThreadPool(new NamedThreadFactory("HamsterCore - Executor")); scheduledService = Executors.newScheduledThreadPool(1, new NamedThreadFactory("HamsterCore - Scheduler")); - getLogger().info("正在创建 redis 客户端"); - jedisPool = new JedisPool(config.getString("redis-url")); - getLogger().info("redis 客户端创建完成"); + getLogger().info("正在创建 redis 连接池"); + jedisPool = new JedisPooled(config.getString("redis-url")); + getLogger().info("redis 连接池创建完成"); ConfigSection datasourceConfig = config.getSection("datasource"); if (datasourceConfig == null) { diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java index 17d2c72..758c412 100644 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java +++ b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java @@ -1,7 +1,5 @@ package cn.hamster3.mc.plugin.core.common.util; -import cn.hamster3.mc.plugin.core.common.api.CoreAPI; -import com.google.gson.Gson; import com.google.gson.JsonObject; import net.kyori.adventure.key.Key; import net.kyori.adventure.sound.Sound; @@ -13,34 +11,11 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; import java.time.Duration; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; @SuppressWarnings("unused") public final class CoreUtils { - /** - * @deprecated 使用 {@link CoreAPI#getGson()} - */ - @Deprecated - public static Gson GSON = CoreAPI.getInstance().getGson(); - /** - * @deprecated 使用 {@link CoreAPI#getHumanGson()} - */ - @Deprecated - public static Gson GSON_HUMAN = CoreAPI.getInstance().getHumanGson(); - /** - * @deprecated 使用 {@link CoreAPI#getExecutorService()} - */ - @Deprecated - public static ExecutorService WORKER_EXECUTOR = CoreAPI.getInstance().getExecutorService(); - /** - * @deprecated 使用 {@link CoreAPI#getScheduledService()} - */ - @Deprecated - public static ScheduledExecutorService SCHEDULED_EXECUTOR = CoreAPI.getInstance().getScheduledService(); - private CoreUtils() { } diff --git a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java b/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java deleted file mode 100644 index 14e838a..0000000 --- a/core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Pair.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.hamster3.mc.plugin.core.common.util; - -import lombok.Getter; - -import java.io.Serializable; -import java.util.Objects; - -@Getter -@Deprecated -@SuppressWarnings("unused") -public class Pair implements Serializable { - private final K key; - private final V value; - - public Pair(K key, V value) { - this.key = key; - this.value = value; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Pair pair = (Pair) o; - return Objects.equals(key, pair.key) && Objects.equals(value, pair.value); - } - - @Override - public int hashCode() { - return Objects.hash(key, value); - } -} -