From 101ae36f571373b00e6f2a0859b44a2838f5a83f Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 6 Mar 2013 10:29:25 -0500 Subject: [PATCH] Call stitcher for non-existent textures as well. Probably allows for generated textures. Hmmm --- .../texture/TextureManager.java.patch | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch index ff6703387..f2f581e5a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureManager.java.patch @@ -1,6 +1,14 @@ --- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureManager.java +++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureManager.java -@@ -66,17 +66,27 @@ +@@ -6,6 +6,7 @@ + import java.io.File; + import java.io.FileNotFoundException; + import java.io.IOException; ++import java.io.InputStream; + import java.util.ArrayList; + import java.util.HashMap; + import java.util.List; +@@ -66,17 +67,38 @@ public List func_94266_e(String par1Str) { @@ -16,10 +24,19 @@ try { - BufferedImage bufferedimage = ImageIO.read(itexturepack.getResourceAsStream("/" + par1Str)); -+ BufferedImage bufferedimage = ImageIO.read(itexturepack.getResourceAsStream("/" + textureFile)); - int i = bufferedimage.getHeight(); - int j = bufferedimage.getWidth(); +- int i = bufferedimage.getHeight(); +- int j = bufferedimage.getWidth(); - String s1 = this.func_98146_d(par1Str); ++ InputStream textureInputStream = itexturepack.getResourceAsStream("/" + textureFile); ++ BufferedImage bufferedimage = null; ++ int i = 0; ++ int j = 0; ++ if (textureInputStream!=null) ++ { ++ bufferedimage = ImageIO.read(textureInputStream); ++ i = bufferedimage.getHeight(); ++ j = bufferedimage.getWidth(); ++ } + String s1 = textureName; - if (this.func_98147_a(par1Str, itexturepack)) @@ -27,6 +44,10 @@ + { + ; + } ++ else if (textureInputStream == null) ++ { ++ throw new FileNotFoundException(); ++ } + else if (this.func_98147_a(par1Str, itexturepack)) { int k = j;