Temp work for 1.5.6

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.5
+mod_version=1.5.6-pre.1

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

@@ -57,6 +57,8 @@ public class ClsManager {
     private static IResourceManager resManager;
 
     static {
+        FUNC_CTX.putConstantBoolean("dark_mode", CustomLoadingScreen.darkMode);
+
         FUNC_CTX.put_l("forge_progress_bar_count", forgeProgressBarTitles::size);
         FUNC_CTX.put_l_o("forge_progress_bar_title", String.class, (index) -> {
             if (index < 0 || index >= forgeProgressBarTitles.size()) {

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

@@ -28,14 +28,18 @@ public class CustomLoadingScreen {
 
     private static final Property PROP_FRAME;
     private static final Property PROP_USE_CUSTOM;
+    // private static final Property PROP_DARK_MODE;
     private static final Property PROP_CONFIG;
     private static final Property PROP_CONFIG_RANDOMS;
     private static final Property PROP_WAIT;
     private static final Property PROP_FPS_LIMIT;
+    private static final Property PROP_DEBUG_RESOURCE_LOADING;
 
     public static final boolean shouldWait;
     public static final boolean useFrame;
     public static final boolean useCustom;
+    public static final boolean darkMode;
+    public static final boolean debugResourceLoading;
     public static final String customConfigPath;
     public static final int fpsLimit;
 
@@ -62,6 +66,13 @@ public class CustomLoadingScreen {
             "Sleep for a tiny amount of time each mod progress stage to make configs that rely on receiving all mod load stages work a bit better."
         );
 
+        // PROP_DARK_MODE = CONFIG.get("general", "dark_mode", false);
+        // PROP_DARK_MODE.setComment("Use dark-mode for loading screens rather than light.");
+        darkMode = false;// PROP_DARK_MODE.getBoolean();
+
+        PROP_DEBUG_RESOURCE_LOADING = CONFIG.get("debug", "resource_loading", false);
+        debugResourceLoading = PROP_DEBUG_RESOURCE_LOADING.getBoolean();
+
         PROP_FPS_LIMIT = CONFIG.get("general", "fps_limit", 75);
         PROP_FPS_LIMIT.setComment(
             "The maximum fps to target for the loading screen. The default is 75. Values between 2 and 300 are allowed."

src/main/java/alexiil/mc/mod/load/baked/render/BakedImageRender.java

@@ -9,6 +9,7 @@
 
 import alexiil.mc.mod.load.render.MinecraftDisplayerRenderer;
 import alexiil.mc.mod.load.render.TextureLoader;
+import alexiil.mc.mod.load.render.TextureLoader.PreScannedImageData;
 
 import buildcraft.lib.expression.node.value.NodeVariableDouble;
 
@@ -24,6 +25,8 @@ public class BakedImageRender extends BakedRenderPositioned {
     protected final ResourceLocation res;
     private final BakedArea pos, tex;
 
+    PreScannedImageData preScanned = null;
+
     public BakedImageRender(
         NodeVariableDouble varWidth, NodeVariableDouble varHeight, String res, BakedArea pos, BakedArea tex
     ) {
@@ -37,8 +40,7 @@ public BakedImageRender(
     public void preLoad(MinecraftDisplayerRenderer renderer) {
         super.preLoad(renderer);
 
-        // TODO: Replace this with loading the texture data to bind on the correct thread.
-        // bindTexture(renderer);
+        preScanned = TextureLoader.preScan(res);
     }
 
     @Override
@@ -62,7 +64,11 @@ public void render(MinecraftDisplayerRenderer renderer) {
     }
 
     public void bindTexture(MinecraftDisplayerRenderer renderer) {
-        TextureLoader.bindTexture(renderer.textureManager, res);
+        if (preScanned != null) {
+            preScanned.bind(renderer.textureManager);
+        } else {
+            TextureLoader.bindTexture(renderer.textureManager, res);
+        }
     }
 
     @Override

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

@@ -66,16 +66,18 @@ public final B bake(FunctionContext context) throws InvalidExpressionException {
 
     // These are helper methods to make deserialisation one-liners
 
-    protected static <O> O deserialiseObject(JsonObject obj, String memeber, JsonDeserializationContext ctx,
-        Class<O> clazz) {
+    protected static <O> O deserialiseObject(
+        JsonObject obj, String memeber, JsonDeserializationContext ctx, Class<O> clazz
+    ) {
         if (obj.has(memeber)) {
             return ctx.deserialize(obj.get(memeber), clazz);
         }
         return null;
     }
 
-    protected static String consolidateFunction(JsonObject obj, String memeber, JsonDeserializationContext ctx,
-        String parent, String defaultF) {
+    protected static String consolidateFunction(
+        JsonObject obj, String memeber, JsonDeserializationContext ctx, String parent, String defaultF
+    ) {
         return consolidateFunction(deserialiseObject(obj, memeber, ctx, String.class), parent, defaultF);
     }
 
@@ -95,16 +97,18 @@ protected static String consolidateFunction(String in, String parent, String def
 
     /** This will override the parents version of the object if in is not null. If in is null and the parent is null,
      * then the default is returned. */
-    protected static <O> O overrideObject(JsonObject obj, String memeber, JsonDeserializationContext ctx,
-        Class<O> clazz, O parent, O defaultO) {
+    protected static <O> O overrideObject(
+        JsonObject obj, String memeber, JsonDeserializationContext ctx, Class<O> clazz, O parent, O defaultO
+    ) {
         O in = deserialiseObject(obj, memeber, ctx, clazz);
         if (in != null) return in;
         if (parent != null) return parent;
         return defaultO;
     }
 
-    protected static JsonVariable[] overrideVariables(JsonObject obj, String memeber, JsonDeserializationContext ctx,
-        JsonVariable[] parent) {
+    protected static JsonVariable[] overrideVariables(
+        JsonObject obj, String memeber, JsonDeserializationContext ctx, JsonVariable[] parent
+    ) {
         JsonVariable[] in = deserialiseObject(obj, memeber, ctx, JsonVariable[].class);
         if (in == null) {
             return parent == null ? new JsonVariable[0] : parent;

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

@@ -23,8 +23,12 @@ public JsonRender(String image, String colour) {
     }
 
     public JsonRender(JsonRender parent, JsonObject json, JsonDeserializationContext context) {
-        this.image = overrideObject(json, "image", context, String.class, parent == null ? null : parent.image, "missingno");
-        this.colour = overrideObject(json, "colour", context, String.class, parent == null ? null : parent.colour, "0xFFFFFFFF");
+        this.image
+            = overrideObject(json, "image", context, String.class, parent == null ? null : parent.image, "missingno");
+
+        this.colour = overrideObject(
+            json, "colour", context, String.class, parent == null ? null : parent.colour, "0xFFFFFFFF"
+        );
     }
 
     public List<BakedInsn> bakeInstructions(FunctionContext context) throws InvalidExpressionException {

src/main/java/alexiil/mc/mod/load/json/subtypes/JsonRenderSlideshow.java

@@ -2,6 +2,7 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -52,13 +53,15 @@ protected BakedRender actuallyBake(FunctionContext context) throws InvalidExpres
 
             ResourceLocation r = new ResourceLocation(l);
             try {
-                if (TextureLoader.loadTexture(r) == null) {
+                InputStream stream = TextureLoader.openResourceStream(r);
+                if (stream == null) {
                     if (i == 0) {
                         continue;
                     } else {
                         break;
                     }
                 }
+                stream.close();
             } catch (FileNotFoundException fnfe) {
                 if (i == 0) {
                     continue;

src/main/java/alexiil/mc/mod/load/render/ClsTexture.java

@@ -0,0 +1,93 @@
+package alexiil.mc.mod.load.render;
+
+import java.awt.image.BufferedImage;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GLContext;
+import org.lwjgl.opengl.KHRDebug;
+
+import net.minecraft.client.renderer.texture.SimpleTexture;
+import net.minecraft.client.renderer.texture.TextureUtil;
+import net.minecraft.client.resources.IResourceManager;
+import net.minecraft.util.ResourceLocation;
+
+import net.minecraftforge.fml.client.SplashProgress;
+
+public class ClsTexture extends SimpleTexture {
+
+    private BufferedImage image;
+    private boolean blur;
+    private boolean clamp;
+
+    public ClsTexture(ResourceLocation location) {
+        super(location);
+    }
+
+    public ResourceLocation location() {
+        return textureLocation;
+    }
+
+    @Override
+    public int getGlTextureId() {
+
+        if (glTextureId == -1) {
+            glTextureId = GL11.glGenTextures();
+        }
+        return glTextureId;
+    }
+
+    @Override
+    public void deleteGlTexture() {
+        if (glTextureId != -1) {
+            GL11.glDeleteTextures(glTextureId);
+            glTextureId = -1;
+        }
+    }
+
+    public void loadImage(IResourceManager resourceManager) throws IOException {
+
+        try (InputStream is = TextureLoader.openResourceStream(location())) {
+
+            if (is == null) {
+                throw new FileNotFoundException(location().toString());
+            }
+
+            image = TextureUtil.readBufferedImage(is);
+            blur = false;
+            clamp = false;
+
+            // if (m.exists()) {
+            // try {
+            // TextureMetadataSection meta = (TextureMetadataSection) iresource.getMetadata("texture");
+            //
+            // if (meta != null) {
+            // blur = meta.getTextureBlur();
+            // clamp = meta.getTextureClamp();
+            // }
+            // } catch (RuntimeException runtimeexception) {
+            // LOGGER.warn("Failed reading metadata of: {}", this.textureLocation, runtimeexception);
+            // }
+            // }
+        }
+    }
+
+    @Override
+    public void loadTexture(IResourceManager resourceManager) throws IOException {
+        deleteGlTexture();
+
+        if (image == null) {
+            loadImage(resourceManager);
+        }
+
+        synchronized (SplashProgress.class) {
+            TextureUtil.uploadTextureImageAllocate(getGlTextureId(), image, blur, clamp);
+        }
+
+        if (GLContext.getCapabilities().GL_KHR_debug) {
+            KHRDebug.glObjectLabel(GL11.GL_TEXTURE, getGlTextureId(), "CLS_custom_tex_'" + location() + "'");
+        }
+    }
+}

src/main/java/alexiil/mc/mod/load/render/MainSplashRenderer.java

@@ -190,7 +190,11 @@ public static void run() {
         start = System.currentTimeMillis();
 
         while (!transitionOutDone) {
-            GL11.glClearColor(1, 1, 1, 1);
+            if (CustomLoadingScreen.darkMode) {
+                GL11.glClearColor(0, 0, 0, 1);
+            } else {
+                GL11.glClearColor(1, 1, 1, 1);
+            }
             GL11.glClear(GL11.GL_COLOR_BUFFER_BIT);
 
             // matrix setup -- similar as SplashProgress
@@ -304,24 +308,26 @@ private static void renderFrame() {
             GL11.glScalef(2, 2, 1);
             GL11.glEnable(GL11.GL_TEXTURE_2D);
 
+            int fontColour = CustomLoadingScreen.darkMode ? 0xFF_FF_FF_FF : 0;
+
             String s = ((diff / 100L) / 10.0) + "s";
-            fontRenderer.drawString(s, 0, -10, 0);
+            fontRenderer.drawString(s, 0, -10, fontColour);
 
             s = status + " - " + subStatus;
-            fontRenderer.drawString(s, -fontRenderer.getStringWidth(s) / 2, -40, 0);
+            fontRenderer.drawString(s, -fontRenderer.getStringWidth(s) / 2, -40, fontColour);
             String bar = getProgress(12, progress);
-            fontRenderer.drawString(bar, -fontRenderer.getStringWidth(bar) / 2, -30, 0);
+            fontRenderer.drawString(bar, -fontRenderer.getStringWidth(bar) / 2, -30, fontColour);
 
             Iterator<ProgressBar> i = ProgressManager.barIterator();
             while (i.hasNext()) {
                 ProgressBar b = i.next();
 
                 int startWidth = fontRenderer.getStringWidth(b.getTitle() + " ");
 
-                fontRenderer.drawString(b.getTitle() + " ", -startWidth, y, 0);
-                fontRenderer.drawString("- " + b.getMessage(), 0, y, 0);
+                fontRenderer.drawString(b.getTitle() + " ", -startWidth, y, fontColour);
+                fontRenderer.drawString("- " + b.getMessage(), 0, y, fontColour);
                 bar = getProgress(b);
-                fontRenderer.drawString(bar, -fontRenderer.getStringWidth(bar) / 2, y + 14, 0);
+                fontRenderer.drawString(bar, -fontRenderer.getStringWidth(bar) / 2, y + 14, fontColour);
 
                 y += 30;
             }
@@ -342,7 +348,7 @@ private static void renderFrame() {
             int x = -w / 4;
             y = -h / 4;
             for (String s2 : list) {
-                fontRenderer.drawString(s2, x, y, 0);
+                fontRenderer.drawString(s2, x, y, fontColour);
                 y += 20;
             }
 

src/main/java/alexiil/mc/mod/load/render/TextureAnimator.java

@@ -79,7 +79,7 @@ public void bindFrame(int frame, boolean loop) {
             } else {
                 ids[frame] = GL11.glGenTextures();
                 uploadTextureImage(ids[frame], images[frame]);
-                GL11.glBindTexture(GL11.GL_TEXTURE_2D,ids[frame]);
+                GL11.glBindTexture(GL11.GL_TEXTURE_2D, ids[frame]);
             }
             lastUsed[frame] = now;
             uploadFramesAhead(frame, TEXTURE_UPLOAD_AHEAD);
@@ -129,7 +129,7 @@ private void tick() {
     public static boolean isAnimated(String resourceLocation) {
         ResourceLocation location = new ResourceLocation(resourceLocation);
         try {
-            final InputStream stream = TextureLoader.loadTexture(location);
+            final InputStream stream = TextureLoader.openResourceStream(location);
             if (stream == null) {
                 return false;
             }
@@ -139,12 +139,14 @@ public static boolean isAnimated(String resourceLocation) {
                         reader.setInput(imageStream);
                         boolean animated = reader.getNumImages(true) > 1;
                         reader.dispose();
+                        stream.close();
                         return animated;
                     } catch (IOException ignored) {} finally {
                         reader.dispose();
                     }
                 }
             }
+            stream.close();
         } catch (IOException ignored) {}
         return false;
     }
@@ -155,7 +157,7 @@ public TextureAnimator(BakedConfig images) {
             String resource = render.render.getLocation();
             if (resource != null) {
                 try {
-                    final InputStream stream = TextureLoader.loadTexture(new ResourceLocation(resource));
+                    final InputStream stream = TextureLoader.openResourceStream(new ResourceLocation(resource));
                     if (stream == null) {
                         continue;
                     }
@@ -183,6 +185,7 @@ public TextureAnimator(BakedConfig images) {
                                     frames = Arrays.copyOf(frames, read);
                                 }
                                 if (frames.length < 2) {
+                                    stream.close();
                                     continue;
                                 }
                                 CLSLog.info("Number of Frames = " + read);
@@ -196,6 +199,7 @@ public TextureAnimator(BakedConfig images) {
                             }
                         }
                     }
+                    stream.close();
                 } catch (IOException e) {
                     // TODO: do something about this!
                 }