add command

add command to be able to use the calculator and fix crash with emty equations

2 files changed, 58 insertions, 6 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java
new file mode 100644
index 00000000..f9b8b4cf
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java
@@ -0,0 +1,57 @@
+package de.hysky.skyblocker.skyblock.calculators;
+
+import com.mojang.brigadier.Command;
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.StringArgumentType;
+import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.utils.Calculator;
+import de.hysky.skyblocker.utils.Constants;
+import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
+import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.command.CommandRegistryAccess;
+import net.minecraft.text.MutableText;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+import java.text.DecimalFormat;
+
+import static com.mojang.brigadier.arguments.StringArgumentType.getString;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument;
+import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.literal;
+
+public class CalculatorCommand {
+    private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+
+    private static final DecimalFormat FORMATTER = new DecimalFormat("#,###.##");
+
+    public static void init() {
+        ClientCommandRegistrationCallback.EVENT.register(CalculatorCommand::calculate);
+    }
+
+    private static void calculate(CommandDispatcher<FabricClientCommandSource> dispatcher, CommandRegistryAccess registryAccess) {
+        dispatcher.register(literal(SkyblockerMod.NAMESPACE)
+                .then(literal("calculate")
+                        .then(argument("equation", StringArgumentType.greedyString())
+                                .executes(context -> doCalculation(getString(context, "equation")) )
+                        )
+                )
+        );
+    }
+
+    private static int doCalculation(String calculation) {
+        MutableText text = Constants.PREFIX.get();
+        try {
+            text.append(Text.literal(FORMATTER.format(Calculator.calculate(calculation))).formatted(Formatting.GREEN));
+        } catch (UnsupportedOperationException e) {
+            text.append(Text.literal("text.autoconfig.skyblocker.option.general.enableSignCalculator.invalidEquation").formatted(Formatting.RED));
+        }
+
+        if (CLIENT == null || CLIENT.player == null) {
+            return 0;
+        }
+
+        CLIENT.player.sendMessage(text, false);
+        return Command.SINGLE_SUCCESS;
+    }
+}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
index be393b49..7dbeabd9 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/SignCalculator.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
@@ -1,17 +1,12 @@
-package de.hysky.skyblocker.skyblock;
+package de.hysky.skyblocker.skyblock.calculators;
 
-import de.hysky.skyblocker.skyblock.dungeon.puzzle.waterboard.Switch;
 import de.hysky.skyblocker.utils.Calculator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import net.minecraft.util.Util;
 
 import java.text.DecimalFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class SignCalculator {