From 64f0f38668a06a566b24e3befd2717a747b0d1d6 Mon Sep 17 00:00:00 2001 From: JFronny Date: Thu, 25 Apr 2024 19:38:45 +0200 Subject: [PATCH] fix(config-ui-tiny): use correct Text for default preset --- .../libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java | 2 +- .../libjf/config/impl/ui/tiny/presets/PresetsScreen.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java index 720759e..49686d5 100644 --- a/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java +++ b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/TinyConfigScreenFactory.java @@ -26,7 +26,7 @@ public class TinyConfigScreenFactory implements ConfigScreenFactory s.equals(CategoryBuilder.CONFIG_PRESET_DEFAULT)) && config.getReferencedConfigs().isEmpty() && config.getCategories().isEmpty()) { - EntryInfo entry = config.getEntries().get(0); + EntryInfo entry = config.getEntries().getFirst(); Type type = entry.supportsRepresentation() ? entry.getValueType() : null; if (type != null && !type.isInt() && !type.isLong() && !type.isFloat() && !type.isDouble() && !type.isString() && !type.isBool() && !type.isEnum()) { final String jsonified; diff --git a/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java index 0f845cc..f4fd02b 100644 --- a/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java +++ b/libjf-config-ui-tiny/src/client/java/io/gitlab/jfronny/libjf/config/impl/ui/tiny/presets/PresetsScreen.java @@ -2,6 +2,7 @@ package io.gitlab.jfronny.libjf.config.impl.ui.tiny.presets; import io.gitlab.jfronny.libjf.LibJf; import io.gitlab.jfronny.libjf.config.api.v2.ConfigCategory; +import io.gitlab.jfronny.libjf.config.api.v2.dsl.CategoryBuilder; import io.gitlab.jfronny.libjf.config.impl.ConfigCore; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -31,7 +32,7 @@ public class PresetsScreen extends Screen { super.init(); PresetListWidget list = new PresetListWidget(this.client, this.width, this.height, 32, 25); for (Map.Entry entry : config.getPresets().entrySet()) { - list.addButton(ButtonWidget.builder(Text.translatable(config.getTranslationPrefix() + entry.getKey()), + list.addButton(ButtonWidget.builder(CategoryBuilder.CONFIG_PRESET_DEFAULT.equals(entry.getKey()) ? Text.translatable(entry.getKey()) : Text.translatable(config.getTranslationPrefix() + entry.getKey()), button -> { LibJf.LOGGER.info("Preset selected: " + entry.getKey()); entry.getValue().run();