From 8c003dd96549a54452b6a9a4b8933ef3e7223612 Mon Sep 17 00:00:00 2001 From: cpw Date: Thu, 22 Jun 2023 14:36:09 -0400 Subject: [PATCH] More tweaks to the mod loading callbacks to make loading bars work better (#9585) --- .../net/minecraftforge/fml/ModLoader.java | 13 ++++++-- .../minecraftforge/fml/ModWorkManager.java | 5 ++-- .../fml/StartupMessageManager.java | 4 +++ .../fml/earlydisplay/DisplayWindow.java | 17 +++++++++-- .../fml/earlydisplay/RenderElement.java | 13 ++++---- .../minecraftforge/fml/loading/FMLConfig.java | 6 ++-- .../fml/loading/ImmediateWindowHandler.java | 12 +++++--- .../progress/StartupNotificationManager.java | 7 +++++ .../resources/META-INF/defaultfmlconfig.toml | 30 +++++++++---------- .../client/loading/ClientModLoader.java | 25 +++------------- .../client/loading/ForgeLoadingOverlay.java | 2 +- .../client/loading/NoVizFallback.java | 16 ++++++++-- 12 files changed, 90 insertions(+), 60 deletions(-) diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java index 1debe3d308..8fdbbcf39b 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModLoader.java @@ -135,7 +135,7 @@ public class ModLoader * @param periodicTask Optional periodic task to perform on the main thread while other activities run */ public void gatherAndInitializeMods(final ModWorkManager.DrivenExecutor syncExecutor, final Executor parallelExecutor, final Runnable periodicTask) { - ForgeFeature.registerFeature("java_version", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version"))); + ForgeFeature.registerFeature("javaVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.BOTH, System.getProperty("java.version"))); ForgeFeature.registerFeature("openGLVersion", ForgeFeature.VersionFeatureTest.forVersionString(IModInfo.DependencySide.CLIENT, ImmediateWindowHandler.getGLVersion())); loadingStateValid = true; FMLLoader.backgroundScanHandler.waitForScanToComplete(periodicTask); @@ -205,11 +205,20 @@ public class ModLoader return; } progressBar.label(progressBar.name()+ " working"); - state.inlineRunnable().ifPresent(a->a.accept(this.modList)); + syncExecutor.drive(ticker); + state.inlineRunnable().ifPresent(a->this.handleInlineTransition(a, state, syncExecutor, ticker)); state.buildTransition(syncExecutor, parallelExecutor, progressBar).ifPresent(t->waitForTransition(state, syncExecutor, ticker, t)); completedStates.add(state); } + private void handleInlineTransition(final Consumer transition, final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker) { + var pb = StartupMessageManager.addProgressBar("State transition " +state.name()+" running", 0); + syncExecutor.drive(ticker); + transition.accept(this.modList); + syncExecutor.drive(ticker); + pb.complete(); + syncExecutor.drive(ticker); + } private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture transition) { while (!transition.isDone()) { syncExecutor.drive(ticker); diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java b/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java index f34a749f19..20e9ad7bb9 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/ModWorkManager.java @@ -23,8 +23,9 @@ public class ModWorkManager { default void drive(Runnable ticker) { if (!selfDriven()) { - while (driveOne()) { - ticker.run(); + ticker.run(); + while (true) { + if (!driveOne()) break; } } else { // park for a bit so other threads can schedule diff --git a/fmlcore/src/main/java/net/minecraftforge/fml/StartupMessageManager.java b/fmlcore/src/main/java/net/minecraftforge/fml/StartupMessageManager.java index df69a26104..02665db9d3 100644 --- a/fmlcore/src/main/java/net/minecraftforge/fml/StartupMessageManager.java +++ b/fmlcore/src/main/java/net/minecraftforge/fml/StartupMessageManager.java @@ -27,4 +27,8 @@ public class StartupMessageManager { public static ProgressMeter addProgressBar(final String barName, final int count) { return StartupNotificationManager.addProgressBar(barName, count); } + + public static ProgressMeter prependProgressBar(final String barName, final int count) { + return StartupNotificationManager.prependProgressBar(barName, count); + } } 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 625c08cd13..d3d21f2833 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -9,6 +9,7 @@ import joptsimple.OptionParser; import net.minecraftforge.fml.loading.FMLConfig; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLPaths; +import net.minecraftforge.fml.loading.ImmediateWindowHandler; import net.minecraftforge.fml.loading.ImmediateWindowProvider; import net.minecraftforge.fml.loading.progress.StartupNotificationManager; import org.jetbrains.annotations.Nullable; @@ -96,6 +97,7 @@ public class DisplayWindow implements ImmediateWindowProvider { private boolean maximized; private String glVersion; private SimpleFont font; + private Runnable repaintTick = ()->{}; @Override public String name() { @@ -151,7 +153,9 @@ public class DisplayWindow implements ImmediateWindowProvider { * When the thread is killed, context is destroyed. */ private void renderThreadFunc() { - if (!renderLock.tryAcquire()) return; + if (!renderLock.tryAcquire()) { + return; + } try { tickSemaphore.set(true); glfwMakeContextCurrent(window); @@ -167,8 +171,10 @@ public class DisplayWindow implements ImmediateWindowProvider { framebuffer.draw(this.fbWidth, this.fbHeight); // Swap buffers; we're done glfwSwapBuffers(window); + } catch (Throwable t) { + LOGGER.error("BARF", t); } finally { - glfwMakeContextCurrent(0); + if (this.windowTick != null) glfwMakeContextCurrent(0); // we release the gl context IF we're running off the main thread renderLock.release(); } } @@ -473,6 +479,7 @@ public class DisplayWindow implements ImmediateWindowProvider { */ public long setupMinecraftWindow(final IntSupplier width, final IntSupplier height, final Supplier title, final LongSupplier monitorSupplier) { // we have to spin wait for the window ticker + ImmediateWindowHandler.updateProgress("Initializing Game Graphics"); while (!this.windowTick.isDone()) { this.windowTick.cancel(false); } @@ -489,7 +496,8 @@ public class DisplayWindow implements ImmediateWindowProvider { Thread.interrupted(); } } while (!renderlockticket); - + // we don't want the lock, just making sure it's back on the main thread + renderLock.release(); // schedule a 50 ms ticker to try and smooth out the rendering renderScheduler.scheduleAtFixedRate(()->tickSemaphore.set(true), 50, 50, TimeUnit.MILLISECONDS); @@ -501,6 +509,8 @@ public class DisplayWindow implements ImmediateWindowProvider { glfwSetFramebufferSizeCallback(window, null).free(); glfwSetWindowPosCallback(window, null).free(); glfwSetWindowSizeCallback(window, null).free(); + this.repaintTick = this::renderThreadFunc; // the repaint will continue to be called until the overlay takes over + this.windowTick = null; // this tells the render thread that the async ticker is done return window; } @@ -551,6 +561,7 @@ public class DisplayWindow implements ImmediateWindowProvider { @Override public void periodicTick() { glfwPollEvents(); + repaintTick.run(); } public void addMojangTexture(final int textureId) { diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java index d3a4b1fe14..3156b9b910 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java @@ -168,21 +168,22 @@ public class RenderElement { acc.accept(buffer, context, frameNumber); } private static final int BAR_HEIGHT = 20; + private static final int BAR_WIDTH = 400; private static Renderer barRenderer(int cnt, int alpha, SimpleFont font, ProgressMeter pm, DisplayContext context) { var barSpacing = font.lineSpacing() - font.descent() + BAR_HEIGHT; var y = 250 * context.scale() + cnt * barSpacing; var colour = (alpha << 24) | 0xFFFFFF; Renderer bar; if (pm.steps() == 0) { - bar = progressBar(ctx->new int[] {50, y + font.lineSpacing() - font.descent(), context.scaledWidth() - 100}, f->colour, RenderElement::indeterminateBar); + bar = progressBar(ctx->new int[] {(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f->colour, frame -> indeterminateBar(frame, cnt == 0)); } else { - bar = progressBar(ctx -> new int[]{50, y + font.lineSpacing() - font.descent(), ctx.scaledWidth() - 100}, f -> colour, f -> new float[]{0f, pm.progress()}); + bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y + font.lineSpacing() - font.descent(), BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pm.progress()}); } - Renderer label = (bb, ctx, frame) -> renderText(font, text(50, y, pm.label().getText(), colour), bb, ctx); + Renderer label = (bb, ctx, frame) -> renderText(font, text((ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, pm.label().getText(), colour), bb, ctx); return bar.then(label); } - private static float[] indeterminateBar(int frame) { - if (RenderElement.globalAlpha != 0xFF) { + private static float[] indeterminateBar(int frame, boolean isActive) { + if (RenderElement.globalAlpha != 0xFF || !isActive) { return new float[] {0f,1f}; } else { var progress = frame % 100; @@ -194,7 +195,7 @@ public class RenderElement { var y = 10 * context.scale(); PerformanceInfo pi = context.performance(); final int colour = hsvToRGB((1.0f - (float)Math.pow(pi.memory(), 1.5f)) / 3f, 1.0f, 0.5f); - var bar = progressBar(ctx -> new int[]{50, y, ctx.scaledWidth() - 100}, f -> colour, f -> new float[]{0f, pi.memory()}); + var bar = progressBar(ctx -> new int[]{(ctx.scaledWidth() - BAR_WIDTH * ctx.scale()) / 2, y, BAR_WIDTH * ctx.scale()}, f -> colour, f -> new float[]{0f, pi.memory()}); var width = font.stringWidth(pi.text()); Renderer label = (bb, ctx, frame) -> renderText(font, text(ctx.scaledWidth() / 2 - width / 2, y + 18, pi.text(), context.colourScheme.foreground().packedint(globalAlpha)), bb, ctx); bar.then(label).accept(buffer, context, frameNumber); 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 3ac70cd665..19c84dc53f 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/FMLConfig.java @@ -7,7 +7,6 @@ package net.minecraftforge.fml.loading; import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.ConfigSpec; -import com.electronwill.nightconfig.core.UnmodifiableCommentedConfig; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.core.file.FileNotFoundAction; import com.electronwill.nightconfig.core.io.ParsingException; @@ -17,9 +16,7 @@ import org.slf4j.Logger; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.function.Function; @@ -28,7 +25,7 @@ import static net.minecraftforge.fml.loading.LogMarkers.CORE; public class FMLConfig { public enum ConfigValue { - SPLASHSCREEN("splashscreen", Boolean.TRUE, "should we show the early splashscreen"), + EARLY_WINDOW_CONTROL("earlyWindowControl", Boolean.TRUE, "Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them."), MAX_THREADS("maxThreads", -1, "Max threads for early initialization parallelism, -1 is based on processor count", FMLConfig::maxThreads), VERSION_CHECK("versionCheck", Boolean.TRUE, "Enable forge global version checking"), DEFAULT_CONFIG_PATH("defaultConfigPath", "defaultconfigs", "Default config path for servers"), @@ -63,6 +60,7 @@ public class FMLConfig } else { spec.define(this.entry, this.defaultValue); } + commentedConfig.add(this.entry, this.defaultValue); commentedConfig.setComment(this.entry, this.comment); } @SuppressWarnings("unchecked") diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java index 41a7ddb679..8e69a595d8 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/ImmediateWindowHandler.java @@ -10,8 +10,6 @@ import net.minecraftforge.fml.loading.progress.StartupNotificationManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.lang.invoke.MethodHandles; -import java.lang.invoke.MethodType; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.*; @@ -28,7 +26,7 @@ public class ImmediateWindowHandler { if (!List.of("forgeclient", "forgeclientuserdev", "forgeclientdev").contains(launchTarget)) { provider = new DummyProvider(); LOGGER.info("ImmediateWindowProvider not loading because launch target is {}", launchTarget); - } else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.SPLASHSCREEN)) { + } else if (!FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_CONTROL)) { provider = new DummyProvider(); LOGGER.info("ImmediateWindowProvider not loading because splash screen is disabled"); } else { @@ -88,6 +86,7 @@ public class ImmediateWindowHandler { private static Method NV_HANDOFF; private static Method NV_POSITION; private static Method NV_OVERLAY; + private static Method NV_VERSION; @Override public String name() { @@ -131,7 +130,11 @@ public class ImmediateWindowHandler { @Override public String getGLVersion() { - return "3.2"; // The default minecraft GL version + try { + return (String) NV_VERSION.invoke(null); + } catch (Throwable e) { + throw new IllegalStateException("How did you get here?", e); + } } @Override @@ -144,6 +147,7 @@ public class ImmediateWindowHandler { NV_HANDOFF = methods.get("windowHandoff"); NV_OVERLAY = methods.get("loadingOverlay"); NV_POSITION = methods.get("windowPositioning"); + NV_VERSION = methods.get("glVersion"); } } diff --git a/fmlloader/src/main/java/net/minecraftforge/fml/loading/progress/StartupNotificationManager.java b/fmlloader/src/main/java/net/minecraftforge/fml/loading/progress/StartupNotificationManager.java index 4a5236a1a3..56b26f739d 100644 --- a/fmlloader/src/main/java/net/minecraftforge/fml/loading/progress/StartupNotificationManager.java +++ b/fmlloader/src/main/java/net/minecraftforge/fml/loading/progress/StartupNotificationManager.java @@ -24,6 +24,13 @@ public class StartupNotificationManager { } } + public static ProgressMeter prependProgressBar(final String barName, final int count) { + var pm = new ProgressMeter(barName, count, 0, new Message(barName, Message.MessageType.ML)); + synchronized (progressMeters) { + progressMeters.addLast(pm); + } + return pm; + } public static ProgressMeter addProgressBar(final String barName, final int count) { var pm = new ProgressMeter(barName, count, 0, new Message(barName, Message.MessageType.ML)); synchronized (progressMeters) { diff --git a/fmlloader/src/main/resources/META-INF/defaultfmlconfig.toml b/fmlloader/src/main/resources/META-INF/defaultfmlconfig.toml index 3c54521b89..77d7226290 100644 --- a/fmlloader/src/main/resources/META-INF/defaultfmlconfig.toml +++ b/fmlloader/src/main/resources/META-INF/defaultfmlconfig.toml @@ -1,21 +1,21 @@ +#Early window height +earlyWindowHeight = 480 +#Early window framebuffer scale +earlyWindowFBScale = 1 #Enable forge global version checking versionCheck = true -#Disables Optimized DFU client-side -disableOptimizedDFU = true +#Early window provider +earlyWindowProvider = "fmlearlywindow" +#Early window width +earlyWindowWidth = 854 +#Early window starts maximized +earlyWindowMaximized = false #Default config path for servers defaultConfigPath = "defaultconfigs" -#Max threads for early initialization parallelism, -1 is based on processor count +#Disables Optimized DFU client-side - already disabled on servers +disableOptimizedDFU = true +#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them. +earlyWindowControl = true +#Max threads for early initialization parallelism, -1 is based on processor count maxThreads = -1 -#should we show the early splashscreen -splashscreen = true -#Early window provider (default fmlearlywindow) -earlyWindowProvider = "fmlearlywindow" -#Initial window height -earlyWindowHeight = 480 -#Initial window width -earlyWindowWidth = 854 -# Start the early window as "maximized" -earlyWindowMaximized = false -# The rendering scale of the early window -earlyWindowFBScale = 1 diff --git a/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java b/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java index cbc322cece..788f03c580 100644 --- a/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java +++ b/src/main/java/net/minecraftforge/client/loading/ClientModLoader.java @@ -61,33 +61,16 @@ public class ClientModLoader private static boolean loadingComplete; private static LoadingFailedException error; - private static class SpacedRunnable implements Runnable { - static final long NANO_SLEEP_TIME = TimeUnit.MILLISECONDS.toNanos(50); - private final Runnable wrapped; - private long lastRun; - - private SpacedRunnable(final Runnable wrapped) { - this.wrapped = wrapped; - this.lastRun = System.nanoTime() - NANO_SLEEP_TIME; - } - - @Override - public void run() { - if (System.nanoTime() - this.lastRun > NANO_SLEEP_TIME) { - wrapped.run(); - this.lastRun = System.nanoTime(); - } - } - } public static void begin(final Minecraft minecraft, final PackRepository defaultResourcePacks, final ReloadableResourceManager mcResourceManager) { // force log4j to shutdown logging in a shutdown hook. This is because we disable default shutdown hook so the server properly logs it's shutdown Runtime.getRuntime().addShutdownHook(new Thread(LogManager::shutdown)); + ImmediateWindowHandler.updateProgress("Loading mods"); loading = true; ClientModLoader.mc = minecraft; LogicalSidedProvider.setClient(()->minecraft); LanguageHook.loadForgeAndMCLangs(); - createRunnableWithCatch(()->ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), new SpacedRunnable(ImmediateWindowHandler::renderTick))).run(); + createRunnableWithCatch(()->ModLoader.get().gatherAndInitializeMods(ModWorkManager.syncExecutor(), ModWorkManager.parallelExecutor(), ImmediateWindowHandler::renderTick)).run(); if (error == null) { ResourcePackLoader.loadResourcePacks(defaultResourcePacks, ClientModLoader::buildPackFinder); ModLoader.get().postEvent(new AddPackFindersEvent(PackType.CLIENT_RESOURCES, defaultResourcePacks::addPackFinder)); @@ -115,12 +98,12 @@ public class ClientModLoader } private static void startModLoading(ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor) { - createRunnableWithCatch(() -> ModLoader.get().loadMods(syncExecutor, parallelExecutor, new SpacedRunnable(ImmediateWindowHandler::renderTick))).run(); + createRunnableWithCatch(() -> ModLoader.get().loadMods(syncExecutor, parallelExecutor, ImmediateWindowHandler::renderTick)).run(); } private static void finishModLoading(ModWorkManager.DrivenExecutor syncExecutor, Executor parallelExecutor) { - createRunnableWithCatch(() -> ModLoader.get().finishMods(syncExecutor, parallelExecutor, new SpacedRunnable(ImmediateWindowHandler::renderTick))).run(); + createRunnableWithCatch(() -> ModLoader.get().finishMods(syncExecutor, parallelExecutor, ImmediateWindowHandler::renderTick)).run(); loading = false; loadingComplete = true; // reload game settings on main thread diff --git a/src/main/java/net/minecraftforge/client/loading/ForgeLoadingOverlay.java b/src/main/java/net/minecraftforge/client/loading/ForgeLoadingOverlay.java index 797dabafe2..41d9c1f1b1 100644 --- a/src/main/java/net/minecraftforge/client/loading/ForgeLoadingOverlay.java +++ b/src/main/java/net/minecraftforge/client/loading/ForgeLoadingOverlay.java @@ -60,7 +60,7 @@ public class ForgeLoadingOverlay extends LoadingOverlay { this.onFinish = errorConsumer; this.displayWindow = displayWindow; displayWindow.addMojangTexture(mc.getTextureManager().getTexture(new ResourceLocation("textures/gui/title/mojangstudios.png")).getId()); - this.progress = StartupMessageManager.addProgressBar("Minecraft Progress", 100); + this.progress = StartupMessageManager.prependProgressBar("Minecraft Progress", 100); } public static Supplier newInstance(Supplier mc, Supplier ri, Consumer> handler, DisplayWindow window) { diff --git a/src/main/java/net/minecraftforge/client/loading/NoVizFallback.java b/src/main/java/net/minecraftforge/client/loading/NoVizFallback.java index 51eca1f5f3..5ded74cf1e 100644 --- a/src/main/java/net/minecraftforge/client/loading/NoVizFallback.java +++ b/src/main/java/net/minecraftforge/client/loading/NoVizFallback.java @@ -6,7 +6,6 @@ package net.minecraftforge.client.loading; import com.mojang.blaze3d.platform.Monitor; -import com.mojang.blaze3d.platform.VideoMode; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.LoadingOverlay; import net.minecraft.server.packs.resources.ReloadInstance; @@ -14,9 +13,12 @@ import net.minecraft.server.packs.resources.ReloadInstance; import java.util.Optional; import java.util.function.*; +import static org.lwjgl.glfw.GLFW.*; + public final class NoVizFallback { + private static long WINDOW; public static LongSupplier windowHandoff(IntSupplier width, IntSupplier height, Supplier title, LongSupplier monitor) { - return ()->org.lwjgl.glfw.GLFW.glfwCreateWindow(width.getAsInt(), height.getAsInt(), title.get(), monitor.getAsLong(), 0L); + return () -> WINDOW = glfwCreateWindow(width.getAsInt(), height.getAsInt(), title.get(), monitor.getAsLong(), 0L); } public static Supplier loadingOverlay(Supplier mc, Supplier ri, Consumer> ex, boolean fadein) { @@ -26,4 +28,14 @@ public final class NoVizFallback { public static Boolean windowPositioning(Optional monitor, IntConsumer widthSetter, IntConsumer heightSetter, IntConsumer xSetter, IntConsumer ySetter) { return Boolean.FALSE; } + + public static String glVersion() { + if (WINDOW != 0) { + var maj = glfwGetWindowAttrib(WINDOW, GLFW_CONTEXT_VERSION_MAJOR); + var min = glfwGetWindowAttrib(WINDOW, GLFW_CONTEXT_VERSION_MINOR); + return maj+"."+min; + } else { + return "3.2"; + } + } }