From 662d843147cbb2af20f22b4a9fc4e5fc8c556d27 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 26 Dec 2025 23:11:12 +0200 Subject: [PATCH] Small refactor --- .../util/script/interpreter/ScriptDocument.java | 16 ++++++++-------- .../gui/util/script/interpreter/TypeInfo.java | 2 +- 2 files changed, 9 insertions(+), 9 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 802382b82..10863298a 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 @@ -806,7 +806,7 @@ public class ScriptDocument { // Check primitive types first if (TypeResolver.isPrimitiveType(baseName)) { - return TypeInfo.forPrimitive(baseName); + return TypeInfo.fromPrimitive(baseName); } // Check for String (common case) @@ -1610,12 +1610,12 @@ public class ScriptDocument { // Character literals if (expr.startsWith("'") && expr.endsWith("'")) { - return TypeInfo.forPrimitive("char"); + return TypeInfo.fromPrimitive("char"); } // Boolean literals if (expr.equals("true") || expr.equals("false")) { - return TypeInfo.forPrimitive("boolean"); + return TypeInfo.fromPrimitive("boolean"); } // Null literal @@ -1626,18 +1626,18 @@ public class ScriptDocument { // Numeric literals if (expr.matches("-?\\d+[lL]?")) { if (expr.toLowerCase().endsWith("l")) { - return TypeInfo.forPrimitive("long"); + return TypeInfo.fromPrimitive("long"); } - return TypeInfo.forPrimitive("int"); + return TypeInfo.fromPrimitive("int"); } if (expr.matches("-?\\d+\\.\\d*[fF]?")) { if (expr.toLowerCase().endsWith("f")) { - return TypeInfo.forPrimitive("float"); + return TypeInfo.fromPrimitive("float"); } - return TypeInfo.forPrimitive("double"); + return TypeInfo.fromPrimitive("double"); } if (expr.matches("-?\\d+\\.\\d*[dD]")) { - return TypeInfo.forPrimitive("double"); + return TypeInfo.fromPrimitive("double"); } // "this" keyword diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TypeInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TypeInfo.java index a55d8c750..862e5f108 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TypeInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TypeInfo.java @@ -98,7 +98,7 @@ public class TypeInfo { /** * Create a TypeInfo for a primitive type. */ - public static TypeInfo forPrimitive(String typeName) { + public static TypeInfo fromPrimitive(String typeName) { Class primitiveClass = null; switch (typeName) { case "boolean": primitiveClass = boolean.class; break;