diff --git a/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java b/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java index 21029e0..d798871 100644 --- a/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java +++ b/src/main/java/cc/fros/features/modules/client/ClickGuiModule.java @@ -16,6 +16,7 @@ import static cc.fros.features.commands.MessageSignatures.GENERAL; public class ClickGuiModule extends Module { private static ClickGuiModule INSTANCE; + public final Setting minecraftFont = bool("MinecraftFont", false); public final Setting font = str("Font", "SansSerif"); public final Setting fontSize = num("FontSize", 10, 6, 24); public final Setting prefix = str("Prefix", "."); @@ -29,7 +30,8 @@ public class ClickGuiModule extends Module { public ClickGuiModule() { super("ClickGui", "Opens the ClickGui", Module.Category.CLIENT); setBind(GLFW.GLFW_KEY_RIGHT_SHIFT); - fontSize.setVisibility(v -> !font.getValue().isEmpty()); + font.setVisibility(v -> !minecraftFont.getValue()); + fontSize.setVisibility(v -> !minecraftFont.getValue() && !font.getValue().isEmpty()); rainbowHue.setVisibility(v -> rainbow.getValue()); rainbowBrightness.setVisibility(v -> rainbow.getValue()); rainbowSaturation.setVisibility(v -> rainbow.getValue()); diff --git a/src/main/java/cc/fros/util/render/FrosFont.java b/src/main/java/cc/fros/util/render/FrosFont.java index 0e0b574..61e4c20 100644 --- a/src/main/java/cc/fros/util/render/FrosFont.java +++ b/src/main/java/cc/fros/util/render/FrosFont.java @@ -136,7 +136,8 @@ public final class FrosFont { private static void sync() { ClickGuiModule gui = ClickGuiModule.getInstance(); - String name = gui == null ? "" : gui.font.getValue(); + boolean vanilla = gui != null && gui.minecraftFont.getValue(); + String name = gui == null || vanilla ? "" : gui.font.getValue(); int size = gui == null ? 10 : gui.fontSize.getValue(); if (name == null) name = "";