mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-20 12:20:11 +00:00
let's do it right this time. Hmmm
This commit is contained in:
1 parent
101ae36f57
commit
f5ba66068a
1 file changed
+10
-14
@@ -1,14 +1,6 @@
|
||||
--- ../src_base/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
|
||||
+++ ../src_work/minecraft/net/minecraft/client/renderer/texture/TextureManager.java
|
||||
@@ -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 @@
|
||||
@@ -66,17 +66,42 @@
|
||||
|
||||
public List func_94266_e(String par1Str)
|
||||
{
|
||||
@@ -27,16 +19,20 @@
|
||||
- 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)
|
||||
+ FileNotFoundException fnfe = null;
|
||||
+ try
|
||||
+ {
|
||||
+ bufferedimage = ImageIO.read(textureInputStream);
|
||||
+ bufferedimage = ImageIO.read(itexturepack.getResourceAsStream("/" + textureFile));
|
||||
+ i = bufferedimage.getHeight();
|
||||
+ j = bufferedimage.getWidth();
|
||||
+ }
|
||||
+ catch (FileNotFoundException e)
|
||||
+ {
|
||||
+ fnfe = e;
|
||||
+ }
|
||||
+ String s1 = textureName;
|
||||
|
||||
- if (this.func_98147_a(par1Str, itexturepack))
|
||||
@@ -44,9 +40,9 @@
|
||||
+ {
|
||||
+ ;
|
||||
+ }
|
||||
+ else if (textureInputStream == null)
|
||||
+ else if (fnfe != null)
|
||||
+ {
|
||||
+ throw new FileNotFoundException();
|
||||
+ throw fnfe;
|
||||
+ }
|
||||
+ else if (this.func_98147_a(par1Str, itexturepack))
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user