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 c570fd1357..a79300826b 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/DisplayWindow.java @@ -90,7 +90,12 @@ public class DisplayWindow implements ImmediateWindowProvider { // The GL ID of the window. Used for all operations private long window; // The thread that contains and ticks the window while Forge is loading mods - private ScheduledExecutorService renderScheduler; + private static final ScheduledExecutorService renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> { + final var thread = Executors.defaultThreadFactory().newThread(r); + thread.setName("EarlyDisplay"); + thread.setDaemon(true); + return thread; + }); private int fbWidth; private int fbHeight; private int fbScale; @@ -149,7 +154,7 @@ public class DisplayWindow implements ImmediateWindowProvider { } this.maximized = parsed.has(maximizedopt) || FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_MAXIMIZED); - StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + forgeVersion)); + StartupNotificationManager.modLoaderConsumer().ifPresent(c->c.accept("Forge loading " + FMLLoader.versionInfo().forgeVersion())); performanceInfo = new PerformanceInfo(); return start(mcVersion, forgeVersion); } @@ -238,7 +243,7 @@ public class DisplayWindow implements ImmediateWindowProvider { 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()); + this.elements.addFirst(RenderElement.squir()); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -287,12 +292,6 @@ public class DisplayWindow implements ImmediateWindowProvider { * Start the window and Render Thread; we're ready to go. */ public Runnable start(@Nullable String mcVersion, final String forgeVersion) { - renderScheduler = Executors.newSingleThreadScheduledExecutor(r -> { - final var thread = Executors.defaultThreadFactory().newThread(r); - thread.setName("EarlyDisplay"); - thread.setDaemon(true); - return thread; - }); initWindow(mcVersion); this.initializationFuture = renderScheduler.schedule(() -> initRender(mcVersion, forgeVersion), 1, TimeUnit.MILLISECONDS); return this::periodicTick; @@ -304,7 +303,7 @@ public class DisplayWindow implements ImmediateWindowProvider { return this.glVersion; } - private void crashElegantly(String errorDetails) { + private static void crashElegantly(String errorDetails) { StringBuilder msgBuilder = new StringBuilder(2000); msgBuilder.append("Failed to initialize graphics window with current settings.\n"); msgBuilder.append("\n\n"); @@ -512,7 +511,7 @@ public class DisplayWindow implements ImmediateWindowProvider { this.winY = y; } } - private void handleLastGLFWError(BiConsumer handler) { + private static void handleLastGLFWError(BiConsumer handler) { try (MemoryStack memorystack = MemoryStack.stackPush()) { PointerBuffer pointerbuffer = memorystack.mallocPointer(1); int error = glfwGetError(pointerbuffer); @@ -640,7 +639,7 @@ public class DisplayWindow implements ImmediateWindowProvider { } public void addMojangTexture(final int textureId) { - this.elements.add(0, RenderElement.mojang(textureId, framecount)); + this.elements.addFirst(RenderElement.mojang(textureId, framecount)); } public void close() { 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 166d165a42..68895f3298 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/RenderElement.java @@ -22,8 +22,8 @@ public class RenderElement { static int globalAlpha = 255; private int retireCount; + @FunctionalInterface interface Renderer { - void accept(SimpleBufferBuilder bb, DisplayContext context, int frame); default Renderer then(Renderer r) { @@ -38,6 +38,9 @@ public class RenderElement { interface TextureRenderer { void accept(SimpleBufferBuilder bb, DisplayContext context, int[] size, int frame); } + + /** @deprecated Use {@link Renderer} directly. This was always eagerly resolved, making it an unnecessary wrapper. */ + @Deprecated(since = "1.21.5", forRemoval = true) @FunctionalInterface interface Initializer extends Supplier {} @@ -56,11 +59,18 @@ public class RenderElement { } } + /** @deprecated Use {@link RenderElement#RenderElement(Renderer)} instead */ + @Deprecated(since = "1.21.5", forRemoval = true) public RenderElement(final Initializer rendererInitializer) { this.bb = new SimpleBufferBuilder(1); this.renderer = rendererInitializer.get(); } + public RenderElement(Renderer renderer) { + this.bb = new SimpleBufferBuilder(1); + this.renderer = renderer; + } + public boolean render(DisplayContext ctx, int count) { this.renderer.accept(bb, ctx, count); return this.retireCount == 0 || this.retireCount < count; @@ -75,7 +85,7 @@ public class RenderElement { List texts = new ArrayList<>(); for (int i = messages.size() - 1; i >= 0; i--) { final StartupNotificationManager.AgeMessage pair = messages.get(i); - final float fade = clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f); + final float fade = Math.clamp((4000.0f - (float) pair.age() - ( i - 4 ) * 1000.0f) / 5000.0f, 0.0f, 1.0f); if (fade <0.01f) continue; Message msg = pair.message(); int colour = Math.min((int)(fade * 255f), globalAlpha) << 24 | 0xFFFFFF; @@ -86,7 +96,7 @@ public class RenderElement { } public static RenderElement mojang(final int textureId, final int frameStart) { - return new RenderElement(()->(bb, ctx, frame) -> { + return new RenderElement((bb, ctx, frame) -> { var size = 256 * ctx.scale(); var x0 = (ctx.scaledWidth() - 2 * size) / 2; var y0 = 64 * ctx.scale() + 32; @@ -138,11 +148,11 @@ public class RenderElement { })); } public static RenderElement progressBars(SimpleFont font) { - return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame)); + return new RenderElement((bb, ctx, frame) -> RenderElement.startupProgressBars(font, bb, ctx, frame)); } public static RenderElement performanceBar(SimpleFont font) { - return new RenderElement(() -> (bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame)); + return new RenderElement((bb, ctx, frame) -> RenderElement.memoryInfo(font, bb, ctx, frame)); } public static void startupProgressBars(SimpleFont font, final SimpleBufferBuilder buffer, final DisplayContext context, final int frameNumber) { @@ -177,10 +187,10 @@ public class RenderElement { } private static float[] indeterminateBar(int frame, boolean isActive) { if (RenderElement.globalAlpha != 0xFF || !isActive) { - return new float[] {0f,1f}; + return new float[] { 0f, 1f }; } else { - var progress = frame % 100; - return new float[]{clamp((progress - 2) / 100f, 0f, 1f), clamp((progress + 2) / 100f, 0f, 1f)}; + int progress = frame % 100; + return new float[] { Math.clamp((progress - 2) / 100f, 0f, 1f), Math.clamp((progress + 2) / 100f, 0f, 1f) }; } } @@ -239,8 +249,8 @@ public class RenderElement { }; } - private static Initializer initializeText(SimpleFont font, TextGenerator textGenerator) { - return () -> (bb, context, frame) -> renderText(font, textGenerator, bb, context); + private static Renderer initializeText(SimpleFont font, TextGenerator textGenerator) { + return (bb, context, frame) -> renderText(font, textGenerator, bb, context); } private static void renderText(final SimpleFont font, final TextGenerator textGenerator, final SimpleBufferBuilder bb, final DisplayContext context) { @@ -254,14 +264,13 @@ public class RenderElement { private static TextGenerator text(int x, int y, String text, int colour) { return (bb, font, context) -> font.generateVerticesForTexts(x, y, bb, new SimpleFont.DisplayText(text, colour)); } - private static Initializer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) { - return ()->{ - int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET); - return (bb, ctx, frame) -> { - ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET); - ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE); - renderTexture(bb, ctx, frame, imgSize, positionAndColour); - }; + + private static Renderer initializeTexture(final String textureFileName, int size, int textureNumber, TextureRenderer positionAndColour) { + int[] imgSize = STBHelper.loadTextureFromClasspath(textureFileName, size, GL_TEXTURE0 + textureNumber + INDEX_TEXTURE_OFFSET); + return (bb, ctx, frame) -> { + ctx.elementShader().updateTextureUniform(textureNumber + INDEX_TEXTURE_OFFSET); + ctx.elementShader().updateRenderTypeUniform(ElementShader.RenderType.TEXTURE); + renderTexture(bb, ctx, frame, imgSize, positionAndColour); }; } @@ -271,21 +280,13 @@ public class RenderElement { bb.draw(); } - + @Deprecated(since = "1.21.5", forRemoval = true) public static float clamp(float num, float min, float max) { - if (num < min) { - return min; - } else { - return Math.min(num, max); - } + return Math.clamp(num, min, max); } public static int clamp(int num, int min, int max) { - if (num < min) { - return min; - } else { - return Math.min(num, max); - } + return Math.min(max, Math.max(num, min)); } public static int hsvToRGB(float hue, float saturation, float value) { diff --git a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/SimpleFont.java b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/SimpleFont.java index d02c22f1dc..1a1482d9c8 100644 --- a/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/SimpleFont.java +++ b/fmlearlydisplay/src/main/java/net/minecraftforge/fml/earlydisplay/SimpleFont.java @@ -22,7 +22,7 @@ public class SimpleFont { private final int textureNumber; private final int lineSpacing; private final int descent; - private final int GLYPH_COUNT = 127-32; + private static final int GLYPH_COUNT = 127 - 32; private final Glyph[] glyphs; private record Glyph(char c, int charwidth, int[] pos, float[] uv) { @@ -120,7 +120,7 @@ public class SimpleFont { case '\n', '\t' -> 0; case ' ' -> glyphs[0].charwidth(); default -> { - if (c - 32 < this.GLYPH_COUNT && c > 32) { + if (c - 32 < GLYPH_COUNT && c > 32) { yield this.glyphs[c - 32].charwidth(); } else { yield 0; @@ -151,7 +151,7 @@ public class SimpleFont { case '\t' -> new Pos(pos.x()+font.glyphs[0].charwidth() * 4, pos.y(), pos.minx()); case ' ' -> new Pos(pos.x()+font.glyphs[0].charwidth(), pos.y(), pos.minx()); default -> { - if (c-32 < font.GLYPH_COUNT && c > 32) { + if (c-32 < GLYPH_COUNT && c > 32) { pos = font.glyphs[c - 32].loadQuad(pos, colour(), bb); } yield pos;