From 75f5a689f561f2adc6852509e16974138cacb9d9 Mon Sep 17 00:00:00 2001 From: Zailer43 Date: Sat, 7 Sep 2024 14:04:38 -0300 Subject: [PATCH] Reorders the categories in the configs, adds sections, and expands `general` category --- .../zailer/me/config/FzmmConfigModel.java | 29 ++++++++++--------- .../resources/assets/fzmm/lang/en_us.json | 2 ++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/fzmm/zailer/me/config/FzmmConfigModel.java b/src/main/java/fzmm/zailer/me/config/FzmmConfigModel.java index fffc8fde..f88969bb 100644 --- a/src/main/java/fzmm/zailer/me/config/FzmmConfigModel.java +++ b/src/main/java/fzmm/zailer/me/config/FzmmConfigModel.java @@ -16,34 +16,34 @@ public class FzmmConfigModel { @Nest + @Expanded public GeneralNest general = new GeneralNest(); - + @Nest + public ColorsNest colors = new ColorsNest(); @Nest public GuiStyleNest guiStyle = new GuiStyleNest(); - @Nest - public ItemEditorBannerNest itemEditorBanner = new ItemEditorBannerNest(); - + @SectionHeader("externalAPIs") + public MineskinNest mineskin = new MineskinNest(); + @Nest + public HeadGalleryNest headGallery = new HeadGalleryNest(); + @SectionHeader("gui") @Nest - public ColorsNest colors = new ColorsNest(); + public ImagetextNest imagetext = new ImagetextNest(); @Nest - public EncryptbookNest encryptbook = new EncryptbookNest(); + public TextFormatNest textFormat = new TextFormatNest(); @Nest - public HeadGalleryNest headGallery = new HeadGalleryNest(); + public PlayerStatueNest playerStatue = new PlayerStatueNest(); + @Nest + public EncryptbookNest encryptbook = new EncryptbookNest(); @Nest public HeadGeneratorNest headGenerator = new HeadGeneratorNest(); @Nest public HistoryNest history = new HistoryNest(); @Nest - public ImagetextNest imagetext = new ImagetextNest(); - @Nest - public MineskinNest mineskin = new MineskinNest(); - @Nest - public PlayerStatueNest playerStatue = new PlayerStatueNest(); - @Nest - public TextFormatNest textFormat = new TextFormatNest(); + public ItemEditorBannerNest itemEditorBanner = new ItemEditorBannerNest(); public static class GeneralNest { public boolean disableItalic = true; @@ -141,6 +141,7 @@ public static class ColorsNest { } public static class HeadGalleryNest { + @RestartRequired public boolean cacheCategories = true; public boolean stylingHeads = true; @RangeConstraint(min = 1, max = 2500) diff --git a/src/main/resources/assets/fzmm/lang/en_us.json b/src/main/resources/assets/fzmm/lang/en_us.json index 747f5536..780e32a8 100644 --- a/src/main/resources/assets/fzmm/lang/en_us.json +++ b/src/main/resources/assets/fzmm/lang/en_us.json @@ -675,5 +675,7 @@ "text.config.fzmm.option.textFormat.maxRainbowHueStep.tooltip": "Maximum value for the step between the change of each hue in the rainbow tab,\nvery high values can cause it to not look like a rainbow.", "text.config.fzmm.option.textFormat.minRainbowHueStep": "Minimum rainbow hue step", "text.config.fzmm.option.textFormat.minRainbowHueStep.tooltip": "Minimum value for the step between the change of each hue in the rainbow tab.", + "text.config.fzmm.section.externalAPIs": "External APIs", + "text.config.fzmm.section.gui": "GUIs", "text.config.fzmm.title": "FZMM configs" }