diff options
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock')
3 files changed, 13 insertions, 17 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 9114fc52..f96e3231 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/auction/EditBidPopup.java @@ -76,8 +76,7 @@ public class EditBidPopup extends AbstractPopupScreen { if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.enabled) { if (!isStringGood(SignCalculator.getNewValue(false))) return; sendPacket(SignCalculator.getNewValue(false)); - } - else { + } else { if (!isStringGood(textFieldWidget.getText().trim())) return; sendPacket(textFieldWidget.getText().trim()); } 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 9c0d83e0..d103bcdd 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java @@ -14,7 +14,7 @@ import net.minecraft.text.MutableText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import java.text.DecimalFormat; +import java.text.NumberFormat; import static com.mojang.brigadier.arguments.StringArgumentType.getString; import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.argument; @@ -22,8 +22,7 @@ import static net.fabricmc.fabric.api.client.command.v2.ClientCommandManager.lit public class CalculatorCommand { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); - - private static final DecimalFormat FORMATTER = new DecimalFormat("#,###.##"); + private static final NumberFormat FORMATTER = NumberFormat.getInstance(); public static void init() { ClientCommandRegistrationCallback.EVENT.register(CalculatorCommand::calculate); @@ -44,7 +43,7 @@ public class CalculatorCommand { try { text.append(Text.literal(FORMATTER.format(Calculator.calculate(calculation))).formatted(Formatting.GREEN)); } catch (UnsupportedOperationException e) { - text.append(Text.translatable("text.autoconfig.skyblocker.option.general.inputCalculator.invalidEquation").formatted(Formatting.RED)); + text.append(Text.translatable("skyblocker.config.uiAndVisuals.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 02701c16..f9bb1e9f 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java @@ -7,16 +7,14 @@ import net.minecraft.client.gui.DrawContext; import net.minecraft.text.Text; import net.minecraft.util.Formatting; -import java.text.DecimalFormat; +import java.text.NumberFormat; public class SignCalculator { - private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); - - private static final DecimalFormat FORMATTER = new DecimalFormat("#,###.##"); + private static final NumberFormat FORMATTER = NumberFormat.getInstance(); private static String lastInput; - private static Double output; + private static double output; public static void renderCalculator(DrawContext context, String message, int renderX, int renderY) { if (SkyblockerConfigManager.get().uiAndVisuals.inputCalculator.requiresEquals) { @@ -24,7 +22,7 @@ public class SignCalculator { message = message.substring(1); } else { - output = null; + output = -1; lastInput = message; return; } @@ -34,7 +32,7 @@ public class SignCalculator { try { output = Calculator.calculate(message); } catch (Exception e) { - output = null; + output = -1; } } @@ -44,14 +42,14 @@ public class SignCalculator { } public static String getNewValue(Boolean isPrice) { - if (output == null) { + 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 output.toString(); + return FORMATTER.format(output); } //amounts want an integer number so round return Long.toString(Math.round(output)); @@ -59,8 +57,8 @@ 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.inputCalculator.invalidEquation").formatted(Formatting.RED); + 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); } |