From 81b3d1c2d3f91ba92886cb292aeb3d86ae86ffc9 Mon Sep 17 00:00:00 2001 From: bigguy345 Date: Fri, 13 Mar 2026 20:47:54 +0200 Subject: [PATCH] Fixed autocomplete item package color for interfaces/enums --- .../client/gui/util/script/autocomplete/AutocompleteMenu.java | 3 +++ .../client/gui/util/script/interpreter/token/TokenType.java | 3 +++ .../npcs/client/gui/util/script/interpreter/type/TypeInfo.java | 1 + 3 files changed, 7 insertions(+) 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 4e060303a..4fc78de21 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 @@ -639,6 +639,9 @@ public class AutocompleteMenu extends Gui { private void drawTypeLabel(AutocompleteItem item, String typeLabel, int x, int y, int typeColor, TypeInfo typeInfo) { if (typeInfo == null || item.getKind() == AutocompleteItem.Kind.CLASS) { //draw package on right + // draw default package color instead of interface/enum colors + if (typeInfo != null && !typeInfo.isClass()) + typeColor = TokenType.getPackageColor(); drawSimpleTypeWithArraySuffix(typeLabel, x, y, typeColor); return; } 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 bf38a1f66..e5bd1f244 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 @@ -112,6 +112,9 @@ public enum TokenType { return getByType(typeInfo).getHexColor(); } + public static int getPackageColor(){ + return IMPORTED_CLASS.getHexColor(); + } /** * Convert this token type to a Minecraft color code character. * Used for backward compatibility with the existing rendering system. diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java index 6a8d2b855..dcac25c99 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/type/TypeInfo.java @@ -604,6 +604,7 @@ public class TypeInfo { public boolean isInnerClass() { return enclosingType != null; } public boolean isInterface() {return kind == Kind.INTERFACE;} public boolean isEnum() {return kind == Kind.ENUM;} + public boolean isClass() {return kind == Kind.CLASS;} public boolean isPrimitive() {return this.isPrimitive || javaClass != null && javaClass.isPrimitive();} private TypeInfo setPrimitive(boolean value) { this.isPrimitive = value; return this;}