Performance/placeholders

plugin/src/main/java/com/iridium/iridiumcore/utils/Placeholder.java

@@ -1,5 +1,7 @@
 package com.iridium.iridiumcore.utils;
 
+import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import lombok.Getter;
@@ -11,8 +13,10 @@
 public class Placeholder {
 
     private final String key;
+    private final String formattedKey;
     private String value;
     private Supplier<String> supplier;
+    private Function<Integer, String> int_supplier;
 
     /**
      * The default constructor.
@@ -21,7 +25,8 @@ public class Placeholder {
      * @param value The actual value of the placeholder
      */
     public Placeholder(String key, String value) {
-        this.key = "%" + key + "%";
+        this.key = key;
+        this.formattedKey = "%" + key + "%";
         this.value = value;
     }
 
@@ -32,15 +37,34 @@ public Placeholder(String key, String value) {
      * @param value The actual value of the placeholder
      */
     public Placeholder(String key, Supplier<String> supplier) {
-        this.key = "%" + key + "%";
+        this.key = key;
+        this.formattedKey = "%" + key + "%";
         this.supplier = supplier;
     }
 
-    public String getValue()
-    {
+    /**
+     * The default constructor.
+     *
+     * @param key   The placeholder without curly brackets.
+     * @param value The actual value of the placeholder
+     */
+    public Placeholder(String key, Function<Integer, String> supplier) {
+        this.key = key;
+        this.formattedKey = "%" + key + "%";
+        this.int_supplier = supplier;
+    }
+
+    public String getValue() {
         if(value==null && supplier!=null) value = supplier.get();
-        return value; 
+        return value;
     }
+
+    public String getValue(int i) {
+        if(this.int_supplier!=null)
+            return this.int_supplier.apply(i);
+        return getValue();
+    }
+
     /**
      * Replaces this placeholder in the provided line with the value of this
      * placeholder.
@@ -52,8 +76,8 @@ public String getValue()
     public String process(String line) {
         if (line == null || line.isEmpty())
             return "";
-        if (line.contains(key))
-            return line.replace(key, getValue());
+        if (line.contains(formattedKey))
+            return line.replace(formattedKey, getValue());
         else
             return line;
     }