add option to need to start with ("=")

also add key for magnitudes into option tooltip

2 files changed, 16 insertions, 3 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
index d78e2c0d..bc44c249 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java
@@ -44,7 +44,7 @@ public class CalculatorCommand {
         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));
+            text.append(Text.literal("text.autoconfig.skyblocker.option.general.inputCalculator.invalidEquation").formatted(Formatting.RED));
         }
 
         if (CLIENT == null || CLIENT.player == null) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
index 3a398c15..ccdc67f6 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
@@ -1,5 +1,6 @@
 package de.hysky.skyblocker.skyblock.calculators;
 
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
 import de.hysky.skyblocker.utils.Calculator;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
@@ -18,6 +19,16 @@ public class SignCalculator {
     private static Double output;
 
     public static void renderCalculator(DrawContext context, String message, int renderX, int renderY) {
+        if (SkyblockerConfigManager.get().general.inputCalculator.requiresEquals) {
+            if (message.startsWith("=")) {
+                message = message.substring(1);
+            }
+            else {
+                output = null;
+                lastInput = message;
+                return;
+            }
+        }
         //only update output if new input
         if (!message.equals(lastInput)) { //
             try {
@@ -34,8 +45,10 @@ public class SignCalculator {
 
     public static String getNewValue(Boolean isPrice) {
         if (output == null) {
-            return "";
+            //if mode is not activated or just invalid equation return what the user typed in
+            return lastInput;
         }
+
         //price can except decimals and exponents
         if (isPrice) {
             return output.toString();
@@ -47,7 +60,7 @@ public class SignCalculator {
     private static void render(DrawContext context, String input, int renderX, int renderY) {
         Text text;
         if (output == null) {
-            text = Text.translatable("text.autoconfig.skyblocker.option.general.enableSignCalculator.invalidEquation").formatted(Formatting.RED);
+            text = Text.translatable("text.autoconfig.skyblocker.option.general.inputCalculator.invalidEquation").formatted(Formatting.RED);
         } else {
             text = Text.literal(input + " = " + FORMATTER.format(output)).formatted(Formatting.GREEN);
         }