From 752fd063892b9986fec703e26b1fac5a574fe795 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 14 Jul 2019 00:38:46 +0200
Subject: [PATCH] This isn't so much a memory leak as an open faucet.

---
 .../com/minelittlepony/client/pony/Pony.java  | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/minelittlepony/client/pony/Pony.java b/src/main/java/com/minelittlepony/client/pony/Pony.java
index 5f96ce8d..933fc317 100644
--- a/src/main/java/com/minelittlepony/client/pony/Pony.java
+++ b/src/main/java/com/minelittlepony/client/pony/Pony.java
@@ -1,6 +1,9 @@
 package com.minelittlepony.client.pony;
 
 import com.google.common.base.MoreObjects;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.minelittlepony.client.MineLittlePony;
 import com.minelittlepony.client.PonyRenderManager;
 import com.minelittlepony.client.render.IPonyRender;
@@ -13,6 +16,8 @@ import net.minecraft.block.Material;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.texture.MissingSprite;
 import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.client.texture.Texture;
 import net.minecraft.client.texture.TextureManager;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
@@ -32,6 +37,8 @@ import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static com.mojang.blaze3d.platform.GlStateManager.getTexLevelParameter;
@@ -42,6 +49,10 @@ public class Pony implements IPony {
 
     private static final AtomicInteger ponyCount = new AtomicInteger();
 
+    private static final LoadingCache<Identifier, NativeImage> nativeCache = CacheBuilder.newBuilder()
+            .expireAfterAccess(30, TimeUnit.SECONDS)
+            .build(CacheLoader.from(Pony::constructFromGlBuffer));
+
     private final int ponyId = ponyCount.getAndIncrement();
 
     private final Identifier texture;
@@ -92,11 +103,25 @@ public class Pony implements IPony {
     }
 
     public static NativeImage getBufferedImage(@Nullable Identifier resource) {
+        if (resource != null) {
+            try {
+                Texture texture = MinecraftClient.getInstance().getTextureManager().getTexture(resource);
+
+                if (texture instanceof NativeImageBackedTexture) {
+                    return ((NativeImageBackedTexture)texture).getImage();
+                }
+
+                return nativeCache.get(resource);
+            } catch (ExecutionException e) {
+                MineLittlePony.logger.fatal("Error fetching native image from gl buffer", e);
+            }
 
-        if (resource == null) {
-            return MissingSprite.getMissingSpriteTexture().getImage();
         }
 
+        return MissingSprite.getMissingSpriteTexture().getImage();
+    }
+
+    private static NativeImage constructFromGlBuffer(Identifier resource) {
         MinecraftClient mc = MinecraftClient.getInstance();
         TextureManager textures = mc.getTextureManager();
 
@@ -116,9 +141,11 @@ public class Pony implements IPony {
         }
 
         NativeImage image = new NativeImage(channels, width, height, false);
+
+        // This allocates a new array to store the image every time.
+        // Don't do this every time. Keep a cache and store it so we don't destroy memory.
         image.loadFromTextureImage(0, false);
         return image;
-
     }
 
     private IPonyData checkSkin(NativeImage bufferedimage) {