keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

MinecraftForge/FML@0da1263ff9 Enhance error output for bad textures a bit more and try and capture more types of error..

Browse source
This commit is contained in:
cpw 2015-04-11 12:30:20 -04:00
parent 345d905438
commit eb12936a52
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml

@ -1 +1 @@
Subproject commit be5ec06e3144d55a03d125f3ce364eade3771f4f Subproject commit 0da1263ff9ede99267c03728a1c823b8056d5e44

6
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
View file

@ -40,7 +40,7 @@
try try
{ {
IResource iresource = p_110571_1_.func_110536_a(resourcelocation1); IResource iresource = p_110571_1_.func_110536_a(resourcelocation1);
@@ -275,6 +289,7 @@ @@ -276,6 +290,7 @@
textureatlassprite = (TextureAtlasSprite)iterator2.next(); textureatlassprite = (TextureAtlasSprite)iterator2.next();
textureatlassprite.func_94217_a(this.field_94249_f); textureatlassprite.func_94217_a(this.field_94249_f);
} }
@ -48,7 +48,7 @@
} }
private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_) private ResourceLocation func_147634_a(ResourceLocation p_147634_1_, int p_147634_2_)
@@ -348,7 +363,7 @@ @@ -349,7 +364,7 @@
{ {
throw new IllegalArgumentException("Name cannot be null!"); throw new IllegalArgumentException("Name cannot be null!");
} }
@ -57,7 +57,7 @@
{ {
Object object = (TextureAtlasSprite)this.field_110574_e.get(p_94245_1_); Object object = (TextureAtlasSprite)this.field_110574_e.get(p_94245_1_);
@@ -404,4 +419,37 @@ @@ -405,4 +420,37 @@
{ {
this.field_147637_k = p_147632_1_; this.field_147637_k = p_147632_1_;
} }