Add strFormat and move math.

Author: zenfyrdev

src/main/java/me/melontini/commander/impl/expression/EvalUtils.java

@@ -18,6 +18,9 @@
 import me.melontini.commander.impl.expression.extensions.ReflectiveValueConverter;
 import me.melontini.commander.impl.expression.functions.*;
 import me.melontini.commander.impl.expression.functions.arrays.*;
+import me.melontini.commander.impl.expression.functions.math.ClampFunction;
+import me.melontini.commander.impl.expression.functions.math.LerpFunction;
+import me.melontini.commander.impl.expression.functions.math.RangedRandomFunction;
 import me.melontini.commander.impl.mixin.evalex.EvaluationValueAccessor;
 import me.melontini.commander.impl.mixin.evalex.ExpressionAccessor;
 import me.melontini.commander.impl.mixin.evalex.ExpressionConfigurationAccessor;
@@ -64,6 +67,8 @@ public class EvalUtils {
         functions.put("arrayNoneMatch", new ArrayNoneMatch());
         functions.put("arrayAllMatch", new ArrayAllMatch());
 
+        functions.put("strFormat", new StringFormatFunction());
+
         functions.put("structContainsKey", new StructContainsKeyFunction());
         functions.put("hasContext", new HasContextFunction());
         builder.functionDictionary(SimpleFunctionDictionary.ofFunctions(functions));

src/main/java/me/melontini/commander/impl/expression/functions/StringFormatFunction.java

@@ -0,0 +1,20 @@
+package me.melontini.commander.impl.expression.functions;
+
+import com.ezylang.evalex.EvaluationException;
+import com.ezylang.evalex.Expression;
+import com.ezylang.evalex.data.EvaluationValue;
+import com.ezylang.evalex.functions.AbstractFunction;
+import com.ezylang.evalex.functions.FunctionParameter;
+import com.ezylang.evalex.parser.Token;
+
+import java.util.Arrays;
+
+@FunctionParameter(name = "pattern")
+@FunctionParameter(name = "args", isVarArg = true)
+public class StringFormatFunction extends AbstractFunction {
+    @Override
+    public EvaluationValue evaluate(Expression expression, Token functionToken, EvaluationValue... par) throws EvaluationException {
+        if (par.length == 1) return EvaluationValue.stringValue(String.format(par[0].getStringValue()));
+        return EvaluationValue.stringValue(String.format(par[0].getStringValue(), Arrays.stream(Arrays.copyOfRange(par, 1, par.length)).map(EvaluationValue::getValue).toArray()));
+    }
+}

…/expression/functions/ClampFunction.java …ession/functions/math/ClampFunction.javasrc/main/java/me/melontini/commander/impl/expression/functions/ClampFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/ClampFunction.java src/main/java/me/melontini/commander/impl/expression/functions/ClampFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/ClampFunction.java

@@ -1,4 +1,4 @@
-package me.melontini.commander.impl.expression.functions;
+package me.melontini.commander.impl.expression.functions.math;
 
 import com.ezylang.evalex.EvaluationException;
 import com.ezylang.evalex.Expression;

…l/expression/functions/LerpFunction.java …ression/functions/math/LerpFunction.javasrc/main/java/me/melontini/commander/impl/expression/functions/LerpFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/LerpFunction.java src/main/java/me/melontini/commander/impl/expression/functions/LerpFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/LerpFunction.java

@@ -1,4 +1,4 @@
-package me.melontini.commander.impl.expression.functions;
+package me.melontini.commander.impl.expression.functions.math;
 
 import com.ezylang.evalex.EvaluationException;
 import com.ezylang.evalex.Expression;

…sion/functions/RangedRandomFunction.java …functions/math/RangedRandomFunction.javasrc/main/java/me/melontini/commander/impl/expression/functions/RangedRandomFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/RangedRandomFunction.java src/main/java/me/melontini/commander/impl/expression/functions/RangedRandomFunction.java renamed to src/main/java/me/melontini/commander/impl/expression/functions/math/RangedRandomFunction.java

@@ -1,4 +1,4 @@
-package me.melontini.commander.impl.expression.functions;
+package me.melontini.commander.impl.expression.functions.math;
 
 import com.ezylang.evalex.EvaluationException;
 import com.ezylang.evalex.Expression;