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

Fixed loading error/warning screen not showing (#6218)

Browse source
This commit is contained in:
ichttt 2019-10-15 23:59:41 +02:00 committed by LexManos
parent c345dfb0c6
commit 6c8342b74e
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/client/Minecraft.java.patch
View file

@ -81,7 +81,7 @@
this.func_213256_aB(); this.func_213256_aB();
} }
- -
+ net.minecraftforge.fml.client.ClientModLoader.complete(); + if (net.minecraftforge.fml.client.ClientModLoader.completeModLoading()) return; // Do not overwrite the error sceen
+ // FORGE: Move opening initial screen to after startup and events are enabled. + // FORGE: Move opening initial screen to after startup and events are enabled.
+ // Also Fixes MC-145102 + // Also Fixes MC-145102
+ if (this.field_71475_ae != null) { + if (this.field_71475_ae != null) {

18
src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
View file

@ -142,7 +142,13 @@ public class ClientModLoader
return VersionChecker.Status.UP_TO_DATE; return VersionChecker.Status.UP_TO_DATE;
} }
@Deprecated // TODO: remove in 1.15
public static void complete() public static void complete()
{
completeModLoading();
}
public static boolean completeModLoading()
{ {
GlStateManager.disableTexture(); GlStateManager.disableTexture();
GlStateManager.enableTexture(); GlStateManager.enableTexture();
@ -161,15 +167,17 @@ public class ClientModLoader
} }
warnings = Collections.emptyList(); //Clear warnings, as the user does not want to see them warnings = Collections.emptyList(); //Clear warnings, as the user does not want to see them
} }
if (error != null || !warnings.isEmpty()) {
mc.displayGuiScreen(new LoadingErrorScreen(error, warnings));
} else {
ClientHooks.logMissingTextureErrors();
}
if (error == null) { if (error == null) {
// We can finally start the forge eventbus up // We can finally start the forge eventbus up
MinecraftForge.EVENT_BUS.start(); MinecraftForge.EVENT_BUS.start();
} }
if (error != null || !warnings.isEmpty()) {
mc.displayGuiScreen(new LoadingErrorScreen(error, warnings));
return true;
} else {
ClientHooks.logMissingTextureErrors();
return false;
}
} }
public static void renderProgressText() { public static void renderProgressText() {