From 13a9bb5f756eaf7e1bbf8a8929cf1f0f0f99d7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= Date: Tue, 27 Feb 2018 12:27:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=87=B3?= =?UTF-8?q?=203.68?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增:Language2Value 对象新增 toString() 方法。 删除:CooldownUtils2 工具取消注册/注销提示 --- .../me/skymc/taboolib/commands/sub/HelpCommand.java | 2 +- .../taboolib/cooldown/seconds/CooldownUtils2.java | 12 ++++++++---- .../taboolib/string/language2/Language2Value.java | 7 ++++++- 3 files changed, 15 insertions(+), 6 deletions(-) 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]", "eijű"); helps.put("/taboolib shell unload 8[7ơ8]", "eжijű"); 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 2018213 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(); + } }