修改builder访问限制

- [A] 添加MessageBuilder，更方便构建参数
- [U] 采用 `Object...` 的形式传入参数

easyplugin-all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-bom/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-command/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -59,6 +59,10 @@
             <type>pom</type>
 
             <exclusions>
+                <exclusion>
+                    <groupId>cc.carm.lib</groupId>
+                    <artifactId>easyplugin-github</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>cc.carm.lib</groupId>
                     <artifactId>easyplugin-placeholderapi</artifactId>

easyplugin-configuration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/EasyMessage.java

@@ -1,105 +1,124 @@
 package cc.carm.lib.easyplugin.configuration.language;
 
 import cc.carm.lib.easyplugin.configuration.file.FileConfig;
+import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageBuilder;
 import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
 import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
-
 public class EasyMessage {
 
-	@Nullable ConfigValue<String> configValue;
+    @Nullable ConfigValue<String> configValue;
 
-	@Nullable String defaultValue;
+    @Nullable String defaultValue;
-	@Nullable String[] messageParams;
+    @Nullable String[] messageParams;
 
-	public EasyMessage() {
+    public static EasyMessageBuilder builder() {
-		this(null);
+        return new EasyMessageBuilder();
-	}
+    }
 
-	public EasyMessage(@Nullable String defaultValue) {
+    public EasyMessage() {
-		this(defaultValue, null);
+        this(null);
-	}
+    }
 
-	public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
+    public EasyMessage(@Nullable String defaultValue) {
-		this.defaultValue = defaultValue;
+        this(defaultValue, null);
-		this.messageParams = messageParams;
+    }
-	}
 
-	public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
+    public EasyMessage(@Nullable String defaultValue, @Nullable String[] messageParams) {
-		this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
+        this.defaultValue = defaultValue;
-	}
+        this.messageParams = messageParams;
+    }
 
-	private @Nullable String getDefaultValue() {
+    public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
-		return defaultValue;
+        this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
-	}
+    }
 
-	private @Nullable String[] getMessageParams() {
+    private @Nullable String getDefaultValue() {
-		return messageParams;
+        return defaultValue;
-	}
+    }
 
-	private @NotNull String getDefaultMessages() {
+    private @Nullable String[] getMessageParams() {
-		if (getDefaultValue() == null) return "";
+        return messageParams;
-		else return getDefaultValue();
+    }
-	}
 
-	private @NotNull String getMessages() {
+    private @NotNull String getDefaultMessages() {
-		if (configValue == null) {
+        if (getDefaultValue() == null) return "";
-			return getDefaultMessages();
+        else return getDefaultValue();
-		} else {
+    }
-			return configValue.get();
-		}
-	}
 
-	public @NotNull String get(@Nullable CommandSender sender) {
+    private @NotNull String getMessages() {
-		return get(sender, null);
+        if (configValue == null) {
-	}
+            return getDefaultMessages();
+        } else {
+            return configValue.get();
+        }
+    }
 
-	public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
+    public @NotNull String get(@Nullable CommandSender sender) {
-		return get(sender, getMessageParams(), values);
+        return get(sender, (Object[]) null);
-	}
+    }
 
-	public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+    public @NotNull String get(@Nullable CommandSender sender, @Nullable Object... values) {
-		if (sender == null) return getMessages();
+        return get(sender, getMessageParams(), values);
-		if (params == null || values == null) {
+    }
-			return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages()));
-		} else {
-			return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
-		}
-	}
 
-	public void send(@Nullable CommandSender sender) {
+    public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		send(sender, null);
+        String messages = getMessages();
-	}
+        if (sender == null || messages.length() < 1) return messages;
+        params = params == null ? new String[0] : params;
+        values = values == null ? new Object[0] : values;
+        return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
+    }
 
-	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
+    public void send(@Nullable CommandSender sender) {
-		send(sender, getMessageParams(), values);
+        send(sender, (Object[]) null);
-	}
+    }
 
-	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+    public void send(@Nullable CommandSender sender, @Nullable Object... values) {
-		if (params == null || values == null) {
+        send(sender, getMessageParams(), values);
-			MessageUtils.sendWithPlaceholders(sender, getMessages());
+    }
-		} else {
-			MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(getMessages()), params, values);
-		}
-	}
 
