From fa71eda3db243d949e18a6f3d78551be4455f353 Mon Sep 17 00:00:00 2001 From: KAMKEEL <28842281+KAMKEEL@users.noreply.github.com> Date: Tue, 29 Sep 2026 22:18:16 -0400 Subject: [PATCH] Font Texture Crash Fix on Splash Screen (#2169) --- .../client/font/BatchingFontRenderer.java | 16 +++++++++++++++- .../mixins/interfaces/FontRendererAccessor.java | 3 +++ .../angelica/fontrenderer/MixinFontRenderer.java | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java index 4a53f3300..19159d073 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -16,6 +16,7 @@ import com.gtnewhorizons.angelica.glsm.hooks.GLSMConfig; import com.gtnewhorizons.angelica.glsm.streaming.PersistentStreamingBuffer; import com.gtnewhorizons.angelica.glsm.streaming.StreamingUploader; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; +import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor; import com.gtnewhorizons.angelica.rendering.tesr.BatchDrawDefaults; import com.gtnewhorizons.angelica.rendering.tesr.ModelPartBatcher; import com.gtnewhorizons.angelica.rendering.tesr.TesrBatchRenderer; @@ -28,6 +29,7 @@ import net.coderbot.iris.layer.GbufferPrograms; import net.coderbot.iris.pipeline.DeferredWorldRenderingPipeline; import net.coderbot.iris.pipeline.PipelineManager; import net.coderbot.iris.uniforms.CapturedRenderingState; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.MathHelper; @@ -401,6 +403,18 @@ public class BatchingFontRenderer { private static final int LAYER_BACKGROUND = -1; private static final int LAYER_DEFAULT = 0; + /** + * FML's splash font renderer draws before the texture manager exists and binds its own + * font texture, so let it bind and read the id back. + */ + private int textureFor(FontProvider fontProvider, char chr) { + if (fontProvider instanceof FontProviderCustom || Minecraft.getMinecraft().getTextureManager() != null) { + return fontProvider.getTexture(chr); + } + ((FontRendererAccessor) underlying).angelica$bindTexture(locationFontTexture); + return GLStateManager.getBoundTextureForServerState(); + } + private void pushDrawCmd(int startIdx, int idxCount, int texture, boolean isUnicode) { pushDrawCmd(startIdx, idxCount, texture, isUnicode, LAYER_DEFAULT); } @@ -1456,7 +1470,7 @@ public class BatchingFontRenderer { final float shadowOffset = fontProvider.getShadowOffset(); final int shadowCopies = FontConfig.shadowCopies; final int boldCopies = FontConfig.boldCopies; - final int texture = fontProvider.getTexture(chr); + final int texture = textureFor(fontProvider, chr); // Wave: Y offset via sine wave float renderY = heightNorth; diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererAccessor.java b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererAccessor.java index 3567e5a71..d01ce9940 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererAccessor.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/interfaces/FontRendererAccessor.java @@ -1,10 +1,13 @@ package com.gtnewhorizons.angelica.mixins.interfaces; import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer; +import net.minecraft.util.ResourceLocation; public interface FontRendererAccessor { int angelica$drawStringBatched(String text, int x, int y, int argb, boolean dropShadow); BatchingFontRenderer angelica$getBatcher(); + + void angelica$bindTexture(ResourceLocation location); } diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java index 2ee1145ec..65a7de77f 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java @@ -111,6 +111,9 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa @Shadow protected abstract String bidiReorder(String p_147647_1_); + @Shadow(remap = false) + protected abstract void bindTexture(ResourceLocation location); + @Unique public BatchingFontRenderer angelica$batcher; @@ -188,6 +191,9 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa return angelica$batcher; } + @Override + public void angelica$bindTexture(ResourceLocation location) { this.bindTexture(location); } + @Inject(method = "getCharWidth", at = @At("HEAD"), cancellable = true) public void getCharWidth(char c, CallbackInfoReturnable cir) { cir.setReturnValue((int) angelica$getBatcher().getCharWidthFine(c));