diff --git a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch index d58b4ea3ce..493ed7a1f1 100644 --- a/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch @@ -164,16 +164,17 @@ { String s = textureatlassprite1.func_94215_i(); map.remove(s); -@@ -186,6 +257,8 @@ +@@ -186,6 +257,9 @@ { textureatlassprite2.func_94217_a(this.field_94249_f); } ++ org.lwjgl.opengl.GL11.glFlush(); // Some systems (mainly macs) need this to make sure the texture map creation finishes before moving on + net.minecraftforge.client.ForgeHooksClient.onTextureStitchedPost(this); + net.minecraftforge.fml.common.ProgressManager.pop(bar); } private boolean func_184397_a(IResourceManager p_184397_1_, final TextureAtlasSprite p_184397_2_) -@@ -195,7 +268,7 @@ +@@ -195,7 +269,7 @@ label62: { boolean flag; @@ -182,7 +183,7 @@ try { iresource = p_184397_1_.func_110536_a(resourcelocation); -@@ -292,7 +365,7 @@ +@@ -292,7 +366,7 @@ } else { @@ -191,7 +192,7 @@ if (textureatlassprite == null) { -@@ -318,4 +391,52 @@ +@@ -318,4 +392,52 @@ { return this.field_94249_f; } diff --git a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java index 278e53ce83..837a62cf02 100644 --- a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java +++ b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java @@ -158,10 +158,9 @@ public class SplashProgress FMLLog.log.info("Could not load splash.properties, will create a default one"); } - //Some system do not support this and have weird effects so we need to detect and disable by default. + //Some systems do not support this and have weird effects, so we need to detect and disable them by default. //The user can always force enable it if they want to take the responsibility for bugs. - //For now macs derp so disable them. - boolean defaultEnabled = !System.getProperty("os.name").toLowerCase().contains("mac"); + boolean defaultEnabled = true; // 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.