-	public void sendToAll() {
+    public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		sendToAll(null);
+        String message = get(sender, params, values);
-	}
+        if (message.length() < 1) return;
+        MessageUtils.send(sender, message);
+    }
 
-	public void sendToAll(@Nullable Object[] values) {
+    public void sendBar(@Nullable Player player) {
-		sendToAll(messageParams, values);
+        sendBar(player, (Object[]) null);
-	}
+    }
 
-	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+    public void sendBar(@Nullable Player player, @Nullable Object... values) {
-		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
+        sendBar(player, getMessageParams(), values);
-	}
+    }
+
+    public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
+        if (player == null) return;
+        String message = get(player, params, values);
+
+        if (message.length() < 1) return;
+        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, params, values)));
+    }
+
+    public void sendToAll() {
+        sendToAll((Object[]) null);
+    }
+
+    public void sendToAll(@Nullable Object... values) {
+        sendToAll(messageParams, values);
+    }
+
+    public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+        Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
+    }
 
 
 }

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/EasyMessageList.java

@@ -1,7 +1,9 @@
 package cc.carm.lib.easyplugin.configuration.language;
 
 import cc.carm.lib.easyplugin.configuration.file.FileConfig;
+import cc.carm.lib.easyplugin.configuration.language.builder.EasyMessageListBuilder;
 import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
+import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -15,96 +17,97 @@ import java.util.List;
 
 public class EasyMessageList {
 
-	@Nullable ConfigValueList<String> configValue;
+    @Nullable ConfigValueList<String> configValue;
 
-	@Nullable String[] defaultValue;
+    @Nullable String[] defaultValue;
-	@Nullable String[] messageParams;
+    @Nullable String[] messageParams;
 
-	public EasyMessageList() {
+    public static EasyMessageListBuilder builder() {
-		this((String[]) null);
+        return new EasyMessageListBuilder();
-	}
+    }
 
-	public EasyMessageList(@Nullable String... defaultValue) {
+    public EasyMessageList() {
-		this(defaultValue, null);
+        this((String[]) null);
-	}
+    }
 
-	public EasyMessageList(@Nullable String[] defaultValue,
+    public EasyMessageList(@Nullable String... defaultValue) {
-						   @Nullable String[] messageParams) {
+        this(defaultValue, null);
-		this.defaultValue = defaultValue;
+    }
-		this.messageParams = messageParams;
-	}
 
-	public void initialize(FileConfig sourceConfig, String sectionName) {
+    public EasyMessageList(@Nullable String[] defaultValue,
-		configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
+                           @Nullable String[] messageParams) {
-	}
+        this.defaultValue = defaultValue;
+        this.messageParams = messageParams;
+    }
 
-	private @Nullable String[] getDefaultValue() {
+    public void initialize(FileConfig sourceConfig, String sectionName) {
-		return defaultValue;
+        configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
-	}
+    }
 
-	@Unmodifiable
+    private @Nullable String[] getDefaultValue() {
-	private @NotNull List<String> getDefaultMessages() {
+        return defaultValue;
-		if (getDefaultValue() == null) return new ArrayList<>();
+    }
-		else return Arrays.asList(getDefaultValue());
-	}
 
+    @Unmodifiable
+    private @NotNull List<String> getDefaultMessages() {
+        if (getDefaultValue() == null) return new ArrayList<>();
+        else return Arrays.asList(getDefaultValue());
+    }
 
-	private @Nullable String[] getMessageParams() {
+    private @Nullable String[] getMessageParams() {
-		return messageParams;
+        return messageParams;
-	}
+    }
 
-	private @NotNull List<String> getMessages() {
+    private @NotNull List<String> getMessages() {
-		if (configValue == null) {
+        if (configValue == null) {
-			return getDefaultMessages();
+            return getDefaultMessages();
-		} else {
+        } else {
-			return configValue.get();
+            return configValue.get();
-		}
+        }
-	}
+    }
 
-	public @NotNull List<String> get(@Nullable CommandSender sender) {
+    public @NotNull List<String> get(@Nullable CommandSender sender) {
-		return get(sender, null);
+        return get(sender, (Object[]) null);
-	}
+    }
 
-	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
+    public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object... values) {
-		return get(sender, getMessageParams(), values);
+        return get(sender, getMessageParams(), values);
-	}
+    }
 
