upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 05:27:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ScriptColorScheme not respecting resourcepack priority

Browse Source
This commit is contained in:
bigguy345 committed 2026-03-13 03:03:39 +02:00
1 parent f1f3b17402
commit b7c3c53dc9
2 files changed
+4 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/CustomNpcResourceListener.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class CustomNpcResourceListener implements
SimpleReloadableResourceManager simplemanager = (SimpleReloadableResourceManager) var1;
FolderResourcePack pack = new FolderResourcePack(CustomNpcs.Dir);
LogWriter.info("[ResourceListener] Adding FolderResourcePack: " + CustomNpcs.Dir.getAbsolutePath());
LogWriter.info("[ResourceListener] Adding FolderResourcePack (as fallback): " + CustomNpcs.Dir.getAbsolutePath());
simplemanager.reloadResourcePack(pack);
ScriptColorScheme.reloadColorScheme(var1);
src/main/java/noppes/npcs/client/gui/util/script/interpreter/token/ScriptColorScheme.java
+3 -13
View File
@@ -43,9 +43,10 @@ public final class ScriptColorScheme {
public static void reloadColorScheme(IResourceManager resourceManager) {
ResourceLocation loc = new ResourceLocation("customnpcs", "colorscheme/script_editor_scheme.json");
try {
IResource resource = resourceManager.getResource(loc);
List<IResource> resources = resourceManager.getAllResources(loc);
IResource top = resources.get(resources.size() - 1);
try (InputStream is = resource.getInputStream();
try (InputStream is = top.getInputStream();
InputStreamReader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
loadFromJson(reader);
LogWriter.info("[ColorScheme] Loaded script_editor_scheme.json successfully");
@@ -60,17 +61,6 @@ public final class ScriptColorScheme {
}
}
private static String peekResourceContent(IResource res) {
try (InputStream peekIs = res.getInputStream()) {
byte[] buf = new byte[120];
int read = peekIs.read(buf);
if (read > 0) {
return new String(buf, 0, read, "UTF-8").replaceAll("\\s+", " ").trim();
}
} catch (Exception ignored) {}
return "<could not peek>";
}
private static void logLoadedSample() {
StyleEntry[] current = styles;
TokenType[] samples = { TokenType.COMMENT, TokenType.KEYWORD, TokenType.STRING, TokenType.METHOD_CALL, TokenType.DEFAULT };