Stop burying the error due to things catching RuntimeExceptions.... (#1767)

Author: mitchej123

lwjgl3-backend/build.gradle.kts

@@ -74,6 +74,7 @@ dependencies {
     // LWJGL3
     implementation("org.lwjgl:lwjgl:${lwjglVersion}")
     implementation("org.lwjgl:lwjgl-opengl:${lwjglVersion}")
+    compileOnly("org.lwjgl:lwjgl-sdl:${lwjglVersion}")
     runtimeOnly("org.lwjgl:lwjgl:$lwjglVersion:$lwjglNatives")
     runtimeOnly("org.lwjgl:lwjgl-opengl:$lwjglVersion:$lwjglNatives")
 

lwjgl3-backend/src/main/java/com/gtnewhorizons/angelica/lwjgl3/MissingDependencySdl.java

@@ -0,0 +1,40 @@
+package com.gtnewhorizons.angelica.lwjgl3;
+
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_MESSAGEBOX_ERROR;
+import static org.lwjgl.sdl.SDLMessageBox.SDL_ShowMessageBox;
+
+import me.eigenraven.lwjgl3ify.api.Lwjgl3Aware;
+import me.eigenraven.lwjgl3ify.client.MainThreadExec;
+import org.lwjgl.sdl.SDL_MessageBoxButtonData;
+import org.lwjgl.sdl.SDL_MessageBoxData;
+import org.lwjgl.system.MemoryStack;
+
+@Lwjgl3Aware
+public final class MissingDependencySdl {
+
+    private MissingDependencySdl() {}
+
+    public static void showFatal(String title, String message) {
+        MainThreadExec.runOnMainThread(() -> showFatalOnMainThread(title, message));
+    }
+
+    private static void showFatalOnMainThread(String title, String message) {
+        try (MemoryStack stack = MemoryStack.stackPush()) {
+            final SDL_MessageBoxData box = SDL_MessageBoxData.calloc(stack);
+            box.flags(SDL_MESSAGEBOX_ERROR);
+            box.title(stack.UTF8(title));
+            box.message(stack.UTF8(message));
+
+            final SDL_MessageBoxButtonData.Buffer buttons = SDL_MessageBoxButtonData.calloc(1, stack);
+            buttons.get(0).set(
+                SDL_MESSAGEBOX_BUTTON_RETURNKEY_DEFAULT | SDL_MESSAGEBOX_BUTTON_ESCAPEKEY_DEFAULT,
+                0,
+                stack.UTF8("OK"));
+            box.buttons(buttons);
+
+            SDL_ShowMessageBox(box, null);
+        }
+    }
+}

src/main/java/com/gtnewhorizons/angelica/loading/AngelicaClientTweaker.java

@@ -11,6 +11,7 @@
 import com.gtnewhorizons.angelica.glsm.loading.DependencyVerifier;
 import com.gtnewhorizons.angelica.glsm.loading.EcosystemNarrowRules;
 import com.gtnewhorizons.angelica.loading.fml.compat.CompatHandlers;
+import com.gtnewhorizons.angelica.lwjgl3.MissingDependencySdl;
 import com.gtnewhorizons.angelica.mixins.Mixins;
 import com.gtnewhorizons.retrofuturabootstrap.SharedConfig;
 import cpw.mods.fml.relauncher.FMLLaunchHandler;
@@ -29,6 +30,8 @@
 import org.spongepowered.asm.launch.GlobalProperties;
 import org.spongepowered.asm.service.mojang.MixinServiceLaunchWrapper;
 
+import javax.swing.JOptionPane;
+import java.awt.GraphicsEnvironment;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -101,14 +104,37 @@ private static void addLwjgl3ifyExclusions() {
     }
 
     private static void verifyDependencies() {
-        DependencyVerifier.verify(AngelicaTweaker.class, List.of(
-            new DependencyVerifier.Check(
-                "/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class",
-                "Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"),
-            new DependencyVerifier.Check(
-                "/com/gtnewhorizon/gtnhlib/client/renderer/VertexCallbackManager.class",
-                "GTNHLib is outdated: Angelica requires GTNHLib 0.10.0 or newer! Download: https://modrinth.com/mod/gtnhlib")
-        ));
+        try {
+            DependencyVerifier.verify(AngelicaTweaker.class, List.of(
+                new DependencyVerifier.Check(
+                    "/it/unimi/dsi/fastutil/ints/Int2ObjectMap.class",
+                    "Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"),
+                new DependencyVerifier.Check(
+                    "/com/gtnewhorizon/gtnhlib/client/renderer/VertexCallbackManager.class",
+                    "GTNHLib is outdated: Angelica requires GTNHLib 0.10.0 or newer! Download: https://modrinth.com/mod/gtnhlib")
+            ));
+        } catch (RuntimeException ex) {
+            fatalDependencyError(ex.getMessage());
+        }
+    }
+
+    private static void fatalDependencyError(String message) {
+        final String title = "Angelica - Missing Dependency";
+        System.err.println("FATAL: " + message);
+        try {
+            LOGGER.fatal(message);
+        } catch (Throwable ignored) {}
+
+        final int lwjgl3ifyMajor = ((Integer) Launch.blackboard.getOrDefault("lwjgl3ify:major-version", Integer.MIN_VALUE));
+        try {
+            if (lwjgl3ifyMajor >= 3) {
+                MissingDependencySdl.showFatal(title, message);
+            } else if (!GraphicsEnvironment.isHeadless()) {
+                JOptionPane.showMessageDialog(null, message, title, JOptionPane.ERROR_MESSAGE);
+            }
+        } catch (Throwable ignored) {}
+
+        Runtime.getRuntime().halt(1);
     }
 
     @Override