From 422cb5f368dc9bba76e71a1572b90244c7c20eee Mon Sep 17 00:00:00 2001 From: Korben <92390626+mpustovoi@users.noreply.github.com> Date: Sun, 23 Feb 2025 12:48:02 +0300 Subject: [PATCH 01/51] Create `ru_ru.json` Parity with `en_us.json`. --- .../resources/assets/midnightlib/lang/ru_ru.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 common/src/main/resources/assets/midnightlib/lang/ru_ru.json diff --git a/common/src/main/resources/assets/midnightlib/lang/ru_ru.json b/common/src/main/resources/assets/midnightlib/lang/ru_ru.json new file mode 100644 index 0000000..fde22c3 --- /dev/null +++ b/common/src/main/resources/assets/midnightlib/lang/ru_ru.json @@ -0,0 +1,15 @@ +{ + "midnightlib.overview.title": "Обзор MidnightConfig", + "midnightlib.midnightconfig.title": "Конфигурация MidnightLib", + "midnightlib.midnightconfig.config_screen_list": "Включить список экранов настройки", + "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aДа", + "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cНет", + "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", + "midnightlib.midnightconfig.background_texture": "Текстура фона экрана настройки", + "midnightlib.modrinth": "Modrinth", + "midnightlib.curseforge": "CurseForge", + "midnightlib.wiki": "Вики", + "modmenu.descriptionTranslation.midnightlib": "Общая библиотека для простой настройки.\nПредоставляет API настройки, автоматическую интеграцию с другими модами и распространённые утилиты.", + "modmenu.summaryTranslation.midnightlib": "Общая библиотека для простой настройки.", + "midnightconfig.colorChooser.title": "Выберите цвет" +} From 30fb35f807cee52a1a9f1334e642cd7aa896acf4 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 20 Mar 2025 20:40:36 +0100 Subject: [PATCH 02/51] feat: minimal custom type adapter for Identifiers - Needed for MC 1.21.5+ (The official Serializer was removed) --- .../java/eu/midnightdust/lib/config/MidnightConfig.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 8591097..a827883 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -1,8 +1,8 @@ package eu.midnightdust.lib.config; import com.google.common.collect.Lists; -import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mojang.blaze3d.systems.RenderSystem; +import com.google.gson.*; import com.google.gson.stream.*; import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; @@ -19,6 +19,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.Color; +import java.io.IOException; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.nio.file.Files; import java.nio.file.Path; @@ -76,8 +77,10 @@ public abstract class MidnightConfig { private static final Gson gson = new GsonBuilder() .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE) .addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()) - .registerTypeAdapter(Identifier.class, new Identifier.Serializer()) - .setPrettyPrinting().create(); + .registerTypeAdapter(Identifier.class, new TypeAdapter() { + public void write(JsonWriter out, Identifier id) throws IOException { out.value(id.toString()); } + public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); } + }).setPrettyPrinting().create(); @SuppressWarnings("unused") // Utility for mod authors public static @Nullable Object getDefaultValue(String modid, String entry) { From 32822e60ed44f3b1dfdf8278479c71ccca279682 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 20 Mar 2025 20:46:43 +0100 Subject: [PATCH 03/51] clean: remove blend functions - No longer needed since 1.21.3 and not available in 1.21.5 --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index a827883..47b2f9d 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -1,7 +1,6 @@ package eu.midnightdust.lib.config; import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; import com.google.gson.*; import com.google.gson.stream.*; import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -428,9 +427,7 @@ public abstract class MidnightConfig { @Override protected void drawHeaderAndFooterSeparators(DrawContext context) { if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); - else { RenderSystem.enableBlend(); - context.drawTexture(RenderLayer::getGuiTextured, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0.0F, 0.0F, this.getWidth(), 2, 32, 2); - RenderSystem.disableBlend(); } + else context.drawTexture(RenderLayer::getGuiTextured, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2); } public void addButton(List buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); } public void clear() { this.clearEntries(); } From 7902042a4490c8814063ac867eac32b8ba8fce19 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 20 Mar 2025 21:12:28 +0100 Subject: [PATCH 04/51] refactor: identifier item display - Now in the list entry render method - Also fixes z-overlap --- .../midnightdust/lib/config/MidnightConfig.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 47b2f9d..275f435 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -406,17 +406,10 @@ public abstract class MidnightConfig { } @Override public void render(DrawContext context, int mouseX, int mouseY, float delta) { - super.render(context,mouseX,mouseY,delta); + super.render(context, mouseX, mouseY, delta); this.list.render(context, mouseX, mouseY, delta); if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF); - - if (this.list != null) { - for (ButtonEntry entry : this.list.children()) { - if (entry.buttons != null && entry.buttons.size() > 1) { - if (entry.buttons.getFirst() instanceof ClickableWidget widget) { - int idMode = entry.info.field.getAnnotation(Entry.class).idMode(); - if (idMode != -1) context.drawItem(idMode == 0 ? Registries.ITEM.get(Identifier.tryParse(entry.info.tempValue)).getDefaultStack() : Registries.BLOCK.get(Identifier.tryParse(entry.info.tempValue)).asItem().getDefaultStack(), widget.getX() + widget.getWidth() - 18, widget.getY() + 2); - }}}}} + } } @Environment(EnvType.CLIENT) public static class MidnightConfigListWidget extends ElementListWidget { @@ -460,6 +453,11 @@ public abstract class MidnightConfig { boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY(); if (tooltipVisible && title.getTooltip() != null) context.drawOrderedTooltip(textRenderer, title.getTooltip().getLines(MinecraftClient.getInstance()), mouseX, mouseY); + + if (!this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) { + int idMode = this.info.field.getAnnotation(Entry.class).idMode(); + if (idMode != -1) context.drawItem(idMode == 0 ? Registries.ITEM.get(Identifier.tryParse(this.info.tempValue)).getDefaultStack() : Registries.BLOCK.get(Identifier.tryParse(this.info.tempValue)).asItem().getDefaultStack(), widget.getX() + widget.getWidth() - 18, y + 2); + } } } public List children() {return Lists.newArrayList(buttons);} From 5da96ac84e240be77aec60d3995a7f5abbcca74a Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 20 Mar 2025 22:56:52 +0100 Subject: [PATCH 05/51] chore: bump version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index a1e95cc..13ede76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ org.gradle.jvmargs=-Xmx4096M minecraft_version=1.21.4 -supported_versions= +supported_versions=1.21.5 yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.6.9 +mod_version=1.6.10 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From 060ca3389a43ed141816ded4979e7dbabf4146eb Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 26 Mar 2025 17:44:35 +0100 Subject: [PATCH 06/51] clean: various code improvements --- .../lib/config/MidnightConfig.java | 128 ++++++++---------- gradle.properties | 4 +- 2 files changed, 62 insertions(+), 70 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 275f435..0e078ea 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -28,7 +28,7 @@ import java.util.regex.Pattern; import static net.minecraft.client.MinecraftClient.IS_SYSTEM_MAC; -/** MidnightConfig v2.6.0 by Martin "Motschen" Prokoph +/** MidnightConfig by Martin "Motschen" Prokoph * Single class config library - feel free to copy! * Based on ... * Credits to Minenash */ @@ -42,17 +42,26 @@ public abstract class MidnightConfig { private static final List entries = new ArrayList<>(); public static class EntryInfo { - Field field; + public Entry entry; + public Comment comment; + final Field field; Class dataType; - int width, listIndex; - boolean centered; + int listIndex; Object defaultValue, value, function; - String modid, tempValue; // The value visible in the config screen + String modid, fieldName, tempValue = ""; // The value visible in the config screen boolean inLimits = true; Text name, error; ClickableWidget actionButton; // color picker button / explorer button Tab tab; + public EntryInfo(Field field) { + this.field = field; + if (field != null) { + this.fieldName = field.getName(); + this.entry = field.getAnnotation(Entry.class); + this.comment = field.getAnnotation(Comment.class); + } + } public void setValue(Object value) { if (this.field.getType() != List.class) { this.value = value; this.tempValue = value.toString(); @@ -63,6 +72,9 @@ public abstract class MidnightConfig { if (this.field.getType() != List.class) return this.value.toString(); else try { return ((List) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";} } + public void updateFieldValue() { + try { this.field.set(null, this.value); } catch (IllegalAccessException ignored) {} + } public void writeList(int index, T value) { var list = (List) this.value; if (index >= list.size()) list.add(value); @@ -75,7 +87,7 @@ public abstract class MidnightConfig { private static final Gson gson = new GsonBuilder() .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE) - .addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()) + .addSerializationExclusionStrategy(new NonEntryExclusionStrategy()) .registerTypeAdapter(Identifier.class, new TypeAdapter() { public void write(JsonWriter out, Identifier id) throws IOException { out.value(id.toString()); } public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); } @@ -87,37 +99,35 @@ public abstract class MidnightConfig { if (modid.equals(e.modid) && entry.equals(e.field.getName())) return e.defaultValue; } return null; } + public static void loadValuesFromJson(String modid) { + try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } + catch (Exception e) { write(modid); } + for (EntryInfo info : entries) if (info.field != null && info.entry != null) { + try { info.value = info.field.get(null); info.tempValue = info.toTemporaryValue(); + } catch (IllegalAccessException ignored) {} + } + } public static void init(String modid, Class config) { path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"); configClass.put(modid, config); for (Field field : config.getFields()) { - EntryInfo info = new EntryInfo(); + EntryInfo info = new EntryInfo(field); if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class) && PlatformFunctions.isClientEnv()) initClient(modid, field, info); if (field.isAnnotationPresent(Entry.class)) try { info.defaultValue = field.get(null); } catch (IllegalAccessException ignored) {} } - try { gson.fromJson(Files.newBufferedReader(path), config); } - catch (Exception e) { write(modid); } - - for (EntryInfo info : entries) { - if (info.field.isAnnotationPresent(Entry.class)) try { - info.value = info.field.get(null); - info.tempValue = info.toTemporaryValue(); - } catch (IllegalAccessException ignored) {} - } + loadValuesFromJson(modid); } @SuppressWarnings("ConstantValue") //pertains to requiredModLoaded @Environment(EnvType.CLIENT) private static void initClient(String modid, Field field, EntryInfo info) { info.dataType = getUnderlyingType(field); - Entry e = field.getAnnotation(Entry.class); - Comment c = field.getAnnotation(Comment.class); - info.width = e != null ? e.width() : 0; - info.field = field; info.modid = modid; + Entry e = info.entry; Comment c = info.comment; + info.modid = modid; boolean requiredModLoaded = true; if (e != null) { @@ -146,7 +156,6 @@ public abstract class MidnightConfig { }, func); }} else if (c != null) { if (!c.requiredMod().isEmpty()) requiredModLoaded = PlatformFunctions.isModLoaded(c.requiredMod()); - info.centered = c.centered(); } if (requiredModLoaded) entries.add(info); } @@ -158,12 +167,10 @@ public abstract class MidnightConfig { } catch (NoSuchFieldException | IllegalAccessException ignored) { return rawType; } } public static Tooltip getTooltip(EntryInfo info, boolean isButton) { - String key = info.modid + ".midnightconfig."+info.field.getName()+(!isButton ? ".label" : "" )+".tooltip"; + String key = info.modid + ".midnightconfig."+info.fieldName+(!isButton ? ".label" : "" )+".tooltip"; return Tooltip.of(isButton && info.error != null ? info.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty()); } - // TODO: Maybe move this into the screen class itself to free up some RAM? - private static void textField(EntryInfo info, Function f, Pattern pattern, double min, double max, boolean cast) { boolean isNumber = pattern != null; info.function = (BiFunction>) (t, b) -> s -> { @@ -190,7 +197,7 @@ public abstract class MidnightConfig { else info.setValue(isNumber ? value : s); } - if (info.field.getAnnotation(Entry.class).isColor()) { + if (info.entry.isColor()) { if (!s.contains("#")) s = '#' + s; if (!HEXADECIMAL_ONLY.matcher(s).matches()) return false; try { info.actionButton.setMessage(Text.literal("⬛").setStyle(Style.EMPTY.withColor(Color.decode(info.tempValue).getRGB()))); @@ -219,20 +226,17 @@ public abstract class MidnightConfig { super(Text.translatable(modid + ".midnightconfig." + "title")); this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; - loadValues(); + loadValuesFromJson(modid); - for (EntryInfo e : entries) { - if (e.modid.equals(modid)) { - String tabId = e.field.isAnnotationPresent(Entry.class) ? e.field.getAnnotation(Entry.class).category() : e.field.getAnnotation(Comment.class).category(); - String name = translationPrefix + "category." + tabId; - if (!I18n.hasTranslation(name) && tabId.equals("default")) - name = translationPrefix + "title"; - if (!tabs.containsKey(name)) { - Tab tab = new GridScreenTab(Text.translatable(name)); - e.tab = tab; - tabs.put(name, tab); - } else e.tab = tabs.get(name); - } + for (EntryInfo e : entries) if (e.modid.equals(modid)) { + String tabId = e.entry != null ? e.entry.category() : e.comment.category(); + String name = translationPrefix + "category." + tabId; + if (!I18n.hasTranslation(name) && tabId.equals("default")) + name = translationPrefix + "title"; + if (!tabs.containsKey(name)) { + Tab tab = new GridScreenTab(Text.translatable(name)); + e.tab = tab; tabs.put(name, tab); + } else e.tab = tabs.get(name); } tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build(); tabNavigation.selectTab(0, false); @@ -259,7 +263,7 @@ public abstract class MidnightConfig { list.setScrollY(0); } scrollProgress = list.getScrollY(); - for (EntryInfo info : entries) try {info.field.set(null, info.value);} catch (IllegalAccessException ignored) {} + for (EntryInfo info : entries) info.updateFieldValue(); updateButtons(); } public void updateButtons() { @@ -271,16 +275,6 @@ public abstract class MidnightConfig { if (entry.buttons.get(1) instanceof ButtonWidget button) button.active = !Objects.equals(entry.info.value.toString(), entry.info.defaultValue.toString()); }}}} - public void loadValues() { - try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } - catch (Exception e) { write(modid); } - - for (EntryInfo info : entries) { - if (info.field.isAnnotationPresent(Entry.class)) - try { info.value = info.field.get(null); info.tempValue = info.toTemporaryValue(); - } catch (IllegalAccessException ignored) {} - } - } @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { if (this.tabNavigation.trySwitchTabsWithKey(keyCode)) return true; @@ -288,7 +282,7 @@ public abstract class MidnightConfig { } @Override public void close() { - loadValues(); cleanup(); + loadValuesFromJson(modid); cleanup(); Objects.requireNonNull(client).setScreen(parent); } private void cleanup() { @@ -304,7 +298,7 @@ public abstract class MidnightConfig { this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close()).dimensions(this.width / 2 - 154, this.height - 26, 150, 20).build()); done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> { - for (EntryInfo info : entries) if (info.modid.equals(modid)) try { info.field.set(null, info.value); } catch (IllegalAccessException ignored) {} + for (EntryInfo info : entries) if (info.modid.equals(modid)) info.updateFieldValue(); write(modid); cleanup(); Objects.requireNonNull(client).setScreen(parent); }).dimensions(this.width / 2 + 4, this.height - 26, 150, 20).build()); @@ -316,7 +310,7 @@ public abstract class MidnightConfig { public void fillList() { for (EntryInfo info : entries) { if (info.modid.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) { - Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.field.getName())); + Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.fieldName)); TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { info.value = info.defaultValue; info.listIndex = 0; info.tempValue = info.toTemporaryValue(); @@ -326,12 +320,12 @@ public abstract class MidnightConfig { if (info.function != null) { ClickableWidget widget; - Entry e = info.field.getAnnotation(Entry.class); + Entry e = info.entry; if (info.function instanceof Map.Entry) { // Enums & booleans var values = (Map.Entry>) info.function; if (info.dataType.isEnum()) - values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString())); + values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); } else if (e.isSlider()) @@ -339,7 +333,7 @@ public abstract class MidnightConfig { else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); if (widget instanceof TextFieldWidget textField) { - textField.setMaxLength(info.width); textField.setText(info.tempValue); + textField.setMaxLength(e.width()); textField.setText(info.tempValue); Predicate processor = ((BiFunction>) info.function).apply(textField, done); textField.setTextPredicate(processor); } @@ -375,10 +369,10 @@ public abstract class MidnightConfig { button -> new Thread(() -> { JFileChooser fileChooser = new JFileChooser(info.tempValue); fileChooser.setFileSelectionMode(e.selectionMode()); fileChooser.setDialogType(e.fileChooserType()); - fileChooser.setDialogTitle(Text.translatable(translationPrefix + info.field.getName() + ".fileChooser").getString()); + fileChooser.setDialogTitle(Text.translatable(translationPrefix + info.fieldName + ".fileChooser").getString()); if ((e.selectionMode() == JFileChooser.FILES_ONLY || e.selectionMode() == JFileChooser.FILES_AND_DIRECTORIES) && Arrays.stream(e.fileExtensions()).noneMatch("*"::equals)) fileChooser.setFileFilter(new FileNameExtensionFilter( - Text.translatable(translationPrefix + info.field.getName() + ".fileFilter").getString(), e.fileExtensions())); + Text.translatable(translationPrefix + info.fieldName + ".fileFilter").getString(), e.fileExtensions())); if (fileChooser.showDialog(null, null) == JFileChooser.APPROVE_OPTION) { info.setValue(fileChooser.getSelectedFile().getAbsolutePath()); list.clear(); fillList(); @@ -436,7 +430,7 @@ public abstract class MidnightConfig { public ButtonEntry(List buttons, Text text, EntryInfo info) { this.buttons = buttons; this.text = text; this.info = info; - if (info != null) this.centered = info.centered; + if (info != null && info.comment != null) this.centered = info.comment.centered(); int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth(); if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) { @@ -454,8 +448,8 @@ public abstract class MidnightConfig { boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY(); if (tooltipVisible && title.getTooltip() != null) context.drawOrderedTooltip(textRenderer, title.getTooltip().getLines(MinecraftClient.getInstance()), mouseX, mouseY); - if (!this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) { - int idMode = this.info.field.getAnnotation(Entry.class).idMode(); + if (info.entry != null && !this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) { + int idMode = this.info.entry.idMode(); if (idMode != -1) context.drawItem(idMode == 0 ? Registries.ITEM.get(Identifier.tryParse(this.info.tempValue)).getDefaultStack() : Registries.BLOCK.get(Identifier.tryParse(this.info.tempValue)).asItem().getDefaultStack(), widget.getX() + widget.getWidth() - 18, y + 2); } } @@ -467,7 +461,7 @@ public abstract class MidnightConfig { private final EntryInfo info; private final Entry e; public MidnightSliderWidget(int x, int y, int width, int height, Text text, double value, EntryInfo info) { super(x, y, width, height, text, value); - this.e = info.field.getAnnotation(Entry.class); + this.e = info.entry; this.info = info; } @@ -481,6 +475,10 @@ public abstract class MidnightConfig { else if (info.dataType == float.class) info.setValue(Math.round((e.min() + value * (e.max() - e.min())) * (float) e.precision()) / (float) e.precision()); } } + public static class NonEntryExclusionStrategy implements ExclusionStrategy { + public boolean shouldSkipClass(Class clazz) { return false; } + public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; } + } /** * Entry Annotation
@@ -524,8 +522,7 @@ public abstract class MidnightConfig { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {} /** - * Hides the entry in config screens, but still makes it - * accessible through the command {@code /midnightconfig MOD_ID ENTRY} and directly editing the config file. + * Hides the entry in config screens, but still makes it accessible through the command {@code /midnightconfig MOD_ID ENTRY} and directly editing the config file. */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Server {} @@ -541,9 +538,4 @@ public abstract class MidnightConfig { String category() default "default"; String requiredMod() default ""; } - - public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy { - public boolean shouldSkipClass(Class clazz) { return false; } - public boolean shouldSkipField(FieldAttributes fieldAttributes) { return fieldAttributes.getAnnotation(Entry.class) == null; } - } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 13ede76..0ed0255 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ org.gradle.jvmargs=-Xmx4096M minecraft_version=1.21.4 -supported_versions=1.21.5 +supported_versions= yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.6.10 +mod_version=1.6.11 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From 465af9507e949fd6a72059b7de9d69eeb86f3435 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 26 Mar 2025 19:08:10 +0100 Subject: [PATCH 07/51] clean: optimize translation files & metadata --- .../assets/midnightlib/lang/de_de.json | 2 -- .../assets/midnightlib/lang/en_us.json | 2 -- .../assets/midnightlib/lang/fr_fr.json | 1 - .../assets/midnightlib/lang/ms_my.json | 5 ----- .../assets/midnightlib/lang/pt_br.json | 1 - .../assets/midnightlib/lang/ru_ru.json | 6 +----- .../assets/midnightlib/lang/tt_ru.json | 1 - .../assets/midnightlib/lang/uk_ua.json | 1 - .../assets/midnightlib/lang/zh_cn.json | 5 ----- .../assets/midnightlib/lang/zh_tw.json | 1 - .../assets/midnightlib/lang/zlm_arab.json | 4 ---- fabric/src/main/resources/fabric.mod.json | 17 +++++------------ 12 files changed, 6 insertions(+), 40 deletions(-) diff --git a/common/src/main/resources/assets/midnightlib/lang/de_de.json b/common/src/main/resources/assets/midnightlib/lang/de_de.json index cd0da97..2afbf42 100755 --- a/common/src/main/resources/assets/midnightlib/lang/de_de.json +++ b/common/src/main/resources/assets/midnightlib/lang/de_de.json @@ -2,8 +2,6 @@ "midnightlib.overview.title":"MidnightConfig Übersicht", "midnightlib.midnightconfig.title":"MidnightLib Konfiguration", "midnightlib.midnightconfig.config_screen_list":"Konfigurationsübersicht", - "modmenu.descriptionTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration.\nStellt eine Konfigurationsschnittstelle, automatische Kompatibilität und oft genutzten Code bereit.", "modmenu.summaryTranslation.midnightlib": "Code-Bibliothek für einfache Konfiguration.", - "midnightconfig.colorChooser.title": "Wähle eine Farbe" } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/en_us.json b/common/src/main/resources/assets/midnightlib/lang/en_us.json index 8579b86..d81ceab 100755 --- a/common/src/main/resources/assets/midnightlib/lang/en_us.json +++ b/common/src/main/resources/assets/midnightlib/lang/en_us.json @@ -8,8 +8,6 @@ "midnightlib.modrinth":"Modrinth", "midnightlib.curseforge":"CurseForge", "midnightlib.wiki":"Wiki", - "modmenu.descriptionTranslation.midnightlib": "Common Library for easy configuration.\nProvides a config api, automatic integration with other mods and common utils.", "modmenu.summaryTranslation.midnightlib": "Common Library for easy configuration.", - "midnightconfig.colorChooser.title": "Choose a color" } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/fr_fr.json b/common/src/main/resources/assets/midnightlib/lang/fr_fr.json index 49e7a92..5898303 100644 --- a/common/src/main/resources/assets/midnightlib/lang/fr_fr.json +++ b/common/src/main/resources/assets/midnightlib/lang/fr_fr.json @@ -4,6 +4,5 @@ "midnightlib.midnightconfig.config_screen_list":"Activer la liste de l'écran de configuration", "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aOui", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNon", - "modmenu.descriptionTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust.\nFournit une API de configuration, une intégration automatique avec d'autres mods et des utilitaires courants.", "modmenu.summaryTranslation.midnightlib": "Bibliothèque commune pour les mods de la Team MidnightDust." } diff --git a/common/src/main/resources/assets/midnightlib/lang/ms_my.json b/common/src/main/resources/assets/midnightlib/lang/ms_my.json index a2b0533..6a5e177 100644 --- a/common/src/main/resources/assets/midnightlib/lang/ms_my.json +++ b/common/src/main/resources/assets/midnightlib/lang/ms_my.json @@ -4,10 +4,5 @@ "midnightlib.midnightconfig.config_screen_list": "Dayakan Senarai Skrin Konfigurasi", "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aYa", "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cTidak", - "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", - "midnightlib.modrinth": "Modrinth", - "midnightlib.curseforge": "CurseForge", - "midnightlib.wiki": "Wiki", - "modmenu.descriptionTranslation.midnightlib": "Pustaka Biasa untuk konfigurasi mudah.\nMenyediakan API konfigurasi, integrasi automatik dengan mod lain dan utiliti biasa.", "modmenu.summaryTranslation.midnightlib": "Pustaka Biasa untuk konfigurasi mudah." } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/pt_br.json b/common/src/main/resources/assets/midnightlib/lang/pt_br.json index 3a47a49..08262fc 100644 --- a/common/src/main/resources/assets/midnightlib/lang/pt_br.json +++ b/common/src/main/resources/assets/midnightlib/lang/pt_br.json @@ -4,6 +4,5 @@ "midnightlib.midnightconfig.config_screen_list":"Ativar lista de telas de configuração", "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aVerdadeiro", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cFalso", - "modmenu.descriptionTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust.\nFornece uma API de configuração, integração automática com outros mods e utilitários comuns.", "modmenu.summaryTranslation.midnightlib": "Biblioteca comum para mods do Team MidnightDust." } \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/ru_ru.json b/common/src/main/resources/assets/midnightlib/lang/ru_ru.json index fde22c3..614b28e 100644 --- a/common/src/main/resources/assets/midnightlib/lang/ru_ru.json +++ b/common/src/main/resources/assets/midnightlib/lang/ru_ru.json @@ -5,11 +5,7 @@ "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aДа", "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cНет", "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", - "midnightlib.midnightconfig.background_texture": "Текстура фона экрана настройки", - "midnightlib.modrinth": "Modrinth", - "midnightlib.curseforge": "CurseForge", "midnightlib.wiki": "Вики", - "modmenu.descriptionTranslation.midnightlib": "Общая библиотека для простой настройки.\nПредоставляет API настройки, автоматическую интеграцию с другими модами и распространённые утилиты.", "modmenu.summaryTranslation.midnightlib": "Общая библиотека для простой настройки.", "midnightconfig.colorChooser.title": "Выберите цвет" -} +} \ No newline at end of file diff --git a/common/src/main/resources/assets/midnightlib/lang/tt_ru.json b/common/src/main/resources/assets/midnightlib/lang/tt_ru.json index 9118e46..c06a27d 100644 --- a/common/src/main/resources/assets/midnightlib/lang/tt_ru.json +++ b/common/src/main/resources/assets/midnightlib/lang/tt_ru.json @@ -5,6 +5,5 @@ "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aӘйе", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cЮк", "midnightlib.wiki":"Вики", - "modmenu.descriptionTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә.\nКөйләүләр API-ын, башка модлар белән автоматик интеграцияне, гомуми хезмәти программаларны һәм бизәнүләрне тәэмин ителә.", "modmenu.summaryTranslation.midnightlib": "MidnightDust төркеменең модлары өчен гомуми китапханә." } diff --git a/common/src/main/resources/assets/midnightlib/lang/uk_ua.json b/common/src/main/resources/assets/midnightlib/lang/uk_ua.json index 41e542f..b785e26 100644 --- a/common/src/main/resources/assets/midnightlib/lang/uk_ua.json +++ b/common/src/main/resources/assets/midnightlib/lang/uk_ua.json @@ -3,6 +3,5 @@ "midnightlib.midnightconfig.title":"Конфігурація MidnightLib", "midnightlib.midnightconfig.config_screen_list":"Увімкнути список екрана конфігурації", "midnightlib.wiki":"Вікі", - "modmenu.descriptionTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust.\nНадає конфігураційний API, автоматичну інтеграцію з іншими модами, загальні утиліти та косметику.", "modmenu.summaryTranslation.midnightlib": "Загальна бібліотека для модів команди MidnightDust." } diff --git a/common/src/main/resources/assets/midnightlib/lang/zh_cn.json b/common/src/main/resources/assets/midnightlib/lang/zh_cn.json index 6ac0bd2..6dc1df7 100644 --- a/common/src/main/resources/assets/midnightlib/lang/zh_cn.json +++ b/common/src/main/resources/assets/midnightlib/lang/zh_cn.json @@ -5,11 +5,6 @@ "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§a是", "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§c否", "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§b模组菜单", - "midnightlib.modrinth":"Modrinth", - "midnightlib.curseforge":"CurseForge", - "midnightlib.wiki":"Wiki", - "modmenu.descriptionTranslation.midnightlib": "本模组是一个便于模组配置的通用库模组。\n提供了一个配置接口,能够自动与其他模组兼容,还提供了一些通用功能。", "modmenu.summaryTranslation.midnightlib": "一个便于模组配置的通用库模组", - "midnightconfig.colorChooser.title": "选择一种颜色" } diff --git a/common/src/main/resources/assets/midnightlib/lang/zh_tw.json b/common/src/main/resources/assets/midnightlib/lang/zh_tw.json index 9b689cb..e710f86 100644 --- a/common/src/main/resources/assets/midnightlib/lang/zh_tw.json +++ b/common/src/main/resources/assets/midnightlib/lang/zh_tw.json @@ -6,6 +6,5 @@ "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§c否", "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§b模組選單", "midnightlib.wiki":"維基", - "modmenu.descriptionTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。\n提供設定 API、與其他模組自動整合、常用工具和美觀。", "modmenu.summaryTranslation.midnightlib": "MidnightDust 團隊的常用程式庫模組。" } diff --git a/common/src/main/resources/assets/midnightlib/lang/zlm_arab.json b/common/src/main/resources/assets/midnightlib/lang/zlm_arab.json index 8538914..ddd1a99 100644 --- a/common/src/main/resources/assets/midnightlib/lang/zlm_arab.json +++ b/common/src/main/resources/assets/midnightlib/lang/zlm_arab.json @@ -4,10 +4,6 @@ "midnightlib.midnightconfig.config_screen_list": "داياکن سناراي سکرين کونفيݢوراسي", "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aيا", "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cتيدق", - "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", - "midnightlib.modrinth": "Modrinth", - "midnightlib.curseforge": "CurseForge", "midnightlib.wiki": "ويکي", - "modmenu.descriptionTranslation.midnightlib": "ڤوستاک بياسا اونتوق کونفيݢوراسي موده.\nمڽدياکن API کونفيݢوراسي⹁ اينتݢراسي اٴوتوماتيک دڠن مود لاٴين دان اوتيليتي بياسا.", "modmenu.summaryTranslation.midnightlib": "ڤوستاک بياسا اونتوق کونفيݢوراسي موده." } \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ea1ee35..1d3ecd3 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -10,13 +10,8 @@ "TeamMidnightDust" ], "contributors": [ - { - "name": "Jaffe2718", - "contact": { - "email": "qqyttwqeei@163.com", - "homepage": "https://space.bilibili.com/1671742926" - } - } + "maloryware", + "Jaffe2718" ], "contact": { "homepage": "https://www.midnightdust.eu/", @@ -51,11 +46,9 @@ "custom": { "modmenu": { "links": { - "modmenu.discord": "https://discord.midnightdust.eu/", - "modmenu.website": "https://www.midnightdust.eu/", - "midnightlib.curseforge": "https://www.curseforge.com/minecraft/mc-mods/midnightlib", - "midnightlib.modrinth": "https://modrinth.com/mod/midnightlib", - "midnightlib.wiki": "https://github.com/TeamMidnightDust/MidnightLib/wiki" + "modmenu.discord": "http://discord.midnightdust.eu/", + "modmenu.website": "https://midnightdust.eu/midnightlib", + "midnightlib.wiki": "https://midnightdust.eu/wiki/midnightlib" }, "badges": [ "library" ] } From 2abf9040a77fa1b9d34b0df12bc27400fb318e31 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 27 Mar 2025 23:30:03 +0100 Subject: [PATCH 08/51] feat: conditions! + large cleanup --- .../lib/config/MidnightConfig.java | 96 +++++++++++++------ .../example/config/MidnightConfigExample.java | 28 ++++++ .../resources/assets/modid/lang/en_us.json | 3 +- 3 files changed, 95 insertions(+), 32 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 0e078ea..27021b1 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -40,27 +40,34 @@ public abstract class MidnightConfig { private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)"); private static final List entries = new ArrayList<>(); + private static boolean reloadScreen = false; public static class EntryInfo { public Entry entry; public Comment comment; - final Field field; - Class dataType; + public Condition condition; + public final Field field; + public final Class dataType; + public final String modid, fieldName; int listIndex; Object defaultValue, value, function; - String modid, fieldName, tempValue = ""; // The value visible in the config screen + String tempValue; // The value visible in the config screen boolean inLimits = true; Text name, error; ClickableWidget actionButton; // color picker button / explorer button Tab tab; + boolean conditionsMet = true; - public EntryInfo(Field field) { - this.field = field; + public EntryInfo(Field field, String modid) { + this.field = field; this.modid = modid; if (field != null) { - this.fieldName = field.getName(); - this.entry = field.getAnnotation(Entry.class); - this.comment = field.getAnnotation(Comment.class); + this.fieldName = field.getName(); this.dataType = getUnderlyingType(field); + this.entry = field.getAnnotation(Entry.class); this.comment = field.getAnnotation(Comment.class); this.condition = field.getAnnotation(Condition.class); + } else { + this.fieldName = ""; this.dataType = null; } + if (entry != null && !entry.name().isEmpty()) this.name = Text.translatable(entry.name()); + else if (comment != null && !comment.name().isEmpty()) this.name = Text.translatable(comment.name()); } public void setValue(Object value) { if (this.field.getType() != List.class) { this.value = value; @@ -73,7 +80,19 @@ public abstract class MidnightConfig { else try { return ((List) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";} } public void updateFieldValue() { - try { this.field.set(null, this.value); } catch (IllegalAccessException ignored) {} + try { if (this.field.get(null) != value) updateConditions(tempValue); + this.field.set(null, this.value); + } catch (IllegalAccessException ignored) {} + } + @SuppressWarnings("ConstantValue") //pertains to requiredModLoaded + public void updateConditions(String newTempValue) { + for (EntryInfo info : entries) { + boolean prevConditionState = info.conditionsMet; + if (info.condition != null && ((info.condition.requiredOption().contains(":") ? "" : info.modid + ":") + info.condition.requiredOption()).equals(this.modid + ":" + this.fieldName)) + info.conditionsMet = Objects.equals(info.condition.requiredValue(), newTempValue); + if (info.condition != null && !info.condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(info.condition.requiredModId())) info.conditionsMet = false; + if (prevConditionState != info.conditionsMet) reloadScreen = true; + } } public void writeList(int index, T value) { var list = (List) this.value; @@ -105,6 +124,7 @@ public abstract class MidnightConfig { for (EntryInfo info : entries) if (info.field != null && info.entry != null) { try { info.value = info.field.get(null); info.tempValue = info.toTemporaryValue(); + info.updateConditions(info.tempValue); } catch (IllegalAccessException ignored) {} } } @@ -113,7 +133,7 @@ public abstract class MidnightConfig { configClass.put(modid, config); for (Field field : config.getFields()) { - EntryInfo info = new EntryInfo(field); + EntryInfo info = new EntryInfo(field, modid); if ((field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) && !field.isAnnotationPresent(Server.class) && !field.isAnnotationPresent(Hidden.class) && PlatformFunctions.isClientEnv()) initClient(modid, field, info); if (field.isAnnotationPresent(Entry.class)) @@ -122,19 +142,10 @@ public abstract class MidnightConfig { } loadValuesFromJson(modid); } - @SuppressWarnings("ConstantValue") //pertains to requiredModLoaded @Environment(EnvType.CLIENT) private static void initClient(String modid, Field field, EntryInfo info) { - info.dataType = getUnderlyingType(field); - Entry e = info.entry; Comment c = info.comment; - info.modid = modid; - boolean requiredModLoaded = true; - + Entry e = info.entry; if (e != null) { - if (!e.requiredMod().isEmpty()) requiredModLoaded = PlatformFunctions.isModLoaded(e.requiredMod()); - - if (!requiredModLoaded) return; - if (!e.name().isEmpty()) info.name = Text.translatable(e.name()); if (info.dataType == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true); else if (info.dataType == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false); else if (info.dataType == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false); @@ -154,10 +165,9 @@ public abstract class MidnightConfig { int index = values.indexOf(info.value) + 1; info.value = values.get(index >= values.size() ? 0 : index); button.setMessage(func.apply(info.value)); }, func); - }} else if (c != null) { - if (!c.requiredMod().isEmpty()) requiredModLoaded = PlatformFunctions.isModLoaded(c.requiredMod()); + } } - if (requiredModLoaded) entries.add(info); + entries.add(info); } public static Class getUnderlyingType(Field field) { Class rawType = field.getType(); @@ -259,12 +269,12 @@ public abstract class MidnightConfig { super.tick(); if (prevTab != null && prevTab != tabManager.getCurrentTab()) { prevTab = tabManager.getCurrentTab(); - this.list.clear(); fillList(); - list.setScrollY(0); + updateList(); list.setScrollY(0); } scrollProgress = list.getScrollY(); for (EntryInfo info : entries) info.updateFieldValue(); updateButtons(); + if (reloadScreen) { updateList(); reloadScreen = false; } } public void updateButtons() { if (this.list != null) { @@ -307,14 +317,18 @@ public abstract class MidnightConfig { this.addSelectableChild(this.list); fillList(); if (tabs.size() > 1) list.renderHeaderSeparator = false; } + public void updateList() { + this.list.clear(); fillList(); + } public void fillList() { for (EntryInfo info : entries) { + if (!info.conditionsMet && info.condition != null && !info.condition.visibleButLocked()) continue; if (info.modid.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) { Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.fieldName)); TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { info.value = info.defaultValue; info.listIndex = 0; info.tempValue = info.toTemporaryValue(); - list.clear(); fillList(); + updateList(); }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build(); resetButton.setPosition(width - 205 + 150 + 25, 0); @@ -348,7 +362,7 @@ public abstract class MidnightConfig { if (info.listIndex > values.size()) info.listIndex = 0; info.tempValue = info.toTemporaryValue(); if (info.listIndex == values.size()) info.tempValue = ""; - list.clear(); fillList(); + updateList(); })).dimensions(width - 185, 0, 20, 20).build(); } if (e.isColor()) { @@ -357,7 +371,7 @@ public abstract class MidnightConfig { Color newColor = JColorChooser.showDialog(null, Text.translatable("midnightconfig.colorChooser.title").getString(), Color.decode(!Objects.equals(info.tempValue, "") ? info.tempValue : "#FFFFFF")); if (newColor != null) { info.setValue("#" + Integer.toHexString(newColor.getRGB()).substring(2)); - list.clear(); fillList(); + updateList(); } }).start() ).dimensions(width - 185, 0, 20, 20).build(); @@ -375,13 +389,14 @@ public abstract class MidnightConfig { Text.translatable(translationPrefix + info.fieldName + ".fileFilter").getString(), e.fileExtensions())); if (fileChooser.showDialog(null, null) == JFileChooser.APPROVE_OPTION) { info.setValue(fileChooser.getSelectedFile().getAbsolutePath()); - list.clear(); fillList(); + updateList(); } }).start(), true ).texture(Identifier.of("midnightlib", "icon/explorer"), 12, 12).dimension(20, 20).build(); explorerButton.setPosition(width - 185, 0); info.actionButton = explorerButton; } + if (!info.conditionsMet) widget.active = false; List widgets = Lists.newArrayList(widget, resetButton); if (info.actionButton != null) { if (IS_SYSTEM_MAC) info.actionButton.active = false; @@ -516,7 +531,7 @@ public abstract class MidnightConfig { boolean isSlider() default false; int precision() default 100; String category() default "default"; - String requiredMod() default ""; + @Deprecated String requiredMod() default ""; } @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Client {} @@ -536,6 +551,25 @@ public abstract class MidnightConfig { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment { boolean centered() default false; String category() default "default"; - String requiredMod() default ""; + String name() default ""; + @Deprecated String requiredMod() default ""; + } + /** + * Condition Annotation
+ * - {@link Condition#requiredModId()}: The id of a mod that is required to be loaded.
+ * - {@link Condition#requiredOption()}: The {@link Field} which will be used to check the condition. Can also access options of other MidnightLib mods ("modid:optionName").
+ * - {@link Condition#requiredValue()}: The value that {@link Condition#requiredOption()} should be set to for the condition to be met.
+ * - {@link Condition#visibleButLocked()}: The behaviour to take when {@link Condition#requiredModId} is not loaded + * or {@link Condition#requiredOption()} returns a value that is not {@link Condition#requiredValue()}.
+ * true – Option is visible, but not editable
+ * false – Option is completely hidden + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + public @interface Condition { + String requiredModId() default ""; + String requiredOption() default ""; + String requiredValue() default "true"; + boolean visibleButLocked() default false; } } \ No newline at end of file diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 12d29c2..bee921b 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -17,6 +17,7 @@ public class MidnightConfigExample extends MidnightConfig { public static final String SLIDERS = "sliders"; public static final String LISTS = "lists"; public static final String FILES = "files"; + public static final String CONDITIONS = "conditions"; @Comment(category = TEXT) public static Comment text1; // Comments are rendered like an option without a button and are excluded from the config file @Comment(category = TEXT, centered = true) public static Comment text2; // Centered comments are the same as normal ones - just centered! @@ -69,5 +70,32 @@ public class MidnightConfigExample extends MidnightConfig { name = "I am a mf file/directory list!") public static List fileOrDirectoryList = new ArrayList<>(); // Yes, that's right – you can even have lists of files/directories + @Condition(requiredModId = "midnightlib") // Conditional options are here! + @Entry(category = CONDITIONS, name="Turn me on!") + public static boolean turnMeOn = false; + @Condition(requiredOption = "modid:turnMeOn", visibleButLocked = true) + @Entry(category = CONDITIONS, name="Turn me off!") + public static Boolean turnMeOff = true; + @Condition(requiredOption = "modid:turnMeOff", requiredValue = "false") + @Entry(category = CONDITIONS, name="Which is the best modloader?") + public static String bestModloader = ""; + @Condition(requiredOption = "bestModloader", requiredValue = "Forge") + @Comment(category = CONDITIONS, name="❌ You have bad taste :(", centered = true) // Don't take this too seriously btw :) + public static Comment answerForge; // Comments can also be conditional! + @Condition(requiredOption = "bestModloader", requiredValue = "NeoForge") + @Comment(category = CONDITIONS, name="⛏ Not quite, but it's alright!", centered = true) + public static Comment answerNeoforge; + @Condition(requiredOption = "bestModloader", requiredValue = "Fabric") + @Comment(category = CONDITIONS, name="⭐ Correct! Fabric (and Quilt) are the best!", centered = true) + public static Comment answerFabric; + @Condition(requiredOption = "bestModloader", requiredValue = "Quilt") + @Comment(category = CONDITIONS, name="⭐ Correct! Quilt (and Fabric) are the best!", centered = true) + public static Comment answerQuilt; + + @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") // Access options of other mods that are also using MidnightLib + @Comment(category = CONDITIONS) public static Comment spaceracer; + @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") + @Comment(category = CONDITIONS, name="You disabled MidnightLib's config screen list. Why? :(", centered = true) public static Comment why; + public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored } \ No newline at end of file diff --git a/test-fabric/src/main/resources/assets/modid/lang/en_us.json b/test-fabric/src/main/resources/assets/modid/lang/en_us.json index 8ac67dd..463f00b 100644 --- a/test-fabric/src/main/resources/assets/modid/lang/en_us.json +++ b/test-fabric/src/main/resources/assets/modid/lang/en_us.json @@ -20,5 +20,6 @@ "modid.midnightconfig.category.text": "Text", "modid.midnightconfig.category.sliders": "Sliders", "modid.midnightconfig.category.lists": "Lists", - "modid.midnightconfig.category.files": "Files" + "modid.midnightconfig.category.files": "Files", + "modid.midnightconfig.category.conditions": "Quiz" } \ No newline at end of file From ebcafa6b0910b0355113a8a2f7ee54fbff720894 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 27 Mar 2025 23:36:48 +0100 Subject: [PATCH 09/51] chore: bump version 1.7.0, baby! --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 0ed0255..beb5c67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.6.11 +mod_version=1.7.0 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From faf8c199b443eb5dbcd963c465823fbe9cca75e4 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Wed, 2 Apr 2025 22:00:54 +0800 Subject: [PATCH 10/51] fix bug: the `@Condition` does not trigger in real-time to update the menu UI --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 27021b1..79874f5 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -163,7 +163,9 @@ public abstract class MidnightConfig { }; info.function = new AbstractMap.SimpleEntry>(button -> { int index = values.indexOf(info.value) + 1; - info.value = values.get(index >= values.size() ? 0 : index); button.setMessage(func.apply(info.value)); + //info.value = values.get(index >= values.size() ? 0 : index); button.setMessage(func.apply(info.value)); + info.setValue(values.get(index >= values.size() ? 0 : index)); + button.setMessage(func.apply(info.value)); }, func); } } From 6eceaded3a6e2f6a086e86f8c747c7ed252477ec Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Thu, 3 Apr 2025 11:13:19 +0800 Subject: [PATCH 11/51] fix bugs: The condition update algorithm is chaotic and does not work properly when the condition values conflict new features: multi-conditions config is supported --- .../lib/config/MidnightConfig.java | 60 ++++++++++++++----- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 79874f5..63b263f 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -14,12 +14,13 @@ import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.Color; import java.io.IOException; -import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import java.lang.annotation.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.nio.file.Files; import java.nio.file.Path; import java.util.*; @@ -45,7 +46,8 @@ public abstract class MidnightConfig { public static class EntryInfo { public Entry entry; public Comment comment; - public Condition condition; +// @ApiStatus.Obsolete public Condition condition; + public Condition[] conditions; public final Field field; public final Class dataType; public final String modid, fieldName; @@ -61,8 +63,13 @@ public abstract class MidnightConfig { public EntryInfo(Field field, String modid) { this.field = field; this.modid = modid; if (field != null) { - this.fieldName = field.getName(); this.dataType = getUnderlyingType(field); - this.entry = field.getAnnotation(Entry.class); this.comment = field.getAnnotation(Comment.class); this.condition = field.getAnnotation(Condition.class); + this.fieldName = field.getName(); + this.dataType = getUnderlyingType(field); + this.entry = field.getAnnotation(Entry.class); + this.comment = field.getAnnotation(Comment.class); + // TODO: use multiple annotations +// this.condition = field.getAnnotation(Condition.class); + this.conditions = field.getAnnotationsByType(Condition.class); } else { this.fieldName = ""; this.dataType = null; } @@ -80,19 +87,30 @@ public abstract class MidnightConfig { else try { return ((List) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";} } public void updateFieldValue() { - try { if (this.field.get(null) != value) updateConditions(tempValue); + try { + if (this.field.get(null) != value) entries.forEach(EntryInfo::updateConditions); this.field.set(null, this.value); } catch (IllegalAccessException ignored) {} } @SuppressWarnings("ConstantValue") //pertains to requiredModLoaded - public void updateConditions(String newTempValue) { - for (EntryInfo info : entries) { - boolean prevConditionState = info.conditionsMet; - if (info.condition != null && ((info.condition.requiredOption().contains(":") ? "" : info.modid + ":") + info.condition.requiredOption()).equals(this.modid + ":" + this.fieldName)) - info.conditionsMet = Objects.equals(info.condition.requiredValue(), newTempValue); - if (info.condition != null && !info.condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(info.condition.requiredModId())) info.conditionsMet = false; - if (prevConditionState != info.conditionsMet) reloadScreen = true; + public void updateConditions() { + boolean prevConditionState = this.conditionsMet; + if (this.conditions.length > 0) this.conditionsMet = true; // reset conditions + for (Condition condition : this.conditions) { + // TODO: redefine entries as a HashMap to optimize complexity + for (EntryInfo info : entries) { + if (((condition.requiredOption().contains(":") ? "" : (this.modid + ":")) + condition.requiredOption()).equals(info.modid + ":" + info.fieldName)) { + this.conditionsMet &= info.tempValue.equals(condition.requiredValue()); +// System.out.println(this.modid + ":" + this.fieldName + "#" + condition.requiredOption() + ": " + condition.requiredValue() + " " + info.tempValue); + } + if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId())) { + this.conditionsMet = false; + } + if (!this.conditionsMet) break; + } + if (!this.conditionsMet) break; } + if (prevConditionState != this.conditionsMet) reloadScreen = true; } public void writeList(int index, T value) { var list = (List) this.value; @@ -124,7 +142,7 @@ public abstract class MidnightConfig { for (EntryInfo info : entries) if (info.field != null && info.entry != null) { try { info.value = info.field.get(null); info.tempValue = info.toTemporaryValue(); - info.updateConditions(info.tempValue); + info.updateConditions(); } catch (IllegalAccessException ignored) {} } } @@ -324,7 +342,14 @@ public abstract class MidnightConfig { } public void fillList() { for (EntryInfo info : entries) { - if (!info.conditionsMet && info.condition != null && !info.condition.visibleButLocked()) continue; +// if (!info.conditionsMet && info.condition != null && !info.condition.visibleButLocked()) continue; + if (!info.conditionsMet) { + boolean visibleButLocked = false; + for (Condition condition : info.conditions) { + visibleButLocked |= condition.visibleButLocked(); + } + if (!visibleButLocked) continue; + } if (info.modid.equals(modid) && (info.tab == null || info.tab == tabManager.getCurrentTab())) { Text name = Objects.requireNonNullElseGet(info.name, () -> Text.translatable(translationPrefix + info.fieldName)); TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { @@ -567,6 +592,7 @@ public abstract class MidnightConfig { * false – Option is completely hidden */ @Retention(RetentionPolicy.RUNTIME) + @Repeatable(Conditions.class) @Target(ElementType.FIELD) public @interface Condition { String requiredModId() default ""; @@ -574,4 +600,10 @@ public abstract class MidnightConfig { String requiredValue() default "true"; boolean visibleButLocked() default false; } + + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + public @interface Conditions { + Condition[] value(); + } } \ No newline at end of file From c1299c219522f929fa2eb72a08e44947cf290583 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Thu, 3 Apr 2025 11:14:02 +0800 Subject: [PATCH 12/51] add examples --- .../example/config/MidnightConfigExample.java | 38 +++++++++++++++++-- .../resources/assets/modid/lang/en_us.json | 20 +++++++--- 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index bee921b..c0fedc6 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -18,6 +18,7 @@ public class MidnightConfigExample extends MidnightConfig { public static final String LISTS = "lists"; public static final String FILES = "files"; public static final String CONDITIONS = "conditions"; + public static final String MULTI_CONDITIONS = "multiConditions"; @Comment(category = TEXT) public static Comment text1; // Comments are rendered like an option without a button and are excluded from the config file @Comment(category = TEXT, centered = true) public static Comment text2; // Centered comments are the same as normal ones - just centered! @@ -27,9 +28,9 @@ public class MidnightConfigExample extends MidnightConfig { @Entry(category = TEXT) public static String name = "Hello World!"; // Example for a string option, which is in a category! @Entry(category = TEXT, width = 7, min = 7, isColor = true, name = "I am a color!") public static String titleColor = "#ffffff"; // The isColor property adds a color chooser for a hexadecimal color @Entry(category = TEXT, idMode = 0) public static Identifier id = Identifier.ofVanilla("diamond"); // Example for an identifier with matching items displayed next to it! - @Entry(category = TEXT) public static TestEnum testEnum = TestEnum.FABRIC; // Example for an enum option - public enum TestEnum { // Enums allow the user to cycle through predefined options - QUILT, FABRIC, FORGE + @Entry(category = TEXT) public static ModPlatform modPlatform = ModPlatform.FABRIC; // Example for an enum option + public enum ModPlatform { // Enums allow the user to cycle through predefined options + QUILT, FABRIC, FORGE, NEOFORGE, VANILLA } @Entry(category = NUMBERS) public static int fabric = 16777215; // Example for an int option @Entry(category = NUMBERS) public static double world = 1.4D; // Example for a double option @@ -74,7 +75,7 @@ public class MidnightConfigExample extends MidnightConfig { @Entry(category = CONDITIONS, name="Turn me on!") public static boolean turnMeOn = false; @Condition(requiredOption = "modid:turnMeOn", visibleButLocked = true) - @Entry(category = CONDITIONS, name="Turn me off!") + @Entry(category = CONDITIONS, name="Turn me off (locked if modid:turnMeOn is false)!") public static Boolean turnMeOff = true; @Condition(requiredOption = "modid:turnMeOff", requiredValue = "false") @Entry(category = CONDITIONS, name="Which is the best modloader?") @@ -97,5 +98,34 @@ public class MidnightConfigExample extends MidnightConfig { @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") @Comment(category = CONDITIONS, name="You disabled MidnightLib's config screen list. Why? :(", centered = true) public static Comment why; + + // Multi-Conditions are also supported! + public enum Arch {X86, X86_64, AARCH64, RISCV64} + public enum OS {WINDOWS, MAC, LINUX} + @Entry(category = MULTI_CONDITIONS, name = "Arch") public static Arch myArch = Arch.X86; + @Entry(category = MULTI_CONDITIONS, name = "OS") public static OS myOS = OS.WINDOWS; + @Entry(category = MULTI_CONDITIONS, name = "Mod Platform") public static ModPlatform myPlatform = ModPlatform.FABRIC; + + @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") + @Condition(requiredOption = "modid:myOS", requiredValue = "WINDOWS") + @Condition(requiredOption = "modid:myPlatform", requiredValue = "FABRIC") + @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Windows x86_64 with Fabric!", centered = true) public static Comment x86_64_windows_fabric; + + @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") + @Condition(requiredOption = "modid:myOS", requiredValue = "LINUX") + @Condition(requiredOption = "modid:myPlatform", requiredValue = "FABRIC") + @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Linux x86_64 with Fabric!", centered = true) public static Comment x86_64_linux_fabric; + + @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") + @Condition(requiredOption = "modid:myOS", requiredValue = "WINDOWS") + @Condition(requiredOption = "modid:myPlatform", requiredValue = "NEOFORGE") + @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Windows x86_64 with NeoForge!", centered = true) public static Comment x86_64_windows_neoforge; + + @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") + @Condition(requiredOption = "modid:myOS", requiredValue = "LINUX") + @Condition(requiredOption = "modid:myPlatform", requiredValue = "NEOFORGE") + @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Linux x86_64 with NeoForge!", centered = true) public static Comment x86_64_linux_neoforge; + + public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored } \ No newline at end of file diff --git a/test-fabric/src/main/resources/assets/modid/lang/en_us.json b/test-fabric/src/main/resources/assets/modid/lang/en_us.json index 463f00b..b014330 100644 --- a/test-fabric/src/main/resources/assets/modid/lang/en_us.json +++ b/test-fabric/src/main/resources/assets/modid/lang/en_us.json @@ -10,10 +10,19 @@ "modid.midnightconfig.showInfo":"I am a boolean", "modid.midnightconfig.hello":"I am a limited int!", "modid.midnightconfig.id":"I am an Item Identifier!", - "modid.midnightconfig.testEnum":"I am an enum!", - "modid.midnightconfig.enum.TestEnum.FORGE":"Slow", - "modid.midnightconfig.enum.TestEnum.FABRIC":"Fancy", - "modid.midnightconfig.enum.TestEnum.QUILT":"Fabulous", + "modid.midnightconfig.modPlatform":"I am an enum!", + "modid.midnightconfig.enum.Arch.X86":"X86", + "modid.midnightconfig.enum.Arch.X86_64":"X86_64", + "modid.midnightconfig.enum.Arch.AARCH64":"AARCH64", + "modid.midnightconfig.enum.Arch.RISCV64":"RISCV64", + "modid.midnightconfig.enum.OS.LINUX":"Linux", + "modid.midnightconfig.enum.OS.WINDOWS":"Windows", + "modid.midnightconfig.enum.OS.MAC":"MacOS", + "modid.midnightconfig.enum.ModPlatform.FORGE":"Forge", + "modid.midnightconfig.enum.ModPlatform.FABRIC":"Fabric", + "modid.midnightconfig.enum.ModPlatform.QUILT":"Quilt", + "modid.midnightconfig.enum.ModPlatform.NEOFORGE":"NeoForge", + "modid.midnightconfig.enum.ModPlatform.VANILLA":"Vanilla", "modid.midnightconfig.myFileOrDirectory.fileChooser": "Select an image or directory", "modid.midnightconfig.myFileOrDirectory.fileFilter": "Supported Images (.png, .jpg, .jpeg)", "modid.midnightconfig.category.numbers": "Numbers", @@ -21,5 +30,6 @@ "modid.midnightconfig.category.sliders": "Sliders", "modid.midnightconfig.category.lists": "Lists", "modid.midnightconfig.category.files": "Files", - "modid.midnightconfig.category.conditions": "Quiz" + "modid.midnightconfig.category.conditions": "Quiz", + "modid.midnightconfig.category.multiConditions": "Multi-Conditions" } \ No newline at end of file From 170363ef359167960d5e56d785a6d8b7f5ee3920 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Thu, 3 Apr 2025 11:15:03 +0800 Subject: [PATCH 13/51] chore: bump version --- gradle.properties | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index beb5c67..59fae1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.0 +mod_version=1.7.1-rc.1 maven_group=eu.midnightdust release_type=release curseforge_id=488090 @@ -18,6 +18,4 @@ fabric_api_version=0.110.5+1.21.4 neoforge_version=21.4.3-beta yarn_mappings_patch_neoforge_version = 1.21+build.4 -quilt_loader_version=0.19.0-beta.18 -quilt_fabric_api_version=7.0.1+0.83.0-1.20 mod_menu_version = 9.0.0 \ No newline at end of file From f4d11832706f2d6558410e6af355e0de5b137b45 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Thu, 3 Apr 2025 11:19:03 +0800 Subject: [PATCH 14/51] cleanup & suppress unused warnings --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 2 -- .../fabric/example/config/MidnightConfigExample.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 63b263f..18ea2c2 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -67,8 +67,6 @@ public abstract class MidnightConfig { this.dataType = getUnderlyingType(field); this.entry = field.getAnnotation(Entry.class); this.comment = field.getAnnotation(Comment.class); - // TODO: use multiple annotations -// this.condition = field.getAnnotation(Condition.class); this.conditions = field.getAnnotationsByType(Condition.class); } else { this.fieldName = ""; this.dataType = null; diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index c0fedc6..50495cb 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -10,7 +10,7 @@ import java.util.List; /** Every option in a MidnightConfig class has to be public and static, so we can access it from other classes. * The config class also has to extend MidnightConfig*/ - +@SuppressWarnings("unused") public class MidnightConfigExample extends MidnightConfig { public static final String TEXT = "text"; public static final String NUMBERS = "numbers"; From ac5a035906a63f85ffb612939ae8220e522a2610 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Thu, 3 Apr 2025 13:30:46 +0800 Subject: [PATCH 15/51] optimize: use hash tables to reduce complexity --- .../lib/config/MidnightConfig.java | 81 ++++++++++--------- gradle.properties | 2 +- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 18ea2c2..10c2668 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -14,7 +14,6 @@ import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; @@ -40,7 +39,9 @@ public abstract class MidnightConfig { private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)"); private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)"); - private static final List entries = new ArrayList<>(); +// private static final List entries = new ArrayList<>(); + private static final Hashtable entries = new Hashtable<>(); // modid:fieldName -> EntryInfo + private static final List entryOrder = Lists.newArrayList(); // ordered list of entries private static boolean reloadScreen = false; public static class EntryInfo { @@ -86,7 +87,7 @@ public abstract class MidnightConfig { } public void updateFieldValue() { try { - if (this.field.get(null) != value) entries.forEach(EntryInfo::updateConditions); + if (this.field.get(null) != value) entries.values().forEach(EntryInfo::updateConditions); this.field.set(null, this.value); } catch (IllegalAccessException ignored) {} } @@ -95,16 +96,12 @@ public abstract class MidnightConfig { boolean prevConditionState = this.conditionsMet; if (this.conditions.length > 0) this.conditionsMet = true; // reset conditions for (Condition condition : this.conditions) { - // TODO: redefine entries as a HashMap to optimize complexity - for (EntryInfo info : entries) { - if (((condition.requiredOption().contains(":") ? "" : (this.modid + ":")) + condition.requiredOption()).equals(info.modid + ":" + info.fieldName)) { - this.conditionsMet &= info.tempValue.equals(condition.requiredValue()); -// System.out.println(this.modid + ":" + this.fieldName + "#" + condition.requiredOption() + ": " + condition.requiredValue() + " " + info.tempValue); - } - if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId())) { - this.conditionsMet = false; - } - if (!this.conditionsMet) break; + if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId())) { + this.conditionsMet = false; + } + String requiredOption = condition.requiredOption().contains(":") ? condition.requiredOption() : (this.modid + ":" + condition.requiredOption()); + if (entries.get(requiredOption) instanceof EntryInfo info) { + this.conditionsMet &= condition.requiredValue().equals(info.tempValue); } if (!this.conditionsMet) break; } @@ -130,19 +127,21 @@ public abstract class MidnightConfig { @SuppressWarnings("unused") // Utility for mod authors public static @Nullable Object getDefaultValue(String modid, String entry) { - for (EntryInfo e : entries) { - if (modid.equals(e.modid) && entry.equals(e.field.getName())) return e.defaultValue; - } return null; + String key = modid + ":" + entry; + return entries.containsKey(key) ? entries.get(key).defaultValue : null; } public static void loadValuesFromJson(String modid) { try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } catch (Exception e) { write(modid); } - - for (EntryInfo info : entries) if (info.field != null && info.entry != null) { - try { info.value = info.field.get(null); info.tempValue = info.toTemporaryValue(); - info.updateConditions(); - } catch (IllegalAccessException ignored) {} - } + entries.values().forEach(info -> { + if (info.field != null && info.entry != null) { + try { + info.value = info.field.get(null); + info.tempValue = info.toTemporaryValue(); + info.updateConditions(); + } catch (IllegalAccessException ignored) {} + } + }); } public static void init(String modid, Class config) { path = PlatformFunctions.getConfigDirectory().resolve(modid + ".json"); @@ -161,6 +160,7 @@ public abstract class MidnightConfig { @Environment(EnvType.CLIENT) private static void initClient(String modid, Field field, EntryInfo info) { Entry e = info.entry; + String key = modid + ":" + field.getName(); if (e != null) { if (info.dataType == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, (int) e.min(), (int) e.max(), true); else if (info.dataType == float.class) textField(info, Float::parseFloat, DECIMAL_ONLY, (float) e.min(), (float) e.max(), false); @@ -185,7 +185,8 @@ public abstract class MidnightConfig { }, func); } } - entries.add(info); + entries.put(key, info); + entryOrder.add(key); } public static Class getUnderlyingType(Field field) { Class rawType = field.getType(); @@ -218,7 +219,7 @@ public abstract class MidnightConfig { info.tempValue = s; t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777); info.inLimits = inLimits; - b.active = entries.stream().allMatch(e -> e.inLimits); + b.active = entries.values().stream().allMatch(e -> e.inLimits); if (inLimits) { if (info.dataType == Identifier.class) info.setValue(Identifier.tryParse(s)); @@ -255,17 +256,18 @@ public abstract class MidnightConfig { this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; loadValuesFromJson(modid); - - for (EntryInfo e : entries) if (e.modid.equals(modid)) { - String tabId = e.entry != null ? e.entry.category() : e.comment.category(); - String name = translationPrefix + "category." + tabId; - if (!I18n.hasTranslation(name) && tabId.equals("default")) - name = translationPrefix + "title"; - if (!tabs.containsKey(name)) { - Tab tab = new GridScreenTab(Text.translatable(name)); - e.tab = tab; tabs.put(name, tab); - } else e.tab = tabs.get(name); - } + entryOrder.stream().map(entries::get).forEach(info -> { + if (info.modid.equals(modid)) { + String tabId = info.entry != null ? info.entry.category() : info.comment.category(); + String name = translationPrefix + "category." + tabId; + if (!I18n.hasTranslation(name) && tabId.equals("default")) + name = translationPrefix + "title"; + if (!tabs.containsKey(name)) { + Tab tab = new GridScreenTab(Text.translatable(name)); + info.tab = tab; tabs.put(name, tab); + } else info.tab = tabs.get(name); + } + }); tabNavigation = TabNavigationWidget.builder(tabManager, this.width).tabs(tabs.values().toArray(new Tab[0])).build(); tabNavigation.selectTab(0, false); tabNavigation.init(); @@ -290,7 +292,7 @@ public abstract class MidnightConfig { updateList(); list.setScrollY(0); } scrollProgress = list.getScrollY(); - for (EntryInfo info : entries) info.updateFieldValue(); + for (EntryInfo info : entries.values()) info.updateFieldValue(); updateButtons(); if (reloadScreen) { updateList(); reloadScreen = false; } } @@ -314,7 +316,7 @@ public abstract class MidnightConfig { Objects.requireNonNull(client).setScreen(parent); } private void cleanup() { - entries.forEach(info -> { + entries.values().forEach(info -> { info.error = null; info.value = null; info.tempValue = null; info.actionButton = null; info.listIndex = 0; info.tab = null; info.inLimits = true; }); } @@ -326,7 +328,7 @@ public abstract class MidnightConfig { this.addDrawableChild(ButtonWidget.builder(ScreenTexts.CANCEL, button -> this.close()).dimensions(this.width / 2 - 154, this.height - 26, 150, 20).build()); done = this.addDrawableChild(ButtonWidget.builder(ScreenTexts.DONE, (button) -> { - for (EntryInfo info : entries) if (info.modid.equals(modid)) info.updateFieldValue(); + for (EntryInfo info : entries.values()) if (info.modid.equals(modid)) info.updateFieldValue(); write(modid); cleanup(); Objects.requireNonNull(client).setScreen(parent); }).dimensions(this.width / 2 + 4, this.height - 26, 150, 20).build()); @@ -339,8 +341,7 @@ public abstract class MidnightConfig { this.list.clear(); fillList(); } public void fillList() { - for (EntryInfo info : entries) { -// if (!info.conditionsMet && info.condition != null && !info.condition.visibleButLocked()) continue; + for (EntryInfo info : entryOrder.stream().map(entries::get).toList()) { if (!info.conditionsMet) { boolean visibleButLocked = false; for (Condition condition : info.conditions) { diff --git a/gradle.properties b/gradle.properties index 59fae1b..8435a28 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.1-rc.1 +mod_version=1.7.1-rc.2 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From ee705b2cbdfc4a96db858c8f8abc19b3c276f6af Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 5 Apr 2025 11:47:04 +0200 Subject: [PATCH 16/51] feat: replace Hashtable with LinkedHashMap - Keeps the entry order in tact without the need to store it separately --- .../midnightdust/lib/config/MidnightConfig.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 10c2668..ddbd496 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -39,15 +39,12 @@ public abstract class MidnightConfig { private static final Pattern DECIMAL_ONLY = Pattern.compile("-?(\\d+\\.?\\d*|\\d*\\.?\\d+|\\.)"); private static final Pattern HEXADECIMAL_ONLY = Pattern.compile("(-?[#0-9a-fA-F]*)"); -// private static final List entries = new ArrayList<>(); - private static final Hashtable entries = new Hashtable<>(); // modid:fieldName -> EntryInfo - private static final List entryOrder = Lists.newArrayList(); // ordered list of entries + private static final LinkedHashMap entries = new LinkedHashMap<>(); // modid:fieldName -> EntryInfo private static boolean reloadScreen = false; public static class EntryInfo { public Entry entry; public Comment comment; -// @ApiStatus.Obsolete public Condition condition; public Condition[] conditions; public final Field field; public final Class dataType; @@ -96,13 +93,11 @@ public abstract class MidnightConfig { boolean prevConditionState = this.conditionsMet; if (this.conditions.length > 0) this.conditionsMet = true; // reset conditions for (Condition condition : this.conditions) { - if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId())) { + if (!condition.requiredModId().isEmpty() && !PlatformFunctions.isModLoaded(condition.requiredModId())) this.conditionsMet = false; - } String requiredOption = condition.requiredOption().contains(":") ? condition.requiredOption() : (this.modid + ":" + condition.requiredOption()); - if (entries.get(requiredOption) instanceof EntryInfo info) { + if (entries.get(requiredOption) instanceof EntryInfo info) this.conditionsMet &= condition.requiredValue().equals(info.tempValue); - } if (!this.conditionsMet) break; } if (prevConditionState != this.conditionsMet) reloadScreen = true; @@ -186,7 +181,6 @@ public abstract class MidnightConfig { } } entries.put(key, info); - entryOrder.add(key); } public static Class getUnderlyingType(Field field) { Class rawType = field.getType(); @@ -256,7 +250,7 @@ public abstract class MidnightConfig { this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; loadValuesFromJson(modid); - entryOrder.stream().map(entries::get).forEach(info -> { + entries.forEach((id, info) -> { if (info.modid.equals(modid)) { String tabId = info.entry != null ? info.entry.category() : info.comment.category(); String name = translationPrefix + "category." + tabId; @@ -341,7 +335,7 @@ public abstract class MidnightConfig { this.list.clear(); fillList(); } public void fillList() { - for (EntryInfo info : entryOrder.stream().map(entries::get).toList()) { + for (EntryInfo info : entries.sequencedValues()) { if (!info.conditionsMet) { boolean visibleButLocked = false; for (Condition condition : info.conditions) { From 64be14f1362382ec33db4c972a344345294d794c Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 5 Apr 2025 12:02:58 +0200 Subject: [PATCH 17/51] clean: improve entry access further --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index ddbd496..4487db3 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -174,7 +174,6 @@ public abstract class MidnightConfig { }; info.function = new AbstractMap.SimpleEntry>(button -> { int index = values.indexOf(info.value) + 1; - //info.value = values.get(index >= values.size() ? 0 : index); button.setMessage(func.apply(info.value)); info.setValue(values.get(index >= values.size() ? 0 : index)); button.setMessage(func.apply(info.value)); }, func); @@ -250,7 +249,7 @@ public abstract class MidnightConfig { this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; loadValuesFromJson(modid); - entries.forEach((id, info) -> { + entries.values().forEach(info -> { if (info.modid.equals(modid)) { String tabId = info.entry != null ? info.entry.category() : info.comment.category(); String name = translationPrefix + "category." + tabId; @@ -335,7 +334,7 @@ public abstract class MidnightConfig { this.list.clear(); fillList(); } public void fillList() { - for (EntryInfo info : entries.sequencedValues()) { + for (EntryInfo info : entries.values()) { if (!info.conditionsMet) { boolean visibleButLocked = false; for (Condition condition : info.conditions) { From 386a95aca82d2a81c78887a398e3973d70d00410 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 5 Apr 2025 12:10:11 +0200 Subject: [PATCH 18/51] feat: optimize AutoCommand's file-size --- .../midnightdust/lib/config/AutoCommand.java | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java b/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java index 95571c8..e41f920 100644 --- a/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java +++ b/common/src/main/java/eu/midnightdust/lib/config/AutoCommand.java @@ -18,44 +18,41 @@ public class AutoCommand { final Field field; final Class type; final String modid; - final boolean isList, isNumber; + final boolean isList; public AutoCommand(Field field, String modid) { this.field = field; this.modid = modid; this.type = MidnightConfig.getUnderlyingType(field); this.isList = field.getType() == List.class; - this.isNumber = type == int.class || type == double.class || type == float.class; var command = CommandManager.literal(field.getName()).executes(this::getValue); if (type.isEnum()) { for (Object enumValue : field.getType().getEnumConstants()) - command = command.then(CommandManager.literal(enumValue.toString()).executes(ctx -> this.setValue(ctx.getSource(), enumValue, ""))); + command = command.then(CommandManager.literal(enumValue.toString()) + .executes(ctx -> this.setValue(ctx.getSource(), enumValue, ""))); } else if (isList) { - for (String action : List.of("add", "remove")) - command = command.then(CommandManager.literal(action).then( - CommandManager.argument(VALUE, getArgType()).executes(ctx -> setValueFromArg(ctx, action)))); + for (String action : new String[]{"add", "remove"}) + command = command.then(CommandManager.literal(action) + .then(CommandManager.argument(VALUE, getArgType()).executes(ctx -> setValueFromArg(ctx, action)))); } else command = command.then(CommandManager.argument(VALUE, getArgType()).executes(ctx -> setValueFromArg(ctx, ""))); PlatformFunctions.registerCommand(CommandManager.literal("midnightconfig").requires(source -> source.hasPermissionLevel(2)).then(CommandManager.literal(modid).then(command))); } public ArgumentType getArgType() { - if (isNumber) { - Entry entry = field.getAnnotation(Entry.class); - if (type == int.class) return IntegerArgumentType.integer((int) entry.min(), (int) entry.max()); - else if (type == double.class) return DoubleArgumentType.doubleArg(entry.min(), entry.max()); - else if (type == float.class) return FloatArgumentType.floatArg((float) entry.min(), (float) entry.max()); - } + Entry entry = field.getAnnotation(Entry.class); + if (type == int.class) return IntegerArgumentType.integer((int) entry.min(), (int) entry.max()); + else if (type == double.class) return DoubleArgumentType.doubleArg(entry.min(), entry.max()); + else if (type == float.class) return FloatArgumentType.floatArg((float) entry.min(), (float) entry.max()); else if (type == boolean.class) return BoolArgumentType.bool(); return StringArgumentType.string(); } + public int setValueFromArg(CommandContext context, String action) { - if (isNumber) { - if (type == int.class) return setValue(context.getSource(), IntegerArgumentType.getInteger(context, VALUE), action); - else if (type == double.class) return setValue(context.getSource(), DoubleArgumentType.getDouble(context, VALUE), action); - else if (type == float.class) return setValue(context.getSource(), FloatArgumentType.getFloat(context, VALUE), action); - } + if (type == int.class) return setValue(context.getSource(), IntegerArgumentType.getInteger(context, VALUE), action); + else if (type == double.class) return setValue(context.getSource(), DoubleArgumentType.getDouble(context, VALUE), action); + else if (type == float.class) return setValue(context.getSource(), FloatArgumentType.getFloat(context, VALUE), action); else if (type == boolean.class) return setValue(context.getSource(), BoolArgumentType.getBool(context, VALUE), action); return setValue(context.getSource(), StringArgumentType.getString(context, VALUE), action); } @@ -72,17 +69,16 @@ public class AutoCommand { MidnightConfig.write(modid); } catch (Exception e) { - if (!isList) source.sendError(Text.literal("Could not set "+field.getName()+" to value "+value+": " + e)); - else source.sendError(Text.literal((add ? "Could not add "+value+" to " : "Could not remove "+value+" from ")+field.getName() +": " + e)); + source.sendError(Text.literal(isList ? "Could not %s %s %s %s: %s".formatted(add ? "add" : "remove", value, add ? "to" : "from", field.getName(), e) : "Could not set %s to value %s: %s".formatted(field.getName(), value, e))); return 0; } - if (!isList) source.sendFeedback(() -> Text.literal("Successfully set " + field.getName()+" to "+value), true); - else source.sendFeedback(() -> Text.literal((add ? "Successfully added " +value+" to " : "Successfully removed " +value+" from ") +field.getName()), true); + source.sendFeedback(() -> Text.literal(isList ? "Successfully %s %s %s %s".formatted(add ? "added" : "removed", value, add ? "to" : "from", field.getName()) : + "Successfully set %s to %s".formatted(field.getName(), value)), true); return 1; } private int getValue(CommandContext context) { context.getSource().sendFeedback(() -> { - try { return Text.literal("The value of "+field.getName()+" is "+field.get(null)); + try { return Text.literal("The value of %s is %s".formatted(field.getName(), field.get(null))); } catch (IllegalAccessException e) {throw new RuntimeException(e);} }, true); return 0; From 9b29b208ebbcaf57999068890e45b2b246b12538 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 5 Apr 2025 12:38:38 +0200 Subject: [PATCH 19/51] docs: improve multi-conditions example --- .../example/config/MidnightConfigExample.java | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 50495cb..ec599de 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -18,7 +18,6 @@ public class MidnightConfigExample extends MidnightConfig { public static final String LISTS = "lists"; public static final String FILES = "files"; public static final String CONDITIONS = "conditions"; - public static final String MULTI_CONDITIONS = "multiConditions"; @Comment(category = TEXT) public static Comment text1; // Comments are rendered like an option without a button and are excluded from the config file @Comment(category = TEXT, centered = true) public static Comment text2; // Centered comments are the same as normal ones - just centered! @@ -77,18 +76,27 @@ public class MidnightConfigExample extends MidnightConfig { @Condition(requiredOption = "modid:turnMeOn", visibleButLocked = true) @Entry(category = CONDITIONS, name="Turn me off (locked if modid:turnMeOn is false)!") public static Boolean turnMeOff = true; + @Condition(requiredOption = "turnMeOn") // You can also use multiple conditions for the same entry @Condition(requiredOption = "modid:turnMeOff", requiredValue = "false") @Entry(category = CONDITIONS, name="Which is the best modloader?") public static String bestModloader = ""; + @Condition(requiredOption = "turnMeOn") + @Condition(requiredOption = "turnMeOff", requiredValue = "false") @Condition(requiredOption = "bestModloader", requiredValue = "Forge") @Comment(category = CONDITIONS, name="❌ You have bad taste :(", centered = true) // Don't take this too seriously btw :) public static Comment answerForge; // Comments can also be conditional! + @Condition(requiredOption = "turnMeOn") + @Condition(requiredOption = "turnMeOff", requiredValue = "false") @Condition(requiredOption = "bestModloader", requiredValue = "NeoForge") @Comment(category = CONDITIONS, name="⛏ Not quite, but it's alright!", centered = true) public static Comment answerNeoforge; + @Condition(requiredOption = "turnMeOn") + @Condition(requiredOption = "turnMeOff", requiredValue = "false") @Condition(requiredOption = "bestModloader", requiredValue = "Fabric") @Comment(category = CONDITIONS, name="⭐ Correct! Fabric (and Quilt) are the best!", centered = true) public static Comment answerFabric; + @Condition(requiredOption = "turnMeOn") + @Condition(requiredOption = "turnMeOff", requiredValue = "false") @Condition(requiredOption = "bestModloader", requiredValue = "Quilt") @Comment(category = CONDITIONS, name="⭐ Correct! Quilt (and Fabric) are the best!", centered = true) public static Comment answerQuilt; @@ -98,34 +106,5 @@ public class MidnightConfigExample extends MidnightConfig { @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") @Comment(category = CONDITIONS, name="You disabled MidnightLib's config screen list. Why? :(", centered = true) public static Comment why; - - // Multi-Conditions are also supported! - public enum Arch {X86, X86_64, AARCH64, RISCV64} - public enum OS {WINDOWS, MAC, LINUX} - @Entry(category = MULTI_CONDITIONS, name = "Arch") public static Arch myArch = Arch.X86; - @Entry(category = MULTI_CONDITIONS, name = "OS") public static OS myOS = OS.WINDOWS; - @Entry(category = MULTI_CONDITIONS, name = "Mod Platform") public static ModPlatform myPlatform = ModPlatform.FABRIC; - - @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") - @Condition(requiredOption = "modid:myOS", requiredValue = "WINDOWS") - @Condition(requiredOption = "modid:myPlatform", requiredValue = "FABRIC") - @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Windows x86_64 with Fabric!", centered = true) public static Comment x86_64_windows_fabric; - - @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") - @Condition(requiredOption = "modid:myOS", requiredValue = "LINUX") - @Condition(requiredOption = "modid:myPlatform", requiredValue = "FABRIC") - @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Linux x86_64 with Fabric!", centered = true) public static Comment x86_64_linux_fabric; - - @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") - @Condition(requiredOption = "modid:myOS", requiredValue = "WINDOWS") - @Condition(requiredOption = "modid:myPlatform", requiredValue = "NEOFORGE") - @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Windows x86_64 with NeoForge!", centered = true) public static Comment x86_64_windows_neoforge; - - @Condition(requiredOption = "modid:myArch", requiredValue = "X86_64") - @Condition(requiredOption = "modid:myOS", requiredValue = "LINUX") - @Condition(requiredOption = "modid:myPlatform", requiredValue = "NEOFORGE") - @Comment(category = MULTI_CONDITIONS, name = "MidnightLib can be used on Linux x86_64 with NeoForge!", centered = true) public static Comment x86_64_linux_neoforge; - - public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored } \ No newline at end of file From a3f4dfc9db9ac50207455604e27f0e63e817bec9 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sat, 5 Apr 2025 12:43:07 +0200 Subject: [PATCH 20/51] chore: bump version --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8435a28..6903179 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,12 +1,12 @@ org.gradle.jvmargs=-Xmx4096M minecraft_version=1.21.4 -supported_versions= +supported_versions=1.21.5 yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.1-rc.2 +mod_version=1.7.1 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From 1606646e8750b08ee9c02c48f4056951d7dd318b Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Sun, 13 Apr 2025 18:32:35 +0800 Subject: [PATCH 21/51] - fix bug: avoid the crash due to `Identifier` syntax not legitimate. - new feature: multiple expect values for `@Condition` - change: use `net.minecraft.client.gui.widget.CheckboxWidget` for boolean `@Entry` instead of `net.minecraft.client.gui.widget.ButtonWidget` - misc: cleanup for `en_us.json` and example code & bump version --- .../lib/config/MidnightConfig.java | 32 +++++++++---------- gradle.properties | 2 +- .../example/config/MidnightConfigExample.java | 8 ++++- .../resources/assets/modid/lang/en_us.json | 7 ---- 4 files changed, 24 insertions(+), 25 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 4487db3..65eafca 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -97,7 +97,7 @@ public abstract class MidnightConfig { this.conditionsMet = false; String requiredOption = condition.requiredOption().contains(":") ? condition.requiredOption() : (this.modid + ":" + condition.requiredOption()); if (entries.get(requiredOption) instanceof EntryInfo info) - this.conditionsMet &= condition.requiredValue().equals(info.tempValue); + this.conditionsMet &= List.of(condition.requiredValue()).contains(info.tempValue); if (!this.conditionsMet) break; } if (prevConditionState != this.conditionsMet) reloadScreen = true; @@ -162,10 +162,7 @@ public abstract class MidnightConfig { else if (info.dataType == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false); else if (info.dataType == String.class || info.dataType == Identifier.class) textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true); else if (info.dataType == boolean.class) { - Function func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); - info.function = new AbstractMap.SimpleEntry>(button -> { - info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value)); - }, func); + info.function = (CheckboxWidget.Callback) (ch, b) -> info.setValue(b); } else if (info.dataType.isEnum()) { List values = Arrays.asList(field.getType().getEnumConstants()); Function func = value -> { @@ -215,7 +212,11 @@ public abstract class MidnightConfig { b.active = entries.values().stream().allMatch(e -> e.inLimits); if (inLimits) { - if (info.dataType == Identifier.class) info.setValue(Identifier.tryParse(s)); + if (info.dataType == Identifier.class) { // avoid the crash due to Identifier syntax not legitimate + Identifier id = Identifier.tryParse(s); + if (id == null) return false; + info.setValue(Identifier.tryParse(s)); + } else info.setValue(isNumber ? value : s); } @@ -296,7 +297,7 @@ public abstract class MidnightConfig { if (entry.buttons.get(0) instanceof ClickableWidget widget) if (widget.isFocused() || widget.isHovered()) widget.setTooltip(getTooltip(entry.info, true)); if (entry.buttons.get(1) instanceof ButtonWidget button) - button.active = !Objects.equals(entry.info.value.toString(), entry.info.defaultValue.toString()); + button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)); }}}} @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @@ -354,17 +355,16 @@ public abstract class MidnightConfig { if (info.function != null) { ClickableWidget widget; Entry e = info.entry; - - if (info.function instanceof Map.Entry) { // Enums & booleans + if (info.dataType == boolean.class) { + widget = CheckboxWidget.builder(Text.empty(), textRenderer).pos(width - 185, 0).callback((CheckboxWidget.Callback) info.function).checked((boolean) info.value).build(); + } else if (info.dataType.isEnum()) { var values = (Map.Entry>) info.function; - if (info.dataType.isEnum()) - values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); + values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); - } - else if (e.isSlider()) + } else if (e.isSlider()) widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); - else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); - + else + widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); if (widget instanceof TextFieldWidget textField) { textField.setMaxLength(e.width()); textField.setText(info.tempValue); Predicate processor = ((BiFunction>) info.function).apply(textField, done); @@ -589,7 +589,7 @@ public abstract class MidnightConfig { public @interface Condition { String requiredModId() default ""; String requiredOption() default ""; - String requiredValue() default "true"; + String[] requiredValue() default {"true"}; boolean visibleButLocked() default false; } diff --git a/gradle.properties b/gradle.properties index 6903179..b847844 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.1 +mod_version=1.7.2-rc.1 maven_group=eu.midnightdust release_type=release curseforge_id=488090 diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index ec599de..512f7a3 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -74,7 +74,7 @@ public class MidnightConfigExample extends MidnightConfig { @Entry(category = CONDITIONS, name="Turn me on!") public static boolean turnMeOn = false; @Condition(requiredOption = "modid:turnMeOn", visibleButLocked = true) - @Entry(category = CONDITIONS, name="Turn me off (locked if modid:turnMeOn is false)!") + @Entry(category = CONDITIONS, name="Turn me off (locked)!") public static Boolean turnMeOff = true; @Condition(requiredOption = "turnMeOn") // You can also use multiple conditions for the same entry @Condition(requiredOption = "modid:turnMeOff", requiredValue = "false") @@ -101,6 +101,12 @@ public class MidnightConfigExample extends MidnightConfig { @Comment(category = CONDITIONS, name="⭐ Correct! Quilt (and Fabric) are the best!", centered = true) public static Comment answerQuilt; + @Entry(category = CONDITIONS, name="Enter any prime number below 10") + public static int primeNumber = 0; + @Comment(category = CONDITIONS, name="Correct!") + @Condition(requiredOption = "primeNumber", requiredValue = {"2", "3", "5", "7"}) + public static Comment answerPrime; + @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") // Access options of other mods that are also using MidnightLib @Comment(category = CONDITIONS) public static Comment spaceracer; @Condition(requiredOption = "midnightlib:config_screen_list", requiredValue = "FALSE") diff --git a/test-fabric/src/main/resources/assets/modid/lang/en_us.json b/test-fabric/src/main/resources/assets/modid/lang/en_us.json index b014330..702947c 100644 --- a/test-fabric/src/main/resources/assets/modid/lang/en_us.json +++ b/test-fabric/src/main/resources/assets/modid/lang/en_us.json @@ -11,13 +11,6 @@ "modid.midnightconfig.hello":"I am a limited int!", "modid.midnightconfig.id":"I am an Item Identifier!", "modid.midnightconfig.modPlatform":"I am an enum!", - "modid.midnightconfig.enum.Arch.X86":"X86", - "modid.midnightconfig.enum.Arch.X86_64":"X86_64", - "modid.midnightconfig.enum.Arch.AARCH64":"AARCH64", - "modid.midnightconfig.enum.Arch.RISCV64":"RISCV64", - "modid.midnightconfig.enum.OS.LINUX":"Linux", - "modid.midnightconfig.enum.OS.WINDOWS":"Windows", - "modid.midnightconfig.enum.OS.MAC":"MacOS", "modid.midnightconfig.enum.ModPlatform.FORGE":"Forge", "modid.midnightconfig.enum.ModPlatform.FABRIC":"Fabric", "modid.midnightconfig.enum.ModPlatform.QUILT":"Quilt", From a4ce16482c6ad96ff1c92d16c205e4c84e62ead9 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Sun, 13 Apr 2025 18:42:24 +0800 Subject: [PATCH 22/51] - fix bug+: illegal Identifier cannot input character --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 65eafca..04b312e 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -74,12 +74,12 @@ public abstract class MidnightConfig { } public void setValue(Object value) { if (this.field.getType() != List.class) { this.value = value; - this.tempValue = value.toString(); + this.tempValue = value == null ? "" : value.toString(); // fix bug+: illegal Identifier cannot input character } else { writeList(this.listIndex, value); this.tempValue = toTemporaryValue(); } } public String toTemporaryValue() { - if (this.field.getType() != List.class) return this.value.toString(); + if (this.field.getType() != List.class) return this.value == null ? "" : this.value.toString(); // fix bug+: illegal Identifier cannot input character else try { return ((List) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";} } public void updateFieldValue() { From e046463f669ccff32c85294135c26641683092c5 Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Mon, 14 Apr 2025 20:00:51 +0800 Subject: [PATCH 23/51] - rollback: boolean field (`CheckboxWidget` -> `ButtonWidget`) --- .../eu/midnightdust/lib/config/MidnightConfig.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 04b312e..1c27dc9 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -162,7 +162,10 @@ public abstract class MidnightConfig { else if (info.dataType == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(), false); else if (info.dataType == String.class || info.dataType == Identifier.class) textField(info, String::length, null, Math.min(e.min(), 0), Math.max(e.max(), 1), true); else if (info.dataType == boolean.class) { - info.function = (CheckboxWidget.Callback) (ch, b) -> info.setValue(b); + Function func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); + info.function = new AbstractMap.SimpleEntry>(button -> { + info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value)); + }, func); } else if (info.dataType.isEnum()) { List values = Arrays.asList(field.getType().getEnumConstants()); Function func = value -> { @@ -355,11 +358,10 @@ public abstract class MidnightConfig { if (info.function != null) { ClickableWidget widget; Entry e = info.entry; - if (info.dataType == boolean.class) { - widget = CheckboxWidget.builder(Text.empty(), textRenderer).pos(width - 185, 0).callback((CheckboxWidget.Callback) info.function).checked((boolean) info.value).build(); - } else if (info.dataType.isEnum()) { + if (info.function instanceof Map.Entry) { var values = (Map.Entry>) info.function; - values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); + if (info.dataType.isEnum()) + values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); } else if (e.isSlider()) widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); From 517d3c8a0ee5921d583dcc332f196b751c75b45e Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Mon, 14 Apr 2025 20:05:21 +0800 Subject: [PATCH 24/51] - adjust: optimize code & add comment --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 1c27dc9..34ad33b 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -218,7 +218,7 @@ public abstract class MidnightConfig { if (info.dataType == Identifier.class) { // avoid the crash due to Identifier syntax not legitimate Identifier id = Identifier.tryParse(s); if (id == null) return false; - info.setValue(Identifier.tryParse(s)); + info.setValue(id); } else info.setValue(isNumber ? value : s); } @@ -358,7 +358,7 @@ public abstract class MidnightConfig { if (info.function != null) { ClickableWidget widget; Entry e = info.entry; - if (info.function instanceof Map.Entry) { + if (info.function instanceof Map.Entry) { // Enums & booleans var values = (Map.Entry>) info.function; if (info.dataType.isEnum()) values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); From dcf0dbcaabae15e61335a36ed8eb0cb4f3081bc2 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 14 Apr 2025 17:47:11 +0200 Subject: [PATCH 25/51] fix: improve identifier crash fix Now uses Minecraft's built-in Identifier.validate function to check validity before applying changes --- .../midnightdust/lib/config/MidnightConfig.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 34ad33b..2f706a1 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -66,20 +66,18 @@ public abstract class MidnightConfig { this.entry = field.getAnnotation(Entry.class); this.comment = field.getAnnotation(Comment.class); this.conditions = field.getAnnotationsByType(Condition.class); - } else { - this.fieldName = ""; this.dataType = null; - } + } else { this.fieldName = ""; this.dataType = null; } if (entry != null && !entry.name().isEmpty()) this.name = Text.translatable(entry.name()); else if (comment != null && !comment.name().isEmpty()) this.name = Text.translatable(comment.name()); } public void setValue(Object value) { if (this.field.getType() != List.class) { this.value = value; - this.tempValue = value == null ? "" : value.toString(); // fix bug+: illegal Identifier cannot input character + this.tempValue = value.toString(); } else { writeList(this.listIndex, value); this.tempValue = toTemporaryValue(); } } public String toTemporaryValue() { - if (this.field.getType() != List.class) return this.value == null ? "" : this.value.toString(); // fix bug+: illegal Identifier cannot input character + if (this.field.getType() != List.class) return this.value.toString(); else try { return ((List) this.value).get(this.listIndex).toString(); } catch (Exception ignored) {return "";} } public void updateFieldValue() { @@ -197,7 +195,8 @@ public abstract class MidnightConfig { boolean isNumber = pattern != null; info.function = (BiFunction>) (t, b) -> s -> { s = s.trim(); - if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches())) return false; + if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches()) || + (info.dataType == Identifier.class && Identifier.validate(s).isError())) return false; Number value = 0; boolean inLimits = false; info.error = null; if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) { @@ -215,11 +214,7 @@ public abstract class MidnightConfig { b.active = entries.values().stream().allMatch(e -> e.inLimits); if (inLimits) { - if (info.dataType == Identifier.class) { // avoid the crash due to Identifier syntax not legitimate - Identifier id = Identifier.tryParse(s); - if (id == null) return false; - info.setValue(id); - } + if (info.dataType == Identifier.class) info.setValue(Identifier.tryParse(s)); else info.setValue(isNumber ? value : s); } From 3e6a72cda40bc66050afc3335a9cfafd9824a3c2 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 14 Apr 2025 17:49:02 +0200 Subject: [PATCH 26/51] feat: checkbox buttons next to boolean yes/no text buttons --- .../java/eu/midnightdust/lib/config/MidnightConfig.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 2f706a1..da71553 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -162,6 +162,9 @@ public abstract class MidnightConfig { else if (info.dataType == boolean.class) { Function func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); info.function = new AbstractMap.SimpleEntry>(button -> { + if (info.actionButton instanceof CheckboxWidget checkbox && checkbox.isChecked() == (Boolean) info.value) { + checkbox.onPress(); return; + } info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value)); }, func); } else if (info.dataType.isEnum()) { @@ -358,10 +361,10 @@ public abstract class MidnightConfig { if (info.dataType.isEnum()) values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); + if (info.dataType == boolean.class) info.actionButton = CheckboxWidget.builder(Text.empty(), textRenderer).callback((checkbox, checked) -> values.getKey().onPress((ButtonWidget) widget)).checked((Boolean) info.value).pos(widget.getX(), 1).build(); } else if (e.isSlider()) widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); - else - widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); + else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); if (widget instanceof TextFieldWidget textField) { textField.setMaxLength(e.width()); textField.setText(info.tempValue); Predicate processor = ((BiFunction>) info.function).apply(textField, done); @@ -471,7 +474,7 @@ public abstract class MidnightConfig { } } public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { - buttons.forEach(b -> { b.setY(y); b.render(context, mouseX, mouseY, tickDelta);}); + buttons.forEach(b -> { b.setY(y + (b instanceof CheckboxWidget ? 1 : 0)); b.render(context, mouseX, mouseY, tickDelta);}); if (title != null) { title.setY(y + 9); title.renderWidget(context, mouseX, mouseY, tickDelta); From 0297d91e703ebac235b95861b290ede23a5a1154 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 14 Apr 2025 18:02:56 +0200 Subject: [PATCH 27/51] feat: 'visibleButLocked' now applies for all buttons --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index da71553..c689277 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -298,7 +298,7 @@ public abstract class MidnightConfig { if (entry.buttons.get(0) instanceof ClickableWidget widget) if (widget.isFocused() || widget.isHovered()) widget.setTooltip(getTooltip(entry.info, true)); if (entry.buttons.get(1) instanceof ButtonWidget button) - button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)); + button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)) && entry.info.conditionsMet; }}}} @Override public boolean keyPressed(int keyCode, int scanCode, int modifiers) { @@ -415,7 +415,6 @@ public abstract class MidnightConfig { explorerButton.setPosition(width - 185, 0); info.actionButton = explorerButton; } - if (!info.conditionsMet) widget.active = false; List widgets = Lists.newArrayList(widget, resetButton); if (info.actionButton != null) { if (IS_SYSTEM_MAC) info.actionButton.active = false; @@ -426,6 +425,7 @@ public abstract class MidnightConfig { widget.setWidth(widget.getWidth() - 22); widget.setX(widget.getX() + 22); widgets.add(cycleButton); } + if (!info.conditionsMet) widgets.forEach(w -> w.active = false); this.list.addButton(widgets, name, info); } else this.list.addButton(List.of(), name, info); } list.setScrollY(scrollProgress); From 5905eed58f5fd4ee79658c0a37b436dae7869afe Mon Sep 17 00:00:00 2001 From: Jaffe2718 Date: Fri, 18 Apr 2025 17:01:35 +0800 Subject: [PATCH 28/51] - feat: add clickable url for `@Comment` - chore: bump version `1.7.2-rc.2` --- .../lib/config/MidnightConfig.java | 29 +++++++++++++++++-- gradle.properties | 2 +- .../example/config/MidnightConfigExample.java | 4 ++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index c689277..f132d45 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -5,7 +5,9 @@ import com.google.gson.*; import com.google.gson.stream.*; import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; -import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.ConfirmLinkScreen; +import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; import net.minecraft.client.render.RenderLayer; @@ -14,6 +16,7 @@ import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; +import net.minecraft.util.Util; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; @@ -488,6 +491,20 @@ public abstract class MidnightConfig { } } } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + boolean result = super.mouseClicked(mouseX, mouseY, button); + if (this.info != null && this.info.comment != null && !this.info.comment.url().isBlank()) { + Screen parent = MinecraftClient.getInstance().currentScreen; + MinecraftClient.getInstance().setScreen(new ConfirmLinkScreen((confirm)->{ + if (confirm) Util.getOperatingSystem().open(this.info.comment.url()); + MinecraftClient.getInstance().setScreen(parent); + }, this.info.comment.url(), true)); + } + return result; + } + public List children() {return Lists.newArrayList(buttons);} public List selectableChildren() {return Lists.newArrayList(buttons);} } @@ -567,11 +584,19 @@ public abstract class MidnightConfig { */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Hidden {} + /** + * Comment Annotation
+ * - {@link Comment#centered()}: If the comment should be centered (default: false)
+ * - {@link Comment#category()}: The category of the comment in the config screen (default + * "default")
+ * - {@link Comment#name()}: The name of the comment in the config screen (default: "")
+ * - {@link Comment#url()}: The url of the comment in the config screen, empty or blank means no url (default: "")
+ * */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment { boolean centered() default false; String category() default "default"; String name() default ""; - @Deprecated String requiredMod() default ""; + String url() default ""; } /** * Condition Annotation
diff --git a/gradle.properties b/gradle.properties index b847844..fcb7bd9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.2-rc.1 +mod_version=1.7.2-rc.2 maven_group=eu.midnightdust release_type=release curseforge_id=488090 diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 512f7a3..3ffa54d 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -10,7 +10,7 @@ import java.util.List; /** Every option in a MidnightConfig class has to be public and static, so we can access it from other classes. * The config class also has to extend MidnightConfig*/ -@SuppressWarnings("unused") +@SuppressWarnings({"unused", "DefaultAnnotationParam"}) public class MidnightConfigExample extends MidnightConfig { public static final String TEXT = "text"; public static final String NUMBERS = "numbers"; @@ -31,6 +31,8 @@ public class MidnightConfigExample extends MidnightConfig { public enum ModPlatform { // Enums allow the user to cycle through predefined options QUILT, FABRIC, FORGE, NEOFORGE, VANILLA } + @Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url + @Entry(category = NUMBERS) public static int fabric = 16777215; // Example for an int option @Entry(category = NUMBERS) public static double world = 1.4D; // Example for a double option @Entry(category = NUMBERS, min=69,max=420) public static int hello = 420; // - The entered number has to be larger than 69 and smaller than 420 From e58c7fc0fdc527d24818211f9c5170f98437774a Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Fri, 18 Apr 2025 12:37:46 +0200 Subject: [PATCH 29/51] feat: improve URL handling - Uses the `open` method of `ConfirmLinkScreen` instead of manually instantiating it - Also re-add the `requiredMod` field for `@Comment` to prevent mods that haven't adjusted yet from outright crashing --- .../eu/midnightdust/lib/config/MidnightConfig.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index f132d45..588b1dd 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -494,15 +494,9 @@ public abstract class MidnightConfig { @Override public boolean mouseClicked(double mouseX, double mouseY, int button) { - boolean result = super.mouseClicked(mouseX, mouseY, button); - if (this.info != null && this.info.comment != null && !this.info.comment.url().isBlank()) { - Screen parent = MinecraftClient.getInstance().currentScreen; - MinecraftClient.getInstance().setScreen(new ConfirmLinkScreen((confirm)->{ - if (confirm) Util.getOperatingSystem().open(this.info.comment.url()); - MinecraftClient.getInstance().setScreen(parent); - }, this.info.comment.url(), true)); - } - return result; + if (this.info != null && this.info.comment != null && !this.info.comment.url().isBlank()) + ConfirmLinkScreen.open(MinecraftClient.getInstance().currentScreen, this.info.comment.url(), true); + return super.mouseClicked(mouseX, mouseY, button); } public List children() {return Lists.newArrayList(buttons);} @@ -597,6 +591,7 @@ public abstract class MidnightConfig { String category() default "default"; String name() default ""; String url() default ""; + @Deprecated String requiredMod() default ""; } /** * Condition Annotation
From 82889b8c061ae6debb21d46506feba1d1ef09482 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 21 Apr 2025 10:43:40 +0200 Subject: [PATCH 30/51] docs: improve JavaDocs --- .../eu/midnightdust/lib/config/MidnightConfig.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 588b1dd..355e2b8 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -530,7 +530,7 @@ public abstract class MidnightConfig { * - width: The maximum character length of the {@link String}, {@link Identifier} or String/Identifier {@link List<>} field
* - min: The minimum value of the int, float or double field
* - max: The maximum value of the int, float or double field
- * - name: The name of the field in the config screen
+ * - name: Will be used instead of the default translation key, if not empty
* - selectionMode: The selection mode of the file picker button for {@link String} fields, * -1 for none, {@link JFileChooser#FILES_ONLY} for files, {@link JFileChooser#DIRECTORIES_ONLY} for directories, * {@link JFileChooser#FILES_AND_DIRECTORIES} for both (default: -1). Remember to set the translation key @@ -580,11 +580,10 @@ public abstract class MidnightConfig { /** * Comment Annotation
- * - {@link Comment#centered()}: If the comment should be centered (default: false)
- * - {@link Comment#category()}: The category of the comment in the config screen (default - * "default")
- * - {@link Comment#name()}: The name of the comment in the config screen (default: "")
- * - {@link Comment#url()}: The url of the comment in the config screen, empty or blank means no url (default: "")
+ * - {@link Comment#centered()}: If the comment should be centered
+ * - {@link Comment#category()}: The category of the comment in the config screen
+ * - {@link Comment#name()}: Will be used instead of the default translation key, if not empty
+ * - {@link Comment#url()}: The url of the comment should link to in the config screen (none if left empty)
* */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment { boolean centered() default false; From 06ef4fdcf77c6a4c02fc6b134a1108d4e4d029ff Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 21 Apr 2025 10:45:02 +0200 Subject: [PATCH 31/51] clean: remove unused import --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 355e2b8..3832f0e 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -6,8 +6,7 @@ import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; -import net.minecraft.client.gui.screen.ConfirmLinkScreen; -import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; import net.minecraft.client.render.RenderLayer; @@ -16,7 +15,6 @@ import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; -import net.minecraft.util.Util; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; From 356064b052f51fd409d5e9f9f9fe459f0b873f48 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 21 Apr 2025 10:46:02 +0200 Subject: [PATCH 32/51] chore: bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index fcb7bd9..13e4aee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.2-rc.2 +mod_version=1.7.2 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From daec2a31879dbaf0721b72cec6aecab599c9beca Mon Sep 17 00:00:00 2001 From: Joris Kleiber Date: Sat, 26 Apr 2025 01:10:57 +0200 Subject: [PATCH 33/51] feat: respect TranslatableOption on enums --- .../lib/config/MidnightConfig.java | 20 +++++++---- .../example/config/MidnightConfigExample.java | 35 +++++++++++++++++++ .../resources/assets/modid/lang/en_us.json | 1 + 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 3832f0e..6c0a753 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -15,6 +15,7 @@ import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; +import net.minecraft.util.TranslatableOption; import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; @@ -170,10 +171,7 @@ public abstract class MidnightConfig { }, func); } else if (info.dataType.isEnum()) { List values = Arrays.asList(field.getType().getEnumConstants()); - Function func = value -> { - String translationKey = modid + ".midnightconfig.enum." + info.dataType.getSimpleName() + "." + info.toTemporaryValue(); - return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue()); - }; + Function func = value -> getEnumTranslatableText(value, modid, info); info.function = new AbstractMap.SimpleEntry>(button -> { int index = values.indexOf(info.value) + 1; info.setValue(values.get(index >= values.size() ? 0 : index)); @@ -195,6 +193,15 @@ public abstract class MidnightConfig { return Tooltip.of(isButton && info.error != null ? info.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty()); } + private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) { + if (value instanceof TranslatableOption translatableOption) { + return translatableOption.getText(); + } + + String translationKey = modid + ".midnightconfig.enum." + info.dataType.getSimpleName() + "." + info.toTemporaryValue(); + return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue()); + } + private static void textField(EntryInfo info, Function f, Pattern pattern, double min, double max, boolean cast) { boolean isNumber = pattern != null; info.function = (BiFunction>) (t, b) -> s -> { @@ -359,8 +366,9 @@ public abstract class MidnightConfig { Entry e = info.entry; if (info.function instanceof Map.Entry) { // Enums & booleans var values = (Map.Entry>) info.function; - if (info.dataType.isEnum()) - values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); + if (info.dataType.isEnum()) { + values.setValue(value -> getEnumTranslatableText(value, modid, info)); + } widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); if (info.dataType == boolean.class) info.actionButton = CheckboxWidget.builder(Text.empty(), textRenderer).callback((checkbox, checked) -> values.getKey().onPress((ButtonWidget) widget)).checked((Boolean) info.value).pos(widget.getX(), 1).build(); } else if (e.isSlider()) diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 3ffa54d..2b9c172 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -2,7 +2,11 @@ package eu.midnightdust.fabric.example.config; import com.google.common.collect.Lists; import eu.midnightdust.lib.config.MidnightConfig; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; +import net.minecraft.util.TranslatableOption; import javax.swing.*; import java.util.ArrayList; @@ -31,6 +35,37 @@ public class MidnightConfigExample extends MidnightConfig { public enum ModPlatform { // Enums allow the user to cycle through predefined options QUILT, FABRIC, FORGE, NEOFORGE, VANILLA } + @Entry(category = TEXT) public static GraphicsSteps graphicsSteps = GraphicsSteps.FABULOUS; // Example for an enum option with TranslatableOption + public enum GraphicsSteps implements TranslatableOption { + FAST(0, "options.graphics.fast"), + FANCY(1, "options.graphics.fancy"), + FABULOUS(2, "options.graphics.fabulous"); + + private final int id; + private final String translationKey; + + GraphicsSteps(int id, String translationKey) { + this.id = id; + this.translationKey = translationKey; + } + + @Override + public Text getText() { + MutableText mutableText = Text.translatable(this.getTranslationKey()); + return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText; + } + + @Override + public int getId() { + return this.id; + } + + @Override + public String getTranslationKey() { + return this.translationKey; + } + } + @Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url @Entry(category = NUMBERS) public static int fabric = 16777215; // Example for an int option diff --git a/test-fabric/src/main/resources/assets/modid/lang/en_us.json b/test-fabric/src/main/resources/assets/modid/lang/en_us.json index 702947c..976393b 100644 --- a/test-fabric/src/main/resources/assets/modid/lang/en_us.json +++ b/test-fabric/src/main/resources/assets/modid/lang/en_us.json @@ -16,6 +16,7 @@ "modid.midnightconfig.enum.ModPlatform.QUILT":"Quilt", "modid.midnightconfig.enum.ModPlatform.NEOFORGE":"NeoForge", "modid.midnightconfig.enum.ModPlatform.VANILLA":"Vanilla", + "modid.midnightconfig.graphicsSteps":"I am an enum with TranslatableOption!", "modid.midnightconfig.myFileOrDirectory.fileChooser": "Select an image or directory", "modid.midnightconfig.myFileOrDirectory.fileFilter": "Supported Images (.png, .jpg, .jpeg)", "modid.midnightconfig.category.numbers": "Numbers", From 03223b8d9bf35d2cead844581cf1f152a64ff4bb Mon Sep 17 00:00:00 2001 From: Texaliuz <152565569+Texaliuz@users.noreply.github.com> Date: Tue, 29 Apr 2025 19:41:32 -0300 Subject: [PATCH 34/51] Translation into Argentine Spanish (es_ar) for MidnightLib Hello, I would appreciate if you could add the translation to my language (es_ar) for version 1.21.1 please and thank you. --- .../resources/assets/modid/lang/es_ar.json | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 test-fabric/src/main/resources/assets/modid/lang/es_ar.json diff --git a/test-fabric/src/main/resources/assets/modid/lang/es_ar.json b/test-fabric/src/main/resources/assets/modid/lang/es_ar.json new file mode 100644 index 0000000..d87e7a8 --- /dev/null +++ b/test-fabric/src/main/resources/assets/modid/lang/es_ar.json @@ -0,0 +1,28 @@ +{ + "modid.midnightconfig.title": "Soy un título", + "modid.midnightconfig.text1": "Soy un comentario *u*", + "modid.midnightconfig.text2": "Soy un comentario centrado (╯°□°)╯︵ ┻━┻", + "modid.midnightconfig.name": "¡Soy una cadena de texto!", + "modid.midnightconfig.name.label.tooltip": "Soy el tooltip de una etiqueta \n¡Wujuu!", + "modid.midnightconfig.name.tooltip": "Soy un tooltip uwu \nY una nueva línea", + "modid.midnightconfig.fabric": "Soy un entero", + "modid.midnightconfig.world": "Soy un número decimal", + "modid.midnightconfig.showInfo": "Soy un booleano", + "modid.midnightconfig.hello": "¡Soy un entero limitado!", + "modid.midnightconfig.id": "¡Soy un identificador de ítem!", + "modid.midnightconfig.modPlatform": "¡Soy un enumerador!", + "modid.midnightconfig.enum.ModPlatform.FORGE": "Forge", + "modid.midnightconfig.enum.ModPlatform.FABRIC": "Fabric", + "modid.midnightconfig.enum.ModPlatform.QUILT": "Quilt", + "modid.midnightconfig.enum.ModPlatform.NEOFORGE": "NeoForge", + "modid.midnightconfig.enum.ModPlatform.VANILLA": "Vanilla", + "modid.midnightconfig.myFileOrDirectory.fileChooser": "Seleccioná una imagen o carpeta", + "modid.midnightconfig.myFileOrDirectory.fileFilter": "Imágenes compatibles (.png, .jpg, .jpeg)", + "modid.midnightconfig.category.numbers": "Números", + "modid.midnightconfig.category.text": "Texto", + "modid.midnightconfig.category.sliders": "Deslizadores", + "modid.midnightconfig.category.lists": "Listas", + "modid.midnightconfig.category.files": "Archivos", + "modid.midnightconfig.category.conditions": "Cuestionario", + "modid.midnightconfig.category.multiConditions": "Condiciones múltiples" +} From f986d10e1f8a6911fc60dfd70f47d62eacd9a014 Mon Sep 17 00:00:00 2001 From: Texaliuz <152565569+Texaliuz@users.noreply.github.com> Date: Tue, 29 Apr 2025 19:45:28 -0300 Subject: [PATCH 35/51] Translation into Argentine Spanish (es_ar) for MidnightLib Hello, I would appreciate if you could add the translation to my language (es_ar) for version 1.21.1 please and thank you. --- .../resources/assets/midnightlib/lang/es_ar.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 common/src/main/resources/assets/midnightlib/lang/es_ar.json diff --git a/common/src/main/resources/assets/midnightlib/lang/es_ar.json b/common/src/main/resources/assets/midnightlib/lang/es_ar.json new file mode 100644 index 0000000..44af0ad --- /dev/null +++ b/common/src/main/resources/assets/midnightlib/lang/es_ar.json @@ -0,0 +1,13 @@ +{ + "midnightlib.overview.title": "Resumen de MidnightConfig", + "midnightlib.midnightconfig.title": "Configuración de MidnightLib", + "midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración", + "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí", + "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cNo", + "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", + "midnightlib.modrinth": "Modrinth", + "midnightlib.curseforge": "CurseForge", + "midnightlib.wiki": "Wiki", + "modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.", + "midnightconfig.colorChooser.title": "Elegí un color" +} From 3eb345ce3ca767f220aa71e501c87f07baf712a1 Mon Sep 17 00:00:00 2001 From: Texaliuz <152565569+Texaliuz@users.noreply.github.com> Date: Sun, 4 May 2025 13:10:32 -0300 Subject: [PATCH 36/51] Update es_ar.json Minor corrections --- common/src/main/resources/assets/midnightlib/lang/es_ar.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/resources/assets/midnightlib/lang/es_ar.json b/common/src/main/resources/assets/midnightlib/lang/es_ar.json index 44af0ad..1f559e8 100644 --- a/common/src/main/resources/assets/midnightlib/lang/es_ar.json +++ b/common/src/main/resources/assets/midnightlib/lang/es_ar.json @@ -1,5 +1,5 @@ { - "midnightlib.overview.title": "Resumen de MidnightConfig", + "midnightlib.overview.title": "Visión general de MidnightConfig", "midnightlib.midnightconfig.title": "Configuración de MidnightLib", "midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración", "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí", From 302728192f0f3176264b7057d07cbffa1299b26a Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 12 May 2025 12:35:20 +0200 Subject: [PATCH 37/51] feat: new method to manually add widgets - Also added a keybind widget as an example for this. It will not be included in the base jar, but can be manually copied into mods that rely on it. --- .../lib/config/MidnightConfig.java | 36 ++++--- .../fabric/example/MidnightLibExtras.java | 96 +++++++++++++++++++ .../example/config/MidnightConfigExample.java | 16 ++++ .../resources/assets/modid/lang/en_us.json | 1 + 4 files changed, 134 insertions(+), 15 deletions(-) create mode 100644 test-fabric/src/main/java/eu/midnightdust/fabric/example/MidnightLibExtras.java diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 3832f0e..e8e0f56 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -14,6 +14,7 @@ import net.minecraft.client.resource.language.I18n; import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Style; import net.minecraft.text.Text; +import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import org.jetbrains.annotations.Nullable; @@ -106,6 +107,10 @@ public abstract class MidnightConfig { if (index >= list.size()) list.add(value); else list.set(index, value); } + public Tooltip getTooltip(boolean isButton) { + String key = this.modid + ".midnightconfig."+this.fieldName+(!isButton ? ".label" : "" )+".tooltip"; + return Tooltip.of(isButton && this.error != null ? this.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty()); + } } public static final Map> configClass = new HashMap<>(); @@ -119,11 +124,6 @@ public abstract class MidnightConfig { public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); } }).setPrettyPrinting().create(); - @SuppressWarnings("unused") // Utility for mod authors - public static @Nullable Object getDefaultValue(String modid, String entry) { - String key = modid + ":" + entry; - return entries.containsKey(key) ? entries.get(key).defaultValue : null; - } public static void loadValuesFromJson(String modid) { try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } catch (Exception e) { write(modid); } @@ -190,10 +190,6 @@ public abstract class MidnightConfig { try { return (Class) rawType.getField("TYPE").get(null); // Tries to get primitive types from non-primitives (e.g. Boolean -> boolean) } catch (NoSuchFieldException | IllegalAccessException ignored) { return rawType; } } - public static Tooltip getTooltip(EntryInfo info, boolean isButton) { - String key = info.modid + ".midnightconfig."+info.fieldName+(!isButton ? ".label" : "" )+".tooltip"; - return Tooltip.of(isButton && info.error != null ? info.error : I18n.hasTranslation(key) ? Text.translatable(key) : Text.empty()); - } private static void textField(EntryInfo info, Function f, Pattern pattern, double min, double max, boolean cast) { boolean isNumber = pattern != null; @@ -209,7 +205,7 @@ public abstract class MidnightConfig { info.error = inLimits? null : Text.literal(value.doubleValue() < min ? "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) : "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max)).formatted(Formatting.RED); - t.setTooltip(getTooltip(info, true)); + t.setTooltip(info.getTooltip(true)); } info.tempValue = s; @@ -241,6 +237,15 @@ public abstract class MidnightConfig { Files.write(path, gson.toJson(getClass(modid)).getBytes()); } catch (Exception e) { e.fillInStackTrace(); } } + + @SuppressWarnings("unused") // Utility for mod authors + public static @Nullable Object getDefaultValue(String modid, String entry) { + String key = modid + ":" + entry; + return entries.containsKey(key) ? entries.get(key).defaultValue : null; + } + + public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) {} + @Environment(EnvType.CLIENT) public static Screen getScreen(Screen parent, String modid) { return new MidnightConfigScreen(parent, modid); @@ -295,9 +300,9 @@ public abstract class MidnightConfig { public void updateButtons() { if (this.list != null) { for (ButtonEntry entry : this.list.children()) { - if (entry.buttons != null && entry.buttons.size() > 1) { + if (entry.buttons != null && entry.buttons.size() > 1 && entry.info.field != null) { if (entry.buttons.get(0) instanceof ClickableWidget widget) - if (widget.isFocused() || widget.isHovered()) widget.setTooltip(getTooltip(entry.info, true)); + if (widget.isFocused() || widget.isHovered()) widget.setTooltip(entry.info.getTooltip(true)); if (entry.buttons.get(1) instanceof ButtonWidget button) button.active = !Objects.equals(String.valueOf(entry.info.value), String.valueOf(entry.info.defaultValue)) && entry.info.conditionsMet; }}}} @@ -337,6 +342,7 @@ public abstract class MidnightConfig { this.list.clear(); fillList(); } public void fillList() { + MidnightConfig.getClass(modid).onTabInit(prevTab.getTitle().getContent() instanceof TranslatableTextContent translatable ? translatable.getKey().replace("%s.midnightconfig.category.".formatted(modid), "") : prevTab.getTitle().toString(), list, this); for (EntryInfo info : entries.values()) { if (!info.conditionsMet) { boolean visibleButLocked = false; @@ -361,7 +367,7 @@ public abstract class MidnightConfig { var values = (Map.Entry>) info.function; if (info.dataType.isEnum()) values.setValue(value -> Text.translatable(translationPrefix + "enum." + info.dataType.getSimpleName() + "." + info.value.toString())); - widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(getTooltip(info, true)).build(); + widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(info.getTooltip(true)).build(); if (info.dataType == boolean.class) info.actionButton = CheckboxWidget.builder(Text.empty(), textRenderer).callback((checkbox, checked) -> values.getKey().onPress((ButtonWidget) widget)).checked((Boolean) info.value).pos(widget.getX(), 1).build(); } else if (e.isSlider()) widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); @@ -371,7 +377,7 @@ public abstract class MidnightConfig { Predicate processor = ((BiFunction>) info.function).apply(textField, done); textField.setTextPredicate(processor); } - widget.setTooltip(getTooltip(info, true)); + widget.setTooltip(info.getTooltip(true)); ButtonWidget cycleButton = null; if (info.field.getType() == List.class) { @@ -470,7 +476,7 @@ public abstract class MidnightConfig { if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) { title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer); - if (info != null) title.setTooltip(getTooltip(info, false)); + if (info != null) title.setTooltip(info.getTooltip(false)); title.setMaxWidth(buttons.size() > 1 ? buttons.get(1).getX() - 24 : scaledWidth - 24); } } diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/MidnightLibExtras.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/MidnightLibExtras.java new file mode 100644 index 0000000..12deb14 --- /dev/null +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/MidnightLibExtras.java @@ -0,0 +1,96 @@ +package eu.midnightdust.fabric.example; + +import com.google.common.collect.Lists; +import eu.midnightdust.lib.config.MidnightConfig; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.tooltip.Tooltip; +import net.minecraft.client.gui.widget.ButtonWidget; +import net.minecraft.client.gui.widget.ClickableWidget; +import net.minecraft.client.gui.widget.TextIconButtonWidget; +import net.minecraft.client.option.KeyBinding; +import net.minecraft.client.util.InputUtil; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; +import net.minecraft.util.Formatting; +import net.minecraft.util.Identifier; +import org.jetbrains.annotations.Nullable; +import org.lwjgl.glfw.GLFW; + +/* + Pre-made additional (niche) functionality that is not included in MidnightLib to keep the file size small. + Feel free to copy the parts you need :) +*/ +public class MidnightLibExtras { + public static class KeybindButton extends ButtonWidget { + public static ButtonWidget focusedButton; + + public static void add(KeyBinding binding, MidnightConfig.MidnightConfigListWidget list, MidnightConfig.MidnightConfigScreen screen) { + KeybindButton editButton = new KeybindButton(screen.width - 185, 0, 150, 20, binding); + TextIconButtonWidget resetButton = TextIconButtonWidget.builder(Text.translatable("controls.reset"), (button -> { + binding.setBoundKey(binding.getDefaultKey()); + screen.updateList(); + }), true).texture(Identifier.of("midnightlib","icon/reset"), 12, 12).dimension(20, 20).build(); + resetButton.setPosition(screen.width - 205 + 150 + 25, 0); + editButton.resetButton = resetButton; + editButton.updateMessage(false); + MidnightConfig.EntryInfo info = new MidnightConfig.EntryInfo(null, screen.modid); + + list.addButton(Lists.newArrayList(editButton, resetButton), Text.translatable(binding.getTranslationKey()), info); + } + + private final KeyBinding binding; + private @Nullable ClickableWidget resetButton; + public KeybindButton(int x, int y, int width, int height, KeyBinding binding) { + super(x, y, width, height, binding.getBoundKeyLocalizedText(), (button) -> { + ((KeybindButton) button).updateMessage(true); + focusedButton = button; + }, (textSupplier) -> binding.isUnbound() ? Text.translatable("narrator.controls.unbound", binding.getTranslationKey()) : Text.translatable("narrator.controls.bound", binding.getTranslationKey(), textSupplier.get())); + this.binding = binding; + updateMessage(false); + } + @Override + public boolean keyPressed(int keyCode, int scanCode, int modifiers) { + if (focusedButton == this) { + if (keyCode == GLFW.GLFW_KEY_ESCAPE) { + this.binding.setBoundKey(InputUtil.UNKNOWN_KEY); + } else { + this.binding.setBoundKey(InputUtil.fromKeyCode(keyCode, scanCode)); + } + updateMessage(false); + + focusedButton = null; + return true; + } + return super.keyPressed(keyCode, scanCode, modifiers); + } + + public void updateMessage(boolean focused) { + boolean hasConflicts = false; + MutableText conflictingBindings = Text.empty(); + if (focused) this.setMessage(Text.literal("> ").append(this.binding.getBoundKeyLocalizedText().copy().formatted(Formatting.WHITE, Formatting.UNDERLINE)).append(" <").formatted(Formatting.YELLOW)); + else { + this.setMessage(this.binding.getBoundKeyLocalizedText()); + + if (!this.binding.isUnbound()) { + for(KeyBinding keyBinding : MinecraftClient.getInstance().options.allKeys) { + if (keyBinding != this.binding && this.binding.equals(keyBinding)) { + if (hasConflicts) conflictingBindings.append(", "); + + hasConflicts = true; + conflictingBindings.append(Text.translatable(keyBinding.getTranslationKey())); + } + } + } + } + + if (this.resetButton != null) this.resetButton.active = !this.binding.isDefault(); + + if (hasConflicts) { + this.setMessage(Text.literal("[ ").append(this.getMessage().copy().formatted(Formatting.WHITE)).append(" ]").formatted(Formatting.RED)); + this.setTooltip(Tooltip.of(Text.translatable("controls.keybinds.duplicateKeybinds", conflictingBindings))); + } else { + this.setTooltip(null); + } + } + } +} diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 3ffa54d..80d4a15 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -1,12 +1,15 @@ package eu.midnightdust.fabric.example.config; import com.google.common.collect.Lists; +import eu.midnightdust.fabric.example.MidnightLibExtras; import eu.midnightdust.lib.config.MidnightConfig; +import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; import javax.swing.*; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** Every option in a MidnightConfig class has to be public and static, so we can access it from other classes. * The config class also has to extend MidnightConfig*/ @@ -18,6 +21,7 @@ public class MidnightConfigExample extends MidnightConfig { public static final String LISTS = "lists"; public static final String FILES = "files"; public static final String CONDITIONS = "conditions"; + public static final String EXTRAS = "extras"; @Comment(category = TEXT) public static Comment text1; // Comments are rendered like an option without a button and are excluded from the config file @Comment(category = TEXT, centered = true) public static Comment text2; // Centered comments are the same as normal ones - just centered! @@ -115,4 +119,16 @@ public class MidnightConfigExample extends MidnightConfig { @Comment(category = CONDITIONS, name="You disabled MidnightLib's config screen list. Why? :(", centered = true) public static Comment why; public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored + + @Condition(requiredModId = "thismoddoesnotexist") + @Comment(category = EXTRAS) public static Comment iAmJustADummy; // We only have this to initialize an empty tab for the keybinds below + + @Override + public void onTabInit(String tabName, MidnightConfigListWidget list, MidnightConfigScreen screen) { + if (Objects.equals(tabName, EXTRAS)) { + MidnightLibExtras.KeybindButton.add(MinecraftClient.getInstance().options.advancementsKey, list, screen); + MidnightLibExtras.KeybindButton.add(MinecraftClient.getInstance().options.dropKey, list, screen); + } + } + } \ No newline at end of file diff --git a/test-fabric/src/main/resources/assets/modid/lang/en_us.json b/test-fabric/src/main/resources/assets/modid/lang/en_us.json index 702947c..273f0da 100644 --- a/test-fabric/src/main/resources/assets/modid/lang/en_us.json +++ b/test-fabric/src/main/resources/assets/modid/lang/en_us.json @@ -24,5 +24,6 @@ "modid.midnightconfig.category.lists": "Lists", "modid.midnightconfig.category.files": "Files", "modid.midnightconfig.category.conditions": "Quiz", + "modid.midnightconfig.category.extras": "Extras", "modid.midnightconfig.category.multiConditions": "Multi-Conditions" } \ No newline at end of file From b2c24010da58e4e9f625a2908fdeff05c33844c8 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 12 May 2025 12:45:27 +0200 Subject: [PATCH 38/51] fix: adjust option title position --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index e8e0f56..054fa8d 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -483,7 +483,7 @@ public abstract class MidnightConfig { public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { buttons.forEach(b -> { b.setY(y + (b instanceof CheckboxWidget ? 1 : 0)); b.render(context, mouseX, mouseY, tickDelta);}); if (title != null) { - title.setY(y + 9); + title.setY(y+5); title.renderWidget(context, mouseX, mouseY, tickDelta); boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY(); From 7a15f1fb8dc947a574981fd9e5b4f618369aeef5 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 12 May 2025 18:53:54 +0200 Subject: [PATCH 39/51] fix: conditions are not applied in default tab - Closes #104 --- .../src/main/java/eu/midnightdust/lib/config/MidnightConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 054fa8d..25364c5 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -344,6 +344,7 @@ public abstract class MidnightConfig { public void fillList() { MidnightConfig.getClass(modid).onTabInit(prevTab.getTitle().getContent() instanceof TranslatableTextContent translatable ? translatable.getKey().replace("%s.midnightconfig.category.".formatted(modid), "") : prevTab.getTitle().toString(), list, this); for (EntryInfo info : entries.values()) { + info.updateConditions(); if (!info.conditionsMet) { boolean visibleButLocked = false; for (Condition condition : info.conditions) { From f1fe868192e71b69b8ee08a2dff47e0c9f72e0ee Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 12 May 2025 22:57:15 +0200 Subject: [PATCH 40/51] feat: remove checkbox widgets - As voted on in a recent MidnightDust Discord Poll --- .../java/eu/midnightdust/lib/config/MidnightConfig.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 99b4250..c24bef1 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -164,9 +164,6 @@ public abstract class MidnightConfig { else if (info.dataType == boolean.class) { Function func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); info.function = new AbstractMap.SimpleEntry>(button -> { - if (info.actionButton instanceof CheckboxWidget checkbox && checkbox.isChecked() == (Boolean) info.value) { - checkbox.onPress(); return; - } info.setValue(!(Boolean) info.value); button.setMessage(func.apply(info.value)); }, func); } else if (info.dataType.isEnum()) { @@ -377,7 +374,6 @@ public abstract class MidnightConfig { values.setValue(value -> getEnumTranslatableText(value, modid, info)); } widget = ButtonWidget.builder(values.getValue().apply(info.value), values.getKey()).dimensions(width - 185, 0, 150, 20).tooltip(info.getTooltip(true)).build(); - if (info.dataType == boolean.class) info.actionButton = CheckboxWidget.builder(Text.empty(), textRenderer).callback((checkbox, checked) -> values.getKey().onPress((ButtonWidget) widget)).checked((Boolean) info.value).pos(widget.getX(), 1).build(); } else if (e.isSlider()) widget = new MidnightSliderWidget(width - 185, 0, 150, 20, Text.of(info.tempValue), (Double.parseDouble(info.tempValue) - e.min()) / (e.max() - e.min()), info); else widget = new TextFieldWidget(textRenderer, width - 185, 0, 150, 20, Text.empty()); @@ -490,7 +486,7 @@ public abstract class MidnightConfig { } } public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { - buttons.forEach(b -> { b.setY(y + (b instanceof CheckboxWidget ? 1 : 0)); b.render(context, mouseX, mouseY, tickDelta);}); + buttons.forEach(b -> { b.setY(y); b.render(context, mouseX, mouseY, tickDelta);}); if (title != null) { title.setY(y+5); title.renderWidget(context, mouseX, mouseY, tickDelta); From 6bbaf1ab5d93b7685b569c1e57861da3e1706220 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 12 May 2025 22:58:22 +0200 Subject: [PATCH 41/51] optimize: remove unchanged translations in es_ar --- common/src/main/resources/assets/midnightlib/lang/es_ar.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/src/main/resources/assets/midnightlib/lang/es_ar.json b/common/src/main/resources/assets/midnightlib/lang/es_ar.json index 1f559e8..0829d0a 100644 --- a/common/src/main/resources/assets/midnightlib/lang/es_ar.json +++ b/common/src/main/resources/assets/midnightlib/lang/es_ar.json @@ -3,11 +3,6 @@ "midnightlib.midnightconfig.title": "Configuración de MidnightLib", "midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración", "midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí", - "midnightlib.midnightconfig.enum.ConfigButton.FALSE": "§cNo", - "midnightlib.midnightconfig.enum.ConfigButton.MODMENU": "§bModMenu", - "midnightlib.modrinth": "Modrinth", - "midnightlib.curseforge": "CurseForge", - "midnightlib.wiki": "Wiki", "modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.", "midnightconfig.colorChooser.title": "Elegí un color" } From 7ddfadd4ec84c62f8ffa97b1cfcda155bd5c2ced Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 13 May 2025 12:05:07 +0200 Subject: [PATCH 42/51] clean: some code cleanup --- .../lib/config/MidnightConfig.java | 8 +-- .../example/config/MidnightConfigExample.java | 59 ++++++++++--------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index c24bef1..e85d89c 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -187,11 +187,9 @@ public abstract class MidnightConfig { } private static Text getEnumTranslatableText(Object value, String modid, EntryInfo info) { - if (value instanceof TranslatableOption translatableOption) { - return translatableOption.getText(); - } + if (value instanceof TranslatableOption translatableOption) return translatableOption.getText(); - String translationKey = modid + ".midnightconfig.enum." + info.dataType.getSimpleName() + "." + info.toTemporaryValue(); + String translationKey = "%s.midnightconfig.enum.%s.%s".formatted(modid, info.dataType.getSimpleName(), info.toTemporaryValue()); return I18n.hasTranslation(translationKey) ? Text.translatable(translationKey) : Text.literal(info.toTemporaryValue()); } @@ -257,7 +255,7 @@ public abstract class MidnightConfig { @Environment(EnvType.CLIENT) public static class MidnightConfigScreen extends Screen { protected MidnightConfigScreen(Screen parent, String modid) { - super(Text.translatable(modid + ".midnightconfig." + "title")); + super(Text.translatable(modid + ".midnightconfig.title")); this.parent = parent; this.modid = modid; this.translationPrefix = modid + ".midnightconfig."; loadValuesFromJson(modid); diff --git a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java index 137ded6..095581b 100644 --- a/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java +++ b/test-fabric/src/main/java/eu/midnightdust/fabric/example/config/MidnightConfigExample.java @@ -40,35 +40,6 @@ public class MidnightConfigExample extends MidnightConfig { QUILT, FABRIC, FORGE, NEOFORGE, VANILLA } @Entry(category = TEXT) public static GraphicsSteps graphicsSteps = GraphicsSteps.FABULOUS; // Example for an enum option with TranslatableOption - public enum GraphicsSteps implements TranslatableOption { - FAST(0, "options.graphics.fast"), - FANCY(1, "options.graphics.fancy"), - FABULOUS(2, "options.graphics.fabulous"); - - private final int id; - private final String translationKey; - - GraphicsSteps(int id, String translationKey) { - this.id = id; - this.translationKey = translationKey; - } - - @Override - public Text getText() { - MutableText mutableText = Text.translatable(this.getTranslationKey()); - return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText; - } - - @Override - public int getId() { - return this.id; - } - - @Override - public String getTranslationKey() { - return this.translationKey; - } - } @Comment(category = TEXT, name = "§nMidnightLib Wiki", centered = true, url = "https://www.midnightdust.eu/wiki/midnightlib/") public static Comment wiki; // Example for a comment with a url @@ -155,6 +126,36 @@ public class MidnightConfigExample extends MidnightConfig { public static int imposter = 16777215; // - Entries without an @Entry or @Comment annotation are ignored + public enum GraphicsSteps implements TranslatableOption { + FAST(0, "options.graphics.fast"), + FANCY(1, "options.graphics.fancy"), + FABULOUS(2, "options.graphics.fabulous"); + + private final int id; + private final String translationKey; + + GraphicsSteps(int id, String translationKey) { + this.id = id; + this.translationKey = translationKey; + } + + @Override + public Text getText() { + MutableText mutableText = Text.translatable(this.getTranslationKey()); + return this == GraphicsSteps.FABULOUS ? mutableText.formatted(Formatting.ITALIC).formatted(Formatting.AQUA) : mutableText; + } + + @Override + public int getId() { + return this.id; + } + + @Override + public String getTranslationKey() { + return this.translationKey; + } + } + @Condition(requiredModId = "thismoddoesnotexist") @Comment(category = EXTRAS) public static Comment iAmJustADummy; // We only have this to initialize an empty tab for the keybinds below From a1ad6dd1f085d1782de9f0ab11efd70b8290460d Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 13 May 2025 12:05:21 +0200 Subject: [PATCH 43/51] chore: bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 13e4aee..8d2a03d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.4+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.2 +mod_version=1.7.3 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From b08e38ae11413de2e01a643e21e71fa8f2e804d9 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Wed, 28 May 2025 23:28:03 +0200 Subject: [PATCH 44/51] port: 1.21.6 (pre1) --- build.gradle | 2 +- .../eu/midnightdust/lib/config/MidnightConfig.java | 13 +++++++------ gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 43297f8..7ecfc2e 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ import groovy.json.JsonOutput plugins { id "architectury-plugin" version "3.4-SNAPSHOT" - id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false + id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false id "me.shedaniel.unified-publishing" version "0.1.+" apply false id 'com.github.johnrengelman.shadow' version '8.1.1' apply false } diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index e85d89c..5c3d3e0 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -4,7 +4,9 @@ import com.google.common.collect.Lists; import com.google.gson.*; import com.google.gson.stream.*; import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.DrawContext; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gl.RenderPipelines; +import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; @@ -13,6 +15,7 @@ import net.minecraft.client.render.RenderLayer; import net.minecraft.client.resource.language.I18n; import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; +import net.minecraft.text.HoverEvent; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -458,7 +461,7 @@ public abstract class MidnightConfig { @Override protected void drawHeaderAndFooterSeparators(DrawContext context) { if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context); - else context.drawTexture(RenderLayer::getGuiTextured, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2); + else context.drawTexture(RenderPipelines.GUI_TEXTURED, this.client.world == null ? Screen.FOOTER_SEPARATOR_TEXTURE : Screen.INWORLD_FOOTER_SEPARATOR_TEXTURE, this.getX(), this.getBottom(), 0, 0, this.getWidth(), 2, 32, 2); } public void addButton(List buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); } public void clear() { this.clearEntries(); } @@ -479,6 +482,7 @@ public abstract class MidnightConfig { if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) { title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer); + title.setCentered(centered); if (info != null) title.setTooltip(info.getTooltip(false)); title.setMaxWidth(buttons.size() > 1 ? buttons.get(1).getX() - 24 : scaledWidth - 24); } @@ -487,10 +491,7 @@ public abstract class MidnightConfig { buttons.forEach(b -> { b.setY(y); b.render(context, mouseX, mouseY, tickDelta);}); if (title != null) { title.setY(y+5); - title.renderWidget(context, mouseX, mouseY, tickDelta); - - boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY(); - if (tooltipVisible && title.getTooltip() != null) context.drawOrderedTooltip(textRenderer, title.getTooltip().getLines(MinecraftClient.getInstance()), mouseX, mouseY); + title.render(context, mouseX, mouseY, tickDelta); if (info.entry != null && !this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) { int idMode = this.info.entry.idMode(); diff --git a/gradle.properties b/gradle.properties index 8d2a03d..54aa232 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.21.4 -supported_versions=1.21.5 -yarn_mappings=1.21.4+build.1 +minecraft_version=1.21.6-pre1 +supported_versions= +yarn_mappings=1.21.6-pre1+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib @@ -12,8 +12,8 @@ release_type=release curseforge_id=488090 modrinth_id=codAaoxh -fabric_loader_version=0.16.9 -fabric_api_version=0.110.5+1.21.4 +fabric_loader_version=0.16.14 +fabric_api_version=0.125.2+1.21.6 neoforge_version=21.4.3-beta yarn_mappings_patch_neoforge_version = 1.21+build.4 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0d18421..2733ed5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index 6f5c32b..310a10d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,8 +10,8 @@ pluginManagement { include("common") include("fabric") include("test-fabric") -include("neoforge") -include("test-neoforge") +//include("neoforge") +//include("test-neoforge") //include("quilt") rootProject.name = "midnightlib" From bcde119f236e985a95cc6be15c83447745a4336b Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 17 Jun 2025 17:54:53 +0200 Subject: [PATCH 45/51] fix: correctly wrap option text labels --- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 5c3d3e0..05a58fc 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -484,7 +484,7 @@ public abstract class MidnightConfig { title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer); title.setCentered(centered); if (info != null) title.setTooltip(info.getTooltip(false)); - title.setMaxWidth(buttons.size() > 1 ? buttons.get(1).getX() - 24 : scaledWidth - 24); + title.setMaxWidth(!buttons.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size()-1 : 0).getX() - 16 : scaledWidth - 24); } } public void render(DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { From b61b2cdf1200be9ec680f7e348a2f8fc0b1d9fde Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 17 Jun 2025 17:55:20 +0200 Subject: [PATCH 46/51] port: update to full 1.21.6 --- gradle.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index 54aa232..7c2e9ae 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,19 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.21.6-pre1 +minecraft_version=1.21.6 supported_versions= -yarn_mappings=1.21.6-pre1+build.1 +yarn_mappings=1.21.6+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.3 +mod_version=1.7.4 maven_group=eu.midnightdust release_type=release curseforge_id=488090 modrinth_id=codAaoxh fabric_loader_version=0.16.14 -fabric_api_version=0.125.2+1.21.6 +fabric_api_version=0.127.0+1.21.6 neoforge_version=21.4.3-beta yarn_mappings_patch_neoforge_version = 1.21+build.4 From 30d213b92c5c4ede3d2338a9a6deb819967ebd2a Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 17 Jun 2025 18:00:22 +0200 Subject: [PATCH 47/51] feat: NeoForge 1.21.6 --- gradle.properties | 2 +- settings.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 7c2e9ae..f4ea85c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ modrinth_id=codAaoxh fabric_loader_version=0.16.14 fabric_api_version=0.127.0+1.21.6 -neoforge_version=21.4.3-beta +neoforge_version=21.6.0-beta yarn_mappings_patch_neoforge_version = 1.21+build.4 mod_menu_version = 9.0.0 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 310a10d..6f5c32b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,8 +10,8 @@ pluginManagement { include("common") include("fabric") include("test-fabric") -//include("neoforge") -//include("test-neoforge") +include("neoforge") +include("test-neoforge") //include("quilt") rootProject.name = "midnightlib" From 9602736335e9ecb174c6ee4ef0a8dd652276db4b Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 17 Jun 2025 23:44:21 +0200 Subject: [PATCH 48/51] fix: screen titles not showing --- .../core/screen/MidnightConfigOverviewScreen.java | 2 +- .../main/java/eu/midnightdust/lib/config/MidnightConfig.java | 4 +--- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java b/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java index 7a1df8a..f3a9e33 100755 --- a/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java +++ b/common/src/main/java/eu/midnightdust/core/screen/MidnightConfigOverviewScreen.java @@ -45,6 +45,6 @@ public class MidnightConfigOverviewScreen extends Screen { public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); this.list.render(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF); + context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF); } } \ No newline at end of file diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index 05a58fc..7010451 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -11,11 +11,9 @@ import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selecta import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.tab.GridScreenTab; import net.minecraft.client.gui.tab.Tab; import net.minecraft.client.gui.tab.TabManager; import net.minecraft.client.gui.tooltip.Tooltip; import net.minecraft.client.gui.widget.*; -import net.minecraft.client.render.RenderLayer; import net.minecraft.client.resource.language.I18n; import net.minecraft.registry.Registries; import net.minecraft.screen.ScreenTexts; -import net.minecraft.text.HoverEvent; import net.minecraft.text.Style; import net.minecraft.text.Text; import net.minecraft.text.TranslatableTextContent; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; @@ -449,7 +447,7 @@ public abstract class MidnightConfig { public void render(DrawContext context, int mouseX, int mouseY, float delta) { super.render(context, mouseX, mouseY, delta); this.list.render(context, mouseX, mouseY, delta); - if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFF); + if (tabs.size() < 2) context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 10, 0xFFFFFFFF); } } @Environment(EnvType.CLIENT) diff --git a/gradle.properties b/gradle.properties index f4ea85c..edbb6e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ yarn_mappings=1.21.6+build.1 enabled_platforms=fabric,neoforge archives_base_name=midnightlib -mod_version=1.7.4 +mod_version=1.7.5 maven_group=eu.midnightdust release_type=release curseforge_id=488090 From b963764afe50fcf83591a90fba63b2588a0fdfb8 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 14 Jul 2025 19:13:56 +0200 Subject: [PATCH 49/51] port: update gradle config --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 5cef785..b51236c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ org.gradle.jvmargs=-Xmx4096M -minecraft_version=1.21 -supported_versions=1.21.1 -yarn_mappings=1.21+build.1 +minecraft_version=1.21.1 +supported_versions=1.21 +yarn_mappings=1.21.1+build.3 enabled_platforms=fabric,neoforge archives_base_name=midnightlib @@ -12,10 +12,10 @@ release_type=release curseforge_id=488090 modrinth_id=codAaoxh -fabric_loader_version=0.16.10 -fabric_api_version=0.115.0+1.21.1 +fabric_loader_version=0.16.14 +fabric_api_version=0.116.4+1.21.1 -neoforge_version=21.0.167 +neoforge_version=21.1.192 yarn_mappings_patch_neoforge_version = 1.21+build.4 mod_menu_version = 9.0.0 \ No newline at end of file From 61e9ca96fa9165f8610a72cf7f9a36f6b73ef889 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Mon, 14 Jul 2025 19:14:04 +0200 Subject: [PATCH 50/51] port: adapt to 1.21.1 --- .../eu/midnightdust/lib/config/MidnightConfig.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java index bbb07de..563a52a 100755 --- a/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java +++ b/common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -2,10 +2,10 @@ package eu.midnightdust.lib.config; import com.google.common.collect.Lists; import com.google.gson.*; import com.google.gson.stream.*; +import com.mojang.blaze3d.systems.RenderSystem; import eu.midnightdust.lib.util.PlatformFunctions; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gl.RenderPipelines; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.Element; import net.minecraft.client.gui.Selectable; import net.minecraft.client.gui.screen.ConfirmLinkScreen; import net.minecraft.client.gui.screen.Screen; @@ -22,7 +22,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.Color; -import java.io.IOException; import java.lang.annotation.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.nio.file.Files; import java.nio.file.Path; @@ -121,10 +120,7 @@ public abstract class MidnightConfig { private static final Gson gson = new GsonBuilder() .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE) .addSerializationExclusionStrategy(new NonEntryExclusionStrategy()) - .registerTypeAdapter(Identifier.class, new TypeAdapter() { - public void write(JsonWriter out, Identifier id) throws IOException { out.value(id.toString()); } - public Identifier read(JsonReader in) throws IOException { return Identifier.of(in.nextString()); } - }).setPrettyPrinting().create(); + .registerTypeAdapter(Identifier.class, new Identifier.Serializer()).setPrettyPrinting().create(); public static void loadValuesFromJson(String modid) { try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } @@ -481,7 +477,7 @@ public abstract class MidnightConfig { int scaledWidth = MinecraftClient.getInstance().getWindow().getScaledWidth(); if (text != null && (!text.getString().contains("spacer") || !buttons.isEmpty())) { - title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, Text.of(text), textRenderer); + title = new MultilineTextWidget((centered) ? (scaledWidth / 2 - (textRenderer.getWidth(text) / 2)) : 12, 0, text, textRenderer); title.setCentered(centered); if (info != null) title.setTooltip(info.getTooltip(false)); title.setMaxWidth(!buttons.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size()-1 : 0).getX() - 16 : scaledWidth - 24); @@ -492,6 +488,8 @@ public abstract class MidnightConfig { if (title != null) { title.setY(y+5); title.render(context, mouseX, mouseY, tickDelta); + boolean tooltipVisible = mouseX >= title.getX() && mouseX < title.getWidth() + title.getX() && mouseY >= title.getY() && mouseY < title.getHeight() + title.getY(); + if (tooltipVisible && title.getTooltip() != null) context.drawOrderedTooltip(textRenderer, title.getTooltip().getLines(MinecraftClient.getInstance()), mouseX, mouseY); if (info.entry != null && !this.buttons.isEmpty() && this.buttons.getFirst() instanceof ClickableWidget widget) { int idMode = this.info.entry.idMode(); From cf58bd36377cb9bfccc42d46b5adb58d574b3a16 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Tue, 15 Jul 2025 17:12:35 +0200 Subject: [PATCH 51/51] clean: remove NeoForge bus annotation --- .../main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java b/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java index 57e2d6b..6d93dc9 100644 --- a/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java +++ b/neoforge/src/main/java/eu/midnightdust/neoforge/MidnightLibNeoForge.java @@ -26,7 +26,7 @@ public class MidnightLibNeoForge { if (FMLEnvironment.dist == Dist.CLIENT) MidnightLib.onInitializeClient(); } - @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) + @EventBusSubscriber(modid = "midnightlib", value = Dist.CLIENT) public static class MidnightLibBusEvents { @SubscribeEvent public static void onPostInit(FMLClientSetupEvent event) {