From 37de22ecafd23d4d1036c4ea9e392b7323e26ad4 Mon Sep 17 00:00:00 2001
From: ishaanko <ishaanko.mail@gmail.com>
Date: Mon, 14 Sep 2026 11:08:48 -0700
Subject: [PATCH 1/3] fix(ui): keep the backups icon at the end of the icon row
 when other mods add icons late

---
 CHANGELOG.md                                  |  9 +++++++
 .../ui/IconRowBackupIntegration.java          | 25 ++++++++++++++-----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bc81d3..12678d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## Unreleased
+
+### Fixed
+
+- The World Backups icon on the pause and title screens stays at the end of
+  the icon row when other mods add or move icons after WorldArchive placed
+  it. Before, a mod that changed the row later could leave the icon off to
+  the right of the others.
+
 ## 0.3.7.2 (2026-09-10)
 
 ### Changed
diff --git a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
index 817f842..d25c8d1 100644
--- a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
+++ b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
@@ -66,28 +66,41 @@ private static void afterInit(Minecraft minecraft, Screen screen, int width, int
         } else {
             return;
         }
-        List<Button> iconRow = iconRow(Screens.getWidgets(screen));
+        List<Button> iconRow = iconRow(Screens.getWidgets(screen), null);
         if (iconRow.isEmpty()) {
             // No icon row to join; stay out rather than guess a spot.
             return;
         }
         int size = Math.max(WorldArchiveIconButton.SIZE, iconRow.getFirst().getHeight());
         Button backups = WorldArchiveIconButton.create(0, iconRow.getFirst().getY(), size, action);
-        List<Button> row = new ArrayList<>(iconRow);
-        row.add(backups);
-        recenter(row, rowCenter(iconRow), iconRow.getFirst().getY(), width);
         Screens.getWidgets(screen).add(backups);
+        int centerX = rowCenter(iconRow);
+        layoutRow(screen, backups, centerX, width);
+        // Other mods may add or move icons after this hook ran. Laying the row out again
+        // before every frame keeps the shortcut at the end of the row no matter who ran last.
+        ScreenEvents.beforeExtract(screen).register(
+                (current, graphics, mouseX, mouseY, delta) ->
+                        layoutRow(current, backups, centerX, width));
+    }
+
+    /** Puts the shortcut after every other icon in the row, then recenters the row. */
+    private static void layoutRow(Screen screen, Button backups, int centerX, int screenWidth) {
+        List<Button> row = new ArrayList<>(iconRow(Screens.getWidgets(screen), backups));
+        row.add(backups);
+        recenter(row, centerX, backups.getY(), screenWidth);
     }
 
     /**
      * Picks the square-icon row holding the Friends button, or the widest square-icon row
      * without it. Any square button counts, so icons from other mods stay part of the row
-     * and the recentered layout cannot overlap them.
+     * and the recentered layout cannot overlap them. The excluded button, if any, is left
+     * out so the shortcut itself never counts as part of the row it joins.
      */
-    private static List<Button> iconRow(List<AbstractWidget> widgets) {
+    private static List<Button> iconRow(List<AbstractWidget> widgets, Button excluded) {
         Map<Integer, List<Button>> rows = widgets.stream()
                 .filter(Button.class::isInstance)
                 .map(Button.class::cast)
+                .filter(button -> button != excluded)
                 .filter(IconRowBackupIntegration::isSquareIcon)
                 .collect(Collectors.groupingBy(Button::getY));
         return rows.values().stream()

From 23448415b9445b5f766157ee3c0fabd3ba866b2f Mon Sep 17 00:00:00 2001
From: ishaanko <ishaanko.mail@gmail.com>
Date: Mon, 14 Sep 2026 11:18:12 -0700
Subject: [PATCH 2/3] fix(ui): lay out only the shortcut's own icon row each
 frame

---
 .../ui/IconRowBackupIntegration.java          | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
index d25c8d1..e4df315 100644
--- a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
+++ b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
@@ -66,7 +66,7 @@ private static void afterInit(Minecraft minecraft, Screen screen, int width, int
         } else {
             return;
         }
-        List<Button> iconRow = iconRow(Screens.getWidgets(screen), null);
+        List<Button> iconRow = iconRow(Screens.getWidgets(screen));
         if (iconRow.isEmpty()) {
             // No icon row to join; stay out rather than guess a spot.
             return;
@@ -83,24 +83,31 @@ private static void afterInit(Minecraft minecraft, Screen screen, int width, int
                         layoutRow(current, backups, centerX, width));
     }
 
-    /** Puts the shortcut after every other icon in the row, then recenters the row. */
+    /**
+     * Puts the shortcut after every other square icon on its own row, then recenters the
+     * row. Only that row is touched, so icons elsewhere on the screen are never moved.
+     */
     private static void layoutRow(Screen screen, Button backups, int centerX, int screenWidth) {
-        List<Button> row = new ArrayList<>(iconRow(Screens.getWidgets(screen), backups));
+        int y = backups.getY();
+        List<Button> row = Screens.getWidgets(screen).stream()
+                .filter(Button.class::isInstance)
+                .map(Button.class::cast)
+                .filter(button -> button != backups && button.getY() == y && isSquareIcon(button))
+                .sorted(Comparator.comparingInt(Button::getX))
+                .collect(Collectors.toCollection(ArrayList::new));
         row.add(backups);
-        recenter(row, centerX, backups.getY(), screenWidth);
+        recenter(row, centerX, y, screenWidth);
     }
 
     /**
      * Picks the square-icon row holding the Friends button, or the widest square-icon row
      * without it. Any square button counts, so icons from other mods stay part of the row
-     * and the recentered layout cannot overlap them. The excluded button, if any, is left
-     * out so the shortcut itself never counts as part of the row it joins.
+     * and the recentered layout cannot overlap them.
      */
-    private static List<Button> iconRow(List<AbstractWidget> widgets, Button excluded) {
+    private static List<Button> iconRow(List<AbstractWidget> widgets) {
         Map<Integer, List<Button>> rows = widgets.stream()
                 .filter(Button.class::isInstance)
                 .map(Button.class::cast)
-                .filter(button -> button != excluded)
                 .filter(IconRowBackupIntegration::isSquareIcon)
                 .collect(Collectors.groupingBy(Button::getY));
         return rows.values().stream()

From f1efe8b9340eee8d0c7329143ff257bbf286a604 Mon Sep 17 00:00:00 2001
From: ishaanko <ishaanko.mail@gmail.com>
Date: Mon, 14 Sep 2026 11:31:39 -0700
Subject: [PATCH 3/3] chore(release): prepare 0.3.7.3

---
 CHANGELOG.md      | 2 +-
 gradle.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12678d1..a8d864b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## Unreleased
+## 0.3.7.3 (2026-09-14)
 
 ### Fixed
 
diff --git a/gradle.properties b/gradle.properties
index b3dfe11..e54cce8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,6 +9,6 @@ loom_version=1.17.19
 fabric_api_version=0.157.0+26.2
 modmenu_version=20.0.1
 
-mod_version=0.3.7.2
+mod_version=0.3.7.3
 maven_group=dev.ishaanko
 automatic_release_channel=alpha