-	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+    public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		if (sender == null) return getMessages();
+        if (sender == null) return getMessages();
-		if (params == null || values == null) {
+        params = params == null ? new String[0] : params;
-			return MessageUtils.setPlaceholders(sender, getMessages());
+        values = values == null ? new Object[0] : values;
-		} else {
-			return MessageUtils.setPlaceholders(sender, getMessages(), params, values);
-		}
-	}
 
-	public void send(@Nullable CommandSender sender) {
+        return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
-		send(sender, null);
+    }
-	}
 
-	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
+    public void send(@Nullable CommandSender sender) {
-		send(sender, getMessageParams(), values);
+        send(sender, (Object[]) null);
-	}
+    }
 
-	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+    public void send(@Nullable CommandSender sender, @Nullable Object... values) {
-		if (params == null || values == null) {
+        send(sender, getMessageParams(), values);
-			MessageUtils.sendWithPlaceholders(sender, getMessages());
+    }
-		} else {
-			MessageUtils.sendWithPlaceholders(sender, getMessages(), params, values);
-		}
-	}
 
-	public void sendToAll() {
+    public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		sendToAll(null);
+        List<String> messages = get(sender, params, values);
-	}
+        if (messages.isEmpty()) return;
+        if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
+        MessageUtils.send(sender, messages);
+    }
 
-	public void sendToAll(@Nullable Object[] values) {
+    public void sendToAll() {
-		sendToAll(messageParams, values);
+        sendToAll((Object[]) null);
-	}
+    }
 
-	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+    public void sendToAll(@Nullable Object... values) {
-		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
+        sendToAll(messageParams, values);
-	}
+    }
+
+    public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+        Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
+    }
 
 
 }

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageBuilder.java

@@ -0,0 +1,55 @@
+package cc.carm.lib.easyplugin.configuration.language.builder;
+
+import cc.carm.lib.easyplugin.configuration.language.EasyMessage;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+
+public class EasyMessageBuilder {
+
+    protected String content;
+    protected String[] params;
+
+    protected @Nullable String paramPrefix = "%(";
+    protected @Nullable String paramSuffix = ")";
+
+    public EasyMessageBuilder() {
+    }
+
+
+    public EasyMessageBuilder contents(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public EasyMessageBuilder params(String... placeholders) {
+        this.params = placeholders;
+        return this;
+    }
+
+    public EasyMessageBuilder setParamPrefix(@Nullable String paramPrefix) {
+        this.paramPrefix = paramPrefix;
+        return this;
+    }
+
+    public EasyMessageBuilder setParamSuffix(@Nullable String paramSuffix) {
+        this.paramSuffix = paramSuffix;
+        return this;
+    }
+
+    public EasyMessageBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
+        this.paramPrefix = paramPrefix;
+        this.paramSuffix = paramSuffix;
+        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, buildParams());
+    }
+
+}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/language/builder/EasyMessageListBuilder.java

@@ -0,0 +1,55 @@
+package cc.carm.lib.easyplugin.configuration.language.builder;
+
+import cc.carm.lib.easyplugin.configuration.language.EasyMessageList;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+
+public class EasyMessageListBuilder {
+
+    protected String[] contents;
+    protected String[] params;
+
+    protected @Nullable String paramPrefix = "%(";
+    protected @Nullable String paramSuffix = ")";
+
+    public EasyMessageListBuilder() {
+    }
+
+
+    public EasyMessageListBuilder contents(String... contents) {
+        this.contents = contents;
+        return this;
+    }
+
+    public EasyMessageListBuilder params(String... placeholders) {
+        this.params = placeholders;
+        return this;
+    }
+
+    public EasyMessageListBuilder setParamPrefix(@Nullable String paramPrefix) {
+        this.paramPrefix = paramPrefix;
+        return this;
+    }
+
+    public EasyMessageListBuilder setParamSuffix(@Nullable String paramSuffix) {
+        this.paramSuffix = paramSuffix;
+        return this;
+    }
+
+    public EasyMessageListBuilder setParamFormat(@Nullable String paramPrefix, @Nullable String paramSuffix) {
+        this.paramPrefix = paramPrefix;
+        this.paramSuffix = paramSuffix;
+        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, buildParams());
+    }
+
+}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/message/ConfigMessage.java

