diff --git a/hamster-core-bukkit/build.gradle b/hamster-core-bukkit/build.gradle
index 4618bb3..085ac49 100644
--- a/hamster-core-bukkit/build.gradle
+++ b/hamster-core-bukkit/build.gradle
@@ -26,13 +26,15 @@ dependencies {
// https://mvnrepository.com/artifact/net.kyori/adventure-platform-bukkit
api 'net.kyori:adventure-platform-bukkit:4.1.2'
oldJar 'net.kyori:adventure-platform-bukkit:4.1.2'
- // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
- api 'com.squareup.okhttp3:okhttp:4.10.0'
- oldJar 'com.squareup.okhttp3:okhttp:4.10.0'
+
+// // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+// api 'com.squareup.okhttp3:okhttp:4.10.0'
+// oldJar 'com.squareup.okhttp3:okhttp:4.10.0'
+
// https://mvnrepository.com/artifact/com.zaxxer/HikariCP
compileOnly 'com.zaxxer:HikariCP:5.0.1'
//noinspection GradlePackageUpdate
- oldJar 'com.zaxxer:HikariCP:4.0.3'
+ oldJar('com.zaxxer:HikariCP:4.0.3') exclude group: "org.slf4j"
}
processResources {
diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java
index 2220bc1..3f60339 100644
--- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java
+++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java
@@ -12,7 +12,7 @@ import cn.hamster3.mc.plugin.core.bukkit.page.listener.PageListener;
import cn.hamster3.mc.plugin.core.bukkit.util.ItemStackAdapter;
import cn.hamster3.mc.plugin.core.common.constant.CoreConstantObjects;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
-import cn.hamster3.mc.plugin.core.common.util.MessageTypeAdapter;
+import cn.hamster3.mc.plugin.core.common.misc.MessageTypeAdapter;
import com.google.gson.GsonBuilder;
import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.bukkit.Bukkit;
diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java
index 7f46e9b..d90675f 100644
--- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java
+++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/ParentCommand.java
@@ -44,10 +44,11 @@ public abstract class ParentCommand extends ChildCommand {
@NotNull
@Override
public String getUsage() {
- if (getParent() == null) {
+ ParentCommand parent = getParent();
+ if (parent == null) {
return "/" + name;
}
- return getParent().getUsage() + " " + name;
+ return parent.getUsage() + " " + name;
}
@Override
diff --git a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java
index 730d4d9..9b4a1d1 100644
--- a/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java
+++ b/hamster-core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/command/lore/ParentLoreCommand.java
@@ -3,7 +3,7 @@ package cn.hamster3.mc.plugin.core.bukkit.command.lore;
import cn.hamster3.mc.plugin.core.bukkit.HamsterCorePlugin;
import cn.hamster3.mc.plugin.core.bukkit.command.ParentCommand;
import cn.hamster3.mc.plugin.core.bukkit.command.lore.sub.*;
-import cn.hamster3.mc.plugin.core.common.util.CommonUtils;
+import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.plugin.java.JavaPlugin;
@@ -30,7 +30,7 @@ public final class ParentLoreCommand extends ParentCommand {
@Override
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
- CommonUtils.replaceColorCode(args);
+ CoreUtils.replaceColorCode(args);
return super.onCommand(sender, command, label, args);
}
}
diff --git a/hamster-core-bungeecord/build.gradle b/hamster-core-bungeecord/build.gradle
index 8395216..8071d55 100644
--- a/hamster-core-bungeecord/build.gradle
+++ b/hamster-core-bungeecord/build.gradle
@@ -17,15 +17,17 @@ dependencies {
api 'net.kyori:adventure-platform-bungeecord:4.1.2'
shade 'net.kyori:adventure-platform-bungeecord:4.1.2'
oldJar 'net.kyori:adventure-platform-bungeecord:4.1.2'
- // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
- api 'com.squareup.okhttp3:okhttp:4.10.0'
- shade 'com.squareup.okhttp3:okhttp:4.10.0'
- oldJar 'com.squareup.okhttp3:okhttp:4.10.0'
+
+// // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
+// api 'com.squareup.okhttp3:okhttp:4.10.0'
+// shade 'com.squareup.okhttp3:okhttp:4.10.0'
+// oldJar 'com.squareup.okhttp3:okhttp:4.10.0'
+
// https://mvnrepository.com/artifact/com.zaxxer/HikariCP
compileOnly 'com.zaxxer:HikariCP:5.0.1'
shade 'com.zaxxer:HikariCP:5.0.1'
//noinspection GradlePackageUpdate
- oldJar 'com.zaxxer:HikariCP:4.0.3'
+ oldJar 'com.zaxxer:HikariCP:4.0.3' exclude group: "org.slf4j"
}
processResources {
diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/constant/CoreConstantObjects.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/constant/CoreConstantObjects.java
index 6e6a7e5..eea6558 100644
--- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/constant/CoreConstantObjects.java
+++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/constant/CoreConstantObjects.java
@@ -1,56 +1,20 @@
package cn.hamster3.mc.plugin.core.common.constant;
-import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
-import cn.hamster3.mc.plugin.core.common.util.MessageTypeAdapter;
+import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.jetbrains.annotations.NotNull;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ThreadFactory;
@SuppressWarnings("unused")
-public abstract class CoreConstantObjects {
- /**
- * 异步线程
- */
- public static final ExecutorService WORKER_EXECUTOR = Executors.newCachedThreadPool(new NamedThreadFactory("HamsterCore - Executor"));
- /**
- * 调度器线程
- */
- public static final ScheduledExecutorService SCHEDULED_EXECUTOR = Executors
- .newScheduledThreadPool(1, new NamedThreadFactory("HamsterCore - Scheduler"));
- /**
- * GSON 工具
- */
- public static Gson GSON = new GsonBuilder()
- .registerTypeAdapter(DisplayMessage.class, MessageTypeAdapter.INSTANCE)
- .create();
- /**
- * GSON 工具，会使用格式化输出、且解析中包含null参数
- */
- public static Gson GSON_HUMAN = new GsonBuilder()
- .registerTypeAdapter(DisplayMessage.class, MessageTypeAdapter.INSTANCE)
- .serializeNulls()
- .setPrettyPrinting()
- .create();
-}
+public final class CoreConstantObjects {
+ public static final ExecutorService WORKER_EXECUTOR = CoreUtils.WORKER_EXECUTOR;
+ public static final ScheduledExecutorService SCHEDULED_EXECUTOR = CoreUtils.SCHEDULED_EXECUTOR;
+ public static Gson GSON = CoreUtils.GSON;
+ public static Gson GSON_HUMAN = CoreUtils.GSON_HUMAN;
-class NamedThreadFactory implements ThreadFactory {
- private final String name;
- private int threadID;
-
- public NamedThreadFactory(String name) {
- this.name = name;
- threadID = 0;
- }
-
- @Override
- public Thread newThread(@NotNull Runnable runnable) {
- threadID++;
- return new Thread(runnable, name + "#" + threadID);
+ private CoreConstantObjects() {
}
}
+
diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/MessageTypeAdapter.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/MessageTypeAdapter.java
similarity index 93%
rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/MessageTypeAdapter.java
rename to hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/MessageTypeAdapter.java
index dc8a18b..71b4a12 100644
--- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/MessageTypeAdapter.java
+++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/MessageTypeAdapter.java
@@ -1,4 +1,4 @@
-package cn.hamster3.mc.plugin.core.common.util;
+package cn.hamster3.mc.plugin.core.common.misc;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import com.google.gson.*;
diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/NamedThreadFactory.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/NamedThreadFactory.java
new file mode 100644
index 0000000..d592768
--- /dev/null
+++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/misc/NamedThreadFactory.java
@@ -0,0 +1,21 @@
+package cn.hamster3.mc.plugin.core.common.misc;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.concurrent.ThreadFactory;
+
+public class NamedThreadFactory implements ThreadFactory {
+ private final String name;
+ private int threadID;
+
+ public NamedThreadFactory(String name) {
+ this.name = name;
+ threadID = 0;
+ }
+
+ @Override
+ public Thread newThread(@NotNull Runnable runnable) {
+ threadID++;
+ return new Thread(runnable, name + "#" + threadID);
+ }
+}
diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java
index 875feab..6bdd9b2 100644
--- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java
+++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/Calculator.java
@@ -11,10 +11,6 @@ import java.util.Stack;
* 传入算数表达式，将返回一个浮点值结果
*
* 如果计算过程错误，将返回一个NaN
- *
- * 我也忘了这个类是哪里抄来的
- *
- * 反正它运行起来比直接用 JavaScript 引擎计算要快很多
*/
@SuppressWarnings("unused")
public final class Calculator {
diff --git a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java
similarity index 80%
rename from hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java
rename to hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java
index 039505e..1a60764 100644
--- a/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CommonUtils.java
+++ b/hamster-core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java
@@ -1,5 +1,10 @@
package cn.hamster3.mc.plugin.core.common.util;
+import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
+import cn.hamster3.mc.plugin.core.common.misc.MessageTypeAdapter;
+import cn.hamster3.mc.plugin.core.common.misc.NamedThreadFactory;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -8,12 +13,39 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@SuppressWarnings("unused")
-public final class CommonUtils {
- private CommonUtils() {
+public final class CoreUtils {
+ /**
+ * 异步线程
+ */
+ public static final ExecutorService WORKER_EXECUTOR = Executors.newCachedThreadPool(new NamedThreadFactory("HamsterCore - Executor"));
+ /**
+ * 调度器线程
+ */
+ public static final ScheduledExecutorService SCHEDULED_EXECUTOR = Executors
+ .newScheduledThreadPool(1, new NamedThreadFactory("HamsterCore - Scheduler"));
+ /**
+ * GSON 工具
+ */
+ public static Gson GSON = new GsonBuilder()
+ .registerTypeAdapter(DisplayMessage.class, MessageTypeAdapter.INSTANCE)
+ .create();
+ /**
+ * GSON 工具，会使用格式化输出、且解析中包含null参数
+ */
+ public static Gson GSON_HUMAN = new GsonBuilder()
+ .registerTypeAdapter(DisplayMessage.class, MessageTypeAdapter.INSTANCE)
+ .serializeNulls()
+ .setPrettyPrinting()
+ .create();
+
+ private CoreUtils() {
}
public static void zipCompressionFolder(@NotNull File folder, @NotNull File zipFile) throws IOException {
@@ -175,5 +207,5 @@ public final class CommonUtils {
public static T caseObject(Object o) {
return (T) o;
}
-
}
+