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

Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed

Browse source
This commit is contained in:
RainWarrior 2015-05-04 22:10:36 +03:00
parent fb18c07722
commit c28794fe38
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fml/src/main/java/cpw/mods/fml/client/SplashProgress.java
View file

@ -106,7 +106,7 @@ public class SplashProgress
public static void start() public static void start()
{ {
File configFile = new File(Loader.instance().getConfigDir(),"splash.properties"); File configFile = new File(Minecraft.getMinecraft().mcDataDir, "config/splash.properties");
FileReader r = null; FileReader r = null;
config = new Properties(); config = new Properties();
try try
@ -126,8 +126,8 @@ public class SplashProgress
// Enable if we have the flag, and there's either no optifine, or optifine has added a key to the blackboard ("optifine.ForgeSplashCompatible") // Enable if we have the flag, and there's either no optifine, or optifine has added a key to the blackboard ("optifine.ForgeSplashCompatible")
// Optifine authors - add this key to the blackboard if you feel your modifications are now compatible with this code. // Optifine authors - add this key to the blackboard if you feel your modifications are now compatible with this code.
enabled = getBool("enabled", true) && ( (!FMLClientHandler.instance().hasOptifine()) || Launch.blackboard.containsKey("optifine.ForgeSplashCompatible")); enabled = getBool("enabled", true) && ( (!FMLClientHandler.instance().hasOptifine()) || Launch.blackboard.containsKey("optifine.ForgeSplashCompatible"));
rotate = getBool("rotate", true); rotate = getBool("rotate", false);
logoOffset = getInt("logoOffset", 10); logoOffset = getInt("logoOffset", 0);
backgroundColor = getHex("background", 0xFFFFFF); backgroundColor = getHex("background", 0xFFFFFF);
fontColor = getHex("font", 0x000000); fontColor = getHex("font", 0x000000);
barBorderColor = getHex("barBorder", 0xC0C0C0); barBorderColor = getHex("barBorder", 0xC0C0C0);
@ -136,7 +136,7 @@ public class SplashProgress
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(getString("logoTexture", "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.gif"));
File miscPackFile = new File(Minecraft.getMinecraft().mcDataDir, getString("resourcePackPath", "resources")); File miscPackFile = new File(Minecraft.getMinecraft().mcDataDir, getString("resourcePackPath", "resources"));

BIN
fml/src/main/resources/assets/fml/textures/gui/forge.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 64 KiB