[v1.1.2] 版本更新

- [U] 对于可能为空的配置参数提供Optional方法
- [U] 将复用的方法提出为抽象类使用
- [U] 优化代码结构

easyplugin-main/pom.xml

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

easyplugin-main/src/main/java/cc/carm/lib/easyplugin/EasyPlugin.java

@@ -71,12 +71,12 @@ public abstract class EasyPlugin extends JavaPlugin {
 		log(messageProvider.disabled(this, startTime));
 	}
 
-	public void load() {
+	protected void load() {
 	}
 
-	public abstract boolean initialize();
+	protected abstract boolean initialize();
 
-	public void shutdown() {
+	protected void shutdown() {
 	}
 
 	/**

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

@@ -6,7 +6,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 public class MessageUtils {
 
@@ -42,6 +46,15 @@ public class MessageUtils {
 		sendWithPlaceholders(sender, setCustomParams(messages, params, values));
 	}
 
+	public static String setPlaceholders(@Nullable CommandSender sender, String message) {
+		if (message == null || sender == null) return message;
+		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) {
 		if (messages == null || messages.isEmpty() || sender == null) return messages;
 		if (hasPlaceholderAPI() && sender instanceof Player) {
@@ -51,10 +64,36 @@ public class MessageUtils {
 		}
 	}
 
+	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) {
+		String afterMessage = message;
+		for (Map.Entry<String, Object> entry : params.entrySet()) {
+			afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
+		}
+		return afterMessage;
+	}
+
 	public static List<String> setCustomParams(List<String> messages, String param, Object value) {
 		return setCustomParams(messages, new String[]{param}, new Object[]{value});
 	}
@@ -70,15 +109,7 @@ public class MessageUtils {
 
 
 	public static List<String> setCustomParams(List<String> messages, HashMap<String, Object> params) {
-		List<String> list = new ArrayList<>();
-		for (String message : messages) {
-			String afterMessage = message;
-			for (Map.Entry<String, Object> entry : params.entrySet()) {
-				afterMessage = afterMessage.replace(entry.getKey(), entry.getValue().toString());
-			}
-			list.add(afterMessage);
-		}
-		return list;
+		return messages.stream().map(message -> setCustomParams(message, params)).collect(Collectors.toList());
 	}