1.5.4.

Author: AlexIIL

build.properties

@@ -2,4 +2,4 @@ mc_version=1.12.2
 forge_version=14.23.0.2544
 mcp_mappings=snapshot_20171120
 
-mod_version=1.5.3
+mod_version=1.5.4

src/main/java/alexiil/mc/mod/load/ClsManager.java

@@ -97,6 +97,8 @@ public class ClsManager {
         FUNC_CTX.put_l("memory_used", () -> {
             return (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1024 / 1024;
         });
+
+        FUNC_CTX.put_s_s("translate", Translation::translate);
     }
 
     public static boolean load() throws InvalidExpressionException {

src/main/java/alexiil/mc/mod/load/Translation.java

@@ -57,7 +57,12 @@ static boolean scanLangRoot(final Path langRoot) {
         try {
             for (Path child : Files.list(langRoot).collect(Collectors.toList())) {
                 String fn = child.getFileName().toString();
+                if (fn.endsWith(".lang.txt")) {
+                    fn = fn.substring(0, fn.length() - 4);
+                    CLSLog.warn("Found .lang.txt file in lang root, treating as .lang: " + child);
+                }
                 if (!fn.endsWith(".lang") || !Files.isRegularFile(child)) {
+                    CLSLog.warn("Encountered unknown file in lang root " + child);
                     continue;
                 }
                 String locale = fn.substring(0, fn.lastIndexOf('.'));
@@ -118,7 +123,16 @@ public static void scanFileForTranslations(File modLocation) {
 
     public static void setTranslator() {
         // Scan config dir for langs
-        scanLangRoot(Paths.get("config", "customloadingscreen", "lang"));
+        Path cfgLangFolder = Paths.get("config", "customloadingscreen", "lang");
+        if (Files.exists(cfgLangFolder)) {
+            scanLangRoot(cfgLangFolder);
+        } else {
+            try {
+                Files.createDirectories(cfgLangFolder);
+            } catch (IOException ignored) {
+                // Ignore
+            }
+        }
 
         // Lastly, set the current locale
         File options = new File("./options.txt");

src/main/java/alexiil/mc/mod/load/baked/insn/BakedColourSimple.java

@@ -1,6 +1,6 @@
 package alexiil.mc.mod.load.baked.insn;
 
-import net.minecraft.client.renderer.GlStateManager;
+import org.lwjgl.opengl.GL11;
 
 public class BakedColourSimple extends BakedInsn {
     private final float a, r, g, b;
@@ -14,6 +14,6 @@ public BakedColourSimple(float a, float r, float g, float b) {
 
     @Override
     public void render() {
-        GlStateManager.color(r, g, b, a);
+        GL11.glColor4f(r, g, b, a);
     }
 }

src/main/java/alexiil/mc/mod/load/json/ConfigManager.java

@@ -184,7 +184,7 @@ private static String getTextResource(ResourceLocation identifier) {
     static <T extends JsonConfigurable<T, ?>> T getAsT(EType type, String location) throws InvalidExpressionException {
         if (StringUtils.isEmpty(location)) {
             CLSLog.warn("Location was given as null!", new Throwable());
-            return null;
+            throw new JsonSyntaxException("Invalid location '" + location + "'");
         }
         CLSLog.info("Getting " + location + " as " + type);
         ResourceLocation loc = getLocation(type, location);
@@ -196,7 +196,7 @@ private static String getTextResource(ResourceLocation identifier) {
                 return (T) failed;
             }
             CLSLog.warn("The text inside of \"" + loc + "\" was null!");
-            return null;
+            throw new JsonSyntaxException("Invalid location '" + location + "': the text inside it was null!");
         }
         try {
             T t = (T) GSON_ADAPTORS.fromJson(text, type.clazz);
@@ -241,22 +241,55 @@ public static void getAsScript(String location) {
     }
 
     public static ResourceLocation getLocation(EType type, String base) {
+
+        /* Namespace rules: */
+
+        // If the location starts contains a colon before a slash then it's a namespace,
+        // and we don't do anything special other that use it instead of the default.
+
+        // If the location starts with "config/" then we use "config" as the namespace
+        // and we *don't* add the type prefix if the type is EType.CONFIG.
+
+        /* Path rules: */
+
+        // We always append ".json" to the path, no exceptions
+        // The other rules are a bit more complicated:
+
+        // If it starts with "builtin/" or "sample/" then we bring that to the front.
+
+        // Then we add "type"
+
+        String namespace = "customloadingscreen";
         String path;
-        if (base.startsWith("builtin/")) {
-            path = "builtin/" + type.resourceBase + "/" + base.substring("builtin/".length()) + ".json";
-        } else if (base.startsWith("sample/")) {
-            path = "sample/" + type.resourceBase + "/" + base.substring("sample/".length()) + ".json";
-        } else if (base.startsWith("config/")) {
-            if (type == EType.CONFIG) {
-                path = base.substring("config/".length()) + ".json";
+        int colon = base.indexOf(':');
+        int slash = base.indexOf('/');
+
+        if (colon > 0 && (colon < slash || slash < 0)) {
+            namespace = base.substring(0, colon);
+            base = base.substring(colon + 1);
+
+            if ("config".equals(namespace) && type == EType.CONFIG) {
+                path = base;
             } else {
-                path = type.resourceBase + "/" + base.substring("config/".length()) + ".json";
+                path = type.resourceBase + "/" + base;
             }
-            return new ResourceLocation("config", path);
         } else {
-            path = type.resourceBase + "/" + base + ".json";
+            if (base.startsWith("builtin/")) {
+                path = "builtin/" + type.resourceBase + base.substring(slash);
+            } else if (base.startsWith("sample/")) {
+                path = "sample/" + type.resourceBase + base.substring(slash);
+            } else if (base.startsWith("config/")) {
+                if (type == EType.CONFIG) {
+                    path = base.substring(slash + 1);
+                } else {
+                    path = type.resourceBase + base.substring(slash);
+                }
+                namespace = "config";
+            } else {
+                path = type.resourceBase + "/" + base;
+            }
         }
 
-        return new ResourceLocation("customloadingscreen", path);
+        return new ResourceLocation(namespace, path + ".json");
     }
 }

src/main/resources/changelog/1.5.3.txt

@@ -1,3 +1,3 @@
 Bug Fixes:
 
-* Fix colour handling for non-constant colours.
+* Fix non-constant colour handling treating components as either fully bright or off, rather than values ranging from 255 (100% brightness) to 0 (dark).

src/main/resources/changelog/1.5.4.txt

@@ -0,0 +1,7 @@
+Bug Fixes:
+
+* Fix constant colours sometimes not applying properly.
+* Add a new function: "translate". This takes 1 string argument, and can be used to localize custom language strings (in addition to tghe built-in ones).
+* Print debug information about language paths when loading them.
+* Fix a NullPointerException being thrown when json resources aren't found.
+* Improve namespace handling for json resources.