[v1.3.6] 更新 EasySQL 版本到 0.3.0 。

- [U] 优化消息发送逻辑，不再向玩家发送空消息。

easyplugin-all/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/cast/ConfigSectionCast.java

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
 
@@ -22,13 +23,19 @@ public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
 	public ConfigSectionCast(@NotNull String sectionName,
 							 @NotNull Function<ConfigurationSection, V> valueCast,
 							 @Nullable V defaultValue) {
-		this(null, sectionName, valueCast, defaultValue);
+		this((Supplier<FileConfig>) null, sectionName, valueCast, defaultValue);
 	}
 
 	public ConfigSectionCast(@Nullable FileConfig source, @NotNull String sectionName,
 							 @NotNull Function<ConfigurationSection, V> valueCast,
 							 @Nullable V defaultValue) {
-		super(source, sectionName);
+		this(source == null ? null : () -> source, sectionName, valueCast, defaultValue);
+	}
+
+	public ConfigSectionCast(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+							 @NotNull Function<ConfigurationSection, V> valueCast,
+							 @Nullable V defaultValue) {
+		super(provider, sectionName);
 		this.valueCast = valueCast;
 		this.defaultValue = defaultValue;
 	}
@@ -51,7 +58,6 @@ public class ConfigSectionCast<V> extends FileConfigCachedValue<V> {
 	}
 
 
