From 434f707a4b56f98aa8ad76c42d2cdff9b548ca0d Mon Sep 17 00:00:00 2001
From: Ishaan Kothari <ishaanko.mail@gmail.com>
Date: Sat, 5 Sep 2026 20:14:37 -0700
Subject: [PATCH 1/2] feat(ui): add a World Backups icon to the title and pause
 screen icon rows

---
 CHANGELOG.md                                  |   8 +
 .../worldarchive/WorldArchiveClient.java      |   2 +
 .../ui/IconRowBackupIntegration.java          | 140 ++++++++++++++++++
 .../ui/WorldArchiveIconButton.java            |  31 ++++
 .../assets/worldarchive/lang/en_us.json       |   1 +
 .../textures/gui/sprites/world_backups.png    | Bin 0 -> 697 bytes
 6 files changed, 182 insertions(+)
 create mode 100644 src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
 create mode 100644 src/client/java/dev/ishaanko/worldarchive/ui/WorldArchiveIconButton.java
 create mode 100644 src/main/resources/assets/worldarchive/textures/gui/sprites/world_backups.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1898542..f19c6aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+### Added
+
+- A World Backups icon sits at the far right of the square icons on the title
+  screen and on the pause screen. On the title screen it opens the list of
+  backed-up worlds; in a world it opens that world's backups.
+
 ## 0.3.5.1 (2026-08-24)
 
 ### Fixed
diff --git a/src/client/java/dev/ishaanko/worldarchive/WorldArchiveClient.java b/src/client/java/dev/ishaanko/worldarchive/WorldArchiveClient.java
index 6c8c65e..c4d8874 100644
--- a/src/client/java/dev/ishaanko/worldarchive/WorldArchiveClient.java
+++ b/src/client/java/dev/ishaanko/worldarchive/WorldArchiveClient.java
@@ -3,6 +3,7 @@
 import dev.ishaanko.worldarchive.runtime.WorldArchiveRuntime;
 import dev.ishaanko.worldarchive.settings.ClientSettingsAccess;
 import dev.ishaanko.worldarchive.ui.EditWorldBackupIntegration;
+import dev.ishaanko.worldarchive.ui.IconRowBackupIntegration;
 import dev.ishaanko.worldarchive.ui.SelectWorldBackupIntegration;
 import net.fabricmc.api.ClientModInitializer;
 import org.slf4j.Logger;
@@ -17,6 +18,7 @@ public void onInitializeClient() {
         WorldArchiveRuntime runtime = WorldArchiveRuntime.initialize();
         SelectWorldBackupIntegration.register(() -> runtime);
         EditWorldBackupIntegration.register(() -> runtime);
+        IconRowBackupIntegration.register(() -> runtime, runtime::openBrowser);
         LOGGER.info("{} initialized.", WorldArchiveMetadata.MOD_NAME);
     }
 }
