- rewrote the entire function system to let me have multivariable functions

- your input will not compute rather than giving back "NaN" if your syntax is incorrect
- added cfg? to give you a list of the config options
- fixed existing code that had logic issues, "1+2)/3" is now equal to 1 instead of 3

Author: RealRTTV

src/main/java/ca/rttv/chatcalc/ChatCalc.java

@@ -1,35 +1,47 @@
 package ca.rttv.chatcalc;
 
+import ca.rttv.chatcalc.tokens.Token;
 import com.mojang.logging.LogUtils;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.text.Text;
 import net.minecraft.util.Pair;
 import org.jetbrains.annotations.Contract;
 import org.slf4j.Logger;
+import oshi.util.tuples.Triplet;
 
+import java.util.List;
+import java.util.Optional;
 import java.util.regex.Pattern;
 
 public class ChatCalc {
     public static final Logger LOGGER = LogUtils.getLogger();
-    public static final Pattern NUMBER = Pattern.compile("[-+]?\\d*\\.?\\d+([eE][-+]?\\d+)?");
+    public static final Pattern NUMBER = Pattern.compile("[-+]?\\d+(\\.\\d+)?");
+    public static final String SEPARATOR = ";";
 
     @Contract(value = "_->_", mutates = "param1")
     public static boolean tryParse(TextFieldWidget field) {
         final MinecraftClient client = MinecraftClient.getInstance();
         String originalText = field.getText();
         int cursor = field.getCursor();
         String text = originalText.substring(0, cursor);
+        if ((text.equals("config?") || text.equals("cfg?") || text.equals("?")) && client.player != null) {
+            client.player.sendMessage(Text.translatable("chatcalc.config.description"));
+            return false;
+        }
         String[] split = text.split("=");
         if (split.length == 2) {
             if (Config.JSON.has(split[0])) {
                 Config.JSON.addProperty(split[0], split[1]);
                 Config.refreshJson();
                 return ChatHelper.replaceWord(field, "");
-            } else if (split[0].matches("[A-Za-z]+\\([A-Za-z]+\\)")) {
-                Config.FUNCTIONS.put(split[0].split("\\(")[0], new Pair<>(MathEngine.tokenize(split[1]), split[0].split("[()]")[1]));
-                Config.refreshJson();
-                return ChatHelper.replaceWord(field, "");
+            } else {
+                Optional<Triplet<String, List<Token>, String[]>> parsedFunction = Config.parseFunction(text);
+                if (parsedFunction.isPresent()) {
+                    Config.FUNCTIONS.put(parsedFunction.get().getA(), new Pair<>(parsedFunction.get().getB(), parsedFunction.get().getC()));
+                    Config.refreshJson();
+                    return ChatHelper.replaceWord(field, "");
+                }
             }
         } else if (Config.JSON.has(split[0])) {
             return ChatHelper.replaceWord(field, Config.JSON.get(split[0]).getAsString());

src/main/java/ca/rttv/chatcalc/Config.java

@@ -6,6 +6,7 @@
 import com.google.gson.*;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Pair;
+import oshi.util.tuples.Triplet;
 
 import java.io.*;
 import java.text.DecimalFormat;
@@ -16,7 +17,7 @@ public class Config {
     public static final JsonObject JSON;
     public static final Gson GSON;
     public static final File CONFIG_FILE;
-    public static final Map<String, Pair<List<Token>, String>> FUNCTIONS;
+    public static final Map<String, Pair<List<Token>, String[]>> FUNCTIONS;
     public static final ImmutableMap<String, String> DEFAULTS;
 
     static {
@@ -71,7 +72,7 @@ public static boolean logExceptions() {
     public static void refreshJson() {
         try {
             FileWriter writer = new FileWriter(CONFIG_FILE);
-            JSON.add("functions", FUNCTIONS.entrySet().stream().map(x -> x.getKey() + "(" + x.getValue().getRight() + ")=" + x.getValue().getLeft().stream().map(Object::toString).collect(Collectors.joining())).collect(JsonArray::new, JsonArray::add, JsonArray::addAll));
+            JSON.add("functions", FUNCTIONS.entrySet().stream().map(x -> x.getKey() + "(" + String.join(ChatCalc.SEPARATOR, x.getValue().getRight()) + ")=" + x.getValue().getLeft().stream().map(Object::toString).collect(Collectors.joining())).collect(JsonArray::new, JsonArray::add, JsonArray::addAll));
             writer.write(GSON.toJson(JSON));
             JSON.remove("functions");
             writer.close();
@@ -89,11 +90,38 @@ public static void readJson() {
             JsonObject json = tempJson; // annoying lambda requirement
             DEFAULTS.forEach((key, defaultValue) -> JSON.add(key, json.get(key) instanceof JsonPrimitive primitive && primitive.isString() ? primitive : new JsonPrimitive(defaultValue)));
             if (json.get("functions") instanceof JsonArray array) {
-                array.forEach(e -> FUNCTIONS.put(e.getAsString().split("\\(")[0], new Pair<>(MathEngine.tokenize(e.getAsString().split("=")[1]), e.getAsString().split("[()]")[1])));
+                array.forEach(e -> {
+                    if (e instanceof JsonPrimitive primitive && primitive.isString()) {
+                        parseFunction(e.getAsString()).ifPresent(parsedFunction -> FUNCTIONS.put(parsedFunction.getA(), new Pair<>(parsedFunction.getB(), parsedFunction.getC())));
+                    }
+                });
             }
         } catch (Exception ignored) { }
     }
 
+    public static Optional<Triplet<String, List<Token>, String[]>> parseFunction(String function) {
+        int functionNameEnd = function.indexOf('(');
+        if (functionNameEnd > 0) {
+            String functionName = function.substring(0, functionNameEnd);
+            int paramsEnd = function.substring(functionNameEnd).indexOf(')') + functionNameEnd;
+            if (functionName.matches("[A-Za-z]+") && paramsEnd > 0 && function.substring(paramsEnd + 1).startsWith("=") && function.length() > paramsEnd + 2) { // I'm not commenting why this works, I know it, It's just hard to explain
+                String[] params = function.substring(functionNameEnd + 1, paramsEnd).split(ChatCalc.SEPARATOR);
+                for (String param : params) {
+                    if (!param.matches("[A-Za-z]")) {
+                        return Optional.empty();
+                    }
+                }
+                String rest = function.substring(paramsEnd + 2);
+                try {
+                    List<Token> tokens = MathEngine.tokenize(rest);
+                    return Optional.of(new Triplet<>(functionName, tokens, params));
+//                    System.out.printf("fn: %s, params: %s, rest: %s%n", functionName, params, rest);
+                } catch (Exception ignored) { }
+            }
+        }
+        return Optional.empty();
+    }
+
     public static boolean debugTokens() {
         return Boolean.parseBoolean(JSON.get("debug_tokens").getAsString());
     }
@@ -105,13 +133,26 @@ public static void saveToChatHud(String input) {
         }
     }
 
-    public static double func(String name, double value) {
+    public static double func(String name, double... values) {
         if (FUNCTIONS.containsKey(name)) {
+            if (values.length != FUNCTIONS.get(name).getRight().length) {
+                throw new IllegalArgumentException();
+            }
             List<Token> tokens = new ArrayList<>(FUNCTIONS.get(name).getLeft());
-            MathEngine.simplify(tokens, false, Optional.of(new Pair<>(FUNCTIONS.get(name).getRight(), value)));
-            return ((NumberToken) tokens.get(0)).val;
+            FunctionParameter[] parameters = new FunctionParameter[values.length];
+            for (int i = 0; i < parameters.length; i++) {
+                parameters[i] = new FunctionParameter(FUNCTIONS.get(name).getRight()[i], values[i]);
+            }
+            MathEngine.simplify(tokens, false, Optional.of(parameters));
+            if (tokens.get(0) instanceof NumberToken numberToken) {
+                return numberToken.val;
+            }
+            throw new IllegalArgumentException();
         } else {
-            return value;
+            if (values.length == 0) {
+                throw new IllegalArgumentException();
+            }
+            return values[0];
         }
     }
 

src/main/java/ca/rttv/chatcalc/FunctionParameter.java

@@ -0,0 +1,5 @@
+package ca.rttv.chatcalc;
+
+public record FunctionParameter(String name, double value) {
+
+}