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

Remove splash.properties option for Mojang logo (has been disabled) (#3859)

Browse source 
Fix backgound color being applied to the Forge logo
This commit is contained in:
mezz 2017-05-01 17:13:43 -07:00 committed by LexManos
parent cbf6cb9744
commit 91cc592a3a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,7 @@ public class SplashProgress
memoryLowColor = getHex("memoryLow", 0xE42F2F); memoryLowColor = getHex("memoryLow", 0xE42F2F);
final ResourceLocation fontLoc = new ResourceLocation(getString("fontTexture", "textures/font/ascii.png")); final ResourceLocation fontLoc = new ResourceLocation(getString("fontTexture", "textures/font/ascii.png"));
final ResourceLocation logoLoc = new ResourceLocation(getString("logoTexture", "textures/gui/title/mojang.png")); final ResourceLocation logoLoc = new ResourceLocation("textures/gui/title/mojang.png");
final ResourceLocation forgeLoc = new ResourceLocation(getString("forgeTexture", "fml:textures/gui/forge.png")); final ResourceLocation forgeLoc = new ResourceLocation(getString("forgeTexture", "fml:textures/gui/forge.png"));
final ResourceLocation forgeFallbackLoc = new ResourceLocation("fml:textures/gui/forge.png"); final ResourceLocation forgeFallbackLoc = new ResourceLocation("fml:textures/gui/forge.png");
@ -343,7 +343,7 @@ public class SplashProgress
angle += 1; angle += 1;
// forge logo // forge logo
setColor(backgroundColor); glColor4f(1, 1, 1, 1);
float fw = (float)forgeTexture.getWidth() / 2; float fw = (float)forgeTexture.getWidth() / 2;
float fh = (float)forgeTexture.getHeight() / 2; float fh = (float)forgeTexture.getHeight() / 2;
if(rotate) if(rotate)
@ -953,9 +953,9 @@ public class SplashProgress
} }
} }
private static InputStream open(ResourceLocation loc, @Nullable ResourceLocation fallback, boolean allowRP) throws IOException private static InputStream open(ResourceLocation loc, @Nullable ResourceLocation fallback, boolean allowResourcePack) throws IOException
{ {
if (!allowRP) if (!allowResourcePack)
return mcPack.getInputStream(loc); return mcPack.getInputStream(loc);
if(miscPack.resourceExists(loc)) if(miscPack.resourceExists(loc))