diff --git a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
new file mode 100644
index 0000000..eb7ae71
--- /dev/null
+++ b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
@@ -0,0 +1,140 @@
+package dev.ishaanko.worldarchive.ui;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
+import net.fabricmc.fabric.api.client.screen.v1.Screens;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.FriendsButton;
+import net.minecraft.client.gui.screens.PauseScreen;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.TitleScreen;
+
+/**
+ * Adds the WorldArchive shortcut at the far right of the square-icon row on the title screen
+ * and the pause screen. On the title screen it opens the world list; in a world it opens
+ * that world's backups.
+ */
+public final class IconRowBackupIntegration {
+    private static final int GAP = 4;
+
+    private static final AtomicBoolean REGISTERED = new AtomicBoolean();
+
+    private static volatile Supplier<? extends BackupClientFacade> facadeSupplier;
+
+    private static volatile Runnable openLiveWorldBackups;
+
+    private IconRowBackupIntegration() {
+    }
+
+    /**
+     * Registers the global Fabric screen hook. Repeated calls update the actions.
+     *
+     * @param facade supplies the facade the title-screen world list needs
+     * @param openLiveWorld opens the backup browser for the world that is currently loaded
+     */
+    public static void register(
+            Supplier<? extends BackupClientFacade> facade,
+            Runnable openLiveWorld) {
+        facadeSupplier = Objects.requireNonNull(facade, "facade");
+        openLiveWorldBackups = Objects.requireNonNull(openLiveWorld, "openLiveWorld");
+        if (REGISTERED.compareAndSet(false, true)) {
+            ScreenEvents.AFTER_INIT.register(IconRowBackupIntegration::afterInit);
+        }
+    }
+
+    private static void afterInit(Minecraft minecraft, Screen screen, int width, int height) {
+        Button.OnPress action;
+        if (screen instanceof TitleScreen) {
+            action = ignored -> minecraft.setScreenAndShow(
+                    new BackupWorldsScreen(screen, currentFacade()));
+        } else if (screen instanceof PauseScreen && minecraft.hasSingleplayerServer()) {
+            action = ignored -> currentLiveWorldAction().run();
+        } else {
+            return;
+        }
+        List<Button> iconRow = iconRow(Screens.getWidgets(screen));
+        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);
+    }
+
+    /**
+     * 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.
+     */
+    private static List<Button> iconRow(List<AbstractWidget> widgets) {
+        Map<Integer, List<Button>> rows = widgets.stream()
+                .filter(Button.class::isInstance)
+                .map(Button.class::cast)
+                .filter(IconRowBackupIntegration::isSquareIcon)
+                .collect(Collectors.groupingBy(Button::getY));
+        return rows.values().stream()
+                .max(Comparator
+                        .<List<Button>>comparingInt(row -> row.stream()
+                                .anyMatch(FriendsButton.class::isInstance) ? 1 : 0)
+                        .thenComparingInt(List::size)
+                        .thenComparingInt(row -> row.getFirst().getY()))
+                .map(row -> row.stream()
+                        .sorted(Comparator.comparingInt(Button::getX))
+                        .toList())
+                .orElse(List.of());
+    }
+
+    private static boolean isSquareIcon(Button button) {
+        return button.getWidth() == button.getHeight()
+                && button.getWidth() >= 16
+                && button.getWidth() <= 32;
+    }
+
+    private static int rowCenter(List<Button> iconRow) {
+        int left = iconRow.getFirst().getX();
+        Button last = iconRow.getLast();
+        return (left + last.getX() + last.getWidth()) / 2;
+    }
+
+    /** Lays the row out again around its old center so the new icon does not push off screen. */
+    private static void recenter(List<Button> row, int centerX, int y, int screenWidth) {
+        int totalWidth = row.stream().mapToInt(Button::getWidth).sum() + GAP * (row.size() - 1);
+        int x = Math.clamp(
+                centerX - totalWidth / 2,
+                GAP,
+                Math.max(GAP, screenWidth - totalWidth - GAP));
+        for (Button button : row) {
+            button.setPosition(x, y);
+            x += button.getWidth() + GAP;
+        }
+    }
+
+    private static BackupClientFacade currentFacade() {
+        Supplier<? extends BackupClientFacade> supplier = facadeSupplier;
+        if (supplier == null) {
+            throw new IllegalStateException("WorldArchive client facade has not been registered");
+        }
+        return Objects.requireNonNull(supplier.get(), "facadeSupplier result");
+    }
+
+    private static Runnable currentLiveWorldAction() {
+        Runnable action = openLiveWorldBackups;
+        if (action == null) {
+            throw new IllegalStateException("WorldArchive backup action has not been registered");
+        }
+        return action;
+    }
+}
diff --git a/src/client/java/dev/ishaanko/worldarchive/ui/WorldArchiveIconButton.java b/src/client/java/dev/ishaanko/worldarchive/ui/WorldArchiveIconButton.java
new file mode 100644
index 0000000..0a78756
--- /dev/null
+++ b/src/client/java/dev/ishaanko/worldarchive/ui/WorldArchiveIconButton.java
@@ -0,0 +1,31 @@
+package dev.ishaanko.worldarchive.ui;
+
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.SpriteIconButton;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.Identifier;
+
+/** Builds the compact WorldArchive shortcut used beside vanilla icon buttons. */
+final class WorldArchiveIconButton {
+    static final int SIZE = 20;
+
+    private static final Identifier SPRITE = Identifier.fromNamespaceAndPath(
+            "worldarchive",
+            "world_backups");
+
+    private WorldArchiveIconButton() {
+    }
+
+    static Button create(int x, int y, int size, Button.OnPress onPress) {
+        SpriteIconButton button = SpriteIconButton.builder(
+                        Component.translatable("screen.worldarchive.backups_button"),
+                        onPress,
+                        true)
+                .size(size, size)
+                .sprite(SPRITE, Math.min(16, size - 4), Math.min(16, size - 4))
+                .tooltip(Component.translatable("screen.worldarchive.backups_button"))
+                .build();
+        button.setRectangle(size, size, x, y);
+        return button;
+    }
+}
diff --git a/src/main/resources/assets/worldarchive/lang/en_us.json b/src/main/resources/assets/worldarchive/lang/en_us.json
index 7894cb2..c6aa3e2 100644
--- a/src/main/resources/assets/worldarchive/lang/en_us.json
+++ b/src/main/resources/assets/worldarchive/lang/en_us.json
@@ -1,5 +1,6 @@
 {
     "modmenu.descriptionTranslation.worldarchive": "Creates dependable local backups of your single-player worlds.",
+    "screen.worldarchive.backups_button": "World Backups",
     "screen.worldarchive.settings.archive_folder": "Archive folder",
     "screen.worldarchive.settings.back": "Back",
     "screen.worldarchive.settings.browse": "Browse...",
diff --git a/src/main/resources/assets/worldarchive/textures/gui/sprites/world_backups.png b/src/main/resources/assets/worldarchive/textures/gui/sprites/world_backups.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f276dd1bdf6251c871b227c91656fee713264c1
GIT binary patch
literal 697
zcmV;q0!ICbP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!~RpK~y+TZIerH
z5@8gEXBH+d4Bv2bAq-GyqG7&)ZtMk3QR2Gg=76qxNlYjM1Bo$6<4)VPE^3+f7q~Y-
z_x=G*Q|oWRyyl#N5sizJ`OfgZ&v(w@jG`zC7Gtxpg~F2(9v927?E%{D0SZMgZ+8x%
zs-8}rd*&}Fn$6b`;RLh@g^qG%7u)3>&P61_kk&!}Z@}E#YW4YMGIm{qLqv3FVI4in
z&m{jw8oT8|d_dbCz%W<&Cg+sQ8Hg8OAnIc{u7u+n{Oo*^5Mdn|;{jT>4^dDm?;;~T
zK-ZP%o*4*O69noLJ`>QH1!*$oD!1kXs8^ygfXwv~0u2IOKs3g1&Lx9AfX>yHD|@pc
zDhevKeWnsX+4>66m_XDo7((TX27$b@2UtU;Is^C>$ThzOHd$i^kU7BTF<!aL5Ro_o
z%9Vu{WOg0fr5yyL$=SeY>IOPP1D#pv?V;qMYEd1f${vjD#vg#0%OjpLVcTzT_}N5v
z=s|kt63)<os81lCk0An495nl^HOvJ7RS-)_6rWac<7U{OIQ{<tYXo79pw&m{_TI9F
z0CFV{RaI#dRmfZ(F?yNHL*_ORiY5?@CNRCMVtQ5M)+mo9J&jJ<#TJ5*1aDY;$%NH-
z2}7=9dRfD_4=H^Aco)B}s(itnq=cTz`Wx#5<`KG`#4Rm`qnf~vlQcH(Yj|`|!%ue^
z?`lDqD-XFE(k^^Ml&C&LU&=D*`Xr6_wGfV;g>ZeEW+Q!Q|Cqf+TC9Qv+*T6DRv5=t
f$Xl@g=qP>z^RK1h4OyM>00000NkvXXu0mjf8M`d<

literal 0
HcmV?d00001


From 23a279a43856b9d3a25e922bdfecb2d2d23e4177 Mon Sep 17 00:00:00 2001
From: Ishaan Kothari <ishaanko.mail@gmail.com>
Date: Sat, 5 Sep 2026 20:21:06 -0700
Subject: [PATCH 2/2] fix(ui): open the world list when the pause icon has no
 resolved live world

---
 .../runtime/RuntimeNavigation.java            |  6 ++++--
 .../runtime/WorldArchiveRuntime.java          |  5 +++--
 .../ui/IconRowBackupIntegration.java          | 21 ++++++++++++-------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/client/java/dev/ishaanko/worldarchive/runtime/RuntimeNavigation.java b/src/client/java/dev/ishaanko/worldarchive/runtime/RuntimeNavigation.java
index 8f03a57..f0559a4 100644
--- a/src/client/java/dev/ishaanko/worldarchive/runtime/RuntimeNavigation.java
+++ b/src/client/java/dev/ishaanko/worldarchive/runtime/RuntimeNavigation.java
@@ -72,10 +72,11 @@ void playRestoredWorld(Screen returnTo, RestoreBackupResult result) {
         transitionToRestoredWorld(returnTo, result, true);
     }
 
-    void openBrowser() {
+    /** Opens the live world's browser; false when no world is resolved or the runtime is not ready. */
+    boolean openBrowser() {
         BackupWorldContext world = runtime.currentLiveWorld();
         if (world == null || runtime.unavailable()) {
-            return;
+            return false;
         }
         Minecraft minecraft = runtime.services().minecraft();
         minecraft.execute(() -> {
@@ -86,6 +87,7 @@ void openBrowser() {
                         runtime));
             }
         });
+        return true;
     }
 
     boolean sourceDirectoryAvailable(BackupWorldContext world) {
diff --git a/src/client/java/dev/ishaanko/worldarchive/runtime/WorldArchiveRuntime.java b/src/client/java/dev/ishaanko/worldarchive/runtime/WorldArchiveRuntime.java
index f3e6453..dd9734d 100644
--- a/src/client/java/dev/ishaanko/worldarchive/runtime/WorldArchiveRuntime.java
+++ b/src/client/java/dev/ishaanko/worldarchive/runtime/WorldArchiveRuntime.java
@@ -467,8 +467,9 @@ public void playRestoredWorld(Screen returnTo, RestoreBackupResult result) {
         clientFacade.playRestoredWorld(returnTo, result);
     }
 
-    public void openBrowser() {
-        navigation.openBrowser();
+    /** Opens the live world's backup browser; false when there is no resolved live world yet. */
+    public boolean openBrowser() {
+        return navigation.openBrowser();
     }
 
     private RuntimeState buildState(WorldArchiveConfig config) {
diff --git a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
index eb7ae71..817f842 100644
--- a/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
+++ b/src/client/java/dev/ishaanko/worldarchive/ui/IconRowBackupIntegration.java
@@ -6,6 +6,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BooleanSupplier;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
@@ -21,7 +22,7 @@
 /**
  * Adds the WorldArchive shortcut at the far right of the square-icon row on the title screen
  * and the pause screen. On the title screen it opens the world list; in a world it opens
- * that world's backups.
+ * that world's backups, or the world list while the live world is still being resolved.
  */
 public final class IconRowBackupIntegration {
     private static final int GAP = 4;
@@ -30,7 +31,7 @@ public final class IconRowBackupIntegration {
 
     private static volatile Supplier<? extends BackupClientFacade> facadeSupplier;
 
-    private static volatile Runnable openLiveWorldBackups;
+    private static volatile BooleanSupplier openLiveWorldBackups;
 
     private IconRowBackupIntegration() {
     }
@@ -38,12 +39,12 @@ private IconRowBackupIntegration() {
     /**
      * Registers the global Fabric screen hook. Repeated calls update the actions.
      *
-     * @param facade supplies the facade the title-screen world list needs
-     * @param openLiveWorld opens the backup browser for the world that is currently loaded
+     * @param facade supplies the facade the world list needs
+     * @param openLiveWorld opens the browser for the loaded world and reports whether it did
      */
     public static void register(
             Supplier<? extends BackupClientFacade> facade,
-            Runnable openLiveWorld) {
+            BooleanSupplier openLiveWorld) {
         facadeSupplier = Objects.requireNonNull(facade, "facade");
         openLiveWorldBackups = Objects.requireNonNull(openLiveWorld, "openLiveWorld");
         if (REGISTERED.compareAndSet(false, true)) {
@@ -57,7 +58,11 @@ private static void afterInit(Minecraft minecraft, Screen screen, int width, int
             action = ignored -> minecraft.setScreenAndShow(
                     new BackupWorldsScreen(screen, currentFacade()));
         } else if (screen instanceof PauseScreen && minecraft.hasSingleplayerServer()) {
-            action = ignored -> currentLiveWorldAction().run();
+            action = ignored -> {
+                if (!currentLiveWorldAction().getAsBoolean()) {
+                    minecraft.setScreenAndShow(new BackupWorldsScreen(screen, currentFacade()));
+                }
+            };
         } else {
             return;
         }
@@ -130,8 +135,8 @@ private static BackupClientFacade currentFacade() {
         return Objects.requireNonNull(supplier.get(), "facadeSupplier result");
     }
 
-    private static Runnable currentLiveWorldAction() {
-        Runnable action = openLiveWorldBackups;
+    private static BooleanSupplier currentLiveWorldAction() {
+        BooleanSupplier action = openLiveWorldBackups;
         if (action == null) {
             throw new IllegalStateException("WorldArchive backup action has not been registered");
         }