From f25b9164d06c5f81a6035892b477694bbb14544b Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 13 Mar 2026 20:01:10 +0200 Subject: [PATCH] Added parameter autocomplete coloring --- .../script/autocomplete/AutocompleteItem.java | 17 ++++++++++------- .../script/autocomplete/AutocompleteMenu.java | 2 ++ .../script/interpreter/token/TokenType.java | 3 ++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteItem.java b/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteItem.java index a8adf2031..cac2c2c11 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteItem.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteItem.java @@ -22,12 +22,13 @@ public class AutocompleteItem implements Comparable { public enum Kind { ENUM_CONSTANT(-1), // Enum constant value (highest priority for enums) METHOD(0), // Method or function - FIELD(1), // Field or property - VARIABLE(2), // Local variable or parameter - CLASS(3), // Class or interface type - ENUM(4), // Enum type - KEYWORD(6), // Language keyword - SNIPPET(7); // Code snippet + FIELD(10), // Field or property + PARAMETER(19), // Local variable or parameter + VARIABLE(20), // Local variable or parameter + CLASS(30), // Class or interface type + ENUM(40), // Enum type + KEYWORD(60), // Language keyword + SNIPPET(70); // Code snippet private final int priority; @@ -158,7 +159,7 @@ public class AutocompleteItem implements Comparable { Kind kind; switch (field.getScope()) { case PARAMETER: - kind = Kind.VARIABLE; + kind = Kind.PARAMETER; break; case LOCAL: kind = Kind.VARIABLE; @@ -694,6 +695,7 @@ public class AutocompleteItem implements Comparable { case METHOD: return "m"; case FIELD: return "f"; case VARIABLE: return "v"; + case PARAMETER: return "p"; case CLASS: return "C"; case ENUM: return "E"; case ENUM_CONSTANT: return "e"; @@ -711,6 +713,7 @@ public class AutocompleteItem implements Comparable { case METHOD: return 0xFFB877DB; // Purple for methods case FIELD: return 0xFF79C0FF; // Blue for fields case VARIABLE: return 0xFF7EE787; // Green for variables + case PARAMETER: return 0XFFFF00FF; // Green for variables case CLASS: return 0xFFFFA657; // Orange for classes case ENUM: return 0xFFFFD866; // Yellow for enums case ENUM_CONSTANT: return 0xFFFFD866; diff --git a/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteMenu.java b/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteMenu.java index 5912b5980..4e060303a 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteMenu.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/autocomplete/AutocompleteMenu.java @@ -482,6 +482,8 @@ public class AutocompleteMenu extends Gui { return TokenType.getColor(item.getTypeInfo()); case VARIABLE: return TokenType.LOCAL_FIELD.getHexColor(); + case PARAMETER: + return TokenType.PARAMETER.getHexColor(); case KEYWORD: return TokenType.KEYWORD.getHexColor(); default: diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java index 200e60f6c..bf38a1f66 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/TokenType.java @@ -1,5 +1,6 @@ package noppes.npcs.client.gui.util.script.interpreter.token; +import noppes.npcs.client.gui.util.script.interpreter.field.FieldInfo; import noppes.npcs.client.gui.util.script.interpreter.type.TypeInfo; /** @@ -110,7 +111,7 @@ public enum TokenType { public static int getColor(TypeInfo typeInfo) { return getByType(typeInfo).getHexColor(); } - + /** * Convert this token type to a Minecraft color code character. * Used for backward compatibility with the existing rendering system.