From 857a38181dc8513242624d260610dba8b7a4e97c Mon Sep 17 00:00:00 2001 From: olim Date: Thu, 9 May 2024 17:11:40 +0100 Subject: add (p) for purse also fix code a tad --- src/main/java/de/hysky/skyblocker/utils/Calculator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/de/hysky/skyblocker/utils') 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))); } } -- cgit