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 f0365ef7a..3ffd1ac18 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -5,7 +5,6 @@ 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; -import cpw.mods.fml.client.SplashProgress; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import net.coderbot.iris.gl.program.Program; import net.coderbot.iris.gl.program.ProgramBuilder; @@ -508,10 +507,16 @@ public class BatchingFontRenderer { continue; } - if (FontConfig.enableCustomFont) { + if (FontConfig.enableCustomFont && FontConfig.enableGlyphReplacements) { String chrReplacement = GlyphReplacements.customGlyphs.get(String.valueOf(chr)); if (chrReplacement != null) { - chr = chrReplacement.charAt(0); + char replacement = chrReplacement.charAt(0); + boolean isReplacementCharAvailable = + FontProviderCustom.getPrimary().isGlyphAvailable(replacement) + || FontProviderCustom.getFallback().isGlyphAvailable(replacement); + if (isReplacementCharAvailable) { + chr = replacement; + } } } diff --git a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java index aa833fe01..f5599e2ee 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java @@ -70,4 +70,11 @@ public class FontConfig { @Config.DefaultFloat(1.5F) @Config.RangeFloat(min = 0.1F, max = 3F) public static float customFontScale; + + @Config.Comment({"Mods can provide Angelica with a mapping of special characters to either get replaced with " + + "different characters or rendered using the default Unicode font. Setting this to false disables the " + + "replacement, which is useful in cases where custom fonts have direct support for these special characters. ", + "See for additional details: https://github.com/GTNewHorizons/Angelica/issues/1239#issuecomment-3729877936"}) + @Config.DefaultBoolean(true) + public static boolean enableGlyphReplacements; }