From 37330058396d46481fd4aa4115dbde468be0611b Mon Sep 17 00:00:00 2001 From: LexManos Date: Mon, 3 Jul 2023 16:53:15 -0700 Subject: [PATCH] Bump Eventbus to address NullPointerException when classloading things on some threads. Closes #9570 --- build.gradle | 4 ++-- .../net/minecraftforge/fml/earlydisplay/DisplayWindow.java | 6 +++++- .../main/java/net/minecraftforge/fml/loading/FMLConfig.java | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 602be46561..387bf7c547 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ ext { MERGETOOL_VERSION = '1.1.5' ACCESSTRANSFORMERS_VERSION = '8.0.4' COREMODS_VERSION = '5.0.1' - EVENTBUS_VERSION = '6.0.3' + EVENTBUS_VERSION = '6.0.5' MODLAUNCHER_VERSION = '10.0.9' SECUREJARHANDLER_VERSION = '2.1.10' BOOTSTRAPLAUNCHER_VERSION = '1.1.2' @@ -291,7 +291,7 @@ def sharedDeps = { installer "com.electronwill.night-config:core:${NIGHTCONFIG_VERSION}" installer "com.electronwill.night-config:toml:${NIGHTCONFIG_VERSION}" installer "org.apache.maven:maven-artifact:${APACHE_MAVEN_ARTIFACT_VERSION}" - installer 'net.jodah:typetools:0.8.3' + installer 'net.jodah:typetools:0.6.3' installer "net.minecrell:terminalconsoleappender:${TERMINALCONSOLEAPPENDER_VERSION}" installer "org.jline:jline-reader:${JLINE_VERSION}" // Dep of TerminalConsoleAppender installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java index eee21d6adb..56413a1e5c 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -35,6 +35,7 @@ import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; import java.util.Arrays; +import java.util.Calendar; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -221,7 +222,6 @@ public class DisplayWindow implements ImmediateWindowProvider { crashElegantly("An error occurred initializing a font for rendering. "+t.getMessage()); } this.elements = new ArrayList<>(Arrays.asList( - RenderElement.squir(), RenderElement.anvil(font), RenderElement.logMessageOverlay(font), RenderElement.forgeVersionOverlay(font, mcVersion+"-"+forgeVersion.split("-")[0]), @@ -229,6 +229,10 @@ public class DisplayWindow implements ImmediateWindowProvider { RenderElement.progressBars(font) )); + var date = Calendar.getInstance(); + if (FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SQUIR) || (date.get(Calendar.MONTH) == Calendar.APRIL && date.get(Calendar.DAY_OF_MONTH) == 1)) + this.elements.add(0, RenderElement.squir()); + glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glfwMakeContextCurrent(0); diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java index f3637a9fb9..88ed60233e 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java @@ -35,7 +35,8 @@ public class FMLConfig EARLY_WINDOW_HEIGHT("earlyWindowHeight", 480, "Early window height"), EARLY_WINDOW_FBSCALE("earlyWindowFBScale", 1, "Early window framebuffer scale"), EARLY_WINDOW_MAXIMIZED("earlyWindowMaximized", Boolean.FALSE, "Early window starts maximized"), - EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers") + EARLY_WINDOW_SKIP_GL_VERSIONS("earlyWindowSkipGLVersions", List.of(), "Skip specific GL versions, may help with buggy graphics card drivers"), + EARLY_WINDOW_SQUIR("earlyWindowSquir", Boolean.FALSE, "Squir?") ; private final String entry;