Merge fefbaa1947 into a4d801ddf7

feat: maintain tab order (1.21.1)

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

@@ -37,11 +37,14 @@ public abstract class MixinOptionsScreen extends Screen {
         }
     }
 
-    @Inject(at = @At("TAIL"), method = "refreshWidgetPositions")
+
+
+    @Inject(at = @At("TAIL"), method = "initTabNavigation")
     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

@@ -293,9 +293,9 @@ public abstract class MidnightConfig {
             super.tick();
             if (prevTab != null && prevTab != tabManager.getCurrentTab()) {
                 prevTab = tabManager.getCurrentTab();
-                updateList(); list.setScrollY(0);
+                updateList(); list.setScrollAmount(0);
             }
-            scrollProgress = list.getScrollY();
+            scrollProgress = list.getScrollAmount();
             for (EntryInfo info : entries.values()) info.updateFieldValue();
             updateButtons();
             if (reloadScreen) { updateList(); reloadScreen = false; }
@@ -439,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.setScrollY(scrollProgress);
+                } list.setScrollAmount(scrollProgress);
                 updateButtons();
             }
         }
@@ -459,7 +459,9 @@ public abstract class MidnightConfig {
         @Override
         protected void drawHeaderAndFooterSeparators(DrawContext context) {
             if (renderHeaderSeparator) super.drawHeaderAndFooterSeparators(context);
-            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);
+            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(); }
         }
         public void addButton(List<ClickableWidget> buttons, Text text, EntryInfo info) { this.addEntry(new ButtonEntry(buttons, text, info)); }
         public void clear() { this.clearEntries(); }

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

@@ -1,13 +1,8 @@
 {
-  "midnightlib.overview.title": "Visión general de MidnightConfig",
+	"midnightlib.overview.title": "Visión general de MidnightConfig",
-  "midnightlib.midnightconfig.title": "Configuración de MidnightLib",
+	"midnightlib.midnightconfig.title": "Configuración de MidnightLib",
-  "midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración",
+	"midnightlib.midnightconfig.config_screen_list": "Habilitar lista de pantallas de configuración",
-  "midnightlib.midnightconfig.enum.ConfigButton.TRUE":"§aSí",
+	"midnightlib.midnightconfig.enum.ConfigButton.TRUE": "§aSí",
-  "midnightlib.midnightconfig.enum.ConfigButton.FALSE":"§cNo",
+	"modmenu.summaryTranslation.midnightlib": "Librería común para facilitar la configuración.",
-  "midnightlib.midnightconfig.enum.ConfigButton.MODMENU":"§bMenú del Mod",
+	"midnightconfig.colorChooser.title": "Elegí un color"
-  "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.6
+minecraft_version=1.21
-supported_versions=
+supported_versions=1.21.1
-yarn_mappings=1.21.6+build.1
+yarn_mappings=1.21+build.1
 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.14
+fabric_loader_version=0.16.10
-fabric_api_version=0.127.0+1.21.6
+fabric_api_version=0.115.0+1.21.1
 
-neoforge_version=21.6.0-beta
+neoforge_version=21.0.167
 yarn_mappings_patch_neoforge_version = 1.21+build.4
 
 mod_menu_version = 9.0.0

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

@@ -16,7 +16,6 @@
   "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",
@@ -25,6 +24,5 @@
   "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"
 }