@@ -3,13 +3,16 @@ package cc.carm.lib.easyplugin.configuration.message;
 
 import cc.carm.lib.easyplugin.configuration.file.FileConfig;
 import cc.carm.lib.easyplugin.configuration.values.ConfigValue;
+import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collections;
 import java.util.function.Supplier;
 
 public class ConfigMessage extends ConfigValue<String> {
@@ -41,53 +44,67 @@ public class ConfigMessage extends ConfigValue<String> {
 		this.messageParams = messageParams;
 	}
 
-	public @NotNull String get(CommandSender sender) {
+	public String[] getMessageParams() {
-		return MessageUtils.setPlaceholders(sender, get());
+		return messageParams;
 	}
 
-	public @NotNull String get(CommandSender sender, Object[] values) {
+	public @NotNull String get(@Nullable CommandSender sender) {
-		if (messageParams != null) {
+		return get(sender, null);
-			return get(sender, messageParams, values);
-		} else {
-			return get(sender);
-		}
 	}
 
-	public @NotNull String get(CommandSender sender, String[] params, Object[] values) {
+	public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
-		return MessageUtils.setPlaceholders(sender, get(), params, values);
+		return get(sender, getMessageParams(), values);
 	}
 
-	public void send(CommandSender sender) {
+	public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		MessageUtils.sendWithPlaceholders(sender, get());
+		String messages = get();
+		if (sender == null || messages.length() < 1) return messages;
+		params = params == null ? new String[0] : params;
+		values = values == null ? new Object[0] : values;
+		return ColorParser.parse(MessageUtils.setPlaceholders(sender, messages, params, values));
 	}
 
-	public void send(CommandSender sender, Object[] values) {
+	public void send(@Nullable CommandSender sender) {
-		if (messageParams != null) {
+		send(sender, null);
-			send(sender, messageParams, values);
-		} else {
-			send(sender, new String[0], new Object[0]);
-		}
-
 	}
 
-	public void send(CommandSender sender, String[] params, Object[] values) {
+	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
-		MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(get()), params, values);
+		send(sender, getMessageParams(), values);
+	}
+
+	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+		String message = get(sender, params, values);
+		if (message.length() < 1) return;
+
+		MessageUtils.send(sender, message);
+	}
+
+	public void sendBar(@Nullable Player player) {
+		sendBar(player, null);
+	}
+
+	public void sendBar(@Nullable Player player, @Nullable Object[] values) {
+		sendBar(player, getMessageParams(), values);
+	}
+
+	public void sendBar(@Nullable Player player, @Nullable String[] params, @Nullable Object[] values) {
+		if (player == null) return;
+		String message = get(player, params, values);
+		if (message.length() < 1) return;
+
+		player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(get(player, params, values)));
 	}
 
 	public void sendToAll() {
-		Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, Collections.singletonList(get())));
+		sendToAll(null);
 	}
 
-	public void sendToAll(Object[] values) {
+	public void sendToAll(@Nullable Object[] values) {
-		if (messageParams != null) {
+		sendToAll(messageParams, values);
-			sendToAll(messageParams, values);
-		} else {
-			sendToAll();
-		}
 	}
 
-	public void sendToAll(String[] params, Object[] values) {
+	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
-		Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, Collections.singletonList(get()), params, values));
+		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
 	}
 
 	@Override

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/message/ConfigMessageList.java

@@ -3,6 +3,7 @@ package cc.carm.lib.easyplugin.configuration.message;
 
 import cc.carm.lib.easyplugin.configuration.file.FileConfig;
 import cc.carm.lib.easyplugin.configuration.values.ConfigValueList;
