Merge pull request #108 from Texaliuz/patch-3

Update es_ar.json

common/src/main/java/eu/midnightdust/core/mixin/MixinOptionsScreen.java

@@ -37,14 +37,11 @@ public abstract class MixinOptionsScreen extends Screen {
         }
     }
 
-
-
-    @Inject(at = @At("TAIL"), method = "initTabNavigation")
+    @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
     public void midnightlib$onResize(CallbackInfo ci) {
         if (shouldShowButton()) this.midnightlib$setButtonPos();
     }
 
-
     @Unique
     public void midnightlib$setButtonPos() {
         midnightlib$button.setPosition(layout.getWidth() / 2  + 158, layout.getY() + layout.getFooterHeight() - 4);

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,6 +22,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.*;
 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;
@@ -120,7 +121,10 @@ public abstract class MidnightConfig {
     private static final Gson gson = new GsonBuilder()
             .excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE)
             .addSerializationExclusionStrategy(new NonEntryExclusionStrategy())
-            .registerTypeAdapter(Identifier.class, new Identifier.Serializer()).setPrettyPrinting().create();
+            .registerTypeAdapter(Identifier.class, new TypeAdapter<Identifier>() {
+                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();
 
     public static void loadValuesFromJson(String modid) {
         try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); }
@@ -289,9 +293,9 @@ public abstract class MidnightConfig {
             super.tick();
             if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
                 prevTab = tabManager.getCurrentTab();
-                updateList(); list.setScrollAmount(0);
+                updateList(); list.setScrollY(0);
             }
-            scrollProgress = list.getScrollAmount();
+            scrollProgress = list.getScrollY();
             for (EntryInfo info : entries.values()) info.updateFieldValue();
             updateButtons();
             if (reloadScreen) { updateList(); reloadScreen = false; }
@@ -435,7 +439,7 @@ public abstract class MidnightConfig {
                         if (!info.conditionsMet) widgets.forEach(w -> w.active = false);
                         this.list.addButton(widgets, name, info);
                     } else this.list.addButton(List.of(), name, info);
-                } list.setScrollAmount(scrollProgress);
+                } list.setScrollY(scrollProgress);
                 updateButtons();
             }
         }
@@ -455,9 +459,7 @@ public abstract class MidnightConfig {
         @Override
         protected void drawHeaderAndFooterSeparators(DrawContext context) {
             if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
-            else { RenderSystem.enableBlend();
-                context.drawTexture(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(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(); }
@@ -477,7 +479,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, textRenderer);
+                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.isEmpty() ? buttons.get(buttons.size() > 2 ? buttons.size()-1 : 0).getX() - 16 : scaledWidth - 24);
@@ -488,8 +490,6 @@ 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();

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

@@ -1,8 +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í",
-	"modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.",
-	"midnightconfig.colorChooser.title": "Elegí un color"
+  "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,8 +1,8 @@
 org.gradle.jvmargs=-Xmx4096M
 
-minecraft_version=1.21.1
-supported_versions=1.21
-yarn_mappings=1.21.1+build.3
+minecraft_version=1.21.6
+supported_versions=
+yarn_mappings=1.21.6+build.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=midnightlib
@@ -13,9 +13,9 @@ curseforge_id=488090
 modrinth_id=codAaoxh
 
 fabric_loader_version=0.16.14
-fabric_api_version=0.116.4+1.21.1
+fabric_api_version=0.127.0+1.21.6
 
-neoforge_version=21.1.192
+neoforge_version=21.6.0-beta
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 mod_menu_version = 9.0.0

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", value = Dist.CLIENT)
+    @EventBusSubscriber(modid = "midnightlib", bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT)
     public static class MidnightLibBusEvents {
         @SubscribeEvent
         public static void onPostInit(FMLClientSetupEvent event) {

test-fabric/src/main/resources/assets/modid/lang/es_ar.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": "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",
@@ -24,5 +25,6 @@
   "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"
 }