Merge pull request #108 from Texaliuz/patch-3

Update es_ar.json

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
 }

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);
     }
 }

common/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java

@@ -4,12 +4,13 @@ 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;
 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;
@@ -164,9 +165,6 @@ public abstract class MidnightConfig {
             else if (info.dataType == boolean.class) {
                 Function<Object, Text> func = value -> Text.translatable((Boolean) value ? "gui.yes" : "gui.no").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED);
                 info.function = new AbstractMap.SimpleEntry<ButtonWidget.PressAction, Function<Object, Text>>(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()) {
@@ -190,11 +188,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());
     }
 
@@ -260,7 +256,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);
@@ -377,7 +373,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());
@@ -452,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)
@@ -464,7 +459,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<ClickableWidget> buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); }
         public void clear() { this.clearEntries(); }
@@ -485,18 +480,16 @@ 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);
+                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) {
-            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);
-
-                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();

common/src/main/resources/assets/midnightlib/lang/es_ar.json

@@ -0,0 +1,13 @@
+{
+  "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í",
+  "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo",
+  "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bMenú del Mod",
+  "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"
+}

gradle.properties

@@ -1,21 +1,21 @@
 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
+supported_versions=
+yarn_mappings=1.21.6+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
-mod_version=1.7.2
+mod_version=1.7.5
 maven_group=eu.midnightdust
 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.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

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

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
 

test-fabric/src/main/resources/assets/modid/lang/es_ar.json

@@ -0,0 +1,30 @@
+{
+  "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.graphicsSteps": "Soy una enumeración con opción traducible!",
+  "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.extras": "Extras",
+  "modid.midnightconfig.category.multiConditions": "Condiciones múltiples"
+}