Optimized texture exporting

Textures are exported faster now due to 1) only exporting norm or spec maps if the file is known to exist in the zip file ahead of time (a memory copy of the zip contents is checked for once inistead of multiple times, 2) by switching to directly loading the asset from the zip file instead of iterating over files in the zip until a path matches, and 3) by skipping (sooner) image sets where the default diffuse image is not present at all, whereas before if there was an error in loading the default diffuse image, it will still attempt to continue with the following operations.

src/org/jmc/TextureExporter.java

@@ -8,16 +8,19 @@
 import java.awt.image.WritableRaster;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.InputStream;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
+import java.util.zip.ZipFile;
 
 import javax.imageio.ImageIO;
 import javax.xml.xpath.XPath;
@@ -64,24 +67,42 @@ private static BufferedImage loadImageFromFile(File file) throws IOException {
 		return ImageIO.read(file);
 	}
 
-	private static BufferedImage loadImageFromZip(File zipfile, String imagePath) throws IOException {
+	private static List<String> loadImageListFromZip(File zipfile) throws IOException {
 		ZipInputStream zis = null;
+		ZipEntry entry = null;
+		Log.debug("\tStarted zip LIST stream");
+		List<String> texlist = new ArrayList<String>();
 		try {
 			zis = new ZipInputStream(new FileInputStream(zipfile));
-
-			ZipEntry entry = null;
 			while ((entry = zis.getNextEntry()) != null)
-				if (!entry.isDirectory() && entry.getName().equals(imagePath))
-					break;
+				if (!entry.isDirectory()){
+					texlist.add(entry.getName());
+				}
+		} finally {
+			if (zis != null)
+				zis.close();
+		}
+		return texlist;
+	}
 
-			if (entry == null)
+	private static BufferedImage loadImageFromZip(File zipfile, String imagePath) throws IOException {
+		InputStream zis = null;
+		ZipFile zf = null;
+		BufferedImage result = null;
+		try {
+			zf = new ZipFile(zipfile);
+			ZipEntry entry = null;
+			entry = zf.getEntry(imagePath);
+			if (entry.getName() == null)
 				throw new IOException("Couldn't find " + imagePath + " in " + zipfile.getName());
-
-			BufferedImage result = ImageIO.read(zis);
-			return result;
+			zis = zf.getInputStream(entry);
+			result = ImageIO.read(zis);
 		} finally {
+			if (zf != null)
+				zf.close();
 			if (zis != null)
 				zis.close();
+			return result;
 		}
 	}
 
@@ -177,7 +198,7 @@ private static BufferedImage scaleImage(BufferedImage img, double factor) {
 	/**
 	 * Looks inside the given zip file to determine the format of the texture
 	 * pack.
-	 * 
+	 *
 	 * @param zipfile
 	 * @return Constant indicating texture pack format.
 	 * @throws IOException
@@ -195,6 +216,7 @@ private static int detectTexturePackFormat(File zipfile) throws IOException {
 			ZipEntry entry = null;
 			while ((entry = zis.getNextEntry()) != null) {
 				String entryName = entry.getName();
+				Log.debug(entryName + " found in resource pack");
 				if (entryName.startsWith("assets/minecraft/textures/block"))
 					found1_13AssetsDir = true;
 				else if (entryName.startsWith("assets/minecraft/textures/blocks"))
@@ -205,9 +227,9 @@ else if (entryName.equals("terrain.png"))
 					foundTerrainPng = true;
 			}
 
-			return	found1_13AssetsDir ? FORMAT_1_13 : 
-					found1_6AssetsDir ? FORMAT_1_6 : 
-					foundBlocksDir ? FORMAT_1_5 : 
+			return	found1_13AssetsDir ? FORMAT_1_13 :
+					found1_6AssetsDir ? FORMAT_1_6 :
+					foundBlocksDir ? FORMAT_1_5 :
 					foundTerrainPng ? FORMAT_PRE_1_5 :
 					FORMAT_INVALID;
 		} finally {
@@ -220,7 +242,7 @@ else if (entryName.equals("terrain.png"))
 	 * Reads the configuration file "texsplit.conf". Private method to retrieve
 	 * textures from a texturepack in a list. This was extracted into a separate
 	 * method so it can be reused between the split and merge methods.
-	 * 
+	 *
 	 * @param texturePack
 	 * @param scale
 	 * @param progress
@@ -275,6 +297,9 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 		Document doc = Xml.loadDocument(confFile);
 		XPath xpath = XPathFactory.newInstance().newXPath();
 
+		// create a memory copy of zip file names, to avoid duplicate zipstreams
+		List<String> texlist = loadImageListFromZip(zipfile);
+
 		NodeList fileNodes = (NodeList) xpath.evaluate("/texsplit/file", doc, XPathConstants.NODESET);
 		for (int i = 0; i < fileNodes.getLength(); i++) {
 			Node fileNode = fileNodes.item(i);
@@ -287,11 +312,11 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 				throw new Exception("In " + confFilePath + ": 'file' tag is missing required attribute 'name'.");
 
 			BufferedImage image = null;
-
 			try {
 				image = loadImage(zipfile, source, fileName);
 			} catch (Exception e) {
-				Log.info("Error loading image: " + e.getMessage());
+				Log.info("Error loading image (" + fileName + "): "+ e.getMessage());
+				continue;
 			}
 
 			int width = image.getWidth() / Integer.parseInt(cols, 10);
@@ -307,7 +332,7 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 				String repeating_str = Xml.getAttribute(texNode, "repeating");
 				if (repeating_str != null)
 					repeating = repeating_str.toLowerCase().equals("true");
-				
+
 				boolean luma = false;
 				String luma_str = Xml.getAttribute(texNode, "luma");
 				if (luma_str != null)
@@ -355,13 +380,13 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 				else {
 					Log.debug("Creating Texture for: " + texName);
 					Texture texture2 = new Texture(texName, texture, repeating, luma);
-					
+
 					if (diffuse) {
 						Log.debug("Writing Diffuse Texture: " + texName);
 						ImageIO.write(texture2.image, "png", new File(destination, texture2.name + ".png"));
 					}
-					
-					if (alphas) {
+
+					if (alphas){
 						try {
 							convertToAlpha(texture2.image);
 							Log.debug("Writing Alpha Texture: " + texture2.name + "_a.png");
@@ -370,13 +395,13 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 							Log.info("Cannot save alpha for: " + texture2.name + " (" + e.getMessage() + ")");
 						}
 					}
-					
-					if (exportNormal) {
+
+					if (exportNormal && texlist.contains(fileName.replace(".png", "_n.png"))) {
 						try {
 							Log.debug("Trying normal map");
-							
+
 							BufferedImage imageN = loadImage(zipfile, source, fileName.replace(".png", "_n.png"));
-							
+
 							Log.debug("Found Normal. Creating Buffered Texture.");
 							BufferedImage textureN = new BufferedImage(width, height, imageN.getType());
 							imageN.getSubimage(colPos * width, rowPos * height, width, height).copyData(textureN.getRaster());
@@ -387,23 +412,23 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 									Log.info("Cannot scale image: " + texName + "_n (" + e.getMessage() + ")");
 								}
 							}
-							
+
 							Log.debug("Creating Normal Texture. " + texName + "_n");
 							Texture texture2N = new Texture(texName + "_n", textureN, repeating, false);
 							Log.debug("Writing Normal Texture. " + texture2N.name);
 							ImageIO.write(texture2N.image, "png", new File(destination, texture2N.name + ".png"));
-							
+
 						} catch (Exception e) {
 							Log.info("Error loading normal texture: " + e.getMessage());
 						}
 					}
-					
-					if (exportSpecular) {
+
+					if (exportSpecular && texlist.contains(fileName.replace(".png", "_s.png"))) {
 						try {
 							Log.debug("Trying specular map");
-							
+
 							BufferedImage imageS = loadImage(zipfile, source, fileName.replace(".png", "_s.png"));
-							
+
 							Log.debug("Found Specular. Creating Buffered Texture.");
 							BufferedImage textureS = new BufferedImage(width, height, imageS.getType());
 							imageS.getSubimage(colPos * width, rowPos * height, width, height).copyData(textureS.getRaster());
@@ -418,20 +443,20 @@ private static List<Texture> getTextures(File texturePack, double scale, Progres
 							Texture texture2S = new Texture(texName + "_s", textureS, repeating, false);
 							Log.debug("Writing Specular Texture. " + texture2S.name);
 							ImageIO.write(texture2S.image, "png", new File(destination, texture2S.name + ".png"));
-							
+
 						} catch (Exception e) {
 							Log.info("Error loading specular image: " + e.getMessage());
 						}
 					}
-					
+
 				}
 
 			}
 
 			if (progress != null)
 				progress.setProgress((i + 1) / (float) fileNodes.getLength());
 		}
-		
+
 		if(merging)
 			return ret;
 		else
@@ -446,17 +471,17 @@ else if (source.equalsIgnoreCase("distr"))
 			image = loadImageFromFile(new File(Filesystem.getDatafilesDir(), fileName));
 		else
 			image = loadImageFromFile(new File(fileName));
-		
+
 		if (image.getType() != BufferedImage.TYPE_4BYTE_ABGR)
 			image = convertImageType(image);
-		
+
 		return image;
 	}
 
 	/**
 	 * Reads a Minecraft texture pack and splits the individual block textures
 	 * into .png images.
-	 * 
+	 *
 	 * @param destination
 	 *            Directory to place the output files.
 	 * @param texturePack
@@ -490,7 +515,8 @@ public static void splitTextures(File destination, File texturePack, double scal
 				throw new RuntimeException("Cannot create texture directory!");
 		}
 
-/*		List<Texture> textures = */getTextures(texturePack, scale, progress, diffuse, alphas, false, normals, specular, destination);
+/*		List<Texture> textures = */
+		getTextures(texturePack, scale, progress, diffuse, alphas, false, normals, specular, destination);
 
 //		float texnum = textures.size();
 //		float count = 0;
@@ -517,7 +543,7 @@ public static void splitTextures(File destination, File texturePack, double scal
 	 * Reads a Minecraft texture pack and splits the individual block textures
 	 * into separate images then merges them into a single file containing all
 	 * the textures.
-	 * 
+	 *
 	 * @param destination
 	 *            Directory to place the output files. They will be called
 	 *            "texture.png" and "texture_a.png"
@@ -526,8 +552,8 @@ public static void splitTextures(File destination, File texturePack, double scal
 	 *            default textures.
 	 * @param scale
 	 *            Scaling to apply to textures.
-	 * @param diffuse 
-	 *            Whether to export separate diffuse maps. 
+	 * @param diffuse
+	 *            Whether to export separate diffuse maps.
 	 * @param alphas
 	 *            Whether to export separate alpha masks.
 	 * @param normals
@@ -629,7 +655,7 @@ public static void mergeTextures(File destination, File texturePack, double scal
 
 		BufferedImage textureimage = new BufferedImage(wmax, hmax, BufferedImage.TYPE_4BYTE_ABGR);
 		Graphics2D gtex = textureimage.createGraphics();
-		
+
 		BufferedImage lumaimage = new BufferedImage(wmax, hmax, BufferedImage.TYPE_4BYTE_ABGR);
 		Graphics2D gtexluma = lumaimage.createGraphics();
 
@@ -646,7 +672,7 @@ public static void mergeTextures(File destination, File texturePack, double scal
 						int sy = rect.y + y * rect.height;
 						gtex.drawImage(texture.image, sx, sy, sx + rect.width, sy + rect.height, 0, 0, rect.width,
 								rect.height, null);
-						
+
 						if(lumas)
 							if(texture.luma)
 								gtexluma.drawImage(texture.image, sx, sy, sx + rect.width, sy + rect.height, 0, 0, rect.width,
@@ -668,7 +694,7 @@ public static void mergeTextures(File destination, File texturePack, double scal
 		ImageIO.write(textureimage, "png", new File(destination, "texture.png"));
 		if(lumas)
 			ImageIO.write(lumaimage, "png", new File(destination, "texture_luma.png"));
-		
+
 		if (alphas) {
 			try {
 				convertToAlpha(textureimage);