Fix double-swap on repeated inventory open (1.0.6)

Author: Arthur Simão

gradle.properties

@@ -7,6 +7,6 @@ loader_version_range=[4,)
 mod_id=seamlesshotbar
 mod_name=Seamless Hotbar
 mod_license=LGPL-3.0-only
-mod_version=1.0.5
+mod_version=1.0.6
 mod_authors=DenWav, Antigravity
 mod_description=Seamless Hotbar - a NeoForge 1.21.1 port of Extended Hotbar's Fluent mode.

src/main/java/dev/denwav/fluentbar/client/ClientEventHandler.java

@@ -20,6 +20,7 @@
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
 import net.neoforged.neoforge.client.event.ScreenEvent;
+import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import org.lwjgl.glfw.GLFW;
 
@@ -36,12 +37,20 @@ public static void init(IEventBus modEventBus) {
         modEventBus.addListener(ClientEventHandler::onRegisterKeyMappings);
         NeoForge.EVENT_BUS.addListener(ClientEventHandler::onScreenClosing);
         NeoForge.EVENT_BUS.addListener(ClientEventHandler::onClientTick);
+        NeoForge.EVENT_BUS.addListener(ClientEventHandler::onLevelLoad);
     }
 
     private static void onRegisterKeyMappings(RegisterKeyMappingsEvent event) {
         event.register(TOGGLE_KEY);
     }
 
+    private static void onLevelLoad(net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent.LoggingIn event) {
+        // Reset render-swap state on world join/rejoin so stale state from a previous
+        // session doesn't cause a phantom swap on the first inventory open.
+        SeamlessLogger.debug("onLevelLoad: resetting swapRender state");
+        Util.resetRenderedPosition();
+    }
+
     private static void onScreenClosing(ScreenEvent.Closing event) {
         Screen screen = event.getScreen();
         if (screen instanceof AbstractContainerScreen<?>) {

src/main/java/dev/denwav/fluentbar/mixin/MinecraftMixin.java

@@ -99,22 +99,35 @@ private void onSetScreen(final Screen screen, final CallbackInfo ci) {
             return;
         }
 
-        // HorseInventoryScreen extends AbstractContainerScreen, so no separate check needed
         if (screen instanceof AbstractContainerScreen<?>) {
             // In Creative mode, opening inventory goes: setScreen(InventoryScreen) -> init() ->
-            // setScreen(CreativeInventoryScreen). We must skip the intermediate InventoryScreen
-            // to avoid triggering a swap that gets immediately undone.
+            // setScreen(CreativeModeInventoryScreen). Skip the intermediate screen to avoid a
+            // swap that gets immediately undone.
             final MultiPlayerGameMode gameMode = Minecraft.getInstance().gameMode;
             if (gameMode != null && gameMode.hasInfiniteItems()) {
                 if (!(screen instanceof CreativeModeInventoryScreen)) {
+                    SeamlessLogger.debug("setScreen: creative intermediate screen {}, skipping", screen.getClass().getSimpleName());
                     return;
                 }
             }
 
-            if (!Util.isRenderSwapped()) {
-                SeamlessLogger.debug("setScreen: opening container while POSITION=RIGHT, triggering render swap + physical swap");
+            // Guard: only swap if we haven't already swapped for display.
+            // Also guard against the case where we're transitioning from one container
+            // screen to another (e.g. FancyMenu screen replacements) — if a container
+            // was already open we don't swap again.
+            final boolean previousScreenIsContainer = this.screen instanceof AbstractContainerScreen<?>;
+            if (!Util.isRenderSwapped() && !previousScreenIsContainer) {
+                SeamlessLogger.debug(
+                    "setScreen: opening {} while POSITION=RIGHT, triggering render swap + physical swap",
+                    screen.getClass().getSimpleName()
+                );
                 Util.swapRenderedPosition();
                 Util.performSwap(Minecraft.getInstance(), true);
+            } else {
+                SeamlessLogger.debug(
+                    "setScreen: skipping swap for {} (renderSwapped={}, previousIsContainer={})",
+                    screen.getClass().getSimpleName(), Util.isRenderSwapped(), previousScreenIsContainer
+                );
             }
         }
     }

src/main/resources/META-INF/neoforge.mods.toml

@@ -4,7 +4,7 @@ license="LGPL-3.0-only"
 
 [[mods]]
 modId="seamlesshotbar"
-version="1.0.5"
+version="1.0.6"
 displayName="Seamless Hotbar"
 logoFile="logo.png"
 authors="DenWav, Antigravity"