From 677e2104a0314a7092634a8874472969d4a7cb73 Mon Sep 17 00:00:00 2001 From: RogueLogix Date: Sun, 26 Apr 2020 15:41:53 -0700 Subject: [PATCH] move handOffWindow down near start() --- .../loading/progress/ClientVisualization.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/ClientVisualization.java b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/ClientVisualization.java index fb29f1bddb..5390239b94 100644 --- a/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/ClientVisualization.java +++ b/src/fmllauncher/java/net/minecraftforge/fml/loading/progress/ClientVisualization.java @@ -911,21 +911,6 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization { glfwPollEvents(); } - @Override - public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier title, final LongSupplier monitorSupplier) { - glfwSetWindowTitle(window, title.get()); - glfwSetWindowSize(window, width.getAsInt(), height.getAsInt()); - if (monitorSupplier.getAsLong()!=0L) - glfwSetWindowMonitor(window, monitorSupplier.getAsLong(),0, 0, width.getAsInt(), height.getAsInt(), GLFW_DONT_CARE); - glClearColor(1.0f, 1.0f, 1.0f, 1.0f); - glClear(GL_COLOR_BUFFER_BIT); - renderProgress(); - glfwSwapInterval(0); - glfwSwapBuffers(window); - glfwSwapInterval(1); - return window; - } - private static float clamp(float num, float min, float max) { if (num < min) { return min; @@ -1042,6 +1027,21 @@ class ClientVisualization implements EarlyProgressVisualization.Visualization { return this::renderProgress; } + @Override + public long handOffWindow(final IntSupplier width, final IntSupplier height, final Supplier title, final LongSupplier monitorSupplier) { + glfwSetWindowTitle(window, title.get()); + glfwSetWindowSize(window, width.getAsInt(), height.getAsInt()); + if (monitorSupplier.getAsLong()!=0L) + glfwSetWindowMonitor(window, monitorSupplier.getAsLong(),0, 0, width.getAsInt(), height.getAsInt(), GLFW_DONT_CARE); + glClearColor(1.0f, 1.0f, 1.0f, 1.0f); + glClear(GL_COLOR_BUFFER_BIT); + renderProgress(); + glfwSwapInterval(0); + glfwSwapBuffers(window); + glfwSwapInterval(1); + return window; + } + @Override public boolean replacedWindow() { return true;