From d6a6d3b525af4a6d243cb330cff6c54814fc82e8 Mon Sep 17 00:00:00 2001 From: Death Fuel <108496936+DeathFuel@users.noreply.github.com> Date: Mon, 16 Feb 2026 03:48:51 +0100 Subject: [PATCH] Less logging + small refactor (#1379) * less logging * refactor * missed a spot * consistency --- .../client/font/FontProviderCustom.java | 84 +++++++++---------- 1 file changed, 38 insertions(+), 46 deletions(-) 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 c81bb66e0..0c57c7f3b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/FontProviderCustom.java @@ -1,6 +1,5 @@ package com.gtnewhorizons.angelica.client.font; -import com.gtnewhorizon.gtnhlib.config.ConfigurationManager; import com.gtnewhorizons.angelica.config.FontConfig; import lombok.Setter; import lombok.Value; @@ -46,7 +45,7 @@ public final class FontProviderCustom implements FontProvider { default -> null; }; if (Objects.equals(myFontName, "(none)")) { - font = null; + this.font = null; return; } int fontPos = -1; @@ -58,10 +57,10 @@ public final class FontProviderCustom implements FontProvider { } if (fontPos == -1) { LOGGER.info("Could not find previously set font \"{}\". ", myFontName); - font = null; + this.font = null; return; } - font = availableFonts[fontPos].deriveFont(currentFontQuality); + this.font = availableFonts[fontPos].deriveFont(this.currentFontQuality); } private static class InstLoader { static final FontProviderCustom instance0 = new FontProviderCustom((byte)0); @@ -71,8 +70,8 @@ public final class FontProviderCustom implements FontProvider { public static FontProviderCustom getFallback() { return InstLoader.instance1; } public void reloadFont(int fontID) { - currentFontQuality = FontConfig.customFontQuality; - font = FontStrategist.getAvailableFonts()[fontID].deriveFont(currentFontQuality); + this.currentFontQuality = FontConfig.customFontQuality; + this.font = FontStrategist.getAvailableFonts()[fontID].deriveFont(this.currentFontQuality); File[] files = new File(getFontDir()).listFiles(); if (files != null) { @@ -94,7 +93,7 @@ public final class FontProviderCustom implements FontProvider { } } - fontAtlases = new FontAtlas[ATLAS_COUNT]; + this.fontAtlases = new FontAtlas[ATLAS_COUNT]; } private String getFontDir() { @@ -134,50 +133,44 @@ public final class FontProviderCustom implements FontProvider { } void construct(Font font) { - float separator = currentFontQuality / 3f; + int atlasChars = 0; + for (int i = 0; i < ATLAS_SIZE; i++) { + final char ch = (char) (i + ATLAS_SIZE * this.id); + if (font.canDisplay(ch)) { atlasChars++; } + } + if (atlasChars == 0) { return; } BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB); Graphics2D g2d = image.createGraphics(); g2d.setFont(font); FontMetrics fm = g2d.getFontMetrics(); g2d.dispose(); - int width = 0; - int actualChars = 0; - for (int i = 0; i < ATLAS_SIZE; i++) { - final char ch = (char)(i + ATLAS_SIZE * this.id); - if (font.canDisplay(ch)) { - width += (int) (separator + fm.charWidth(ch)); - actualChars++; - } - } - if (actualChars == 0) { - return; - } - final int atlasTilesX = (int) Math.ceil(Math.sqrt(actualChars) * 1.5f); - final int atlasTilesY = (int) Math.ceil((double) actualChars / atlasTilesX); - LOGGER.info("constructing custom font atlas (ID {}) of nominal size {} chars, actual: {}, {} rows by {} columns", - this.id, ATLAS_SIZE, actualChars, atlasTilesX, atlasTilesY); - width = 0; - actualChars = 0; + + final int atlasTilesX = (int) Math.ceil(Math.sqrt(atlasChars) * 1.5f); + final int atlasTilesY = (int) Math.ceil((double) atlasChars / atlasTilesX); + final float charSeparator = currentFontQuality / 3f; + int rowWidth = 0; int maxRowWidth = 0; + atlasChars = 0; + for (int i = 0; i < ATLAS_SIZE; i++) { - if (actualChars % atlasTilesX == 0) { - maxRowWidth = Math.max(maxRowWidth, width); - width = 0; + if (atlasChars % atlasTilesX == 0) { + maxRowWidth = Math.max(maxRowWidth, rowWidth); + rowWidth = 0; } final char ch = (char)(i + ATLAS_SIZE * this.id); if (font.canDisplay(ch)) { - width += (int) (separator + fm.charWidth(ch)); - actualChars++; + rowWidth += (int) (charSeparator + fm.charWidth(ch)); + atlasChars++; } } - maxRowWidth = Math.max(maxRowWidth, width); + maxRowWidth = Math.max(maxRowWidth, rowWidth); final int lineHeight = fm.getHeight(); final float desc = fm.getDescent(); - final int imageWidth = (int) (maxRowWidth + separator); - final int imageHeight = (int) ((separator + lineHeight) * atlasTilesY + separator); + final int imageWidth = (int) (maxRowWidth + charSeparator); + final int imageHeight = (int) ((charSeparator + lineHeight) * atlasTilesY + charSeparator); image = new BufferedImage(imageWidth, imageHeight, BufferedImage.TYPE_INT_ARGB); g2d = image.createGraphics(); @@ -192,35 +185,34 @@ public final class FontProviderCustom implements FontProvider { fm = g2d.getFontMetrics(); int tileX = 0, tileY = 0; // position in atlas tiles - int imgX = (int) separator; // position in pixels + int imgX = (int) charSeparator; // position in pixels for (int i = 0; i < ATLAS_SIZE; i++) { - final char ch = (char)(i + ATLAS_SIZE * this.id); + final char ch = (char) (i + ATLAS_SIZE * this.id); if (!font.canDisplay(ch)) { continue; } if (tileX >= atlasTilesX) { tileX = 0; - imgX = (int) separator; + imgX = (int) charSeparator; tileY++; } final int charWidth = fm.charWidth(ch); final float charAspectRatio = (float) charWidth / lineHeight; final float inset = currentFontQuality / 16; - g2d.drawString(Character.toString(ch), imgX, (lineHeight + separator) * (tileY + 1) - desc); + g2d.drawString(Character.toString(ch), imgX, (lineHeight + charSeparator) * (tileY + 1) - desc); final float uStart = (float) (imgX - inset * charAspectRatio) / imageWidth; - final float vStart = ((lineHeight + separator) * (tileY + 1) - lineHeight - inset) / imageHeight; + final float vStart = ((lineHeight + charSeparator) * (tileY + 1) - lineHeight - inset) / imageHeight; final float xAdvance = charAspectRatio * 8 * charWidth / (charWidth + 2 * inset * charAspectRatio); final float glyphW = charAspectRatio * 8 + 1; final float uSz = (float) (charWidth + 2 * inset * charAspectRatio) / imageWidth; final float vSz = (float) (lineHeight + 2 * inset) / imageHeight; - glyphData[i] = new GlyphData(uStart, vStart, xAdvance, glyphW, uSz, vSz); - imgX += (int) (charWidth + separator); + this.glyphData[i] = new GlyphData(uStart, vStart, xAdvance, glyphW, uSz, vSz); + imgX += (int) (charWidth + charSeparator); tileX++; } g2d.dispose(); try { - LOGGER.info("writing custom font atlas texture ({}x{} px) to {}", imageWidth, imageHeight, getAtlasFullPath(this.id)); Files.createDirectories(Paths.get(getFontDir())); ImageIO.write(image, "png", new File(getAtlasFullPath(this.id))); } catch (IOException e) { @@ -232,18 +224,18 @@ public final class FontProviderCustom implements FontProvider { private FontAtlas getAtlas(char chr) { int id = chr / ATLAS_SIZE; - FontAtlas fa = fontAtlases[id]; + FontAtlas fa = this.fontAtlases[id]; if (fa == null) { fa = new FontAtlas(id); - fa.construct(font); + fa.construct(this.font); + this.fontAtlases[id] = fa; } - fontAtlases[id] = fa; return fa; } @Override public boolean isGlyphAvailable(char chr) { - if (font == null) { return false; } + if (this.font == null) { return false; } return (getAtlas(chr).glyphData[chr % ATLAS_SIZE] != null); }