diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptTextContainer.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptTextContainer.java index 9e3f83b96..5c73fe530 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptTextContainer.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptTextContainer.java @@ -128,7 +128,6 @@ public class ScriptTextContainer extends JavaTextContainer { if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.IMPORT_KEYWORD) return JavaTextContainer.TokenType.IMPORT_KEYWORD; if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.KEYWORD) return JavaTextContainer.TokenType.KEYWORD; if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.MODIFIER) return JavaTextContainer.TokenType.MODIFIER; - if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.NEW_TYPE) return JavaTextContainer.TokenType.NEW_TYPE; if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.INTERFACE_DECL) return JavaTextContainer.TokenType.INTERFACE_DECL; if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.ENUM_DECL) return JavaTextContainer.TokenType.ENUM_DECL; if (type == noppes.npcs.client.gui.util.script.interpreter.TokenType.CLASS_DECL) return JavaTextContainer.TokenType.CLASS_DECL; diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/Token.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/Token.java index 06aa821a7..af4af8ac7 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/Token.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/Token.java @@ -191,7 +191,7 @@ public class Token { public boolean isTypeReference() { return type == TokenType.TYPE_DECL || type == TokenType.IMPORTED_CLASS || type == TokenType.CLASS_DECL || type == TokenType.INTERFACE_DECL || - type == TokenType.ENUM_DECL || type == TokenType.NEW_TYPE; + type == TokenType.ENUM_DECL; } public boolean isResolved() { diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TokenType.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TokenType.java index acbace01d..d3c619758 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TokenType.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/TokenType.java @@ -18,7 +18,6 @@ public enum TokenType { MODIFIER(0xFFAA00, 90), // public, private, static, final, etc. // Type declarations and references - NEW_TYPE(0xFF55FF, 80), // type after 'new' keyword INTERFACE_DECL(0x55FFFF, 85), // interface names (aqua) ENUM_DECL(0xFF55FF, 85), // enum names (magenta) CLASS_DECL(0x00AAAA, 85), // class names in declarations @@ -76,7 +75,6 @@ public enum TokenType { case IMPORT_KEYWORD: case MODIFIER: return '6'; // gold - case NEW_TYPE: case ENUM_DECL: return 'd'; // magenta case INTERFACE_DECL: diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java index 8a0c6c1e3..16d9e6e1c 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/hover/TokenHoverInfo.java @@ -98,7 +98,6 @@ public class TokenHoverInfo { case INTERFACE_DECL: case ENUM_DECL: case TYPE_DECL: - case NEW_TYPE: info.extractClassInfo(token); break;