From 236693a6a1dda1b6f08a417e820374bbb67ff474 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Tue, 23 Dec 2025 20:09:21 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=88=9D=E6=AD=A5=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NewTipsVariables/utils/LoadVariables.java | 16 +++--- .../utils/PluginsListEnum.java | 29 ++++++++++ .../NewTipsVariables/utils/PluginsState.java | 53 ++++++++----------- 3 files changed, 60 insertions(+), 38 deletions(-) create mode 100644 src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java index e99b4d9..50c5f49 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java @@ -20,22 +20,24 @@ public static LuckPerms getLP() { //需要加载的变量的插件 public static void pluginVariables() { + PluginsState.initPluginStates(); + PluginsState ps = PluginsState.getInstance(); boolean debug = Main.debug; List pluginList = Arrays.asList("playerPoints","EconomyAPI","OreArea","RSTask","HealthAPI","LevelAwakenSystem","RSWeapon","LuckPerms"); - for(String plugin: pluginList){ + /*for(String plugin: pluginList){ if (Server.getInstance().getPluginManager().getPlugin(plugin) != null) { ps.setPluginState(plugin); if (debug) {Main.getInstance().getLogger().info(Main.debugPrefix+"§a找到插件§e【§b"+plugin+"§e】§a相关变量已加载");} } else if (debug) { Main.getInstance().getLogger().info(Main.debugPrefix+"§a无法找到插件§e【§b"+plugin+"§e】§a相相关变量加载失败,请安装相关插件再试"); } - } - Api.registerVariables("SmallasWaterPlugins", SmallasWaterPlugins.class); - if (ps.economyAPI) { - Api.registerVariables("EconomyApiVariable", EconomyApiVariable.class); - } - if (ps.luckPerms) { + }*/ +// Api.registerVariables("SmallasWaterPlugins", SmallasWaterPlugins.class); +// if (ps.economyAPI) { +// Api.registerVariables("EconomyApiVariable", EconomyApiVariable.class); +// } + if (PluginsState.getPluginsStates().get(PluginsListEnum.LUCK_PERMS.getName())) { luckperms = LuckPermsProvider.get(); Api.registerVariables("LuckPermsVar", LuckPermsVar.class); } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java new file mode 100644 index 0000000..94f29aa --- /dev/null +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java @@ -0,0 +1,29 @@ +package cn.stevei5mc.NewTipsVariables.utils; + +public enum PluginsListEnum { + +// PLAYER_POINTS("playerPoints"), +// ECONOMY_API("EconomyAPI"), +// ORE_AREA("OreArea"), +// RS_TASK("RSTask"), +// HEALTH_API("HealthAPI"), +// LEVEL_AWAKEN_SYSTEM("LevelAwakenSystem"), +// RS_WEAPON("RSWeapon"), + LUCK_PERMS("LuckPerms", "net.luckperms.api.LuckPermsProvider"); + + private final String name; + private final String mainClass; + + PluginsListEnum(String name, String mainClass) { + this.name = name; + this.mainClass = mainClass; + } + + public String getName() { + return name; + } + + public String getMainClass() { + return mainClass; + } +} diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java index 24b99c3..62517f9 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java @@ -1,10 +1,32 @@ package cn.stevei5mc.NewTipsVariables.utils; +import cn.stevei5mc.NewTipsVariables.Main; +import lombok.Getter; + +import java.util.HashMap; + public class PluginsState { private static PluginsState instance; + @Getter + private static HashMap pluginsStates; + private static Main main = Main.getInstance(); + public static void initPluginStates() { + pluginsStates = new HashMap<>(); + for (PluginsListEnum plugin: PluginsListEnum.values()) { + try{ + Class.forName(plugin.getMainClass()); + pluginsStates.put(plugin.getName(), true); + main.getLogger().info(Main.debugPrefix + "§a找到插件§e【§b" + plugin.getName() + "§e】§a相关变量已加载"); + }catch (Exception ignore) { + pluginsStates.put(plugin.getName(), false); + main.getLogger().info(Main.debugPrefix + "§a无法找到插件§e【§b" + plugin.getName() + "§e】§a相相关变量加载失败,请安装相关插件再试"); + } + } + } + public static PluginsState getInstance() { if (instance == null) { instance = new PluginsState(); @@ -22,35 +44,4 @@ public static PluginsState getInstance() { public boolean rSWeapon = false; public boolean luckPerms = false; - public void setPluginState(String pluginName) { - switch (pluginName) { - case "playerPoints": - playerPoints = true; - break; - case "EconomyAPI": - economyAPI = true; - break; - case "OreArea": - oreArea = true; - break; - case "RSTask": - rSTask = true; - break; - case "HealthAPI": - healthAPI = true; - break; - case "LevelAwakenSystem": - levelAwakenSystem = true; - break; - case "RSWeapon": - rSWeapon = true; - break; - case "LuckPerms": - luckPerms = true; - break; - default: - // 对于其他插件，不做任何操作，因为没有必要 - break; - } - } } \ No newline at end of file From 7251e2c7f5c9aab9cd055f54f636d47a1f108df3 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Wed, 24 Dec 2025 11:54:50 +0800 Subject: [PATCH 02/11] Update --- .../NewTipsVariables/utils/LoadVariables.java | 17 ++++------------- .../NewTipsVariables/utils/PluginsListEnum.java | 2 +- .../NewTipsVariables/utils/PluginsState.java | 6 ++++-- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java index 50c5f49..ea4af31 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java @@ -24,20 +24,11 @@ public static void pluginVariables() { PluginsState ps = PluginsState.getInstance(); boolean debug = Main.debug; - List pluginList = Arrays.asList("playerPoints","EconomyAPI","OreArea","RSTask","HealthAPI","LevelAwakenSystem","RSWeapon","LuckPerms"); - /*for(String plugin: pluginList){ - if (Server.getInstance().getPluginManager().getPlugin(plugin) != null) { - ps.setPluginState(plugin); - if (debug) {Main.getInstance().getLogger().info(Main.debugPrefix+"§a找到插件§e【§b"+plugin+"§e】§a相关变量已加载");} - } else if (debug) { - Main.getInstance().getLogger().info(Main.debugPrefix+"§a无法找到插件§e【§b"+plugin+"§e】§a相相关变量加载失败,请安装相关插件再试"); - } - }*/ // Api.registerVariables("SmallasWaterPlugins", SmallasWaterPlugins.class); -// if (ps.economyAPI) { -// Api.registerVariables("EconomyApiVariable", EconomyApiVariable.class); -// } - if (PluginsState.getPluginsStates().get(PluginsListEnum.LUCK_PERMS.getName())) { + if (PluginsState.getPluginState(PluginsListEnum.ECONOMY_API.getName())) { + Api.registerVariables("EconomyApiVariable", EconomyApiVariable.class); + } + if (PluginsState.getPluginState(PluginsListEnum.LUCK_PERMS.getName())) { luckperms = LuckPermsProvider.get(); Api.registerVariables("LuckPermsVar", LuckPermsVar.class); } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java index 94f29aa..ad40737 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java @@ -3,7 +3,7 @@ public enum PluginsListEnum { // PLAYER_POINTS("playerPoints"), -// ECONOMY_API("EconomyAPI"), + ECONOMY_API("EconomyAPI", "me.onebone.economyapi.EconomyAPI"), // ORE_AREA("OreArea"), // RS_TASK("RSTask"), // HEALTH_API("HealthAPI"), diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java index 62517f9..d4256e5 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java @@ -27,6 +27,10 @@ public static void initPluginStates() { } } + public static boolean getPluginState(String pluginName) { + return pluginsStates.getOrDefault(pluginName, false); + } + public static PluginsState getInstance() { if (instance == null) { instance = new PluginsState(); @@ -36,12 +40,10 @@ public static PluginsState getInstance() { // 插件的状态 public boolean playerPoints = false; - public boolean economyAPI = false; public boolean oreArea = false; public boolean rSTask = false; public boolean healthAPI = false; public boolean levelAwakenSystem = false; public boolean rSWeapon = false; - public boolean luckPerms = false; } \ No newline at end of file From 0a69473f0de38edc8a01e985b24855a7d363fd59 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Wed, 24 Dec 2025 19:42:30 +0800 Subject: [PATCH 03/11] Update --- src/main/java/cn/stevei5mc/NewTipsVariables/Main.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java b/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java index e4688ac..87f5f28 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java @@ -42,7 +42,8 @@ public void onLoad() { public void onEnable() { //判断需要的前置插件是否存在 - if (this.getServer().getPluginManager().getPlugin("Tips") != null) { + try{ + Class.forName("tip.Main"); //存在则加载该插件 this.getServer().getCommandMap().register("", new NewTipsVariablesCommand());//注册命令 this.tipsVariables();//加载变量部分 @@ -54,10 +55,10 @@ public void onEnable() { Plugin pl = getServer().getPluginManager().getPlugin("UnicodeVariables"); if (pl != null) { Server.getInstance().getPluginManager().disablePlugin(pl); - getLogger().info("§c插件UnicodeVariables的功能已合并到本插件，插件UnicodeVariables不再接受维护，你可以将其删除掉来使用本插件的相关功能"); + getLogger().info("§c插件UnicodeVariables的功能已合并到本插件，插件UnicodeVariables不再接受维护，你可以将其删除掉来使用本插件的相关功能"); } },20); - } else { + }catch (Exception ignore) { //不存在作为卸载该插件 this.getLogger().warning("§c未检测到前置插件§aTips§c，请安装§aTips§c再试!!!"); this.getLogger().warning("§b下载地址: §ehttps://motci.cn/job/GameCore/ 或 https://ci.lanink.cn/job/GameCore/"); From 1b862975589d88f95d55bc900712fc3e9f78f22a Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Wed, 24 Dec 2025 20:09:32 +0800 Subject: [PATCH 04/11] Update --- .../command/NewTipsVariablesCommand.java | 4 ++-- .../command/sub/CheckStateCommand.java | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java index 9ecf24d..2eb9633 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java @@ -10,7 +10,7 @@ public class NewTipsVariablesCommand extends BaseCommand { public NewTipsVariablesCommand() { - super("NewTipsVariables", "NewTipsVariables 命令"); + super("newtipsvariables", "NewTipsVariables 命令"); this.setPermission("newtipsariables.admin"); this.addSubCommand(new ReloadCommand("reload")); this.addSubCommand(new CheckStateCommand("checkstatus")); @@ -19,7 +19,7 @@ public NewTipsVariablesCommand() { @Override public void sendHelp(CommandSender sender) { - String cmdname = "§a/newtipsariables "; + String cmdname = "§a/newtipsvariables "; sender.sendMessage("§b=== NewTipsVariables ==="); sender.sendMessage(cmdname+"reload §e重载配置文件"); sender.sendMessage(cmdname+"checkstatus §e检查插件的状态"); diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java index 130676c..e93b464 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java @@ -3,6 +3,7 @@ import cn.nukkit.command.CommandSender; import cn.nukkit.command.data.CommandParameter; import cn.stevei5mc.NewTipsVariables.command.BaseSubCommand; +import cn.stevei5mc.NewTipsVariables.utils.PluginsListEnum; import cn.stevei5mc.NewTipsVariables.utils.PluginsState; public class CheckStateCommand extends BaseSubCommand { @@ -23,16 +24,11 @@ public String[] getAliases() { @Override public boolean execute(CommandSender sender, String label, String[] args) { - PluginsState ps = PluginsState.getInstance(); - sender.sendMessage("Plugins loading status"); - sender.sendMessage("playerPoints = " + ps.playerPoints); - sender.sendMessage("EconomyAPI = " + ps.economyAPI); - sender.sendMessage("OreArea = " + ps.oreArea); - sender.sendMessage("RSTask = " + ps.rSTask); - sender.sendMessage("HealthAPI = " + ps.healthAPI); - sender.sendMessage("LevelAwakenSystem = " + ps.levelAwakenSystem); - sender.sendMessage("RSWeapon = " + ps.rSWeapon); - sender.sendMessage("LuckPerms = " + ps.luckPerms); + for (PluginsListEnum plugin : PluginsListEnum.values()) { + String name = plugin.getName(); + boolean state = PluginsState.getPluginState(name); + sender.sendMessage("§b" + name + "§7=§a" + state); + } return true; } From 20649b95222c5afaf7731a73645f44a58b9eae49 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Thu, 25 Dec 2025 14:37:23 +0800 Subject: [PATCH 05/11] Update --- .../NewTipsVariables/utils/GetConfigInfo.java | 4 +-- .../NewTipsVariables/utils/LoadVariables.java | 4 +-- .../utils/PluginsListEnum.java | 12 +++---- .../NewTipsVariables/utils/PluginsState.java | 33 +++++-------------- .../variables/SmallasWaterPlugins.java | 14 ++++---- 5 files changed, 25 insertions(+), 42 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java index 34fabfe..4d454e7 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java @@ -15,7 +15,7 @@ public static String getServerTps() { String serverTpslowColor = Main.getInstance().getConfigInServer().getString("TPS.low_color");//low值 int serverTpsMediumValue = Main.getInstance().getConfigInServer().getInt("TPS.medium_value");//medium值 String serverTpsMediumColor = Main.getInstance().getConfigInServer().getString("TPS.medium_color"); - int serverTpsHgihValue = Main.getInstance().getConfigInServer().getInt("TPS.high_value");//hgih值 + int serverTpsHgihValue = Main.getInstance().getConfigInServer().getInt("TPS.high_value");//high值 String serverTpsHgihColor = Main.getInstance().getConfigInServer().getString("TPS.high_color"); String serverTps; float tpsValue = Server.getInstance().getTicksPerSecond(); @@ -92,7 +92,7 @@ public static String getPlayerHealth(Player player) { double healthValue; String healthValue2; String healthMaxValue; - if (PluginsState.getInstance().healthAPI) { + if (PluginsState.getPluginState(PluginsListEnum.HEALTH_API.getName())) { PlayerHealth health = PlayerHealth.getPlayerHealth(player); healthValue = health.getHealth(); healthValue2 = String.valueOf(healthValue); diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java index ea4af31..78161c8 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java @@ -22,9 +22,7 @@ public static LuckPerms getLP() { public static void pluginVariables() { PluginsState.initPluginStates(); - PluginsState ps = PluginsState.getInstance(); - boolean debug = Main.debug; -// Api.registerVariables("SmallasWaterPlugins", SmallasWaterPlugins.class); + Api.registerVariables("SmallasWaterPlugins", SmallasWaterPlugins.class); if (PluginsState.getPluginState(PluginsListEnum.ECONOMY_API.getName())) { Api.registerVariables("EconomyApiVariable", EconomyApiVariable.class); } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java index ad40737..6641274 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsListEnum.java @@ -2,13 +2,13 @@ public enum PluginsListEnum { -// PLAYER_POINTS("playerPoints"), + PLAYER_POINTS("playerPoints", "net.player.PlayerPoint"), ECONOMY_API("EconomyAPI", "me.onebone.economyapi.EconomyAPI"), -// ORE_AREA("OreArea"), -// RS_TASK("RSTask"), -// HEALTH_API("HealthAPI"), -// LEVEL_AWAKEN_SYSTEM("LevelAwakenSystem"), -// RS_WEAPON("RSWeapon"), + ORE_AREA("OreArea", "ore.area.AreaMainClass"), + RS_TASK("RSTask", "com.task.RsTask"), + HEALTH_API("HealthAPI", "healthapi.HealthMainClass"), + LEVEL_AWAKEN_SYSTEM("LevelAwakenSystem", "AwakenSystem.AwakenSystem"), + RS_WEAPON("RSWeapon", "weapon.RsWeapon"), LUCK_PERMS("LuckPerms", "net.luckperms.api.LuckPermsProvider"); private final String name; diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java index d4256e5..9b45b49 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java @@ -6,44 +6,29 @@ import java.util.HashMap; public class PluginsState { - - private static PluginsState instance; + @Getter - private static HashMap pluginsStates; - private static Main main = Main.getInstance(); + private static HashMap pluginsState; + private static final Main main = Main.getInstance(); public static void initPluginStates() { - pluginsStates = new HashMap<>(); + pluginsState = new HashMap<>(); for (PluginsListEnum plugin: PluginsListEnum.values()) { try{ + main.getLogger().info("Enabled: " + main.getServer().getPluginManager().getPlugin(plugin.getName()).isEnabled()); + main.getLogger().info("Disabled: " + main.getServer().getPluginManager().getPlugin(plugin.getName()).isDisabled()); Class.forName(plugin.getMainClass()); - pluginsStates.put(plugin.getName(), true); + pluginsState.put(plugin.getName(), true); main.getLogger().info(Main.debugPrefix + "§a找到插件§e【§b" + plugin.getName() + "§e】§a相关变量已加载"); }catch (Exception ignore) { - pluginsStates.put(plugin.getName(), false); + pluginsState.put(plugin.getName(), false); main.getLogger().info(Main.debugPrefix + "§a无法找到插件§e【§b" + plugin.getName() + "§e】§a相相关变量加载失败,请安装相关插件再试"); } } } public static boolean getPluginState(String pluginName) { - return pluginsStates.getOrDefault(pluginName, false); - } - - public static PluginsState getInstance() { - if (instance == null) { - instance = new PluginsState(); - } - return instance; + return pluginsState.getOrDefault(pluginName, false); } - - // 插件的状态 - public boolean playerPoints = false; - public boolean oreArea = false; - public boolean rSTask = false; - public boolean healthAPI = false; - public boolean levelAwakenSystem = false; - public boolean rSWeapon = false; - } \ No newline at end of file diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/variables/SmallasWaterPlugins.java b/src/main/java/cn/stevei5mc/NewTipsVariables/variables/SmallasWaterPlugins.java index e8b4211..16aaf37 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/variables/SmallasWaterPlugins.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/variables/SmallasWaterPlugins.java @@ -6,6 +6,7 @@ import AwakenSystem.utils.nbtItems; import cn.nukkit.Player; import cn.nukkit.item.Item; +import cn.stevei5mc.NewTipsVariables.utils.PluginsListEnum; import cn.stevei5mc.NewTipsVariables.utils.PluginsState; import com.task.utils.tasks.PlayerFile; import com.task.utils.tasks.taskitems.PlayerTask; @@ -30,23 +31,22 @@ public SmallasWaterPlugins(Player player) { public void strReplace() { if (player != null && player.isOnline()) { - PluginsState ps = PluginsState.getInstance(); - if (ps.playerPoints) { + if (PluginsState.getPluginState(PluginsListEnum.PLAYER_POINTS.getName())) { playerPoint(); } - if (ps.rSTask) { + if (PluginsState.getPluginState(PluginsListEnum.RS_TASK.getName())) { RsTask(); } - if (ps.oreArea) { + if (PluginsState.getPluginState(PluginsListEnum.ORE_AREA.getName())) { OreArea(); } - if (ps.healthAPI) { + if (PluginsState.getPluginState(PluginsListEnum.HEALTH_API.getName())) { HealthAPI(); } - if (ps.rSWeapon) { + if (PluginsState.getPluginState(PluginsListEnum.RS_WEAPON.getName())) { RSWeapon(); } - if (ps.levelAwakenSystem) { + if (PluginsState.getPluginState(PluginsListEnum.LEVEL_AWAKEN_SYSTEM.getName())) { LevelAwakenSystem(); } } From 15540d37174f18dcd10ab80e32a2a1eff7370707 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Thu, 25 Dec 2025 19:47:06 +0800 Subject: [PATCH 06/11] Update --- .../cn/stevei5mc/NewTipsVariables/Main.java | 2 +- .../command/sub/CheckStateCommand.java | 3 +- .../NewTipsVariables/utils/PluginsState.java | 30 ++++++++++++------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java b/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java index 87f5f28..80a5f9b 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/Main.java @@ -43,7 +43,7 @@ public void onLoad() { public void onEnable() { //判断需要的前置插件是否存在 try{ - Class.forName("tip.Main"); + Class.forName("tip.utils.variables.BaseVariable"); //存在则加载该插件 this.getServer().getCommandMap().register("", new NewTipsVariablesCommand());//注册命令 this.tipsVariables();//加载变量部分 diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java index e93b464..329efc5 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java @@ -27,7 +27,8 @@ public boolean execute(CommandSender sender, String label, String[] args) { for (PluginsListEnum plugin : PluginsListEnum.values()) { String name = plugin.getName(); boolean state = PluginsState.getPluginState(name); - sender.sendMessage("§b" + name + "§7=§a" + state); + String color = state ? "§a" : "§c"; + sender.sendMessage("§b" + name + "§7=" + color + state); } return true; } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java index 9b45b49..203015a 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java @@ -15,20 +15,30 @@ public class PluginsState { public static void initPluginStates() { pluginsState = new HashMap<>(); for (PluginsListEnum plugin: PluginsListEnum.values()) { - try{ - main.getLogger().info("Enabled: " + main.getServer().getPluginManager().getPlugin(plugin.getName()).isEnabled()); - main.getLogger().info("Disabled: " + main.getServer().getPluginManager().getPlugin(plugin.getName()).isDisabled()); - Class.forName(plugin.getMainClass()); - pluginsState.put(plugin.getName(), true); - main.getLogger().info(Main.debugPrefix + "§a找到插件§e【§b" + plugin.getName() + "§e】§a相关变量已加载"); - }catch (Exception ignore) { - pluginsState.put(plugin.getName(), false); - main.getLogger().info(Main.debugPrefix + "§a无法找到插件§e【§b" + plugin.getName() + "§e】§a相相关变量加载失败,请安装相关插件再试"); - } + checkPluginState(plugin); + } + } + + public static void checkPluginState(PluginsListEnum plugin) { + try{ + Class.forName(plugin.getMainClass()); + setPluginsState(plugin.getName(), true); + main.getLogger().info(Main.debugPrefix + "§a找到插件§e【§b" + plugin.getName() + "§e】§a相关变量已加载"); + }catch (Exception ignore) { + setPluginsState(plugin.getName(), false); + main.getLogger().info(Main.debugPrefix + "§a无法找到插件§e【§b" + plugin.getName() + "§e】§a相关变量加载失败,请安装相关插件再试"); } } public static boolean getPluginState(String pluginName) { return pluginsState.getOrDefault(pluginName, false); } + + private static void setPluginsState(String pluginName, boolean state) { + if(pluginsState.containsKey(pluginName)) { + pluginsState.replace(pluginName, state); + }else { + pluginsState.put(pluginName, state); + } + } } \ No newline at end of file From 84364a7a883440d0f81733d1cc853d29d1198889 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Fri, 26 Dec 2025 11:58:26 +0800 Subject: [PATCH 07/11] Update --- .../NewTipsVariables/command/NewTipsVariablesCommand.java | 6 +++--- .../cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java index 2eb9633..276abfb 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java @@ -19,9 +19,9 @@ public NewTipsVariablesCommand() { @Override public void sendHelp(CommandSender sender) { - String cmdname = "§a/newtipsvariables "; + String cmdName = "§a/" + getName(); sender.sendMessage("§b=== NewTipsVariables ==="); - sender.sendMessage(cmdname+"reload §e重载配置文件"); - sender.sendMessage(cmdname+"checkstatus §e检查插件的状态"); + sender.sendMessage(cmdName + "reload §e重载配置文件"); + sender.sendMessage(cmdName +" checkstatus §e检查插件的状态"); } } \ No newline at end of file diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java index 78161c8..3c51026 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/LoadVariables.java @@ -1,7 +1,5 @@ package cn.stevei5mc.NewTipsVariables.utils; -import cn.nukkit.Server; -import cn.stevei5mc.NewTipsVariables.Main; import cn.stevei5mc.NewTipsVariables.variables.EconomyApiVariable; import cn.stevei5mc.NewTipsVariables.variables.LuckPermsVar; import cn.stevei5mc.NewTipsVariables.variables.SmallasWaterPlugins; @@ -9,9 +7,6 @@ import net.luckperms.api.LuckPermsProvider; import tip.utils.Api; -import java.util.Arrays; -import java.util.List; - public class LoadVariables{ private static LuckPerms luckperms; public static LuckPerms getLP() { From 910fda897822a22304c8d9316c9cd6da960b8356 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Fri, 26 Dec 2025 12:04:10 +0800 Subject: [PATCH 08/11] Update --- .../NewTipsVariables/command/NewTipsVariablesCommand.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java index 276abfb..ae02f40 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java @@ -4,9 +4,6 @@ import cn.stevei5mc.NewTipsVariables.command.sub.CheckStateCommand; import cn.stevei5mc.NewTipsVariables.command.sub.ReloadCommand; -/** - * @author lt_name - */ public class NewTipsVariablesCommand extends BaseCommand { public NewTipsVariablesCommand() { From 07ff7495fecec7573755e7da4a2fc2e12bfd72fc Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Fri, 26 Dec 2025 18:21:26 +0800 Subject: [PATCH 09/11] ci: fix --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 248a6a4..ea28283 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,6 @@ on: - '[0-9]+.[0-9]+.[0-9]+' - '[0-9]+.[0-9]+.[0-9]+-beta[0-9]+' pull_request: - branches: [master] workflow_dispatch: jobs: From 1fb51be87c0d9c1fe67aedf7ed8683d8780d8ab2 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Sat, 27 Dec 2025 19:59:41 +0800 Subject: [PATCH 10/11] Update --- .../NewTipsVariables/command/NewTipsVariablesCommand.java | 2 +- .../NewTipsVariables/command/sub/CheckStateCommand.java | 3 ++- .../java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java index ae02f40..ab88be2 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/NewTipsVariablesCommand.java @@ -17,7 +17,7 @@ public NewTipsVariablesCommand() { @Override public void sendHelp(CommandSender sender) { String cmdName = "§a/" + getName(); - sender.sendMessage("§b=== NewTipsVariables ==="); + sender.sendMessage("§bNewTipsVariables 命令帮助"); sender.sendMessage(cmdName + "reload §e重载配置文件"); sender.sendMessage(cmdName +" checkstatus §e检查插件的状态"); } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java index 329efc5..399b686 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java @@ -24,11 +24,12 @@ public String[] getAliases() { @Override public boolean execute(CommandSender sender, String label, String[] args) { + sender.sendMessage("§bNewTipsVariables 支持插件的状态列表"); for (PluginsListEnum plugin : PluginsListEnum.values()) { String name = plugin.getName(); boolean state = PluginsState.getPluginState(name); String color = state ? "§a" : "§c"; - sender.sendMessage("§b" + name + "§7=" + color + state); + sender.sendMessage("§3" + name + "§7=" + color + state); } return true; } diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java index 203015a..bca895a 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/PluginsState.java @@ -26,7 +26,7 @@ public static void checkPluginState(PluginsListEnum plugin) { main.getLogger().info(Main.debugPrefix + "§a找到插件§e【§b" + plugin.getName() + "§e】§a相关变量已加载"); }catch (Exception ignore) { setPluginsState(plugin.getName(), false); - main.getLogger().info(Main.debugPrefix + "§a无法找到插件§e【§b" + plugin.getName() + "§e】§a相关变量加载失败,请安装相关插件再试"); + main.getLogger().info(Main.debugPrefix + "§c无法找到插件§e【§b" + plugin.getName() + "§e】§c相关变量加载失败,请安装相关插件再试"); } } From 655108a38af734f2a8ad0157dc1822ba8210d0b6 Mon Sep 17 00:00:00 2001 From: stevei5mc <82391055+stevei5mc@users.noreply.github.com> Date: Sun, 28 Dec 2025 19:29:59 +0800 Subject: [PATCH 11/11] Update --- .../command/sub/CheckStateCommand.java | 2 +- .../NewTipsVariables/utils/GetConfigInfo.java | 10 +++++----- .../NewTipsVariables/variables/BaseVariables.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java index 399b686..ad4292a 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/command/sub/CheckStateCommand.java @@ -24,7 +24,7 @@ public String[] getAliases() { @Override public boolean execute(CommandSender sender, String label, String[] args) { - sender.sendMessage("§bNewTipsVariables 支持插件的状态列表"); + sender.sendMessage("§bNewTipsVariables 支持插件的状态列表:"); for (PluginsListEnum plugin : PluginsListEnum.values()) { String name = plugin.getName(); boolean state = PluginsState.getPluginState(name); diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java index 4d454e7..6fe9bbe 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/utils/GetConfigInfo.java @@ -60,16 +60,16 @@ private static String getWorldName(String worldName) { * @return 玩家的延迟 */ public static String getPlayerPing(Player player) { - String playerPingLowColor = Main.getInstance().getConfigInPlayer().getString("ping.low_color");//low值 + String playerPingLowColor = Main.getInstance().getConfigInPlayer().getString("ping.low_color");// low color int playerPingMediumValue = Main.getInstance().getConfigInPlayer().getInt("ping.medium_value");//medium值 String playerPingMediumColor = Main.getInstance().getConfigInPlayer().getString("ping.medium_color"); - int playerPingHgihValue = Main.getInstance().getConfigInPlayer().getInt("ping.high_value");//hgih值 - String playerPingHgihColor = Main.getInstance().getConfigInPlayer().getString("ping.high_color"); + int playerPingHighValue = Main.getInstance().getConfigInPlayer().getInt("ping.high_value");//high值 + String playerPingHighColor = Main.getInstance().getConfigInPlayer().getString("ping.high_color"); String playerMS; int pingValue = player.getPing(); //low=0 - if (pingValue >= playerPingHgihValue) { - playerMS = playerPingHgihColor + pingValue; + if (pingValue >= playerPingHighValue) { + playerMS = playerPingHighColor + pingValue; }else if (pingValue >= playerPingMediumValue) { playerMS = playerPingMediumColor + pingValue; }else { diff --git a/src/main/java/cn/stevei5mc/NewTipsVariables/variables/BaseVariables.java b/src/main/java/cn/stevei5mc/NewTipsVariables/variables/BaseVariables.java index e634028..ca9cfa1 100644 --- a/src/main/java/cn/stevei5mc/NewTipsVariables/variables/BaseVariables.java +++ b/src/main/java/cn/stevei5mc/NewTipsVariables/variables/BaseVariables.java @@ -12,11 +12,11 @@ public BaseVariables(Player player) { } public void strReplace() { + text(); + unicode(); + server(); if (player != null && player.isOnline()) { - text(); player(); - server(); - unicode(); } }