2 Commits

Author SHA1 Message Date
a75853187c style: 移除无效异常信息 2024-07-25 20:23:04 +08:00
2263a74a77 feat: 兼容1.21 2024-07-25 20:22:32 +08:00
4 changed files with 19 additions and 11 deletions

View File

@@ -35,7 +35,6 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.logging.Level;
public class HamsterCorePlugin extends JavaPlugin {
@Getter
@@ -91,7 +90,7 @@ public class HamsterCorePlugin extends JavaPlugin {
CoreBukkitAPI.init(configFile);
simpleLogger.info("已初始化 CoreAPI");
} catch (Exception e) {
simpleLogger.log(Level.WARNING, "初始化 CoreAPI 出错", e);
simpleLogger.error(e, "初始化 CoreAPI 出错");
}
CoreMessage.init(this);
simpleLogger.info("已初始化语言文本");
@@ -114,6 +113,9 @@ public class HamsterCorePlugin extends JavaPlugin {
simpleLogger.info("已注册 CallbackListener");
Bukkit.getPluginManager().registerEvents(DebugListener.INSTANCE, this);
simpleLogger.info("已注册 DebugListener");
simpleLogger.info("Redis 启用状态: %b", CoreAPI.getInstance().isEnableRedis());
simpleLogger.info("Database 启用状态: %b", CoreAPI.getInstance().isEnableDatabase());
simpleLogger.info("已注册 DebugListener");
long time = System.currentTimeMillis() - start;
sync(() -> {
PointAPI.reloadPlayerPointAPIHook();

View File

@@ -61,9 +61,11 @@ public class MinecraftVersion {
@NotNull
public static Class<?> getNMSClass(@NotNull String className) throws ClassNotFoundException {
if (version1 >= 1 && version2 >= 17) {
if (version1 >= 1) {
if (version2 >= 17) {
return Class.forName("net.minecraft.server." + className);
}
}
String nmsVersion = getNMSVersion();
return Class.forName("net.minecraft.server." + nmsVersion + "." + className);
}
@@ -79,9 +81,14 @@ public class MinecraftVersion {
@NotNull
public static Class<?> getCraftBukkitClass(@NotNull String className) throws ClassNotFoundException {
if (version1 >= 1 && version2 >= 20 && version3 >= 6) {
if (version1 >= 1) {
if (version2 >= 21) {
return Class.forName("org.bukkit.craftbukkit." + className);
}
if (version2 == 20 && version3 >= 6) {
return Class.forName("org.bukkit.craftbukkit." + className);
}
}
String nmsVersion = getNMSVersion();
return Class.forName("org.bukkit.craftbukkit." + nmsVersion + "." + className);
}

View File

@@ -19,7 +19,6 @@ import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.logging.Level;
public class HamsterCorePlugin extends Plugin {
@Getter
@@ -51,7 +50,7 @@ public class HamsterCorePlugin extends Plugin {
CoreBungeeAPI.init(configFile);
simpleLogger.info("已初始化 CoreAPI");
} catch (Exception e) {
simpleLogger.log(Level.WARNING, "初始化 CoreAPI 出错", e);
simpleLogger.error(e, "初始化 CoreAPI 出错");
}
long time = System.currentTimeMillis() - start;
simpleLogger.info("仓鼠核心初始化完成,总计耗时 " + time + " ms");

View File

@@ -19,9 +19,9 @@ public abstract class SimpleLogger {
try {
log(level, String.format(msg, args));
} catch (Exception e) {
log(Level.WARNING, "输出日志 " + msg + " 时遇到一个异常");
log(Level.WARNING, "日志参数: " + Arrays.toString(args));
log(Level.WARNING, "异常信息: ", e);
log(Level.WARNING, "输出日志 %s 时遇到一个异常", msg);
log(Level.WARNING, "日志参数: %s", Arrays.toString(args));
log(Level.WARNING, e, "异常信息: ");
}
}