From 91cc592a3a5b891d15bcfa4e3abab179dac93107 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 1 May 2017 17:13:43 -0700 Subject: [PATCH] Remove splash.properties option for Mojang logo (has been disabled) (#3859) Fix backgound color being applied to the Forge logo --- .../net/minecraftforge/fml/client/SplashProgress.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java index 8ddda26bb..837dc11cd 100644 --- a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java +++ b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java @@ -188,7 +188,7 @@ public class SplashProgress memoryLowColor = getHex("memoryLow", 0xE42F2F); 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 forgeFallbackLoc = new ResourceLocation("fml:textures/gui/forge.png"); @@ -343,7 +343,7 @@ public class SplashProgress angle += 1; // forge logo - setColor(backgroundColor); + glColor4f(1, 1, 1, 1); float fw = (float)forgeTexture.getWidth() / 2; float fh = (float)forgeTexture.getHeight() / 2; 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); if(miscPack.resourceExists(loc))