From 9fcbe27046e7e96d48b1f7ff4ac4acb5cc6725df Mon Sep 17 00:00:00 2001
From: Lukas <leisenhau@gmail.com>
Date: Tue, 8 Dec 2020 18:12:39 +0100
Subject: [PATCH] TextureLoading: no longer save a temporary file

---
 pom.xml                                       |  5 ---
 .../render/texture/TextureLoader.java         | 37 +++++++------------
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/pom.xml b/pom.xml
index f0b9473a0..a19e3dd00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,11 +95,6 @@
             <classifier>natives-windows</classifier>
             <version>${lwjgl.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.l33tlabs.twl</groupId>
-            <artifactId>pngdecoder</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.lwjgl</groupId>
             <artifactId>lwjgl-glfw</artifactId>
diff --git a/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java b/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
index cc4f5a147..94bedbe74 100644
--- a/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
+++ b/src/main/java/de/bixilon/minosoft/render/texture/TextureLoader.java
@@ -13,18 +13,15 @@
 
 package de.bixilon.minosoft.render.texture;
 
-import de.bixilon.minosoft.config.StaticConfiguration;
 import de.bixilon.minosoft.data.assets.AssetsManager;
 import de.bixilon.minosoft.logging.Log;
 import de.bixilon.minosoft.render.GameWindow;
 import de.bixilon.minosoft.render.blockModels.Face.RenderConstants;
-import de.matthiasmann.twl.utils.PNGDecoder;
 
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
+import java.awt.image.DataBufferInt;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -42,21 +39,21 @@ public class TextureLoader {
     private int textureID;
     private float step;
     private int totalTextures = 0;
-
+    // ARGB -> RGBA
     public TextureLoader(HashSet<String> textures, HashMap<String, float[]> tints) {
         countDownLatch = new CountDownLatch(1);
         textureCoordinates = new HashMap<>();
         loadTextures(textures, tints);
-        combineTextures();
-        try {
-            PNGDecoder decoder = new PNGDecoder(new FileInputStream(StaticConfiguration.HOME_DIRECTORY + "assets/allTextures.png"));
-            ByteBuffer buf = ByteBuffer.allocateDirect(decoder.getWidth() * decoder.getHeight() * 4);
-            decoder.decode(buf, decoder.getWidth() * 4, PNGDecoder.Format.RGBA);
-            bindTexture(buf, decoder.getWidth(), decoder.getHeight());
-        } catch (IOException e) {
-            e.printStackTrace();
-            System.exit(5);
+        BufferedImage image = combineTextures();
+        ByteBuffer buf = ByteBuffer.allocateDirect(image.getWidth() * image.getHeight() * 4);
+        int[] imageData = ((DataBufferInt) image.getRaster().getDataBuffer()).getData();
+        for (int data: imageData) {
+            buf.put((byte) (( data >> 16 ) & 0xFF)); // R
+            buf.put((byte) (( data >>  8 ) & 0xFF)); // G
+            buf.put((byte) (( data       ) & 0xFF)); // B
+            buf.put((byte) (( data >> 24 ) & 0xFF)); // A
         }
+        bindTexture(buf, image.getWidth(), image.getHeight());
     }
 
     private static void tintImage(BufferedImage image, float[] tintColor) {
@@ -96,11 +93,11 @@ public class TextureLoader {
         images = modTextureMap;
     }
 
-    private void combineTextures() {
+    private BufferedImage combineTextures() {
         // converts all single textures into a very wide image. Improves performance in opengl
         // TEXTURE_PACK_RESxTEXTURE_PACK_RES textures only
         int imageLength = Integer.highestOneBit(totalTextures * RenderConstants.TEXTURE_PACK_RESOLUTION) * 2;
-        BufferedImage totalImage = new BufferedImage(imageLength, RenderConstants.TEXTURE_PACK_RESOLUTION, BufferedImage.TYPE_4BYTE_ABGR);
+        BufferedImage totalImage = new BufferedImage(imageLength, RenderConstants.TEXTURE_PACK_RESOLUTION, BufferedImage.TYPE_INT_ARGB);
 
         int currentPos = 0;
         for (Map.Entry<String, BufferedImage> texture : images.entrySet()) {
@@ -112,14 +109,8 @@ public class TextureLoader {
             }
             textureCoordinates.put(texture.getKey(), currentPos++);
         }
-
-        try {
-            File outputFile = new File(StaticConfiguration.HOME_DIRECTORY + "assets/allTextures.png");
-            ImageIO.write(totalImage, "png", outputFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         step = (float) 1 / (float) imageLength * RenderConstants.TEXTURE_PACK_RESOLUTION;
+        return totalImage;
     }
 
     private void bindTexture(ByteBuffer buf, int width, int height) {