diff --git a/src/main/src/me/skymc/taboolib/commands/sub/HelpCommand.java b/src/main/src/me/skymc/taboolib/commands/sub/HelpCommand.java index d64d523..afa53fa 100644 --- a/src/main/src/me/skymc/taboolib/commands/sub/HelpCommand.java +++ b/src/main/src/me/skymc/taboolib/commands/sub/HelpCommand.java @@ -40,7 +40,7 @@ public class HelpCommand extends SubCommand { helps.put("/taboolib cycle info §8[§7名称§8]", "§e查询检查器信息"); helps.put("/taboolib cycle reset §8[§7名称§8]", "§e初始化时间检查器"); helps.put("/taboolib cycle update §8[§7名称§8]", "§e更新时间检查器"); - helps.put("§d", null); + helps.put("§f", null); helps.put("/taboolib shell load §8[§7名称§8]", "§e载入某个脚本"); helps.put("/taboolib shell unload §8[§7名称§8]", "§e卸载某个脚本"); helps.put("§e", null); diff --git a/src/main/src/me/skymc/taboolib/cooldown/seconds/CooldownUtils2.java b/src/main/src/me/skymc/taboolib/cooldown/seconds/CooldownUtils2.java index 8067859..2f3fd45 100644 --- a/src/main/src/me/skymc/taboolib/cooldown/seconds/CooldownUtils2.java +++ b/src/main/src/me/skymc/taboolib/cooldown/seconds/CooldownUtils2.java @@ -18,23 +18,27 @@ import me.skymc.taboolib.message.MsgUtils; public class CooldownUtils2 implements Listener { private static ConcurrentHashMap packlist = new ConcurrentHashMap<>(); + + public static ConcurrentHashMap getCooldownPacks() { + return packlist; + } public static void register(CooldownPack2 pack) { packlist.put(pack.getPackName(), pack); - MsgUtils.send("注册冷却包: " + pack.getPackName() + ", 时间: " + pack.getPackSeconds() + " 秒 (匿名注册)"); +// MsgUtils.send("注册冷却包: " + pack.getPackName() + ", 时间: " + pack.getPackSeconds() + " 秒 (匿名注册)"); } public static void register(CooldownPack2 pack, Plugin plugin) { pack.setPlugin(plugin.getName()); packlist.put(pack.getPackName(), pack); - MsgUtils.send("注册冷却包: " + pack.getPackName() + ", 时间: " + pack.getPackSeconds() + " 秒 (" + plugin.getName() + ")"); +// MsgUtils.send("注册冷却包: " + pack.getPackName() + ", 时间: " + pack.getPackSeconds() + " 秒 (" + plugin.getName() + ")"); } public static void unregister(String name) { packlist.remove(name); - MsgUtils.send("注销冷却包: " + name + " (主动注销)"); +// MsgUtils.send("注销冷却包: " + name + " (主动注销)"); } @EventHandler @@ -52,7 +56,7 @@ public class CooldownUtils2 implements Listener { if (pack.getPlugin().equals(e.getPlugin().getName())) { packlist.remove(pack.getPackName()); - MsgUtils.send("注销冷却包: " + pack.getPackName() + " (自动注销)"); +// MsgUtils.send("注销冷却包: " + pack.getPackName() + " (自动注销)"); } } } diff --git a/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java b/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java index 5b6c7bf..4f74255 100644 --- a/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java +++ b/src/main/src/me/skymc/taboolib/string/language2/Language2Value.java @@ -23,7 +23,7 @@ import me.skymc.taboolib.string.language2.type.Language2Title; * @author sky * @since 2018年2月13日 下午3:05:15 */ -public class Language2Value { +public class Language2Value extends Object { @Getter private Language2 language; @@ -272,4 +272,9 @@ public class Language2Value { } return list; } + + @Override + public String toString() { + return asString(); + } }