From 5db2b248d72fa2c2aea7349c5ce283c6288bc618 Mon Sep 17 00:00:00 2001 From: Dan <104518973+alppp@users.noreply.github.com> Date: Thu, 28 May 2026 02:44:54 +0300 Subject: [PATCH] add per-segment drop shadow (&u) (#1754) Co-authored-by: Ranzu <66495944+Ranzuu@users.noreply.github.com> --- .../client/font/BatchingFontRenderer.java | 33 +++++++++++++++-- .../angelica/client/font/ColorCodeUtils.java | 11 +++++- .../angelica/config/AngelicaConfig.java | 4 ++ .../client/gui/SodiumGameOptionPages.java | 37 +++++++++++-------- .../resources/assets/angelica/lang/en_US.lang | 17 +++++++++ .../fontrenderer/MixinFontRenderer.java | 11 ++++++ 6 files changed, 93 insertions(+), 20 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 a054974e1..a328d2a05 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -560,6 +560,9 @@ public class BatchingFontRenderer { boolean curWave = false; boolean curDinnerbone = false; boolean curGradient = false; + boolean curShadow = false; + boolean curShadowCustomColor = false; + int curShadowColorOverride = 0; int gradientStartRgb = 0, gradientEndRgb = 0; int gradientCharIndex = 0, gradientTotalChars = 0; float gradientStep = 0f; @@ -651,6 +654,19 @@ public class BatchingFontRenderer { curWave = !curWave; } else if (fmtCode == 'v' && AngelicaConfig.enableDinnerboneText) { curDinnerbone = !curDinnerbone; + } else if (fmtCode == 'u' && AngelicaConfig.enableDropShadow) { + int customRgb = (charIdx + SECTION_X_LENGTH < stringEnd) + ? ColorCodeUtils.parseSectionXAt(string, charIdx + 1) + : -1; + if (customRgb != -1) { + curShadow = true; + curShadowCustomColor = true; + curShadowColorOverride = customRgb; + charIdx += SECTION_X_LENGTH; + } else { + curShadow = !curShadow; + if (!curShadow) curShadowCustomColor = false; + } } else if (fmtCode == 'g' && AngelicaConfig.enableGradients && charIdx + GRADIENT_PAYLOAD < stringEnd) { int color1 = ColorCodeUtils.parseSectionXAt(string, charIdx + 1); int color2 = ColorCodeUtils.parseSectionXAt(string, charIdx + 1 + SECTION_X_LENGTH); @@ -674,6 +690,8 @@ public class BatchingFontRenderer { curWave = false; curDinnerbone = false; curGradient = false; + curShadow = false; + curShadowCustomColor = false; curColor = color; curShadowColor = shadowColor; } @@ -682,6 +700,8 @@ public class BatchingFontRenderer { continue; } + if (chr == ColorCodeUtils.ESCAPED_AMPERSAND) { chr = '&'; } + if (FontConfig.enableCustomFont && FontConfig.enableGlyphReplacements) { final char replacement = GlyphReplacements.getReplacementGlyph(chr); if (replacement != 0) { @@ -747,13 +767,17 @@ public class BatchingFontRenderer { renderY += (float) Math.sin(visibleCharIndex * WAVE_FREQUENCY + time) * AngelicaConfig.waveAmplitude; } - if (enableShadow) { + final boolean drawShadow = enableShadow || curShadow; + if (drawShadow) { + final int effectiveShadowColor = curShadowCustomColor + ? ((curColor & 0xFF000000) | (curShadowColorOverride & 0x00FFFFFF)) + : curShadowColor; for (int n = 1; n <= shadowCopies; n++) { final float shadowOffsetPart = shadowOffset * ((float) n / shadowCopies); - pushTexRect(curX + shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz, curDinnerbone); + pushTexRect(curX + shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, effectiveShadowColor, uStart, vStart, uSz, vSz, curDinnerbone); if (curBold) { - pushTexRect(curX + 2.0f * shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz, curDinnerbone); + pushTexRect(curX + 2.0f * shadowOffsetPart, renderY + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, effectiveShadowColor, uStart, vStart, uSz, vSz, curDinnerbone); } } } @@ -775,7 +799,7 @@ public class BatchingFontRenderer { both: 4(1 + 2 * shadowCopies + boldCopies) */ int charCount = 1; - if (enableShadow) { charCount += shadowCopies * (curBold ? 2 : 1); } + if (drawShadow) { charCount += shadowCopies * (curBold ? 2 : 1); } if (curBold) { charCount += boldCopies; } final int vtxCount = 4 * charCount; pushDrawCmd(idxId, vtxCount / 2 * 3, texture, chr > 255); @@ -822,6 +846,7 @@ public class BatchingFontRenderer { } public float getCharWidthFine(char chr) { + if (chr == ColorCodeUtils.ESCAPED_AMPERSAND) { chr = '&'; } if (chr == FORMATTING_CHAR) { return -1; } if (chr == ' ' || chr == '\u00A0' || chr == '\u202F') { diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/ColorCodeUtils.java b/src/main/java/com/gtnewhorizons/angelica/client/font/ColorCodeUtils.java index 7442d8376..5e3bd95d3 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/ColorCodeUtils.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/ColorCodeUtils.java @@ -18,6 +18,7 @@ public final class ColorCodeUtils { private ColorCodeUtils() {} public static final char FORMATTING_CHAR = '§'; + public static final char ESCAPED_AMPERSAND = ''; public static final int SECTION_X_PAYLOAD = 12; public static final int SECTION_X_LENGTH = 14; @@ -25,7 +26,7 @@ public final class ColorCodeUtils { public static final int GRADIENT_LENGTH = 30; /** Valid single {@code &} codes. {@code g} is excluded; {@code &g} only converts as part of a gradient. */ - public static final String VALID_SINGLE_CODES = "0123456789abcdefklmnorqzv"; + public static final String VALID_SINGLE_CODES = "0123456789abcdefklmnorqzvu"; private static final String[] SECTION_PREFIX = new String[128]; static { @@ -87,6 +88,14 @@ public final class ColorCodeUtils { StringBuilder sb = null; int last = 0; while (idx != -1 && idx + 1 < len) { + if (idx > 0 && text.charAt(idx - 1) == '\\') { + if (sb == null) sb = new StringBuilder(len + 16); + sb.append(text, last, idx - 1); + sb.append(ESCAPED_AMPERSAND); + last = idx + 1; + idx = text.indexOf('&', last); + continue; + } if (text.charAt(idx + 1) == '#' && idx + 7 < len) { boolean validHex = true; for (int i = 2; i <= 7; i++) { diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 537a441a8..f152c6ba4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -132,6 +132,10 @@ public class AngelicaConfig { @Config.DefaultBoolean(true) public static boolean enableDinnerboneText; + @Config.Comment("Enable per-segment drop shadow toggle (&u) and colored shadow (&u&#RRGGBB)") + @Config.DefaultBoolean(true) + public static boolean enableDropShadow; + @Config.Comment("Wave text amplitude (how far characters bounce)") @Config.DefaultFloat(2.0f) @Config.RangeFloat(min = 1.0f, max = 8.0f) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index 41301f6c7..6b213a3a7 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -540,56 +540,63 @@ public class SodiumGameOptionPages { groups.add(OptionGroup.createBuilder() .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("RGB Colors") - .setTooltip("Enable hex colors via &#RRGGBB syntax") + .setName(I18n.format("options.angelica.texteffects.rgb_colors")) + .setTooltip(I18n.format("options.angelica.texteffects.rgb_colors.tooltip", "\\&#RRGGBB")) .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableRGBColors = value, opts -> AngelicaConfig.enableRGBColors) .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("Gradients") - .setTooltip("Smooth color transitions via &g&#start&#end") + .setName(I18n.format("options.angelica.texteffects.gradients")) + .setTooltip(I18n.format("options.angelica.texteffects.gradients.tooltip") + " \\&g\\&#start\\&#end") .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableGradients = value, opts -> AngelicaConfig.enableGradients) .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("Rainbow") - .setTooltip("Cycling rainbow colors via &q") + .setName(I18n.format("options.angelica.texteffects.rainbow")) + .setTooltip(I18n.format("options.angelica.texteffects.rainbow.tooltip") + " \\&q") .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableRainbow = value, opts -> AngelicaConfig.enableRainbow) .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("Wave Text") - .setTooltip("Animated bouncing text via &z") + .setName(I18n.format("options.angelica.texteffects.wave_text")) + .setTooltip(I18n.format("options.angelica.texteffects.wave_text.tooltip") + " \\&z") .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableWaveText = value, opts -> AngelicaConfig.enableWaveText) .build()) .add(OptionImpl.createBuilder(int.class, angelicaOpts) - .setName("Wave Amplitude") - .setTooltip("How far wave text bounces (default 2.0)") + .setName(I18n.format("options.angelica.texteffects.wave_amplitude")) + .setTooltip(I18n.format("options.angelica.texteffects.wave_amplitude.tooltip")) .setControl(option -> new SliderControl(option, 10, 80, 5, v -> (v / 10) + "." + (v % 10))) .setBinding((opts, value) -> AngelicaConfig.waveAmplitude = value / 10f, opts -> Math.round(AngelicaConfig.waveAmplitude * 10f)) .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("Dinnerbone Text") - .setTooltip("Flipped upside down text via &v") + .setName(I18n.format("options.angelica.texteffects.dinnerbone_text")) + .setTooltip(I18n.format("options.angelica.texteffects.dinnerbone_text.tooltip") + " \\&v") .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableDinnerboneText = value, opts -> AngelicaConfig.enableDinnerboneText) .build()) .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) - .setName("Ampersand Conversion") - .setTooltip("Convert & prefix codes to formatting codes at render time") + .setName(I18n.format("options.angelica.texteffects.drop_shadow")) + .setTooltip(I18n.format("options.angelica.texteffects.drop_shadow.tooltip", "\\&u") + " \\&u\\&#RRGGBB") + .setControl(TickBoxControl::new) + .setBinding((opts, value) -> AngelicaConfig.enableDropShadow = value, + opts -> AngelicaConfig.enableDropShadow) + .build()) + .add(OptionImpl.createBuilder(boolean.class, angelicaOpts) + .setName(I18n.format("options.angelica.texteffects.ampersand_conversion")) + .setTooltip(I18n.format("options.angelica.texteffects.ampersand_conversion.tooltip", "\\&")) .setControl(TickBoxControl::new) .setBinding((opts, value) -> AngelicaConfig.enableAmpersandConversion = value, opts -> AngelicaConfig.enableAmpersandConversion) .build()) .build()); - return new OptionPage("Text Effects", ImmutableList.copyOf(groups)); + return new OptionPage(I18n.format("sodium.options.pages.text"), ImmutableList.copyOf(groups)); } } diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 1a49cd825..869cbbf07 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -14,6 +14,7 @@ sodium.options.pages.quality=Quality sodium.options.pages.performance=Performance sodium.options.pages.advanced=Advanced sodium.options.pages.appearance=Appearance +sodium.options.pages.text=Text Effects sodium.options.view_distance.tooltip=The render distance controls how far away terrain will be rendered. Shorter distances mean that less terrain will be rendered, improving frame rates. sodium.options.simulation_distance.tooltip=The simulation distance controls how far away terrain and entities will be loaded and ticked. Shorter distances can reduce the internal server's load and may improve frame rates. sodium.options.brightness.tooltip=Controls the brightness (gamma) of the game. @@ -223,6 +224,22 @@ options.angelica.aggressiveChunkLoading=Aggressive Chunk Loading options.angelica.aggressiveChunkLoading.tooltip=Renders chunks immediately when loaded, even if neighbors aren't ready yet. Improves perceived loading speed at render distance edges. Chunks rebuild automatically when neighbors load. Useful for low render distance servers. options.angelica.disablef3=Disable F3 Additions options.angelica.disablef3.tooltip=Disables Angelica's additions to the F3 debug screen. +options.angelica.texteffects.rgb_colors=RGB Colors +options.angelica.texteffects.rgb_colors.tooltip=Enable hex colors via %s syntax +options.angelica.texteffects.gradients=Gradients +options.angelica.texteffects.gradients.tooltip=Smooth color transitions via +options.angelica.texteffects.rainbow=Rainbow +options.angelica.texteffects.rainbow.tooltip=Cycling rainbow colors via +options.angelica.texteffects.wave_text=Wave Text +options.angelica.texteffects.wave_text.tooltip=Animated bouncing text via +options.angelica.texteffects.wave_amplitude=Wave Amplitude +options.angelica.texteffects.wave_amplitude.tooltip=How far wave text bounces (default 2.0) +options.angelica.texteffects.dinnerbone_text=Dinnerbone Text +options.angelica.texteffects.dinnerbone_text.tooltip=Flipped upside down text via +options.angelica.texteffects.drop_shadow=Drop Shadow +options.angelica.texteffects.drop_shadow.tooltip=Per-segment drop shadow via %s, colored shadow via +options.angelica.texteffects.ampersand_conversion=Ampersand Conversion +options.angelica.texteffects.ampersand_conversion.tooltip=Convert %s prefix codes to formatting codes at render time sodium.options.multidraw_mode.name=Multi-Draw Mode sodium.options.multidraw_mode.tooltip=Controls how draw commands are dispatched for terrain rendering. §lDirect§r uses glMultiDrawElementsBaseVertex (default, GL 3.2+). §lIndirect§r uses GPU indirect rendering (GL 4.3+), may reduce CPU overhead on some hardware. §lIndividual§r issues individual draw calls. diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java index ff4900a67..e55c82374 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/fontrenderer/MixinFontRenderer.java @@ -292,6 +292,17 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa } else if (code >= 'k' && code <= 'o') { styles.append(ColorCodeUtils.sectionPrefix(code)); i++; + } else if (code == 'u') { + if (i + 2 + SECTION_X_LENGTH <= len && ColorCodeUtils.isValidSectionX(text, i + 2)) { + final StringBuilder cb = EXTRACT_COLOR; + cb.setLength(0); + for (int j = 0; j < 2 + SECTION_X_LENGTH; j++) cb.append(text.charAt(i + j)); + effects.append(cb); + i += 1 + SECTION_X_LENGTH; + } else { + effects.append(ColorCodeUtils.sectionPrefix(code)); + i++; + } } else if (code == 'q' || code == 'z' || code == 'v') { effects.append(ColorCodeUtils.sectionPrefix(code)); i++;