fix: Meteor b51 - Refactor FontUtils Font loading

Author: X-C-0

src/main/java/me/pindour/catpuccin/gui/text/RichTextRenderer.java

@@ -5,11 +5,10 @@
 import meteordevelopment.meteorclient.renderer.MeshRenderer;
 import meteordevelopment.meteorclient.renderer.MeteorRenderPipelines;
 import meteordevelopment.meteorclient.renderer.text.*;
-import meteordevelopment.meteorclient.utils.Utils;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 import net.minecraft.client.MinecraftClient;
-import org.lwjgl.BufferUtils;
 
+import java.io.IOException;
 import java.nio.ByteBuffer;
 
 public class RichTextRenderer implements TextRenderer {
@@ -29,27 +28,14 @@ public class RichTextRenderer implements TextRenderer {
     private double fontScale = 1;
     private double scale = 1;
 
-    public RichTextRenderer(FontFace regularFace, FontFace boldFace, FontFace italicFace) {
-        if (boldFace == null || italicFace == null) {
-            FontFamily fontFamily = findFontFamily(regularFace);
-
-            regularFace = fontFamily.get(FontInfo.Type.Regular);
-            boldFace = fontFamily.get(FontInfo.Type.Bold);
-            italicFace = fontFamily.get(FontInfo.Type.Italic);
-        }
-
-        this.regularFonts = loadFonts(regularFace);
-        this.boldFonts = boldFace != null ? loadFonts(boldFace) : regularFonts;
-        this.italicFonts = italicFace != null ? loadFonts(italicFace) : regularFonts;
+    public RichTextRenderer(FontFace fontFace) throws IOException {
+        this.regularFonts = loadFonts(fontFace);
+        this.boldFonts = resolveVariant(fontFace, FontInfo.Type.Bold);
+        this.italicFonts = resolveVariant(fontFace, FontInfo.Type.Italic);
     }
 
-    public RichTextRenderer(FontFace fontFace) {
-        this(fontFace, null, null);
-    }
-
-    private Font[] loadFonts(FontFace fontFace) {
-        byte[] bytes = Utils.readBytes(fontFace.toStream());
-        ByteBuffer buffer = BufferUtils.createByteBuffer(bytes.length).put(bytes).flip();
+    private Font[] loadFonts(FontFace fontFace) throws IOException {
+        ByteBuffer buffer = fontFace.readToDirectByteBuffer();
 
         Font[] fonts = new Font[5];
 
@@ -59,6 +45,16 @@ private Font[] loadFonts(FontFace fontFace) {
         return fonts;
     }
 
+    private Font[] resolveVariant(FontFace regularFace, FontInfo.Type type) throws IOException {
+        FontFamily family = Fonts.getFamily(regularFace.info.family());
+        FontFace fontVariant = family.get(type);
+
+        if (fontVariant != null && fontVariant != regularFace)
+            return loadFonts(fontVariant);
+
+        return regularFonts; // Fallback
+    }
+
     @Override
     public void setAlpha(double a) {
         mesh.alpha = a;
@@ -250,12 +246,4 @@ private Font getCurrentFont(Font[] fonts) {
 
         return fonts[0];
     }
-
-    private FontFamily findFontFamily(FontFace fontFace) {
-        for (FontFamily fontFamily : Fonts.FONT_FAMILIES)
-            if (fontFamily.getName().equalsIgnoreCase(fontFace.info.family()))
-                return fontFamily;
-
-        return Fonts.FONT_FAMILIES.getFirst();
-    }
 }

src/main/java/me/pindour/catpuccin/gui/themes/catpuccin/CatpuccinGuiTheme.java

@@ -1,5 +1,6 @@
 package me.pindour.catpuccin.gui.themes.catpuccin;
 
+import me.pindour.catpuccin.CatpuccinAddon;
 import me.pindour.catpuccin.gui.animation.AnimationType;
 import me.pindour.catpuccin.gui.renderer.CatpuccinRenderer;
 import me.pindour.catpuccin.gui.screens.CatpuccinModuleScreen;
@@ -623,7 +624,14 @@ public TextRenderer textRenderer() {
     }
 
     public RichTextRenderer richTextRenderer() {
-        if (textRenderer == null) textRenderer = new RichTextRenderer(Config.get().font.get());
+        if (textRenderer == null) {
+            try {
+                setTextRenderer(new RichTextRenderer(Config.get().font.get()));
+            } catch (Exception e) {
+                CatpuccinAddon.LOG.error("Failed to load TextRenderer: ", e);
+            }
+        }
+
         return textRenderer;
     }