+import cc.carm.lib.easyplugin.utils.ColorParser;
 import cc.carm.lib.easyplugin.utils.MessageUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
@@ -41,52 +42,52 @@ public class ConfigMessageList extends ConfigValueList<String> {
 		this.messageParams = messageParams;
 	}
 
+	public String[] getMessageParams() {
+		return messageParams;
+	}
+
 	public @NotNull List<String> get(@Nullable CommandSender sender) {
-		return MessageUtils.setPlaceholders(sender, get());
+		return get(sender, null);
 	}
 
-	public @NotNull List<String> get(@Nullable CommandSender sender, Object[] values) {
+
-		if (messageParams != null) {
+	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
-			return get(sender, messageParams, values);
+		return get(sender, getMessageParams(), values);
-		} else {
-			return get(sender);
-		}
 	}
 
-	public @NotNull List<String> get(@Nullable CommandSender sender, String[] params, Object[] values) {
+	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		return MessageUtils.setPlaceholders(sender, get(), params, values);
+		if (sender == null) return get();
+		params = params == null ? new String[0] : params;
+		values = values == null ? new Object[0] : values;
+
+		return ColorParser.parse(MessageUtils.setPlaceholders(sender, get(), params, values));
 	}
 
 	public void send(@Nullable CommandSender sender) {
-		MessageUtils.sendWithPlaceholders(sender, get());
+		send(sender, null);
 	}
 
-	public void send(@Nullable CommandSender sender, Object[] values) {
+	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
-		if (messageParams != null) {
+		send(sender, getMessageParams(), values);
-			send(sender, messageParams, values);
-		} else {
-			send(sender);
-		}
 	}
 
-	public void send(@Nullable CommandSender sender, String[] params, Object[] values) {
+	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-		MessageUtils.sendWithPlaceholders(sender, get(), params, values);
+		List<String> messages = get(sender, params, values);
-	}
+		if (messages.isEmpty()) return;
-
+		if (messages.size() == 1 && messages.get(0).length() == 0) return; //空消息不再发送
-	public void sendToAll(String[] params, Object[] values) {
+		MessageUtils.send(sender, messages);
-		Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, get(), params, values));
 	}
 
 	public void sendToAll() {
-		Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, get()));
+		sendToAll(null);
 	}
 
-	public void sendToAll(Object[] values) {
+	public void sendToAll(@Nullable Object[] values) {
-		if (messageParams != null) {
+		sendToAll(messageParams, values);
-			sendToAll(messageParams, values);
+	}
-		} else {
+
-			sendToAll();
+	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
-		}
+		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
 	}
 
 	@Override

easyplugin-database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -54,7 +54,7 @@
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easysql-beecp</artifactId>
-            <version>0.2.7</version>
+            <version>0.3.8</version>
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>

easyplugin-gui/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-lp/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-main/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-main/src/main/java/cc/carm/lib/easyplugin/utils/MessageUtils.java

@@ -4,6 +4,8 @@ import me.clip.placeholderapi.PlaceholderAPI;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
@@ -14,104 +16,132 @@ import java.util.stream.Collectors;
 
 public class MessageUtils {
 
-    public static boolean hasPlaceholderAPI() {
+	public static boolean hasPlaceholderAPI() {
-        return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
+		return Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null;
-    }
+	}
 
 
-    public static void send(@Nullable CommandSender sender, String... messages) {
+	public static void send(@Nullable CommandSender sender, String... messages) {
-        send(sender, Arrays.asList(messages));
+		send(sender, Arrays.asList(messages));
-    }
+	}
 
-    public static void send(@Nullable CommandSender sender, List<String> messages) {
+	public static void send(@Nullable CommandSender sender, List<String> messages) {
-        if (messages == null || messages.isEmpty() || sender == null) return;
+		if (messages == null || messages.isEmpty() || sender == null) return;
-        for (String s : messages) {
+		for (String s : messages) {
-            sender.sendMessage(ColorParser.parse(s));
+			sender.sendMessage(ColorParser.parse(s));
-        }
+		}
-    }
+	}
-    
-    public static void sendWithPlaceholders(CommandSender sender, String... messages) {
-        sendWithPlaceholders(sender, Arrays.asList(messages));
-    }
 
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
+	public static void sendWithPlaceholders(CommandSender sender, String... messages) {
-        if (messages == null || messages.isEmpty() || sender == null) return;
+		sendWithPlaceholders(sender, Arrays.asList(messages));
-        send(sender, setPlaceholders(sender, messages));
+	}
-    }
 
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
+	public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages) {
-        sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
+		if (messages == null || messages.isEmpty() || sender == null) return;
-    }
+		send(sender, setPlaceholders(sender, messages));
+	}
 
