1.12.2

Author: CubeCrafter72

build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = 'dev.pixelstudios'
-version = '1.12.1'
+version = '1.12.2'
 
 repositories {
     mavenCentral()
@@ -22,7 +22,7 @@ repositories {
     maven { url 'https://repo.auxilor.io/repository/maven-public/' }
     maven { url 'https://nexus.phoenixdevt.fr/repository/maven-public/' }
     maven { url 'https://repo.momirealms.net/releases/' }
-    maven { url 'https://repo.nexomc.com/releases'}
+    maven { url 'https://repo.nexomc.com/releases' }
 }
 
 dependencies {

src/main/java/dev/pixelstudios/xutils/config/Configuration.java

@@ -3,13 +3,15 @@
 import dev.pixelstudios.xutils.FileUtil;
 import dev.pixelstudios.xutils.config.serializer.ConfigSerializer;
 import dev.pixelstudios.xutils.XUtils;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
 public class Configuration extends YamlConfiguration {
@@ -92,4 +94,8 @@ public <T> T deserialize(String path, Class<T> objectClass) {
         return ConfigSerializer.deserialize(objectClass, this, path);
     }
 
+    public List<ConfigurationSection> getSubSections(String path) {
+        return ConfigUtil.getSubSections(getConfigurationSection(path));
+    }
+
 }

src/main/java/dev/pixelstudios/xutils/config/serializer/ColorSerializer.java

@@ -7,21 +7,29 @@ public class ColorSerializer implements Serializer<Color> {
 
     @Override
     public Color deserialize(String serialized) {
-        String[] split = serialized.split(":");
+        serialized = serialized.trim();
 
-        Color color;
+        // Hex format
+        if (serialized.startsWith("#") && serialized.length() == 7) {
+            return Color.fromRGB(Integer.parseInt(serialized.substring(1), 16));
+        }
 
-        if (split.length != 3) {
-            color = DyeColor.valueOf(serialized).getColor();
-        } else {
-            color = Color.fromRGB(
+        // RGB format
+        String[] split = serialized.split(":");
+        if (split.length == 3) {
+            return Color.fromRGB(
                     Integer.parseInt(split[0]),
                     Integer.parseInt(split[1]),
                     Integer.parseInt(split[2])
             );
         }
 
-        return color;
+        // Bukkit DyeColor
+        try {
+            return DyeColor.valueOf(serialized.toUpperCase()).getColor();
+        } catch (IllegalArgumentException e) {
+            throw new IllegalArgumentException("Invalid color: " + serialized);
+        }
     }
 
 }

src/main/java/dev/pixelstudios/xutils/config/serializer/LocationSerializer.java

@@ -3,20 +3,24 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 
+import java.text.DecimalFormat;
+
 public class LocationSerializer implements Serializer<Location> {
 
+    private final DecimalFormat formatter = new DecimalFormat("#.##");
+
     @Override
     public String serialize(Location location) {
         StringBuilder builder = new StringBuilder();
 
         builder.append(location.getWorld().getName())
-                .append(":").append(location.getX())
-                .append(":").append(location.getY())
-                .append(":").append(location.getZ());
+                .append(":").append(formatter.format(location.getX()))
+                .append(":").append(formatter.format(location.getY()))
+                .append(":").append(formatter.format(location.getZ()));
 
         if (location.getYaw() != 0 && location.getPitch() != 0) {
-            builder.append(":").append(location.getYaw())
-                    .append(":").append(location.getPitch());
+            builder.append(":").append(formatter.format(location.getYaw()))
+                    .append(":").append(formatter.format(location.getPitch()));
         }
 
         return builder.toString();

src/main/java/dev/pixelstudios/xutils/item/ItemUtil.java

@@ -49,8 +49,8 @@ public static ItemStack parsePlaceholders(ItemStack item, OfflinePlayer player)
         if (Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
             return setNameAndLore(
                     item,
-                    text -> PlaceholderAPI.setPlaceholders(player, text),
-                    lines -> PlaceholderAPI.setPlaceholders(player, lines)
+                    text -> TextUtil.color(PlaceholderAPI.setPlaceholders(player, text)),
+                    lines -> TextUtil.color(PlaceholderAPI.setPlaceholders(player, lines))
             );
         }
         return item;

src/main/java/dev/pixelstudios/xutils/menu/Menu.java

@@ -244,11 +244,13 @@ private ItemStack processItem(MenuItem item) {
     }
 
     private String processText(String text) {
+        text = placeholders.parse(text);
+
         if (parsePlaceholders) {
             text = TextUtil.parsePlaceholders(player, text);
         }
 
-        return placeholders.parse(text);
+        return TextUtil.color(text);
     }
 
 }

src/main/java/dev/pixelstudios/xutils/text/placeholder/PlaceholderMap.java

@@ -22,11 +22,24 @@ public PlaceholderMap add(String key, Supplier<String> value) {
         return this;
     }
 
+    public PlaceholderMap add(String key, Supplier<String> value, String defaultValue) {
+        placeholders.put(key, () -> {
+            String val = value.get();
+            return val != null ? val : defaultValue;
+        });
+        return this;
+    }
+
     public PlaceholderMap add(String key, String value) {
         placeholders.put(key, () -> value);
         return this;
     }
 
+    public PlaceholderMap add(String key, String value, String defaultValue) {
+        placeholders.put(key, () -> value != null ? value : defaultValue);
+        return this;
+    }
+
     public PlaceholderMap addNumber(String key, Supplier<Number> value) {
         placeholders.put(key, () -> String.valueOf(value.get()));
         return this;

src/main/java/dev/pixelstudios/xutils/text/placeholder/papi/Argument.java

@@ -12,21 +12,30 @@ public class Argument {
     private final String id;
     private final Function<String, Object> function;
     private final boolean required;
+    private final Object defaultValue;
 
     public static Argument required(String id) {
-        return new Argument(id, string -> string, true);
+        return new Argument(id, string -> string, true, null);
     }
 
     public static Argument required(String id, Function<String, Object> function) {
-        return new Argument(id, function, true);
+        return new Argument(id, function, true, null);
     }
 
     public static Argument optional(String id) {
-        return new Argument(id, string -> string, false);
+        return new Argument(id, string -> string, false, null);
     }
 
     public static Argument optional(String id, Function<String, Object> function) {
-        return new Argument(id, function, false);
+        return new Argument(id, function, false, null);
+    }
+
+    public static Argument optional(String id, Object defaultValue) {
+        return new Argument(id, string -> string, false, defaultValue);
+    }
+
+    public static Argument optional(String id, Function<String, Object> function, Object defaultValue) {
+        return new Argument(id, function, false, defaultValue);
     }
 
 }

src/main/java/dev/pixelstudios/xutils/text/placeholder/papi/PAPIPlaceholder.java

@@ -69,9 +69,10 @@ private Map<String, Object> parseArguments(String input) {
                 arguments.put(argument.getId(), value);
             } else {
                 if (split.length <= i) {
-                    break;
+                    arguments.put(argument.getId(), argument.getDefaultValue());
+                } else {
+                    arguments.put(argument.getId(), argument.getFunction().apply(split[i]));
                 }
-                arguments.put(argument.getId(), argument.getFunction().apply(split[i]));
             }
         }