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 64cdf9c2d..c81bb66e0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java @@ -40,12 +40,6 @@ public final class FontProviderCustom implements FontProvider { private FontProviderCustom(byte id) { this.id = id; Font[] availableFonts = FontStrategist.getAvailableFonts(); - if (availableFonts.length == 0) { - LOGGER.fatal("There seem to be no fonts available on this system! Disabling custom font and throwing an exception in an attempt to restore the session."); - FontConfig.enableCustomFont = false; - ConfigurationManager.save(FontConfig.class); - throw new RuntimeException(); - } String myFontName = switch (this.id) { case 0 -> FontConfig.customFontNamePrimary; case 1 -> FontConfig.customFontNameFallback; 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 55471916b..4f81227ab 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontStrategist.java @@ -27,34 +27,40 @@ public class FontStrategist { public static final Logger LOGGER = LogManager.getLogger("Angelica"); static { - // get available fonts without duplicates (250 copies of dialog.plain need not apply) - Font[] availableFontsDirty = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts(); - HashMap fontSet = new HashMap<>(); - HashMultiset duplicates = HashMultiset.create(); // for debugging + if (GraphicsEnvironment.isHeadless()) { + LOGGER.warn("GraphicsEnvironment.isHeadless() returned true! Custom fonts will be unavailable. This is likely a MacOS issue."); + availableFonts = new Font[0]; + } else { + // get available fonts without duplicates (250 copies of dialog.plain need not apply) + Font[] availableFontsDirty = GraphicsEnvironment.getLocalGraphicsEnvironment().getAllFonts(); + HashMap fontSet = new HashMap<>(); + HashMultiset duplicates = HashMultiset.create(); // for debugging - for (Font font : availableFontsDirty) { - String fontName = font.getFontName(); - if (fontSet.containsKey(fontName)) { - duplicates.add(fontName); - } else { - fontSet.put(fontName, font); - } - } - - if (!duplicates.isEmpty()) { - StringBuilder sb = new StringBuilder(duplicates.size() + " duplicate font(s) found in the list reported by Java: "); - for (Iterator iter = duplicates.stream().distinct().iterator(); iter.hasNext(); ) { - String dupe = iter.next(); - sb.append(duplicates.count(dupe)).append("x ").append(dupe); - if (iter.hasNext()) { - sb.append(", "); + for (Font font : availableFontsDirty) { + String fontName = font.getFontName(); + if (fontSet.containsKey(fontName)) { + duplicates.add(fontName); + } else { + fontSet.put(fontName, font); } } - sb.append(". Some fonts may be missing from the font selection menu."); - LOGGER.warn(sb.toString()); - } - availableFonts = fontSet.values().stream().sorted(Comparator.comparing(Font::getFontName)).toArray(Font[]::new); + if (!duplicates.isEmpty()) { + StringBuilder sb = new StringBuilder(duplicates.size() + " duplicate font(s) found in the list reported by Java: "); + for (Iterator iter = duplicates.stream().distinct().iterator(); iter.hasNext(); ) { + String dupe = iter.next(); + sb.append(duplicates.count(dupe)).append("x ").append(dupe); + if (iter.hasNext()) { + sb.append(", "); + } + } + sb.append(". Some fonts may be missing from the font selection menu."); + LOGGER.warn(sb.toString()); + } + availableFonts = fontSet.values().stream().sorted(Comparator.comparing(Font::getFontName)).toArray(Font[]::new); + + LOGGER.info("Got {} fonts from GraphicsEnvironment ({} after deduplication)", availableFontsDirty.length, availableFonts.length); + } // create and add the resource pack that provides fonts HashMap packMap = new HashMap<>(); 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 0171d344a..ba35a05a2 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java @@ -29,6 +29,7 @@ public class FontConfigScreen extends GuiScreen { private final String searchPrompt; private final String testAreaPrompt; private List testAreaInfo; + private List noFontsWarning; private String currentPrimaryFontName; private String currentFallbackFontName; private FontList fontList; @@ -332,9 +333,22 @@ public class FontConfigScreen extends GuiScreen { @Override public void drawScreen(int mouseX, int mouseY, float delta) { drawBackground(0); - fontList.drawScreen(mouseX, mouseY, delta); - searchBox.drawTextBox(); - // I bet you thought this was drawn inside the search box, not on top of it. + + this.fontList.drawScreen(mouseX, mouseY, delta); + if (availableFonts.length == 0) { + if (this.noFontsWarning == null) { + this.noFontsWarning = this.fontRendererObj.listFormattedStringToWidth( + I18n.format("options.angelica.fontconfig.no_fonts_warning"), this.width / 2 + ); + } + int y = 80; + for (String s : this.noFontsWarning) { + drawCenteredString(this.fontRendererObj, s, this.width / 3, y, 0xFFFFFF); + y += this.fontRendererObj.FONT_HEIGHT; + } + } + + this.searchBox.drawTextBox(); if (!this.searchBox.isFocused() && this.searchBox.getText().isEmpty()) { this.drawCenteredString(this.fontRendererObj, this.searchPrompt, this.searchBox.xPosition + this.fontRendererObj.getStringWidth(this.searchPrompt) / 2 + 4, diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index e9d6344cb..7ad511e49 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -145,6 +145,7 @@ options.angelica.fontconfig.testareaexample=&d&lHerobrine&r was &7&m&oNOT&r &nhe options.angelica.fontconfig.disable_custom_font=Disable Custom Font options.angelica.fontconfig.enable_custom_font=Enable Custom Font options.angelica.fontconfig.reset_values=Reset Values +options.angelica.fontconfig.no_fonts_warning=Custom fonts are not available on your system. Check logs for details. options.angelica.fontconfig.font_quality=Custom Font Quality: %s options.angelica.fontconfig.shadow_offset=Shadow Offset: %s options.angelica.fontconfig.shadow_copies=Shadow Copies: %s