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 6fed6313b..979851180 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -162,6 +162,15 @@ public class BatchingFontRenderer { pushQuadIdx(vtxId); } + private void pushTexRect(float x, float y, float w, float h, float itOff, int rgba, float uStart, float vStart, float uSz, float vSz) { + final int vtxId = vtxWriterIndex; + pushVtx(x + itOff, y, rgba, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz); + pushVtx(x - itOff, y + h, rgba, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); + pushVtx(x + itOff + w, y, rgba, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz); + pushVtx(x - itOff + w, y + h, rgba, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); + pushQuadIdx(vtxId); + } + private int pushQuadIdx(int startV) { final int idx = idxWriterIndex; batchIndices.put(idx, startV); @@ -518,49 +527,44 @@ 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 int shadowCopies = FontConfig.shadowCopies; + final int boldCopies = FontConfig.boldCopies; final ResourceLocation texture = fontProvider.getTexture(chr); - - final int vtxId = vtxWriterIndex; final int idxId = idxWriterIndex; - int vtxCount = 0; - if (enableShadow) { - pushVtx(curX + itOff + shadowOffset, heightNorth + shadowOffset, curShadowColor, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX - itOff + shadowOffset, heightNorth + heightSouth + shadowOffset, curShadowColor, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F + itOff + shadowOffset, heightNorth + shadowOffset, curShadowColor, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F - itOff + shadowOffset, heightNorth + heightSouth + shadowOffset, curShadowColor, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushQuadIdx(vtxId + vtxCount); - vtxCount += 4; + 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); - if (curBold) { - final float shadowOffset2 = 2.0f * shadowOffset; - pushVtx(curX + itOff + shadowOffset2, heightNorth + shadowOffset, curShadowColor, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX - itOff + shadowOffset2, heightNorth + heightSouth + shadowOffset, curShadowColor, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F + itOff + shadowOffset2, heightNorth + shadowOffset, curShadowColor, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F - itOff + shadowOffset2, heightNorth + heightSouth + shadowOffset, curShadowColor, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushQuadIdx(vtxId + vtxCount); - vtxCount += 4; + if (curBold) { + pushTexRect(curX + 2.0f * shadowOffsetPart, heightNorth + shadowOffsetPart, glyphW - 1.0f, heightSouth, itOff, curShadowColor, uStart, vStart, uSz, vSz); + } } } - pushVtx(curX + itOff, heightNorth, curColor, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX - itOff, heightNorth + heightSouth, curColor, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F + itOff, heightNorth, curColor, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(curX + glyphW - 1.0F - itOff, heightNorth + heightSouth, curColor, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushQuadIdx(vtxId + vtxCount); - vtxCount += 4; + pushTexRect(curX, heightNorth, glyphW - 1.0f, heightSouth, itOff, curColor, uStart, vStart, uSz, vSz); if (curBold) { - pushVtx(shadowOffset + curX + itOff, heightNorth, curColor, uStart, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(shadowOffset + curX - itOff, heightNorth + heightSouth, curColor, uStart, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(shadowOffset + curX + glyphW - 1.0F + itOff, heightNorth, curColor, uStart + uSz, vStart, uStart, uStart + uSz, vStart, vStart + vSz); - pushVtx(shadowOffset + curX + glyphW - 1.0F - itOff, heightNorth + heightSouth, curColor, uStart + uSz, vStart + vSz, uStart, uStart + uSz, vStart, vStart + vSz); - pushQuadIdx(vtxId + vtxCount); - vtxCount += 4; + 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); + } } + /* + Vertex-per-char counts for different configurations + default: 4 + shadow only: 4(1 + shadowCopies) + bold only: 4(1 + boldCopies) + both: 4(1 + 2 * shadowCopies + boldCopies) + */ + int charCount = 1; + if (enableShadow) { charCount += shadowCopies * (curBold ? 2 : 1); } + if (curBold) { charCount += boldCopies; } + final int vtxCount = 4 * charCount; pushDrawCmd(idxId, vtxCount / 2 * 3, texture, chr > 255); + curX += (xAdvance + (curBold ? shadowOffset : 0.0f)) + getGlyphSpacing(); underlineEndX = curX; strikethroughEndX = curX; 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 f9f7b6a51..2a97e92cf 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/gui/FontConfigScreen.java @@ -11,6 +11,7 @@ import net.minecraft.client.gui.GuiSlot; import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.resources.I18n; +import net.minecraft.util.MathHelper; import org.lwjgl.input.Keyboard; import java.awt.Font; @@ -26,6 +27,8 @@ public class FontConfigScreen extends GuiScreen { private final GuiScreen parent; private final String title; private final String searchPrompt; + private final String testAreaPrompt; + private List testAreaInfo; private String currentPrimaryFontName; private String currentFallbackFontName; private FontList fontList; @@ -33,10 +36,31 @@ public class FontConfigScreen extends GuiScreen { private int selectedFallbackFontListPos = -1; private ArrayList displayedFonts; private GuiTextField searchBox; + private GuiTextField testArea; + private int sliderPages = 0; + private int displayedSliderPage = 0; + private final int sliderWidth = 160; + private final int sliderHeight = 20; + + // need to save these separately + private IrisButton fwdButton; + private IrisButton backButton; + + SliderClone.Option optFontQuality = new SliderClone.Option(6, 72, 6); + SliderClone.Option optShadowOffset = new SliderClone.Option(0, 2, 0.05f); + SliderClone.Option optShadowCopies = new SliderClone.Option(1, 8, 1); + SliderClone.Option optBoldCopies = new SliderClone.Option(1, 8, 1); + SliderClone.Option optGlyphAspect = new SliderClone.Option(-1, 1, 0.05f); + SliderClone.Option optGlyphScale = new SliderClone.Option(0.1f, 3, 0.05f); + SliderClone.Option optWhitespaceScale = new SliderClone.Option(0.1f, 3, 0.05f); + 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); public FontConfigScreen(GuiScreen parent) { this.title = I18n.format("options.angelica.fontconfig.title"); this.searchPrompt = I18n.format("options.angelica.fontconfig.searchprompt"); + this.testAreaPrompt = I18n.format("options.angelica.fontconfig.testareaprompt"); this.parent = parent; this.currentPrimaryFontName = FontConfig.customFontNamePrimary; this.currentFallbackFontName = FontConfig.customFontNameFallback; @@ -51,65 +75,175 @@ public class FontConfigScreen extends GuiScreen { } } - SliderClone.Option optFontQuality = new SliderClone.Option(6, 72, 6); - SliderClone.Option optShadowOffset = new SliderClone.Option(0, 2, 0.05f); - SliderClone.Option optGlyphAspect = new SliderClone.Option(-1, 1, 0.05f); - SliderClone.Option optGlyphScale = new SliderClone.Option(0.1f, 3, 0.05f); - SliderClone.Option optWhitespaceScale = new SliderClone.Option(0.1f, 3, 0.05f); - 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); - public void initGui() { Keyboard.enableRepeatEvents(true); searchBox = new GuiTextField(this.fontRendererObj, this.width / 2 - 120, 24, 240, 20); searchBox.setMaxStringLength(64); fontList = new FontList(); + testArea = new GuiTextField(this.fontRendererObj, this.width * 5 / 6 - this.width / 7, 63 - 10, this.width * 2 / 7, 20); + testArea.setMaxStringLength(512); + testArea.setText(I18n.format("options.angelica.fontconfig.testareaexample")); initButtons(); } private void initButtons() { - this.buttonList.add(new IrisButton(this.width / 2 - 81 - 165, this.height - 20 - 7, 162, 20, + final int halfWidth = this.width / 2; + final int sliderSpacing = 4; + + final int x1 = halfWidth - sliderWidth - sliderSpacing; + final int x2 = halfWidth; + final int x3 = halfWidth + sliderWidth + sliderSpacing; + final int y3 = this.height - 65 + 2 * (sliderHeight + sliderSpacing); + + this.buttonList.add(new IrisButton(x1 - sliderWidth / 2, y3 - sliderHeight / 2, sliderWidth, sliderHeight, FontConfig.enableCustomFont ? I18n.format("options.angelica.fontconfig.disable_custom_font") : I18n.format("options.angelica.fontconfig.enable_custom_font"), this::toggleCustomFont)); - this.buttonList.add(new IrisButton(this.width / 2 - 80, this.height - 20 - 7, 160, 20, + this.buttonList.add(new IrisButton(x2 - sliderWidth / 2, y3 - sliderHeight / 2, sliderWidth, sliderHeight, I18n.format("options.angelica.fontconfig.reset_values"), this::resetValues)); - this.buttonList.add(new IrisButton(this.width / 2 - 81 + 165, this.height - 20 - 7, 162, 20, + this.buttonList.add(new IrisButton(x3 - sliderWidth / 2, y3 - sliderHeight / 2, sliderWidth, sliderHeight, I18n.format("gui.done"), button -> this.onClose())); - // might refactor later, feeling too lazy at the moment - this.buttonList.add(new SliderClone( this.width / 2 - 60 - 186, this.height - 40 - 11, 120, 20, - optFontQuality, FontConfig.customFontQuality, this::setFontQuality, - value -> I18n.format("options.angelica.fontconfig.font_quality", String.format("%2.0f", value)), - "options.angelica.fontconfig.font_quality.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 - 186, this.height - 60 - 15, 120, 20, - optShadowOffset, FontConfig.fontShadowOffset, value -> FontConfig.fontShadowOffset = value, - value -> I18n.format("options.angelica.fontconfig.shadow_offset", String.format("x%3.2f", value)), - "options.angelica.fontconfig.shadow_offset.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 - 62, this.height - 40 - 11, 120, 20, - optGlyphAspect, FontConfig.glyphAspect, value -> FontConfig.glyphAspect = value, - value -> I18n.format("options.angelica.fontconfig.glyph_aspect", String.format("%3.2f", value)), - "options.angelica.fontconfig.glyph_aspect.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 - 62, this.height - 60 - 15, 120, 20, - optGlyphScale, FontConfig.glyphScale, value -> FontConfig.glyphScale = value, - value -> I18n.format("options.angelica.fontconfig.glyph_scale", String.format("x%3.2f", value)), - "options.angelica.fontconfig.glyph_scale.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 + 62, this.height - 40 - 11, 120, 20, - optWhitespaceScale, FontConfig.whitespaceScale, value -> FontConfig.whitespaceScale = value, - value -> I18n.format("options.angelica.fontconfig.whitespace_scale", String.format("x%3.2f", value)), - "options.angelica.fontconfig.whitespace_scale.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 + 62, this.height - 60 - 15, 120, 20, - optGlyphSpacing, FontConfig.glyphSpacing, value -> FontConfig.glyphSpacing = value, - value -> I18n.format("options.angelica.fontconfig.glyph_spacing", String.format("%3.2f", value)), - "options.angelica.fontconfig.glyph_spacing.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 + 186, this.height - 40 - 11, 120, 20, - optFontAAStrength, FontConfig.fontAAStrength, value -> FontConfig.fontAAStrength = value.intValue(), - value -> I18n.format("options.angelica.fontconfig.font_aa_strength", String.format("%.0f", value)), - "options.angelica.fontconfig.font_aa_strength.tooltip")); - this.buttonList.add(new SliderClone( this.width / 2 - 60 + 186, this.height - 60 - 15, 120, 20, - optFontAAMode, FontConfig.fontAAMode, value -> FontConfig.fontAAMode = value.intValue(), - this::fontAAModeFormat, - "options.angelica.fontconfig.aamode.tooltip")); + backButton = new IrisButton(halfWidth - 20 - 224, this.height - 89 - 10, 40, 20, + "<", button -> this.switchPage(-1)); + fwdButton = new IrisButton(halfWidth - 20 + 224, this.height - 89 - 10, 40, 20, + ">", button -> this.switchPage(1)); + this.buttonList.add(fwdButton); + this.buttonList.add(backButton); + + initSliders(); + } + + private void initSliders() { + ArrayList sliders = new ArrayList<>(); + + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optFontQuality) + .initialValue(FontConfig.customFontQuality) + .setter(this::setFontQuality) + .langKey("options.angelica.fontconfig.font_quality") + .formatString("%2.0f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optShadowOffset) + .initialValue(FontConfig.fontShadowOffset) + .setter(value -> FontConfig.fontShadowOffset = value) + .langKey("options.angelica.fontconfig.shadow_offset") + .formatString("x%3.2f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optGlyphAspect) + .initialValue(FontConfig.glyphAspect) + .setter(value -> FontConfig.glyphAspect = value) + .langKey("options.angelica.fontconfig.glyph_aspect") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optGlyphScale) + .initialValue(FontConfig.glyphScale) + .setter(value -> FontConfig.glyphScale = value) + .langKey("options.angelica.fontconfig.glyph_scale") + .formatString("x%3.2f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optFontAAStrength) + .initialValue(FontConfig.fontAAStrength) + .setter(value -> FontConfig.fontAAStrength = value.intValue()) + .langKey("options.angelica.fontconfig.font_aa_strength") + .formatString("%.0f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optFontAAMode) + .initialValue(FontConfig.fontAAMode) + .setter(value -> FontConfig.fontAAMode = value.intValue()) + .formatter(this::fontAAModeFormat) + .langKey("options.angelica.fontconfig.aamode") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optWhitespaceScale) + .initialValue(FontConfig.whitespaceScale) + .setter(value -> FontConfig.whitespaceScale = value) + .langKey("options.angelica.fontconfig.whitespace_scale") + .formatString("x%3.2f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optGlyphSpacing) + .initialValue(FontConfig.glyphSpacing) + .setter(value -> FontConfig.glyphSpacing = value) + .langKey("options.angelica.fontconfig.glyph_spacing") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optShadowCopies) + .initialValue(FontConfig.shadowCopies) + .setter(value -> FontConfig.shadowCopies = value.intValue()) + .langKey("options.angelica.fontconfig.shadow_copies") + .formatString("%.0f") + .build() + ); + sliders.add(new SliderClone.SliderCloneBuilder() + .width(sliderWidth) + .height(sliderHeight) + .option(optBoldCopies) + .initialValue(FontConfig.boldCopies) + .setter(value -> FontConfig.boldCopies = value.intValue()) + .langKey("options.angelica.fontconfig.bold_copies") + .formatString("%.0f") + .build() + ); + + final int halfWidth = this.width / 2; + final int sliderSpacing = 4; + + final int x1 = halfWidth - sliderWidth - sliderSpacing; + final int x2 = halfWidth; + final int x3 = halfWidth + sliderWidth + sliderSpacing; + final int y1 = this.height - 65; + final int y2 = this.height - 65 + sliderHeight + sliderSpacing; + + this.sliderPages = sliders.size() / 6; + this.displayedSliderPage = Math.min(this.displayedSliderPage, this.sliderPages); + + this.backButton.enabled = (this.displayedSliderPage != 0); + this.fwdButton.enabled = (this.displayedSliderPage != this.sliderPages); + + final int start = 6 * this.displayedSliderPage; + final int end = Math.min(6 * (this.displayedSliderPage + 1), sliders.size()); + List s = sliders.subList(start, end); + try { + s.get(0).setCenterPosition(x1, y1); + s.get(1).setCenterPosition(x1, y2); + s.get(2).setCenterPosition(x2, y1); + s.get(3).setCenterPosition(x2, y2); + s.get(4).setCenterPosition(x3, y1); + s.get(5).setCenterPosition(x3, y2); + } catch (IndexOutOfBoundsException ignored) { + // we're on the last page and it has less than 6 sliders to display + } + this.buttonList.addAll(s); } private void onClose() { @@ -141,6 +275,8 @@ public class FontConfigScreen extends GuiScreen { } catch (ConfigException e) { throw new RuntimeException(e); } + currentPrimaryFontName = null; + currentFallbackFontName = null; selectedPrimaryFontListPos = -1; selectedFallbackFontListPos = -1; FontStrategist.customFontInUse = false; @@ -156,6 +292,12 @@ public class FontConfigScreen extends GuiScreen { I18n.format("options.angelica.fontconfig.enable_custom_font"); } + private void switchPage(int offset) { + this.displayedSliderPage = MathHelper.clamp_int(this.displayedSliderPage + offset, 0, this.sliderPages); + this.buttonList.removeIf(guiButton -> guiButton instanceof SliderClone); + this.initSliders(); + } + private int qualityLast = FontConfig.customFontQuality; private void setFontQuality(float quality) { @@ -179,7 +321,7 @@ public class FontConfigScreen extends GuiScreen { private long lastStillTime = 0; @Override public void drawScreen(int mouseX, int mouseY, float delta) { - super.drawDefaultBackground(); + 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. @@ -191,6 +333,34 @@ public class FontConfigScreen extends GuiScreen { drawCenteredString(this.fontRendererObj, this.title, (int) (this.width * 0.5), 8, 0xFFFFFF); drawCenteredString(this.fontRendererObj, I18n.format("options.angelica.fontconfig.currentfonts", FontConfig.customFontNamePrimary, FontConfig.customFontNameFallback), (int) (this.width * 0.5), this.height - 92, 0xFFFFFF); + + if (this.testAreaInfo == null) { + this.testAreaInfo = this.fontRendererObj.listFormattedStringToWidth( + I18n.format("options.angelica.fontconfig.testareainfo"), this.width / 4 + ); + } + int cumulativeY = 73; + for (String s : this.testAreaInfo) { + drawCenteredString(this.fontRendererObj, s, this.width * 5 / 6, cumulativeY, 0xFFFFFF); + cumulativeY += this.fontRendererObj.FONT_HEIGHT; + } + cumulativeY += 4; + this.testArea.yPosition = cumulativeY; + this.testArea.drawTextBox(); + if (!this.testArea.isFocused() && this.testArea.getText().isEmpty()) { + this.drawCenteredString(this.fontRendererObj, this.testAreaPrompt, + this.testArea.xPosition + this.fontRendererObj.getStringWidth(this.testAreaPrompt) / 2 + 4, + this.testArea.yPosition + this.testArea.height / 2 - 4, 0xFFFFFF); + } + List testText = this.fontRendererObj.listFormattedStringToWidth( + this.testArea.getText().replace('&', '§'), this.width / 4 + ); + cumulativeY += this.testArea.height + 4; + for (String s : testText) { + drawCenteredString(this.fontRendererObj, s, this.width * 5 / 6, cumulativeY, 0xFFFFFF); + cumulativeY += this.fontRendererObj.FONT_HEIGHT; + } + super.drawScreen(mouseX, mouseY, delta); for (GuiButton guiButton : buttonList) { @@ -235,10 +405,18 @@ public class FontConfigScreen extends GuiScreen { if (this.searchBox.isFocused()) { if (keyCode == Keyboard.KEY_ESCAPE) { this.searchBox.setFocused(false); + return; } this.searchBox.textboxKeyTyped(typedChar, keyCode); this.displayedFonts = filterFonts(this.searchBox.getText().toLowerCase()); } + if (this.testArea.isFocused()) { + if (keyCode == Keyboard.KEY_ESCAPE) { + this.testArea.setFocused(false); + return; + } + this.testArea.textboxKeyTyped(typedChar, keyCode); + } if (keyCode == Keyboard.KEY_ESCAPE) { this.onClose(); } @@ -248,12 +426,14 @@ public class FontConfigScreen extends GuiScreen { protected void mouseClicked(int mouseX, int mouseY, int mouseButton) { super.mouseClicked(mouseX, mouseY, mouseButton); this.searchBox.mouseClicked(mouseX, mouseY, mouseButton); + this.testArea.mouseClicked(mouseX, mouseY, mouseButton); this.fontList.mouseClicked(mouseX, mouseY, mouseButton); } @Override public void updateScreen() { this.searchBox.updateCursorCounter(); + this.testArea.updateCursorCounter(); } // this could be more efficient, but it's good enough as is @@ -281,7 +461,7 @@ public class FontConfigScreen extends GuiScreen { class FontList extends GuiSlot { public FontList() { - super(FontConfigScreen.this.mc, FontConfigScreen.this.width, FontConfigScreen.this.height, 52, FontConfigScreen.this.height - 100, 18); + super(FontConfigScreen.this.mc, FontConfigScreen.this.width * 2 / 3, FontConfigScreen.this.height, 52, FontConfigScreen.this.height - 102, 18); } private void mouseClicked(int mouseX, int mouseY, int mouseButton) { @@ -328,7 +508,7 @@ public class FontConfigScreen extends GuiScreen { @Override protected int getScrollBarX() { - return this.width * 11 / 12 - 5; + return this.width * 15 / 16 - 5; } @Override @@ -340,7 +520,7 @@ public class FontConfigScreen extends GuiScreen { protected void elementClicked(int index, boolean doubleClicked, int mouseX, int mouseY) {} protected void drawBackground() { - drawDefaultBackground(); + // do nothing, the font list doesn't occupy the entire screen } protected void drawSlot(int index, int x, int y, int p_148126_4_, Tessellator tessellator, int p_148126_6_, int p_148126_7_) { diff --git a/src/main/java/com/gtnewhorizons/angelica/client/gui/SliderClone.java b/src/main/java/com/gtnewhorizons/angelica/client/gui/SliderClone.java index d94d815b1..14fe5369d 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/gui/SliderClone.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/gui/SliderClone.java @@ -1,8 +1,11 @@ package com.gtnewhorizons.angelica.client.gui; import lombok.AllArgsConstructor; +import lombok.Setter; +import lombok.experimental.Accessors; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.resources.I18n; import org.lwjgl.opengl.GL11; import java.util.function.Consumer; @@ -43,6 +46,53 @@ public class SliderClone extends GuiButton { this.tooltipKey = tooltipKey; } + public static SliderCloneBuilder builder() { + return new SliderCloneBuilder(); + } + + public void setCenterPosition(int x, int y) { + this.xPosition = x - this.width / 2; + this.yPosition = y - this.height / 2; + } + + @Accessors(fluent = true) @Setter + public static class SliderCloneBuilder { + private int x = 0, y = 0; // center position, not a corner + private int width = 144, height = 20; + private Option option; + private float initialValue; + private Consumer setter; + private String formatString = "%3.2f"; + private String langKey; + + // overrides: if null, these get set to default values + private String tooltipKey; + private Function formatter; + + public SliderClone build() { + if (this.formatter == null) { + this.formatter = value -> I18n.format(this.langKey, String.format(this.formatString, value)); + } + + if (this.tooltipKey == null) { + this.tooltipKey = this.langKey + ".tooltip"; + } + + return new SliderClone( + this.x - this.width / 2, + this.y - this.height / 2, + this.width, + this.height, + this.option, + this.initialValue, + this.setter, + this.formatter, + this.tooltipKey + ); + } + } + + /** * Returns 0 if the button is disabled, 1 if the mouse is NOT hovering over this button and 2 if it IS hovering over * this button. diff --git a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java index 6bbe9618d..e9c2d3416 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/FontConfig.java @@ -26,6 +26,16 @@ public class FontConfig { @Config.RangeFloat(min = 0F, max = 2F) public static float fontShadowOffset; + @Config.Comment("The number of shadows to be drawn behind text at various offsets.") + @Config.DefaultInt(1) + @Config.RangeInt(min = 1, max = 8) + public static int shadowCopies; + + @Config.Comment("The number of bold copies to be drawn behind text at various offsets.") + @Config.DefaultInt(2) + @Config.RangeInt(min = 1, max = 8) + public static int boldCopies; + @Config.Comment("Influences the aspect ratio of each glyph.") @Config.DefaultFloat(0F) @Config.RangeFloat(min = -1F, max = 1F) diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 9749ea6b6..d1e8fd3b3 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -139,11 +139,16 @@ options.angelica.fontconfig=Font Configuration... options.angelica.fontconfig.title=Font Configuration options.angelica.fontconfig.currentfonts=Primary font: §e%s§r Fallback font: §b%s options.angelica.fontconfig.searchprompt=§7§oSearch fonts... +options.angelica.fontconfig.testareaprompt=§7§oTest area... +options.angelica.fontconfig.testareainfo=Enter text below to see how it renders. Use & for formatting. +options.angelica.fontconfig.testareaexample=&d&lHerobrine&r was &7&m&oNOT&r &nhere 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.font_quality=Custom Font Quality: %s options.angelica.fontconfig.shadow_offset=Shadow Offset: %s +options.angelica.fontconfig.shadow_copies=Shadow Copies: %s +options.angelica.fontconfig.bold_copies=Bold Copies: %s options.angelica.fontconfig.glyph_scale=Glyph Scale: %s options.angelica.fontconfig.glyph_aspect=Glyph Aspect: %s options.angelica.fontconfig.whitespace_scale=Whitespace Size: %s @@ -153,7 +158,9 @@ 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.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; turn this down if you see double text. +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. +options.angelica.fontconfig.bold_copies.tooltip=The number of text copies drawn when rendering bold text. Can improve the appearance of bold text with thinner custom fonts. options.angelica.fontconfig.glyph_scale.tooltip=The scale of each individual glyph. Extreme values might make your game unplayable. options.angelica.fontconfig.glyph_aspect.tooltip=The aspect ratio of each individual glyph. options.angelica.fontconfig.whitespace_scale.tooltip=The scaling factor of blank characters like spaces.