From c9e50f2cde7efac3e1ed190fdedf61acf55968ba Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Mon, 29 Dec 2025 17:05:24 +0200 Subject: [PATCH] Deprecated CastExpressionResolver as ExpressionResolver API already has all this built in --- .../gui/util/script/interpreter/ScriptDocument.java | 12 ++++-------- .../expression/CastExpressionResolver.java | 3 +++ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java index 0e58f0904..5e0f08da6 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java @@ -2272,13 +2272,9 @@ public class ScriptDocument { } // Check if expression contains operators - if so, use the full expression resolver - if (containsOperators(expr)) { - return resolveExpressionWithOperators(expr, position); - } - // Handle cast expressions: (Type)expr, ((Type)expr).method(), etc. - if (expr.startsWith("(")) { - return resolveCastOrParenthesizedExpression(expr, position); + if (containsOperators(expr) || expr.startsWith("(")) { + return resolveExpressionWithParserAPI(expr, position); } // Invalid expressions starting with brackets @@ -2802,10 +2798,10 @@ public class ScriptDocument { } /** - * Resolve an expression that contains operators using the full expression parser. + * Resolve an expression that contains operators or casts using the full expression parser. * This handles all Java operators with proper precedence and type promotion rules. */ - private TypeInfo resolveExpressionWithOperators(String expr, int position) { + private TypeInfo resolveExpressionWithParserAPI(String expr, int position) { // Create a context that bridges to ScriptDocument's existing resolution methods ExpressionNode.TypeResolverContext context = createExpressionResolverContext(position); diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/CastExpressionResolver.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/CastExpressionResolver.java index f0d691174..d2b37c64a 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/CastExpressionResolver.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/expression/CastExpressionResolver.java @@ -11,7 +11,10 @@ import java.util.function.Function; * - Nested casts: ((Type) expr) * - Cast chains: ((Type) expr).method() * - Parenthesized expressions: (expr) + * + * @Deprecated ExpressionTypeResolver API has all this built in. */ +@Deprecated public class CastExpressionResolver { /**