From dd277e99e8ddd8232b6cb17c429023aaacb0a723 Mon Sep 17 00:00:00 2001 From: CarmJos Date: Fri, 25 Feb 2022 22:24:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E7=AB=8BbuildParams=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../language/builder/EasyMessageBuilder.java | 8 ++++++-- .../language/builder/EasyMessageListBuilder.java | 8 ++++++-- pom.xml | 5 +++++ 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java b/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java index 2e3f3f9..1b5a8f8 100644 --- a/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java +++ b/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java @@ -4,7 +4,6 @@ import cc.carm.lib.easyplugin.configuration.language.EasyMessage; import org.jetbrains.annotations.Nullable; import java.util.Arrays; -import java.util.Optional; public class EasyMessageBuilder { @@ -44,8 +43,13 @@ public class EasyMessageBuilder { return this; } + protected @Nullable String[] buildParams() { + if (this.params == null) return null; + else return Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new); + } + public EasyMessage build() { - return new EasyMessage(this.content, Optional.ofNullable(this.params).map(params -> Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new)).orElse(null)); + return new EasyMessage(this.content, buildParams()); } } diff --git a/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java b/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java index 1b5f332..08f8117 100644 --- a/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java +++ b/easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java @@ -4,7 +4,6 @@ import cc.carm.lib.easyplugin.configuration.language.EasyMessageList; import org.jetbrains.annotations.Nullable; import java.util.Arrays; -import java.util.Optional; public class EasyMessageListBuilder { @@ -44,8 +43,13 @@ public class EasyMessageListBuilder { return this; } + protected @Nullable String[] buildParams() { + if (this.params == null) return null; + else return Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new); + } + public EasyMessageList build() { - return new EasyMessageList(this.contents, Optional.ofNullable(this.params).map(params -> Arrays.stream(this.params).map(param -> paramPrefix + param + paramSuffix).toArray(String[]::new)).orElse(null)); + return new EasyMessageList(this.contents, buildParams()); } } diff --git a/pom.xml b/pom.xml index cd23803..aeb6b2d 100644 --- a/pom.xml +++ b/pom.xml @@ -85,6 +85,11 @@ https://oss.sonatype.org/content/groups/public + + spigot-repo + https://hub.spigotmc.org/nexus/content/repositories/snapshots/ + + carm-repo Carm's Repo