-
 	public void set(ConfigurationSection section) {
 	}
 

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/cast/ConfigStringCast.java

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ConfigStringCast<V> extends FileConfigCachedValue<V> {
 
@@ -21,13 +22,19 @@ public class ConfigStringCast<V> extends FileConfigCachedValue<V> {
 	public ConfigStringCast(@NotNull String configSection,
 							@NotNull Function<String, V> valueCast,
 							@Nullable V defaultValue) {
-		this(null, configSection, valueCast, defaultValue);
+		this((Supplier<FileConfig>) null, configSection, valueCast, defaultValue);
 	}
 
 	public ConfigStringCast(@Nullable FileConfig source, @NotNull String sectionName,
 							@NotNull Function<String, V> valueCast,
 							@Nullable V defaultValue) {
-		super(source, sectionName);
+		this(source == null ? null : () -> source, sectionName, valueCast, defaultValue);
+	}
+
+	public ConfigStringCast(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+							@NotNull Function<String, V> valueCast,
+							@Nullable V defaultValue) {
+		super(provider, sectionName);
 		this.valueCast = valueCast;
 		this.defaultValue = defaultValue;
 	}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/file/FileConfigCachedValue.java

@@ -3,6 +3,8 @@ package cc.carm.lib.easyplugin.configuration.file;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.function.Supplier;
+
 public abstract class FileConfigCachedValue<V> extends FileConfigValue {
 
 	protected V cachedValue;
@@ -12,8 +14,8 @@ public abstract class FileConfigCachedValue<V> extends FileConfigValue {
 		super(sectionName);
 	}
 
-	public FileConfigCachedValue(@Nullable FileConfig source, @NotNull String sectionName) {
-		super(source, sectionName);
+	public FileConfigCachedValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName) {
+		super(provider, sectionName);
 	}
 
 	public V updateCache(V value) {

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/file/FileConfigValue.java

@@ -6,18 +6,19 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public abstract class FileConfigValue {
 
-	protected @Nullable FileConfig source;
+	protected @Nullable Supplier<FileConfig> provider;
 	private final @NotNull String sectionName;
 
 	public FileConfigValue(@NotNull String sectionName) {
 		this(null, sectionName);
 	}
 
-	public FileConfigValue(@Nullable FileConfig source, @NotNull String sectionName) {
-		this.source = source;
+	public FileConfigValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName) {
+		this.provider = provider;
 		this.sectionName = sectionName;
 	}
 
@@ -52,7 +53,7 @@ public abstract class FileConfigValue {
 	}
 
 	public @Nullable FileConfig getSource() {
-		return source == null ? FileConfig.getPluginConfiguration() : source;
+		return provider == null || provider.get() == null ? defaultSource() : provider.get();
 	}
 
 	public Optional<FileConfig> getSourceOptional() {
@@ -71,4 +72,8 @@ public abstract class FileConfigValue {
 		return clazz.isInstance(val) ? clazz.cast(val) : defaultValue;
 	}
 
+	public FileConfig defaultSource() {
+		return FileConfig.getPluginConfiguration();
+	}
+
 }

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/impl/ConfigItem.java

@@ -0,0 +1,152 @@
+package cc.carm.lib.easyplugin.configuration.impl;
+
+import cc.carm.lib.easyplugin.configuration.cast.ConfigSectionCast;
+import cc.carm.lib.easyplugin.configuration.file.FileConfig;
+import cc.carm.lib.easyplugin.utils.ItemStackFactory;
+import cc.carm.lib.easyplugin.utils.MessageUtils;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+public class ConfigItem extends ConfigSectionCast<ConfigItem.ItemConfiguration> {
+
+	@Nullable
+	String[] itemParams;
+
+	public ConfigItem(@NotNull String configSection) {
+		this(configSection, null, null);
+	}
+
+	public ConfigItem(@NotNull String configSection,
+					  @Nullable String[] itemParams) {
+		this(configSection, itemParams, null);
+	}
+
+	public ConfigItem(@NotNull String configSection,
+					  @Nullable ItemConfiguration defaultValue) {
+		this(configSection, null, defaultValue);
+	}
+
+	public ConfigItem(@NotNull String sectionName,
+					  @Nullable String[] itemParams,
+					  @Nullable ItemConfiguration defaultValue) {
+		this(null, sectionName, itemParams, defaultValue);
+	}
+
+	public ConfigItem(@Nullable Supplier<FileConfig> provider,
+					  @NotNull String sectionName,
+					  @Nullable String[] itemParams,
+					  @Nullable ItemConfiguration defaultValue) {
+		this(provider, sectionName, ConfigItem::parseItemConfiguration, itemParams, defaultValue);
+	}
+
+	public ConfigItem(@Nullable Supplier<FileConfig> provider,
+					  @NotNull String sectionName,
+					  @NotNull Function<ConfigurationSection, ItemConfiguration> valueCast,
+					  @Nullable String[] itemParams,
+					  @Nullable ItemConfiguration defaultValue) {
+		super(provider, sectionName, valueCast, defaultValue);
+		this.itemParams = itemParams;
+	}
+
+	public ItemStack getItem(@NotNull Player player) {
+		return getItem(player, null);
+	}
+
+	public ItemStack getItem(@NotNull Player player,
+							 @Nullable Object[] values) {
+		if (values != null && itemParams != null && itemParams.length > 0) {
+			return getItem(player, itemParams, values);
+		} else {
+			return getItem(player, null, null);
+		}
+	}
+
+	public ItemStack getItem(@NotNull Player player,
+							 @Nullable String[] params,
+							 @Nullable Object[] values) {
+		params = params == null ? new String[0] : params;
+		values = values == null ? new Object[0] : values;
+
+		ItemConfiguration configuration = get();
+		if (configuration == null) return null;
+
+		ItemStackFactory factory = new ItemStackFactory(configuration.getType());
+		if (configuration.getName() != null) {
+			factory.setDisplayName(MessageUtils.setCustomParams(configuration.getName(), params, values));
+		}
+
+		if (configuration.getLore() != null) {
+			factory.setLore(MessageUtils.setCustomParams(configuration.getLore(), params, values));
+		}
+
+		return factory.toItemStack();
+	}
+
+	public static class ItemConfiguration {
+
+		@NotNull Material type;
+		@Nullable String name;
+		@Nullable List<String> lore;
+
+		public ItemConfiguration(@NotNull Material type, @Nullable String name, @Nullable List<String> lore) {
+			this.type = type;
+			this.name = name;
+			this.lore = lore;
+		}
+
+
+		public @NotNull Material getType() {
+			return type;
+		}
+
+		public @Nullable String getName() {
+			return name;
+		}
+
+
+		public @Nullable List<String> getLore() {
+			return lore;
+		}
+
+		public static ItemConfiguration readFrom(@NotNull ConfigurationSection section) {
+			String typeName = section.getString("type");
+			if (typeName == null) return null;
+			Material type = Material.matchMaterial(typeName);
+			if (type == null) return null;
+			String name = section.getString("name");
+			List<String> lore = section.getStringList("lore");
+			return new ItemConfiguration(type, name, lore);
+		}
+	}
+
+	private static ItemConfiguration parseItemConfiguration(@NotNull ConfigurationSection section) {
+		return ItemConfiguration.readFrom(section);
+	}
+
+	@NotNull
+	public static ItemConfiguration create(@NotNull Material type) {
+		return create(type, null);
+	}
+
+	@NotNull
+	public static ItemConfiguration create(@NotNull Material type,
+										   @Nullable String name) {
+		return create(type, name, null);
+	}
+
+	@NotNull
+	public static ItemConfiguration create(@NotNull Material type,
+										   @Nullable String name,
+										   @Nullable String[] lore) {
+		return new ItemConfiguration(type, name, lore == null ? null : Arrays.asList(lore));
+	}
+}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/impl/ConfigSound.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
 
@@ -18,12 +19,20 @@ public class ConfigSound extends ConfigStringCast<ConfigSound.SoundData> {
 
 	public ConfigSound(@NotNull String configSection,
 					   @Nullable Sound defaultValue) {
-		this(null, configSection, defaultValue);
+		this((Supplier<FileConfig>) null, configSection, defaultValue);
 	}
 
 	public ConfigSound(@Nullable FileConfig source, @NotNull String configSection,
 					   @Nullable Sound defaultValue) {
-		super(source, configSection, getSoundParser(), defaultValue == null ? null : new SoundData(defaultValue));
+		this(source == null ? null : () -> source, configSection, defaultValue);
+	}
+
+	public ConfigSound(@Nullable Supplier<FileConfig> provider, @NotNull String configSection,
+					   @Nullable Sound defaultValue) {
+		super(provider, configSection,
+				getSoundParser(),
+				defaultValue == null ? null : new SoundData(defaultValue)
+		);
 	}
 
 	public void set(@Nullable SoundData value) {

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

@@ -4,13 +4,14 @@ 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;
-
 public class EasyMessage {
 
 	@Nullable ConfigValue<String> configValue;
@@ -31,8 +32,8 @@ public class EasyMessage {
 		this.messageParams = messageParams;
 	}
 
-    public void initialize(@NotNull FileConfig sourceConfig, @NotNull String sectionName) {
-        this.configValue = new ConfigValue<>(sourceConfig, sectionName, String.class, getDefaultValue());
+	public void initialize(@NotNull FileConfig source, @NotNull String sectionName) {
+		this.configValue = new ConfigValue<>(() -> source, sectionName, String.class, getDefaultValue());
 	}
 
 	private @Nullable String getDefaultValue() {
@@ -65,12 +66,11 @@ public class EasyMessage {
 	}
 
 	public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-        if (sender == null) return getMessages();
-        if (params == null || values == null) {
-            return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages()));
-        } else {
-            return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
-        }
+		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) {
@@ -82,11 +82,25 @@ public class EasyMessage {
 	}
 
 	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-        if (params == null || values == null) {
-            MessageUtils.sendWithPlaceholders(sender, getMessages());
-        } else {
-            MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(getMessages()), params, 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() {

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

@@ -2,6 +2,7 @@ package cc.carm.lib.easyplugin.configuration.language;
 
 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;
@@ -35,7 +36,7 @@ public class EasyMessageList {
 	}
 
 	public void initialize(FileConfig sourceConfig, String sectionName) {
-        configValue = new ConfigValueList<>(sourceConfig, sectionName, String.class, getDefaultValue());
+		configValue = new ConfigValueList<>(() -> sourceConfig, sectionName, String.class, getDefaultValue());
 	}
 
 	private @Nullable String[] getDefaultValue() {
@@ -48,7 +49,6 @@ public class EasyMessageList {
 		else return Arrays.asList(getDefaultValue());
 	}
 
-
 	private @Nullable String[] getMessageParams() {
 		return messageParams;
 	}
@@ -71,11 +71,10 @@ public class EasyMessageList {
 
 	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
 		if (sender == null) return getMessages();
-        if (params == null || values == null) {
-            return MessageUtils.setPlaceholders(sender, getMessages());
-        } else {
-            return MessageUtils.setPlaceholders(sender, getMessages(), params, values);
-        }
+		params = params == null ? new String[0] : params;
+		values = values == null ? new Object[0] : values;
+
+		return ColorParser.parse(MessageUtils.setPlaceholders(sender, getMessages(), params, values));
 	}
 
 	public void send(@Nullable CommandSender sender) {
@@ -87,11 +86,10 @@ public class EasyMessageList {
 	}
 
 	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
-        if (params == null || values == null) {
-            MessageUtils.sendWithPlaceholders(sender, getMessages());
-        } else {
-            MessageUtils.sendWithPlaceholders(sender, getMessages(), params, values);
-        }
+		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() {

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

@@ -3,13 +3,17 @@ 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> {
 
@@ -23,70 +27,88 @@ public class ConfigMessage extends ConfigValue<String> {
 		this(sectionName, defaultValue, null);
 	}
 
-	public ConfigMessage(@NotNull String sectionName, @Nullable String defaultValue, String[] messageParams) {
-		super(null, sectionName, String.class, defaultValue);
-		this.messageParams = messageParams;
+	public ConfigMessage(@NotNull String sectionName,
+						 @Nullable String defaultValue,
+						 String[] messageParams) {
+		this((Supplier<FileConfig>) null, sectionName, defaultValue, messageParams);
 	}
 
 	public ConfigMessage(@Nullable FileConfig source, @NotNull String sectionName,
 						 @Nullable String defaultValue, String[] messageParams) {
-		super(source, sectionName, String.class, defaultValue);
+		this(source == null ? null : () -> source, sectionName, defaultValue, messageParams);
+	}
+
+	public ConfigMessage(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+						 @Nullable String defaultValue, String[] messageParams) {
+		super(provider, sectionName, String.class, defaultValue);
 		this.messageParams = messageParams;
 	}
 
-	public @NotNull String get(CommandSender sender) {
-		return MessageUtils.setPlaceholders(sender, get());
+	public String[] getMessageParams() {
+		return messageParams;
 	}
 
-	public @NotNull String get(CommandSender sender, Object[] values) {
-		if (messageParams != null) {
-			return get(sender, messageParams, values);
-		} else {
-			return get(sender);
-		}
+	public @NotNull String get(@Nullable CommandSender sender) {
+		return get(sender, null);
 	}
 
-	public @NotNull String get(CommandSender sender, String[] params, Object[] values) {
-		return MessageUtils.setPlaceholders(sender, get(), params, values);
+	public @NotNull String get(@Nullable CommandSender sender, @Nullable Object[] values) {
+		return get(sender, getMessageParams(), values);
 	}
 
-	public void send(CommandSender sender) {
-		MessageUtils.sendWithPlaceholders(sender, get());
+	public @NotNull String get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+		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) {
-		if (messageParams != null) {
-			send(sender, messageParams, values);
-		} else {
-			send(sender, new String[0], new Object[0]);
+	public void send(@Nullable CommandSender sender) {
+		send(sender, null);
 	}
 
+	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
+		send(sender, getMessageParams(), values);
 	}
 
-	public void send(CommandSender sender, String[] params, Object[] values) {
-		MessageUtils.sendWithPlaceholders(sender, Collections.singletonList(get()), params, 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) {
-		if (messageParams != null) {
+	public void sendToAll(@Nullable Object[] values) {
 		sendToAll(messageParams, values);
-		} else {
-			sendToAll();
-		}
 	}
 
-	public void sendToAll(String[] params, Object[] values) {
-		Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, Collections.singletonList(get()), params, values));
+	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
 	}
 
 	@Override
-	public @Nullable FileConfig getSource() {
-		return source == null ? FileConfig.getMessageConfiguration() : source;
+	public FileConfig defaultSource() {
+		return FileConfig.getMessageConfiguration();
 	}
-
-
 }

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;
@@ -10,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
+import java.util.function.Supplier;
 
 public class ConfigMessageList extends ConfigValueList<String> {
 
@@ -23,68 +25,73 @@ public class ConfigMessageList extends ConfigValueList<String> {
 		this(sectionName, defaultValue, null);
 	}
 
-	public ConfigMessageList(@NotNull String sectionName, @Nullable String[] defaultValue, String[] messageParams) {
-		super(null, sectionName, String.class, defaultValue);
-		this.messageParams = messageParams;
+	public ConfigMessageList(@NotNull String sectionName,
+							 @Nullable String[] defaultValue,
+							 String[] messageParams) {
+		this((Supplier<FileConfig>) null, sectionName, defaultValue, null);
 	}
 
 	public ConfigMessageList(@Nullable FileConfig source, @NotNull String sectionName,
 							 @Nullable String[] defaultValue, String[] messageParams) {
-		super(source, sectionName, String.class, defaultValue);
+		this(source == null ? null : () -> source, sectionName, defaultValue, messageParams);
+	}
+
+	public ConfigMessageList(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+							 @Nullable String[] defaultValue, String[] messageParams) {
+		super(provider, sectionName, String.class, defaultValue);
 		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) {
-			return get(sender, messageParams, values);
-		} else {
-			return get(sender);
-		}
+
+	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable Object[] values) {
+		return get(sender, getMessageParams(), values);
 	}
 
-	public @NotNull List<String> get(@Nullable CommandSender sender, String[] params, Object[] values) {
-		return MessageUtils.setPlaceholders(sender, get(), params, values);
+	public @NotNull List<String> get(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] 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) {
-		if (messageParams != null) {
-			send(sender, messageParams, values);
-		} else {
-			send(sender);
-		}
+	public void send(@Nullable CommandSender sender, @Nullable Object[] values) {
+		send(sender, getMessageParams(), values);
 	}
 
-	public void send(@Nullable CommandSender sender, String[] params, Object[] values) {
-		MessageUtils.sendWithPlaceholders(sender, get(), params, values);
-	}
-
-	public void sendToAll(String[] params, Object[] values) {
-		Bukkit.getOnlinePlayers().forEach(pl -> MessageUtils.sendWithPlaceholders(pl, get(), params, values));
+	public void send(@Nullable CommandSender sender, @Nullable String[] params, @Nullable Object[] values) {
+		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() {
-		Bukkit.getOnlinePlayers().forEach(player -> MessageUtils.sendWithPlaceholders(player, get()));
+		sendToAll(null);
 	}
 
-	public void sendToAll(Object[] values) {
-		if (messageParams != null) {
+	public void sendToAll(@Nullable Object[] values) {
 		sendToAll(messageParams, values);
-		} else {
-			sendToAll();
 	}
+
+	public void sendToAll(@Nullable String[] params, @Nullable Object[] values) {
+		Bukkit.getOnlinePlayers().forEach(pl -> send(pl, params, values));
 	}
 
 	@Override
-	public @Nullable FileConfig getSource() {
-		return source == null ? FileConfig.getMessageConfiguration() : source;
+	public FileConfig defaultSource() {
+		return FileConfig.getMessageConfiguration();
 	}
-
 }

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/values/ConfigValue.java

@@ -6,6 +6,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
+import java.util.function.Supplier;
 
 public class ConfigValue<V> extends FileConfigValue {
 	private final @NotNull Class<V> clazz;
@@ -19,13 +20,19 @@ public class ConfigValue<V> extends FileConfigValue {
 	public ConfigValue(@NotNull String sectionName,
 					   @NotNull Class<V> clazz,
 					   @Nullable V defaultValue) {
-		this(null, sectionName, clazz, defaultValue);
+		this((Supplier<FileConfig>) null, sectionName, clazz, defaultValue);
 	}
 
 	public ConfigValue(@Nullable FileConfig source, @NotNull String sectionName,
 					   @NotNull Class<V> clazz,
 					   @Nullable V defaultValue) {
-		super(source, sectionName);
+		this(source == null ? null : () -> source, sectionName, clazz, defaultValue);
+	}
+
+	public ConfigValue(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+					   @NotNull Class<V> clazz,
+					   @Nullable V defaultValue) {
+		super(provider, sectionName);
 		this.clazz = clazz;
 		this.defaultValue = defaultValue;
 	}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/values/ConfigValueList.java

@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Objects;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class ConfigValueList<V> extends FileConfigValue {
@@ -28,15 +29,17 @@ public class ConfigValueList<V> extends FileConfigValue {
 		this(null, sectionName, clazz, defaultValue);
 	}
 
-	public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
+	public ConfigValueList(@Nullable Supplier<FileConfig> provider,
+						   @NotNull String sectionName,
 						   Class<V> clazz) {
-		this(configuration, sectionName, clazz, null);
+		this(provider, sectionName, clazz, null);
 	}
 
-	public ConfigValueList(@Nullable FileConfig configuration, @NotNull String sectionName,
+	public ConfigValueList(@Nullable Supplier<FileConfig> provider,
+						   @NotNull String sectionName,
 						   @NotNull Class<V> clazz,
 						   @Nullable V[] defaultValue) {
-		super(configuration, sectionName);
+		super(provider, sectionName);
 		this.clazz = clazz;
 		this.defaultValue = defaultValue;
 	}

easyplugin-configuration/src/main/java/cc/carm/lib/easyplugin/configuration/values/ConfigValueMap.java

@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 public class ConfigValueMap<K, V> extends FileConfigCachedValue<Map<K, V>> {
 
@@ -16,12 +17,18 @@ public class ConfigValueMap<K, V> extends FileConfigCachedValue<Map<K, V>> {
 
 	public ConfigValueMap(@NotNull String sectionName, @NotNull Function<String, K> keyCast,
 						  @NotNull Class<V> valueClazz) {
-		this(null, sectionName, keyCast, valueClazz);
+		this((Supplier<FileConfig>) null, sectionName, keyCast, valueClazz);
 	}
 
+
 	public ConfigValueMap(@Nullable FileConfig source, @NotNull String sectionName,
 						  @NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
-		super(source, sectionName);
+		this(source == null ? null : () -> source, sectionName, keyCast, valueClazz);
+	}
+
+	public ConfigValueMap(@Nullable Supplier<FileConfig> provider, @NotNull String sectionName,
+						  @NotNull Function<String, K> keyCast, @NotNull Class<V> valueClazz) {
+		super(provider, sectionName);
 		this.keyCast = keyCast;
 		this.valueClazz = valueClazz;
 	}

easyplugin-database/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.3</version>
+        <version>1.3.6</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.0</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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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;
@@ -47,7 +49,7 @@ public class MessageUtils {
 		sendWithPlaceholders(sender, setCustomParams(messages, params, values));
 	}
 
-    public static String setPlaceholders(@Nullable CommandSender sender, String message) {
+	public static String setPlaceholders(@Nullable CommandSender sender, @Nullable String message) {
 		if (message == null || sender == null) return message;
 		if (hasPlaceholderAPI() && sender instanceof Player) {
 			return PlaceholderAPI.setPlaceholders((Player) sender, message);
@@ -56,7 +58,11 @@ public class MessageUtils {
 		}
 	}
 
-    public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages) {
+
+	@Nullable
+	@Contract("_, !null -> !null")
+	public static List<String> setPlaceholders(@Nullable CommandSender sender,
+											   @Nullable List<String> messages) {
 		if (messages == null || messages.isEmpty() || sender == null) return messages;
 		if (hasPlaceholderAPI() && sender instanceof Player) {
 			return PlaceholderAPI.setPlaceholders((Player) sender, messages);
@@ -65,20 +71,35 @@ public class MessageUtils {
 		}
 	}
 
-    public static String setPlaceholders(@Nullable CommandSender sender, String message, String[] params, Object[] values) {
+	public static String setPlaceholders(@Nullable CommandSender sender,
+										 @NotNull String message,
+										 @Nullable String[] params,
+										 @Nullable Object[] values) {
 		return setPlaceholders(sender, setCustomParams(message, params, values));
 	}
 
-    public static List<String> setPlaceholders(@Nullable CommandSender sender, List<String> messages, String[] params, Object[] values) {
+	public static List<String> setPlaceholders(@Nullable CommandSender sender,
+											   @NotNull List<String> messages,
+											   @Nullable String[] params,
+											   @Nullable Object[] values) {
 		return setPlaceholders(sender, setCustomParams(messages, params, values));
 	}
 
-    public static String setCustomParams(String message, String param, Object value) {
+	public static String setCustomParams(@NotNull String message,
+										 @NotNull String param,
+										 @NotNull Object value) {
 		return setCustomParams(message, new String[]{param}, new Object[]{value});
 	}
 
-    public static String setCustomParams(String message, String[] params, Object[] values) {
+	@Nullable
+	@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]);
@@ -86,8 +107,8 @@ public class MessageUtils {
 		return setCustomParams(message, paramsMap);
 	}
 
-
-    public static String setCustomParams(String message, HashMap<String, Object> params) {
+	@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());
@@ -95,11 +116,18 @@ public class MessageUtils {
 		return afterMessage;
 	}
 
-    public static List<String> setCustomParams(List<String> messages, String param, Object value) {
+	@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});
 	}
 
-    public static List<String> setCustomParams(List<String> messages, String[] params, Object[] values) {
+	@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++) {
@@ -108,9 +136,11 @@ public class MessageUtils {
 		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());
+		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.3</version>
+        <version>1.3.6</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.3</version>
+        <version>1.3.6</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.3</version>
+    <version>1.3.6</version>
     <modules>
 
         <module>easyplugin-main</module>