diff --git a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java index c856cbea3..cb39c40c2 100644 --- a/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java +++ b/src/main/java/noppes/npcs/client/CustomNpcResourceListener.java @@ -31,9 +31,6 @@ public class CustomNpcResourceListener implements FolderResourcePack pack = new FolderResourcePack(CustomNpcs.Dir); LogWriter.info("[ResourceListener] Adding FolderResourcePack: " + CustomNpcs.Dir.getAbsolutePath()); - File schemeInFolder = new File(CustomNpcs.Dir, "assets/customnpcs/colorscheme/script_editor_scheme.json"); - LogWriter.info("[ResourceListener] Colorscheme in customnpcs folder: " + schemeInFolder.exists() - + " (" + schemeInFolder.getAbsolutePath() + ")"); simplemanager.reloadResourcePack(pack); ScriptColorScheme.reloadColorScheme(var1); diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java index dac50d743..74a2432b6 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiScriptTextArea.java @@ -1053,7 +1053,7 @@ public class GuiScriptTextArea extends GuiNpcTextField { if (active && isEnabled() && (recentInput || (cursorCounter / 10) % 2 == 0) && (selection.getCursorPosition() >= data.start && selection.getCursorPosition() < data.end || (i == list.size() - 1 && selection.getCursorPosition() == text.length()))) { int posX = x + LINE_NUMBER_GUTTER_WIDTH + ClientProxy.Font.width( line.substring(0, Math.min(selection.getCursorPosition() - data.start, line.length()))); - drawRect(posX + 1, posY, posX + 2, posY + container.lineHeight, 0xffffffff); + drawRect(posX + 1, posY, posX + 2, posY + container.lineHeight, ScriptColorScheme.getBackgroundStyle().getCaretColor()); } } } diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/ScriptColorScheme.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/ScriptColorScheme.java index 05bd1e4af..e38aae462 100644 --- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/ScriptColorScheme.java +++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/ScriptColorScheme.java @@ -178,9 +178,10 @@ public final class ScriptColorScheme { int lineNumberActiveColor = bg.has("lineNumberActiveColor") ? parseColor(bg.get("lineNumberActiveColor"), d.getLineNumberActiveColor(), "background.lineNumberActiveColor") : d.getLineNumberActiveColor(); int scrollbarColor = bg.has("scrollbarColor") ? parseColor(bg.get("scrollbarColor"), d.getScrollbarColor(), "background.scrollbarColor") : d.getScrollbarColor(); int borderColor = bg.has("borderColor") ? parseColor(bg.get("borderColor"), d.getBorderColor(), "background.borderColor") : d.getBorderColor(); + int caretColor = bg.has("caretColor") ? parseColor(bg.get("caretColor"), d.getCaretColor(), "background.caretColor") : d.getCaretColor(); return new BackgroundStyleEntry(backgroundColor, gutterColor, gutterSeparatorColor, - lineNumberColor, lineNumberActiveColor, scrollbarColor, borderColor); + lineNumberColor, lineNumberActiveColor, scrollbarColor, borderColor, caretColor); } catch (Exception e) { LogWriter.error("[ColorScheme] Error parsing 'background', using defaults: " + e.getMessage()); return BackgroundStyleEntry.DEFAULT; @@ -241,7 +242,8 @@ public final class ScriptColorScheme { 0xFF606366, // lineNumberColor (inactive) 0xFFb9c7d6, // lineNumberActiveColor (current line) 0xFFe0e0e0, // scrollbarColor - 0xffa0a0a0 // borderColor (outer border) + 0xffa0a0a0, // borderColor (outer border) + 0xffffffff // caretColor (cursor) ); private final int backgroundColor; @@ -251,10 +253,11 @@ public final class ScriptColorScheme { private final int lineNumberActiveColor; private final int scrollbarColor; private final int borderColor; + private final int caretColor; BackgroundStyleEntry(int backgroundColor, int gutterColor, int gutterSeparatorColor, int lineNumberColor, int lineNumberActiveColor, - int scrollbarColor, int borderColor) { + int scrollbarColor, int borderColor, int caretColor) { this.backgroundColor = backgroundColor; this.gutterColor = gutterColor; this.gutterSeparatorColor = gutterSeparatorColor; @@ -262,6 +265,7 @@ public final class ScriptColorScheme { this.lineNumberActiveColor = lineNumberActiveColor; this.scrollbarColor = scrollbarColor; this.borderColor = borderColor; + this.caretColor = caretColor; } public int getBackgroundColor() { return backgroundColor; } @@ -271,5 +275,6 @@ public final class ScriptColorScheme { public int getLineNumberActiveColor() { return lineNumberActiveColor; } public int getScrollbarColor() { return scrollbarColor; } public int getBorderColor() { return borderColor; } + public int getCaretColor() { return caretColor; } } } diff --git a/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json b/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json index 86dd81927..61b0b82d4 100644 --- a/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json +++ b/src/main/resources/assets/customnpcs/colorscheme/script_editor_scheme.json @@ -6,7 +6,9 @@ "lineNumberColor": "#FF606366", "lineNumberActiveColor": "#FFB9C7D6", "scrollbarColor": "#FFE0E0E0", - "borderColor": "#FFA0A0A0" + "borderColor": "#FFA0A0A0", + "caretColor": "#FFFFFFFF" + }, "COMMENT": { "color": "#FF777777",