Add a texture expiry timer defaulting to 10 seconds.

This stops slideshows with 100s of images from consuming many GB of RAM to store all images, even long after they've been shown.

Author: AlexIIL

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

@@ -39,6 +39,7 @@ public class CustomLoadingScreen {
     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_TEXTURE_CLEAR_INTERVAL;
     private static final Property PROP_DEBUG_RESOURCE_LOADING;
 
     public static final boolean shouldWait;
@@ -48,6 +49,7 @@ public class CustomLoadingScreen {
     public static final boolean debugResourceLoading;
     public static final String customConfigPath;
     public static final int fpsLimit;
+    public static final int textureClearInterval;
 
     private static FrameDisplayer displayer;
 
@@ -88,6 +90,15 @@ public class CustomLoadingScreen {
         PROP_FPS_LIMIT.setMaxValue(300);
         fpsLimit = Math.max(2, Math.min(300, PROP_FPS_LIMIT.getInt()));
 
+        PROP_TEXTURE_CLEAR_INTERVAL = CONFIG.get("performance", "texture_clear_interval", 10);
+        PROP_TEXTURE_CLEAR_INTERVAL.setMinValue(0);
+        PROP_TEXTURE_CLEAR_INTERVAL.setComment(
+            "The interval, in seconds, after which textures will be deleted to save memory, at the cost of additional disk reading if they are used later."
+                + "\nSet debug.resource_loading to true to log when this occurs."
+                + "\nSet to 0 to disable texture clearing."
+        );
+        textureClearInterval = Math.max(0, PROP_TEXTURE_CLEAR_INTERVAL.getInt(10));
+
         useCustom = PROP_USE_CUSTOM.getBoolean();
 
         String customName = PROP_CONFIG.getString();

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

@@ -52,16 +52,14 @@ protected BakedRender actuallyBake(FunctionContext context) throws InvalidExpres
             String l = image.replace("#", Integer.toString(i));
 
             ResourceLocation r = new ResourceLocation(l);
-            try {
-                InputStream stream = TextureLoader.openResourceStream(r);
+            try (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/MinecraftDisplayerRenderer.java

@@ -124,6 +124,8 @@ public void render() {
         GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
         GL11.glColor4f(1, 1, 1, 1);
 
+        textureManager.onFrame();
+
         if (GLContext.getCapabilities().GL_KHR_debug) {
             KHRDebug.glPopDebugGroup();
         }

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

@@ -1,26 +1,47 @@
 package alexiil.mc.mod.load.render;
 
-import java.util.HashSet;
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import net.minecraft.client.renderer.texture.ITextureObject;
 import net.minecraft.client.renderer.texture.ITickableTextureObject;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.resources.IResourceManager;
 import net.minecraft.util.ResourceLocation;
 
+import alexiil.mc.mod.load.CLSLog;
+import alexiil.mc.mod.load.CustomLoadingScreen;
+
 public class TextureManagerCLS extends TextureManager {
 
-    private final Set<ResourceLocation> textures = new HashSet<>();
+    /** Map of texture to last access tick. */
+    private final Map<ResourceLocation, Long> textures = new HashMap<>();
+    // If we're forced to put a full object into the map value, we may as well intern them by only creating them once
+    private Long currentTime = System.currentTimeMillis();
 
     public TextureManagerCLS(IResourceManager resourceManager) {
         super(resourceManager);
     }
 
+    private void onTextureAccess(ResourceLocation resource) {
+        textures.put(resource, currentTime);
+    }
+
     @Override
     public void bindTexture(ResourceLocation resource) {
         super.bindTexture(resource);
-        textures.add(resource);
+        onTextureAccess(resource);
+    }
+
+    @Override
+    public ITextureObject getTexture(ResourceLocation resource) {
+        ITextureObject obj = super.getTexture(resource);
+        if (obj != null) {
+            onTextureAccess(resource);
+        }
+        return obj;
     }
 
     @Override
@@ -31,19 +52,51 @@ public void deleteTexture(ResourceLocation textureLocation) {
 
     @Override
     public boolean loadTexture(ResourceLocation textureLocation, ITextureObject textureObj) {
-        textures.add(textureLocation);
+        onTextureAccess(textureLocation);
         return super.loadTexture(textureLocation, textureObj);
     }
 
     @Override
     public boolean loadTickableTexture(ResourceLocation textureLocation, ITickableTextureObject textureObj) {
-        textures.add(textureLocation);
+        onTextureAccess(textureLocation);
         return super.loadTickableTexture(textureLocation, textureObj);
     }
 
     public void deleteAll() {
-        for (ResourceLocation location : textures.toArray(new ResourceLocation[0])) {
+        for (ResourceLocation location : textures.keySet().toArray(new ResourceLocation[0])) {
             deleteTexture(location);
         }
     }
+
+    public void onFrame() {
+        if (CustomLoadingScreen.textureClearInterval == 0) {
+            return;
+        }
+
+        Long last = currentTime;
+        long next = System.currentTimeMillis();
+
+        if (last + 1000 < next) {
+            return;
+        }
+
+        currentTime = next;
+
+        long minTime = currentTime - (CustomLoadingScreen.textureClearInterval * 1000);
+
+        List<ResourceLocation> toRemove = new ArrayList<>();
+
+        for (Map.Entry<ResourceLocation, Long> entry : textures.entrySet()) {
+            if (entry.getValue() < minTime) {
+                toRemove.add(entry.getKey());
+            }
+        }
+
+        for (ResourceLocation tex : toRemove) {
+            if (CustomLoadingScreen.debugResourceLoading) {
+                CLSLog.info("[debug] Automatically deleting texture " + tex);
+            }
+            deleteTexture(tex);
+        }
+    }
 }