-    public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
+	public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String param, Object value) {
-        sendWithPlaceholders(sender, setCustomParams(messages, params, values));
+		sendWithPlaceholders(sender, messages, new String[]{param}, new Object[]{value});
-    }
+	}
 
-    public static String setPlaceholders(@Nullable CommandSender sender, String message) {
+	public static void sendWithPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
-        if (message == null || sender == null) return message;
+		sendWithPlaceholders(sender, setCustomParams(messages, params, values));
-        if (hasPlaceholderAPI() && sender instanceof Player) {
+	}
-            return PlaceholderAPI.setPlaceholders((Player) sender, message);
-        } else {
-            return message;
-        }
-    }
 
-    public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages) {
+	public static String setPlaceholders(@Nullable CommandSender sender, @Nullable String message) {
-        if (messages == null || messages.isEmpty() || sender == null) return messages;
+		if (message == null || sender == null) return message;
-        if (hasPlaceholderAPI() && sender instanceof Player) {
+		if (hasPlaceholderAPI() && sender instanceof Player) {
-            return PlaceholderAPI.setPlaceholders((Player) sender, messages);
+			return PlaceholderAPI.setPlaceholders((Player) sender, message);
-        } else {
+		} else {
-            return messages;
+			return message;
-        }
+		}
-    }
+	}
-
-    public static String setPlaceholders(@Nullable CommandSender sender, String message, String[] params, Object[] values) {
-        return setPlaceholders(sender, setCustomParams(message, params, values));
-    }
-
-    public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
-        return setPlaceholders(sender, setCustomParams(messages, params, values));
-    }
-
-    public static String setCustomParams(String message, String param, Object value) {
-        return setCustomParams(message, new String[]{param}, new Object[]{value});
-    }
-
-    public static String setCustomParams(String message, String[] params, Object[] values) {
-        if (params.length != values.length) return message;
-        HashMap<String, Object> paramsMap = new HashMap<>();
-        for (int i = 0; i < params.length; i++) {
-            paramsMap.put(params[i], values[i]);
-        }
-        return setCustomParams(message, paramsMap);
-    }
 
 
-    public static String setCustomParams(String message, HashMap<String, Object> params) {
+	@Nullable
-        String afterMessage = message;
+	@Contract("_, !null -> !null")
-        for (Map.Entry<String, Object> entry : params.entrySet()) {
+	public static List<String> setPlaceholders(@Nullable CommandSender sender,
-            afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
+											   @Nullable List<String> messages) {
-        }
+		if (messages == null || messages.isEmpty() || sender == null) return messages;
-        return afterMessage;
+		if (hasPlaceholderAPI() && sender instanceof Player) {
-    }
+			return PlaceholderAPI.setPlaceholders((Player) sender, messages);
+		} else {
+			return messages;
+		}
+	}
 
-    public static List<String> setCustomParams(List<String> messages, String param, Object value) {
+	public static String setPlaceholders(@Nullable CommandSender sender,
-        return setCustomParams(messages, new String[]{param}, new Object[]{value});
+										 @NotNull String message,
-    }
+										 @Nullable String[] params,
+										 @Nullable Object[] values) {
+		return setPlaceholders(sender, setCustomParams(message, params, values));
+	}
 
