From bfb2015b20b5dda9844bed390351b824d16cf2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=9D=8F=E9=BB=91?= Date: Sat, 10 Mar 2018 21:55:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E8=87=B3?= =?UTF-8?q?=EF=BC=9A3.77?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 调整：Language2 工具变量算法优化 修复：Language2 工具修复 [book] 类型的变量无法识别问题 --- resources/plugin.yml | 2 +- .../string/language2/Language2Format.java | 4 +++- .../string/language2/value/Language2Action.java | 2 +- .../string/language2/value/Language2Book.java | 10 +++++----- .../string/language2/value/Language2Json.java | 16 ++++++++-------- .../string/language2/value/Language2Text.java | 4 ++-- .../string/language2/value/Language2Title.java | 2 +- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/resources/plugin.yml b/resources/plugin.yml index 4d474aa..d7e4a98 100644 --- a/resources/plugin.yml +++ b/resources/plugin.yml @@ -6,7 +6,7 @@ website: http://www.15imc.com/index.html main: me.skymc.taboolib.Main -version: 3.76 +version: 3.77 commands: taboolib: diff --git a/src/main/java/me/skymc/taboolib/string/language2/Language2Format.java b/src/main/java/me/skymc/taboolib/string/language2/Language2Format.java index 634bb15..a79f46b 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/Language2Format.java +++ b/src/main/java/me/skymc/taboolib/string/language2/Language2Format.java @@ -105,7 +105,9 @@ public class Language2Format implements Language2Line { private void parseValue(Player player, List list, Language2Type type) { if (list.size() == 0) { return; - } + } + // 变量转换 + list = language2Value.setPlaceholder(list, player); // 大标题 if (type == Language2Type.TITLE) { diff --git a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Action.java b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Action.java index d68253e..78972b3 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Action.java +++ b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Action.java @@ -80,7 +80,7 @@ public class Language2Action implements Language2Line { @Override public void run() { - ActionUtils.send(player, value.setPlaceholder(text, player)); + ActionUtils.send(player, text); if ((times += 1) >= repeat) { cancel(); } diff --git a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Book.java b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Book.java index 0452823..9545e24 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Book.java +++ b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Book.java @@ -139,17 +139,17 @@ public class Language2Book implements Language2Line { // 遍历内容 for (String _option : entry.getValue()) { if (_option.startsWith(KEY_TEXT)) { - builder.text(value.setPlaceholder(_option.substring(KEY_TEXT.length()), player)); + builder.text(_option.substring(KEY_TEXT.length())); } else if (_option.startsWith(KEY_COMMAND)) { - builder.onClick(ClickAction.runCommand(value.setPlaceholder(_option.substring(KEY_COMMAND.length()), player))); + builder.onClick(ClickAction.runCommand(_option.substring(KEY_COMMAND.length()))); } else if (_option.startsWith(KEY_SUGGEST)) { - builder.onClick(ClickAction.suggestCommand(value.setPlaceholder(_option.substring(KEY_SUGGEST.length()), player))); + builder.onClick(ClickAction.suggestCommand(_option.substring(KEY_SUGGEST.length()))); } else if (_option.startsWith(KEY_URL)) { try { - builder.onClick(ClickAction.openUrl(value.setPlaceholder(_option.substring(KEY_URL.length()), player))); + builder.onClick(ClickAction.openUrl(_option.substring(KEY_URL.length()))); } catch (Exception e) { builder.text("§4[]"); @@ -159,7 +159,7 @@ public class Language2Book implements Language2Line { builder.onClick(ClickAction.changePage(NumberUtils.getInteger(_option.substring(KEY_PAGE.length())))); } else if (_option.startsWith(KEY_SHOWTEXT)) { - builder.onHover(HoverAction.showText(value.setPlaceholder(_option.substring(KEY_SHOWTEXT.length()), player))); + builder.onHover(HoverAction.showText(_option.substring(KEY_SHOWTEXT.length()))); } else if (_option.startsWith(KEY_SHOWITEM)) { ItemStack item = ItemUtils.getCacheItem(_option.substring(KEY_SHOWITEM.length())); diff --git a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Json.java b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Json.java index 9a4a753..731b949 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Json.java +++ b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Json.java @@ -68,7 +68,7 @@ public class Language2Json implements Language2Line { try { // 如果是显示文本 if (message.startsWith(KEY_TEXT)) { - hoverEvent = new ShowTextEvent(value.setPlaceholder(message.replace("||", "\n").substring(KEY_TEXT.length()), player)); + hoverEvent = new ShowTextEvent(message.replace("||", "\n").substring(KEY_TEXT.length())); } // 显示物品 else if (message.startsWith(KEY_ITEM)) { @@ -80,15 +80,15 @@ public class Language2Json implements Language2Line { } // 执行指令 else if (message.startsWith(KEY_COMMAND)) { - clickEvent = new RunCommandEvent(value.setPlaceholder(message.substring(KEY_COMMAND.length()), player)); + clickEvent = new RunCommandEvent(message.substring(KEY_COMMAND.length())); } // 打印指令 else if (message.startsWith(KEY_SUGGEST)) { - clickEvent = new SuggestCommandEvent(value.setPlaceholder(message.substring(KEY_SUGGEST.length()), player)); + clickEvent = new SuggestCommandEvent(message.substring(KEY_SUGGEST.length())); } // 打开连接 else if (message.startsWith(KEY_URL)) { - clickEvent = new OpenUrlEvent(value.setPlaceholder(message.substring(KEY_SUGGEST.length()), player)); + clickEvent = new OpenUrlEvent(message.substring(KEY_SUGGEST.length())); } // 换行 else if (message.equals("[break]")) { @@ -149,16 +149,16 @@ public class Language2Json implements Language2Line { private void append(String current, ClickEvent clickEvent, HoverEvent hoverEvent) { if (clickEvent == null && hoverEvent == null) { // 纯文本 - json.append(value.setPlaceholder(current, player)); + json.append(current); } else if (clickEvent != null && hoverEvent == null) { // 纯点击 - json.appendClick(value.setPlaceholder(current, player), clickEvent); + json.appendClick(current, clickEvent); } else if (clickEvent == null && hoverEvent != null) { // 纯显示 - json.appendHover(value.setPlaceholder(current, player), hoverEvent); + json.appendHover(current, hoverEvent); } else { // 全部 - json.appendHoverClick(value.setPlaceholder(current, player), hoverEvent, clickEvent); + json.appendHoverClick(current, hoverEvent, clickEvent); } // 追加显示文本 text.append(current); diff --git a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Text.java b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Text.java index 895a480..1c8a1f1 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Text.java +++ b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Text.java @@ -36,14 +36,14 @@ public class Language2Text implements Language2Line { @Override public void send(Player player) { for (String line : text) { - player.sendMessage(value.setPlaceholder(line, player)); + player.sendMessage(line); } } @Override public void console() { for (String line : text) { - Bukkit.getConsoleSender().sendMessage(value.setPlaceholder(line, null)); + Bukkit.getConsoleSender().sendMessage(line); } } } diff --git a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Title.java b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Title.java index b601890..2a01d62 100644 --- a/src/main/java/me/skymc/taboolib/string/language2/value/Language2Title.java +++ b/src/main/java/me/skymc/taboolib/string/language2/value/Language2Title.java @@ -79,7 +79,7 @@ public class Language2Title implements Language2Line { player.sendMessage(ChatColor.DARK_RED + "[]"); } else { - TitleUtils.sendTitle(player, value.setPlaceholder(title, player), value.setPlaceholder(subtitle, player), fade1, stay, fade2); + TitleUtils.sendTitle(player, title, subtitle, fade1, stay, fade2); } }