From 08140d6b262a9b694cbc9d14189249d10c10eef6 Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 2 May 2024 19:38:55 +0100 Subject: clean code and fix to 1.20.6 --- .../skyblock/calculators/CalculatorCommand.java | 2 +- .../skyblocker/skyblock/calculators/SignCalculator.java | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/skyblock/calculators') 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 f9b8b4cf..d78e2c0d 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/CalculatorCommand.java @@ -33,7 +33,7 @@ public class CalculatorCommand { dispatcher.register(literal(SkyblockerMod.NAMESPACE) .then(literal("calculate") .then(argument("equation", StringArgumentType.greedyString()) - .executes(context -> doCalculation(getString(context, "equation")) ) + .executes(context -> doCalculation(getString(context, "equation"))) ) ) ); 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 7dbeabd9..82d86ba7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/calculators/SignCalculator.java @@ -12,21 +12,19 @@ public class SignCalculator { private static final MinecraftClient CLIENT = MinecraftClient.getInstance(); - private static final DecimalFormat FORMATTER = new DecimalFormat("#,###.##"); + private static final DecimalFormat FORMATTER = new DecimalFormat("#,###.##"); private static String lastInput; private static String input; private static Double output; - public static void renderSign(DrawContext context, String[] messages){ + public static void renderSign(DrawContext context, String[] messages) { input = messages[0]; - - //only update output if new input if (!input.equals(lastInput)) { // try { output = Calculator.calculate(input); - } catch (Exception e){ + } catch (Exception e) { output = null; } } @@ -52,11 +50,10 @@ public class SignCalculator { Text text; if (output == null) { text = Text.translatable("text.autoconfig.skyblocker.option.general.enableSignCalculator.invalidEquation").formatted(Formatting.RED); - } - else { - text = Text.literal(input +" = " + FORMATTER.format(output)).formatted(Formatting.GREEN); + } else { + text = Text.literal(input + " = " + FORMATTER.format(output)).formatted(Formatting.GREEN); } - context.drawCenteredTextWithShadow(CLIENT.textRenderer, text,context.getScaledWindowWidth() /2 , 55,0xFFFFFFFF); + context.drawCenteredTextWithShadow(CLIENT.textRenderer, text, context.getScaledWindowWidth() / 2, 55, 0xFFFFFFFF); } } -- cgit