-    public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
+	public static List<String> setPlaceholders(@Nullable CommandSender sender,
-        if (params.length != values.length) return messages;
+											   @NotNull List<String> messages,
-        HashMap<String, Object> paramsMap = new HashMap<>();
+											   @Nullable String[] params,
-        for (int i = 0; i < params.length; i++) {
+											   @Nullable Object[] values) {
-            paramsMap.put(params[i], values[i]);
+		return setPlaceholders(sender, setCustomParams(messages, params, values));
-        }
+	}
-        return setCustomParams(messages, paramsMap);
-    }
 
+	public static String setCustomParams(@NotNull String message,
+										 @NotNull String param,
+										 @NotNull Object value) {
+		return setCustomParams(message, new String[]{param}, new Object[]{value});
+	}
 
-    public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
+	@Nullable
-        return messages.stream().map(message -> setCustomParams(message, params)).collect(Collectors.toList());
+	@Contract("!null, _, _-> !null ; null, _, _->null ")
-    }
+	public static String setCustomParams(@Nullable String message,
+										 @Nullable String[] params,
+										 @Nullable Object[] values) {
+		if (message == null) return null;
+		if (params == null || values == null) return message;
+		if (params.length != values.length) return message;
+
+		HashMap<String, Object> paramsMap = new HashMap<>();
+		for (int i = 0; i < params.length; i++) {
+			paramsMap.put(params[i], values[i]);
+		}
+		return setCustomParams(message, paramsMap);
+	}
+
+	@NotNull
+	public static String setCustomParams(@NotNull String message, @NotNull HashMap<String, Object> params) {
+		String afterMessage = message;
+		for (Map.Entry<String, Object> entry : params.entrySet()) {
+			afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
+		}
+		return afterMessage;
+	}
+
+	@NotNull
+	public static List<String> setCustomParams(@NotNull List<String> messages,
+											   @NotNull String param,
+											   @NotNull Object value) {
+		return setCustomParams(messages, new String[]{param}, new Object[]{value});
+	}
+
+	@NotNull
+	public static List<String> setCustomParams(@NotNull List<String> messages,
+											   @Nullable String[] params,
+											   @Nullable Object[] values) {
+		if (params == null || values == null) return messages;
+		if (params.length != values.length) return messages;
+		HashMap<String, Object> paramsMap = new HashMap<>();
+		for (int i = 0; i < params.length; i++) {
+			paramsMap.put(params[i], values[i]);
+		}
+		return setCustomParams(messages, paramsMap);
+	}
+
+	@NotNull
+	public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
+		return messages.stream()
+				.map(message -> setCustomParams(message, params))
+				.collect(Collectors.toList());
+	}
 
 
 }

easyplugin-placeholderapi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-vault/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.4</version>
+        <version>1.3.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

pom.xml

@@ -14,7 +14,7 @@
     <groupId>cc.carm.lib</groupId>
     <artifactId>easyplugin-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.3.4</version>
+    <version>1.3.9</version>
     <modules>
 
         <module>easyplugin-main</module>
@@ -75,12 +75,6 @@
 
     <repositories>
 
-        <repository>
-            <id>carm-repo</id>
-            <name>Carm's Repo</name>
-            <url>https://repo.carm.cc/repository/maven-public/</url>
-        </repository>
-
         <repository>
             <id>central</id>
             <url>https://repo1.maven.org/maven2/</url>
@@ -91,6 +85,17 @@
             <url>https://oss.sonatype.org/content/groups/public</url>
         </repository>
 
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+        </repository>
+
+        <repository>
+            <id>carm-repo</id>
+            <name>Carm's Repo</name>
+            <url>https://repo.carm.cc/repository/maven-public/</url>
+        </repository>
+
         <repository>
             <id>github</id>
             <name>GitHub Packages</name>
@@ -104,13 +109,6 @@
 
     <dependencies>
 
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.13.2-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
@@ -160,9 +158,6 @@
                     <version>3.2.0</version>
                     <configuration>
                         <classifier>javadoc</classifier>
-                        <links>
-                            <link>https://javadoc.io/doc/org.jetbrains/annotations/</link>
-                        </links>
                         <detectJavaApiLink>false</detectJavaApiLink>
                         <encoding>UTF-8</encoding>
                         <charset>UTF-8</charset>