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

Removed unintentional functionality when using the Splash Screen.

Browse source
This commit is contained in:
LexManos 2016-08-08 17:54:12 -07:00
parent fdea60f89a
commit fe2243df9f
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/minecraftforge/fml/client/SplashProgress.java
View file

@ -245,7 +245,7 @@ public class SplashProgress
{
setGL();
fontTexture = new Texture(fontLoc);
logoTexture = new Texture(logoLoc);
logoTexture = new Texture(logoLoc, false);
forgeTexture = new Texture(forgeLoc);
glEnable(GL_TEXTURE_2D);
fontRenderer = new SplashFontRenderer();
@ -642,12 +642,17 @@ public class SplashProgress
private final int size;
public Texture(ResourceLocation location)
{
this(location, true);
}
public Texture(ResourceLocation location, boolean allowRP)
{
InputStream s = null;
try
{
this.location = location;
s = open(location);
s = open(location, allowRP);
ImageInputStream stream = ImageIO.createImageInputStream(s);
Iterator<ImageReader> readers = ImageIO.getImageReaders(stream);
if(!readers.hasNext()) throw new IOException("No suitable reader found for image" + location);
@ -811,8 +816,11 @@ public class SplashProgress
}
}
private static InputStream open(ResourceLocation loc) throws IOException
private static InputStream open(ResourceLocation loc, boolean allowRP) throws IOException
{
if (!allowRP)
return mcPack.getInputStream(loc);
if(miscPack.resourceExists(loc))
{
return miscPack.getInputStream(loc);