Skip to content

Fixed bold italic fonts not being restored on restart #6632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dekrom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed bold italic fonts not being restored on restart #6632

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions src/main/java/meteordevelopment/meteorclient/settings/FontFaceSetting.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,24 +66,19 @@ protected CompoundTag save(CompoundTag tag) {
@Override
protected FontFace load(CompoundTag tag) {
String family = tag.getStringOr("family", "");
FontInfo.Type type;
FontInfo.Type type = FontInfo.Type.fromString(tag.getStringOr("type", ""));

try {
type = FontInfo.Type.valueOf(tag.getStringOr("type", ""));
} catch (IllegalArgumentException _) {
set(Fonts.DEFAULT_FONT);
return get();
}

boolean changed = false;
for (FontFamily fontFamily : Fonts.FONT_FAMILIES) {
if (fontFamily.getName().equals(family)) {
set(fontFamily.get(type));
changed = true;
if (!fontFamily.getName().equals(family)) continue;

FontFace face = fontFamily.get(type);
if (face != null) {
set(face);
return get();
}
}
if (!changed) set(Fonts.DEFAULT_FONT);

set(Fonts.DEFAULT_FONT);
return get();
}

Expand Down