From 26922f9225c92bfa52af687510e9aa9c30a182d7 Mon Sep 17 00:00:00 2001 From: CarmJos Date: Mon, 25 Apr 2022 09:59:25 +0800 Subject: [PATCH] =?UTF-8?q?[1.1.3-SNAPSHOT]=20=E4=BC=98=E5=8C=96=E7=A9=BA?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BF=BD=E7=95=A5=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bukkit/pom.xml | 2 +- bungee/pom.xml | 2 +- craftbukkit/pom.xml | 2 +- .../configuration/craft/data/MessageText.java | 4 ++-- .../craft/value/ConfiguredMessage.java | 14 ++++---------- .../craft/value/ConfiguredMessageList.java | 17 +++++++---------- pom.xml | 2 +- spigot/pom.xml | 2 +- 8 files changed, 18 insertions(+), 27 deletions(-) diff --git a/bukkit/pom.xml b/bukkit/pom.xml index 30cd1585..c8e0eba5 100644 --- a/bukkit/pom.xml +++ b/bukkit/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/bungee/pom.xml b/bungee/pom.xml index eb796a23..3d07e7d9 100644 --- a/bungee/pom.xml +++ b/bungee/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/craftbukkit/pom.xml b/craftbukkit/pom.xml index 17eef1b8..0cb3d982 100644 --- a/craftbukkit/pom.xml +++ b/craftbukkit/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0 diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/MessageText.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/MessageText.java index fe2729b7..1ab84284 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/MessageText.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/data/MessageText.java @@ -50,7 +50,7 @@ public MessageText(@NotNull String message) { else return parser.apply(sender, setPlaceholders(message, placeholders)); } - protected static Map buildParams(@Nullable String[] params, @Nullable Object[] values) { + public static Map buildParams(@Nullable String[] params, @Nullable Object[] values) { Map map = new HashMap<>(); if (params == null || params.length == 0) return map; for (int i = 0; i < params.length; i++) { @@ -59,7 +59,7 @@ protected static Map buildParams(@Nullable String[] params, @Nul return map; } - protected static String setPlaceholders(@NotNull String messages, @NotNull Map placeholders) { + public static String setPlaceholders(@NotNull String messages, @NotNull Map placeholders) { if (messages.isEmpty()) return messages; String parsed = messages; diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessage.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessage.java index 97abe9e9..aabf20f8 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessage.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessage.java @@ -54,22 +54,17 @@ public ConfiguredMessage(@Nullable ConfigurationProvider provider, } public @Nullable M parse(@Nullable CommandSender sender, @Nullable Object... values) { - MessageText value = get(); - if (value == null) return null; - else return value.parse(this.messageParser, sender, this.params, values); + return parse(sender, MessageText.buildParams(params, values)); } public @Nullable M parse(@Nullable CommandSender sender, @NotNull Map placeholders) { MessageText value = get(); - if (value == null) return null; + if (value == null || value.getMessage().isEmpty()) return null; else return value.parse(this.messageParser, sender, placeholders); } public void send(@Nullable CommandSender receiver, @Nullable Object... values) { - if (receiver == null) return; - M parsed = parse(receiver, values); - if (parsed == null) return; - sendFunction.accept(receiver, parsed); + send(receiver, MessageText.buildParams(params, values)); } public void send(@Nullable CommandSender receiver, @NotNull Map placeholders) { @@ -80,8 +75,7 @@ public void send(@Nullable CommandSender receiver, @NotNull Map } public void broadcast(@Nullable Object... values) { - Bukkit.getOnlinePlayers().forEach(pl -> send(pl, values)); - send(Bukkit.getConsoleSender(), values); + broadcast(MessageText.buildParams(params, values)); } public void broadcast(@NotNull Map placeholders) { diff --git a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessageList.java b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessageList.java index 417951cf..d122ec4b 100644 --- a/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessageList.java +++ b/craftbukkit/src/main/java/cc/carm/lib/configuration/craft/value/ConfiguredMessageList.java @@ -51,24 +51,22 @@ public ConfiguredMessageList(@Nullable ConfigurationProvider provider, } public @Nullable List parse(@Nullable CommandSender sender, @Nullable Object... values) { - List list = get(); - if (list.isEmpty()) return null; - return list.stream().map(value -> value.parse(this.messageParser, sender, this.params, values)) - .collect(Collectors.toList()); + return parse(sender, MessageText.buildParams(params, values)); } public @Nullable List parse(@Nullable CommandSender sender, @NotNull Map placeholders) { List list = get(); if (list.isEmpty()) return null; + + List messages = list.stream().map(MessageText::getMessage).collect(Collectors.toList()); + if (String.join("", messages).isEmpty()) return null; + return list.stream().map(value -> value.parse(this.messageParser, sender, placeholders)) .collect(Collectors.toList()); } public void send(@Nullable CommandSender receiver, @Nullable Object... values) { - if (receiver == null) return; - List parsed = parse(receiver, values); - if (parsed == null) return; - sendFunction.accept(receiver, parsed); + send(receiver, MessageText.buildParams(params, values)); } public void send(@Nullable CommandSender receiver, @NotNull Map placeholders) { @@ -79,8 +77,7 @@ public void send(@Nullable CommandSender receiver, @NotNull Map } public void broadcast(@Nullable Object... values) { - Bukkit.getOnlinePlayers().forEach(pl -> send(pl, values)); - send(Bukkit.getConsoleSender(), values); + broadcast(MessageText.buildParams(params, values)); } public void broadcast(@NotNull Map placeholders) { diff --git a/pom.xml b/pom.xml index b9e3f2f0..0c554935 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ cc.carm.lib mineconfiguration-parent - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT pom MineConfiguration diff --git a/spigot/pom.xml b/spigot/pom.xml index a9030a70..d5dee672 100644 --- a/spigot/pom.xml +++ b/spigot/pom.xml @@ -5,7 +5,7 @@ mineconfiguration-parent cc.carm.lib - 1.1.2-SNAPSHOT + 1.1.3-SNAPSHOT 4.0.0