Merge pull request #686 from olim88/sign-calculator

Sign calculator

3 files changed, 134 insertions, 3 deletions

diff --git a/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java b/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java
index 9d460803..f96e3231 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java
@@ -1,5 +1,7 @@
 package de.hysky.skyblocker.skyblock.auction;
 
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
+import de.hysky.skyblocker.skyblock.calculators.SignCalculator;
 import de.hysky.skyblocker.utils.render.gui.AbstractPopupScreen;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.client.MinecraftClient;
@@ -9,7 +11,6 @@ import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import org.jetbrains.annotations.NotNull;
-import org.lwjgl.glfw.GLFW;
 
 public class EditBidPopup extends AbstractPopupScreen {
     private DirectionalLayoutWidget layout = DirectionalLayoutWidget.vertical();
@@ -55,6 +56,9 @@ public class EditBidPopup extends AbstractPopupScreen {
     public void renderBackground(DrawContext context, int mouseX, int mouseY, float delta) {
         super.renderBackground(context, mouseX, mouseY, delta);
         drawPopupBackground(context, layout.getX(), layout.getY(), layout.getWidth(), layout.getHeight());
+        if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.enabled) {
+            SignCalculator.renderCalculator(context, textFieldWidget.getText(), context.getScaledWindowWidth() / 2, textFieldWidget.getY() - 8);
+        }
     }
 
     private boolean isStringGood(String s) {
@@ -69,8 +73,13 @@ public class EditBidPopup extends AbstractPopupScreen {
     }
 
     private void done(ButtonWidget widget) {
-        if (!isStringGood(textFieldWidget.getText().trim())) return;
-        sendPacket(textFieldWidget.getText().trim());
+        if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.enabled) {
+            if (!isStringGood(SignCalculator.getNewValue(false))) return;
+            sendPacket(SignCalculator.getNewValue(false));
+        } else {
+            if (!isStringGood(textFieldWidget.getText().trim())) return;
+            sendPacket(textFieldWidget.getText().trim());
+        }
         this.close();
     }
 
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..d103bcdd
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java
@@ -0,0 +1,56 @@
+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.NumberFormat;
+
+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 NumberFormat FORMATTER = NumberFormat.getInstance();
+
+    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.translatable("skyblocker.config.uiAndVisuals.inputCalculator.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/calculators/SignCalculator.java b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
new file mode 100644
index 00000000..dc51e48c
--- /dev/null
+++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java
@@ -0,0 +1,66 @@
+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;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+import java.text.NumberFormat;
+
+public class SignCalculator {
+    private static final MinecraftClient CLIENT = MinecraftClient.getInstance();
+    private static final NumberFormat FORMATTER = NumberFormat.getInstance();
+
+    private static String lastInput;
+    private static double output;
+
+    public static void renderCalculator(DrawContext context, String message, int renderX, int renderY) {
+        if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.requiresEquals && !message.startsWith("=")) {
+            output = -1;
+            lastInput = message;
+            return;
+        }
+        if (message.startsWith("=")) {
+            message = message.substring(1);
+        }
+        //only update output if new input
+        if (!message.equals(lastInput)) { //
+            try {
+                output = Calculator.calculate(message);
+            } catch (Exception e) {
+                output = -1;
+            }
+        }
+
+        render(context, message, renderX, renderY);
+
+        lastInput = message;
+    }
+
+    public static String getNewValue(Boolean isPrice) {
+        if (output == -1) {
+            //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 FORMATTER.format(output);
+        }
+        //amounts want an integer number so round
+        return Long.toString(Math.round(output));
+    }
+
+    private static void render(DrawContext context, String input, int renderX, int renderY) {
+        Text text;
+        if (output == -1) {
+            text = Text.translatable("skyblocker.config.uiAndVisuals.inputCalculator.invalidEquation").formatted(Formatting.RED);
+        } else {
+            text = Text.literal(input + " = " + FORMATTER.format(output)).formatted(Formatting.GREEN);
+        }
+
+        context.drawCenteredTextWithShadow(CLIENT.textRenderer, text, renderX, renderY, 0xFFFFFFFF);
+    }
+}