add (p) for purse

also fix code a tad

2 files changed, 3 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 bc44c249..9c0d83e0 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.inputCalculator.invalidEquation").formatted(Formatting.RED));
+            text.append(Text.translatable("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/utils/Calculator.java b/src/main/java/de/hysky/skyblocker/utils/Calculator.java
index 562c66bc..9991c697 100644
--- a/src/main/java/de/hysky/skyblocker/utils/Calculator.java
+++ b/src/main/java/de/hysky/skyblocker/utils/Calculator.java
@@ -47,7 +47,7 @@ public class Calculator {
                     token.tokenLength = 1;
                     //add implicit multiplication when there is a number before brackets
                     if (!tokens.isEmpty()) {
-                        TokenType lastType = tokens.get(tokens.size() - 1).type;
+                        TokenType lastType = tokens.getLast().type;
                         if (lastType == TokenType.R_PARENTHESIS || lastType == TokenType.NUMBER) {
                             Token mutliplyToken = new Token();
                             mutliplyToken.type = TokenType.OPERATOR;
@@ -219,7 +219,7 @@ public class Calculator {
 
     public static double calculate(String equation) {
         //custom bit for replacing purse with its value
-        equation = equation.replace("purse",String.valueOf((int)Utils.getPurse()));
+        equation = equation.toLowerCase().replaceAll("p(urse)?",String.valueOf((int)Utils.getPurse()));
         return evaluate(shunt(lex(equation)));
     }
 }