From 8bec43369957edab2289b286713e0df91d337fe4 Mon Sep 17 00:00:00 2001 From: Death Fuel <108496936+DeathFuel@users.noreply.github.com> Date: Sat, 6 Dec 2025 18:48:03 +0100 Subject: [PATCH] GT5 custom glyph handling and visual fixes (#1148) Co-authored-by: Jason Mitchell --- .../client/font/BatchingFontRenderer.java | 30 +++++++++++++------ .../angelica/client/font/FontProvider.java | 1 + .../client/font/FontProviderCustom.java | 9 ++++-- .../angelica/client/font/FontProviderMC.java | 5 ++++ .../client/font/FontProviderUnicode.java | 5 ++++ .../angelica/client/font/FontStrategist.java | 22 -------------- .../angelica/client/gui/FontConfigScreen.java | 12 +++++++- .../angelica/config/FontConfig.java | 5 ++++ .../resources/assets/angelica/lang/en_US.lang | 2 ++ 9 files changed, 57 insertions(+), 34 deletions(-) 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 979851180..4e7e3ea21 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -1,6 +1,7 @@ package com.gtnewhorizons.angelica.client.font; import com.google.common.collect.ImmutableSet; +import com.gtnewhorizon.gtnhlib.util.font.GlyphReplacements; import com.gtnewhorizons.angelica.config.FontConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor; @@ -380,11 +381,11 @@ public class BatchingFontRenderer { } public float getGlyphScaleX() { - return forceDefaults() ? 1 : (float) (FontConfig.glyphScale * Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1); + return forceDefaults() ? 1 : (float) (FontConfig.glyphScale * Math.pow(2, FontConfig.glyphAspect)); } public float getGlyphScaleY() { - return forceDefaults() ? 1 : (float) (FontConfig.glyphScale / Math.pow(2, FontConfig.glyphAspect)) * (FontStrategist.customFontInUse ? 1.5f : 1); + return forceDefaults() ? 1 : (float) (FontConfig.glyphScale / Math.pow(2, FontConfig.glyphAspect)); } public float getGlyphSpacing() { @@ -431,13 +432,13 @@ public class BatchingFontRenderer { boolean curStrikethrough = false; boolean curUnderline = false; - final float glyphScaleY = getGlyphScaleY(); - final float heightNorth = anchorY + (underlying.FONT_HEIGHT - 1.0f) * (0.5f - glyphScaleY / 2); - final float heightSouth = (underlying.FONT_HEIGHT - 1.0f) * glyphScaleY; + float glyphScaleY = getGlyphScaleY(); + float heightNorth = anchorY + (underlying.FONT_HEIGHT - 1.0f) * (0.5f - glyphScaleY / 2); final float underlineY = heightNorth + (underlying.FONT_HEIGHT - 1.0f) * glyphScaleY; float underlineStartX = 0.0f; float underlineEndX = 0.0f; + final float strikethroughY = heightNorth + ((float) (underlying.FONT_HEIGHT / 2) - 1.0f) * glyphScaleY; float strikethroughStartX = 0.0f; float strikethroughEndX = 0.0f; @@ -507,12 +508,22 @@ public class BatchingFontRenderer { continue; } + if (FontConfig.enableCustomFont) { + String chrReplacement = GlyphReplacements.customGlyphs.get(String.valueOf(chr)); + if (chrReplacement != null) { + chr = chrReplacement.charAt(0); + } + } + if (curRandom) { chr = FontProviderMC.get(this.isSGA).getRandomReplacement(chr); } FontProvider fontProvider = FontStrategist.getFontProvider(this, chr, FontConfig.enableCustomFont, unicodeFlag); + heightNorth = anchorY + (underlying.FONT_HEIGHT - 1.0f) * (0.5f - glyphScaleY * fontProvider.getYScaleMultiplier() / 2); + float heightSouth = (underlying.FONT_HEIGHT - 1.0f) * glyphScaleY * fontProvider.getYScaleMultiplier(); + // Check ASCII space, NBSP, NNBSP if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') { curX += 4 * this.getWhitespaceScale(); @@ -527,6 +538,7 @@ public class BatchingFontRenderer { final float vSz = fontProvider.getVSize(chr); final float itOff = curItalic ? 1.0F : 0.0F; // italic offset final float shadowOffset = fontProvider.getShadowOffset(); + final float xShift = (fontProvider instanceof FontProviderCustom ? getGlyphScaleX() * FontConfig.customFontScale : 0.0f); // corrective factor to improve text alignment final int shadowCopies = FontConfig.shadowCopies; final int boldCopies = FontConfig.boldCopies; final ResourceLocation texture = fontProvider.getTexture(chr); @@ -535,20 +547,20 @@ public class BatchingFontRenderer { if (enableShadow) { for (int n = 1; n <= shadowCopies; n++) { final float shadowOffsetPart = shadowOffset * ((float) n / shadowCopies); - pushTexRect(curX + shadowOffsetPart, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz); + pushTexRect(curX + shadowOffsetPart - xShift, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz); if (curBold) { - pushTexRect(curX + 2.0f * shadowOffsetPart, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz); + pushTexRect(curX + 2.0f * shadowOffsetPart - xShift, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz); } } } - pushTexRect(curX, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz); + pushTexRect(curX - xShift, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz); if (curBold) { for (int n = 1; n <= boldCopies; n++) { final float shadowOffsetPart = shadowOffset * ((float) n / boldCopies); - pushTexRect(curX + shadowOffsetPart, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz); + pushTexRect(curX + shadowOffsetPart - xShift, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz); } } diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProvider.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProvider.java index 3896777d9..48ca1f899 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProvider.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProvider.java @@ -17,4 +17,5 @@ public interface FontProvider { float getVSize(char chr); float getShadowOffset(); ResourceLocation getTexture(char chr); + float getYScaleMultiplier(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java index c7d380728..64cdf9c2d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java @@ -270,12 +270,12 @@ public final class FontProviderCustom implements FontProvider { @Override public float getXAdvance(char chr) { - return getAtlas(chr).glyphData[chr % ATLAS_SIZE].xAdvance; + return getAtlas(chr).glyphData[chr % ATLAS_SIZE].xAdvance * FontConfig.customFontScale; } @Override public float getGlyphW(char chr) { - return getAtlas(chr).glyphData[chr % ATLAS_SIZE].glyphW; + return getAtlas(chr).glyphData[chr % ATLAS_SIZE].glyphW * FontConfig.customFontScale; } @Override @@ -297,4 +297,9 @@ public final class FontProviderCustom implements FontProvider { public ResourceLocation getTexture(char chr) { return getAtlas(chr).texture; } + + @Override + public float getYScaleMultiplier() { + return FontConfig.customFontScale; + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderMC.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderMC.java index 714f0c5aa..280c3da82 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderMC.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderMC.java @@ -103,4 +103,9 @@ public final class FontProviderMC implements FontProvider { public ResourceLocation getTexture(char chr) { return locationFontTexture; } + + @Override + public float getYScaleMultiplier() { + return 1; + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderUnicode.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderUnicode.java index 9a662d4d4..39243f175 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderUnicode.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderUnicode.java @@ -90,4 +90,9 @@ public final class FontProviderUnicode implements FontProvider { final int uniPage = chr / 256; return getUnicodePageLocation(uniPage); } + + @Override + public float getYScaleMultiplier() { + return 1; + } } diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java b/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java index 639ff7857..55471916b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java @@ -25,7 +25,6 @@ public class FontStrategist { @Getter private static final Font[] availableFonts; public static final Logger LOGGER = LogManager.getLogger("Angelica"); - public static boolean customFontInUse; static { // get available fonts without duplicates (250 copies of dialog.plain need not apply) @@ -68,21 +67,6 @@ public class FontStrategist { List defaultResourcePacks = ((ResourceAccessor) Minecraft.getMinecraft()).angelica$getDefaultResourcePacks(); defaultResourcePacks.add(fontResourcePack); Minecraft.getMinecraft().refreshResources(); - - // determine if a custom font is in use based on config values - boolean primaryFontFound = false; - boolean fallbackFontFound = false; - for (Font availableFont : availableFonts) { - if (Objects.equals(FontConfig.customFontNamePrimary, availableFont.getFontName())) { - primaryFontFound = true; - break; - } - if (Objects.equals(FontConfig.customFontNameFallback, availableFont.getFontName())) { - fallbackFontFound = true; - break; - } - } - customFontInUse = (FontConfig.enableCustomFont && (primaryFontFound || fallbackFontFound)); } /** @@ -112,20 +96,14 @@ public class FontStrategist { public static void reloadCustomFontProviders() { FontProviderCustom.getPrimary().setFont(null); FontProviderCustom.getFallback().setFont(null); - boolean primaryFontFound = false; - boolean fallbackFontFound = false; for (int i = 0; i < availableFonts.length; i++) { if (Objects.equals(FontConfig.customFontNamePrimary, availableFonts[i].getFontName())) { FontProviderCustom.getPrimary().reloadFont(i); - primaryFontFound = true; } if (Objects.equals(FontConfig.customFontNameFallback, availableFonts[i].getFontName())) { FontProviderCustom.getFallback().reloadFont(i); - fallbackFontFound = true; } - if (primaryFontFound && fallbackFontFound) { break; } } - customFontInUse = (FontConfig.enableCustomFont && (primaryFontFound || fallbackFontFound)); } public static boolean isSplashFontRendererActive(FontRenderer fontRenderer) { diff --git a/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java b/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java index 2a97e92cf..0171d344a 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java @@ -56,6 +56,7 @@ public class FontConfigScreen extends GuiScreen { SliderClone.Option optGlyphSpacing = new SliderClone.Option(-2f, 2f, 0.05f); SliderClone.Option optFontAAMode = new SliderClone.Option(0, 2, 1); SliderClone.Option optFontAAStrength = new SliderClone.Option(1, 24, 1); + SliderClone.Option optCustomFontScale = new SliderClone.Option(0.1f, 3, 0.05f); public FontConfigScreen(GuiScreen parent) { this.title = I18n.format("options.angelica.fontconfig.title"); @@ -214,6 +215,16 @@ public class FontConfigScreen extends GuiScreen { .formatString("%.0f") .build() ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optCustomFontScale) + .initialValue(FontConfig.customFontScale) + .setter(value -> FontConfig.customFontScale = value) + .langKey("options.angelica.fontconfig.custom_font_scale") + .formatString("x%3.2f") + .build() + ); final int halfWidth = this.width / 2; final int sliderSpacing = 4; @@ -279,7 +290,6 @@ public class FontConfigScreen extends GuiScreen { currentFallbackFontName = null; selectedPrimaryFontListPos = -1; selectedFallbackFontListPos = -1; - FontStrategist.customFontInUse = false; super.buttonList.clear(); this.initButtons(); } diff --git a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java index e9c2d3416..aa833fe01 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java @@ -65,4 +65,9 @@ public class FontConfig { @Config.DefaultInt(7) @Config.RangeInt(min = 1, max = 24) public static int fontAAStrength; + + @Config.Comment("Custom font scale multiplier, for bugfixes.") + @Config.DefaultFloat(1.5F) + @Config.RangeFloat(min = 0.1F, max = 3F) + public static float customFontScale; } diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index d1e8fd3b3..e9d6344cb 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -157,6 +157,7 @@ options.angelica.fontconfig.font_aa_strength=Font AA Strength: %s options.angelica.fontconfig.aamode.aa_none=Font AA: OFF options.angelica.fontconfig.aamode.aa_4x=Font AA: 4x MSAA options.angelica.fontconfig.aamode.aa_16x=Font AA: 16x MSAA +options.angelica.fontconfig.custom_font_scale=Custom Font Scale: %s options.angelica.fontconfig.font_quality.tooltip=The quality at which custom fonts are rendered, making them less pixelated at the expense of some performance and memory. options.angelica.fontconfig.shadow_offset.tooltip=The distance at which the fonts' shadows are drawn. Also affects the way §lbold§r text is drawn. options.angelica.fontconfig.shadow_copies.tooltip=The number of shadows to be drawn behind text, all offset so as to provide a fake 3D effect. @@ -167,6 +168,7 @@ options.angelica.fontconfig.whitespace_scale.tooltip=The scaling factor of blank options.angelica.fontconfig.glyph_spacing.tooltip=The spacing between each individual glyph. options.angelica.fontconfig.font_aa_strength.tooltip=The spacing of samples used in font antialiasing. High values may cause fonts to look blurry, low values may cause aliasing. See what works best with your settings. options.angelica.fontconfig.aamode.tooltip=The font antialiasing mode. Can significantly improve the appearance and readability of text that's being scaled or viewed at oblique angles, at the expense of some performance. +options.angelica.fontconfig.custom_font_scale.tooltip=A multiplier that affects the scale of custom fonts. Adjust this if text in your font of choice looks under-/over-sized relative to text that does not use custom fonts. options.angelica.droppedItemLimit=Dropped Item Render Limit options.angelica.droppedItemLimit.tooltip=The maximum number of dropped items that will be rendered. Lower values can improve performance. options.angelica.mobSpawnerRenderDistance=Mob spawner render distance