splitscreen(feature): window close button functionality

Author: isXander

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/SplitscreenPawn.java

@@ -50,6 +50,11 @@ public interface SplitscreenPawn {
      */
     void setWindowFocusState(boolean focused);
 
+    /**
+     * Closes the game.
+     */
+    void closeGame();
+
     /**
      * @return the current splitscreen mode of the window
      */

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/client/LocalSplitscreenPawn.java

@@ -54,6 +54,11 @@ public void setWindowFocusState(boolean focused) {
         this.minecraft.setWindowActive(focused);
     }
 
+    @Override
+    public void closeGame() {
+        this.minecraft.stop();
+    }
+
     @Override
     public SplitscreenPosition getWindowSplitscreenMode() {
         return position;

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/client/protocol/PawnPlayPacketListener.java

@@ -53,6 +53,10 @@ public void handleWindowFocusState(PawnboundWindowFocusStatePacket packet) {
         this.pawn.setWindowFocusState(packet.focused());
     }
 
+    public void handleCloseGame(PawnboundCloseGamePacket packet) {
+        this.pawn.closeGame();
+    }
+
     public void handleKeepAlive(PawnboundKeepAlivePacket packet) {
         this.connection.send(ControllerboundKeepAlivePacket.INSTANCE);
     }

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/mixins/core/MinecraftMixin.java

@@ -6,10 +6,15 @@
 import com.mojang.blaze3d.platform.DisplayData;
 import com.mojang.blaze3d.platform.Window;
 import dev.isxander.controlify.splitscreen.SplitscreenBootstrapper;
+import dev.isxander.controlify.splitscreen.window.ParentWindow;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.VirtualScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.Optional;
 
 @Mixin(Minecraft.class)
 public class MinecraftMixin {
@@ -46,4 +51,14 @@ private boolean markWindowReady(Minecraft instance) {
             return false;
         }).orElse(true);
     }
+
+    /**
+     * Ensures the parent window is closed when the game exist.
+     */
+    @Inject(method = "close", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/Window;close()V", shift = At.Shift.AFTER))
+    private void closeParentWindow(CallbackInfo ci) {
+        SplitscreenBootstrapper.getController()
+                .flatMap(controller -> Optional.ofNullable(controller.getParentWindow()))
+                .ifPresent(ParentWindow::close);
+    }
 }

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/protocol/PlayProtocols.java

@@ -28,5 +28,6 @@ public final class PlayProtocols {
                             .addPacket(PawnboundParentWindowPacket.TYPE, PawnboundParentWindowPacket.CODEC)
                             .addPacket(PawnboundSplitscreenPositionPacket.TYPE, PawnboundSplitscreenPositionPacket.CODEC)
                             .addPacket(PawnboundWindowFocusStatePacket.TYPE, PawnboundWindowFocusStatePacket.CODEC)
+                            .addPacket(PawnboundCloseGamePacket.TYPE, PawnboundCloseGamePacket.CODEC)
             ).bind(FriendlyByteBuf::new);
 }

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/protocol/pawnbound/play/PawnboundCloseGamePacket.java

@@ -0,0 +1,24 @@
+package dev.isxander.controlify.splitscreen.protocol.pawnbound.play;
+
+import dev.isxander.controlify.splitscreen.client.protocol.PawnPlayPacketListener;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.PacketType;
+
+public record PawnboundCloseGamePacket() implements PawnboundPlayPacket {
+    public static final PawnboundCloseGamePacket INSTANCE = new PawnboundCloseGamePacket();
+    public static final StreamCodec<FriendlyByteBuf, PawnboundCloseGamePacket> CODEC =
+            StreamCodec.unit(INSTANCE);
+    public static final PacketType<PawnboundCloseGamePacket> TYPE =
+            PawnboundPlayPacket.createType("close_game");
+
+    @Override
+    public void handle(PawnPlayPacketListener handler) {
+        handler.handleCloseGame(this);
+    }
+
+    @Override
+    public PacketType<PawnboundCloseGamePacket> type() {
+        return TYPE;
+    }
+}

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/server/RemoteSplitscreenPawn.java

@@ -1,10 +1,7 @@
 package dev.isxander.controlify.splitscreen.server;
 
 import dev.isxander.controlify.splitscreen.SplitscreenPawn;
-import dev.isxander.controlify.splitscreen.protocol.pawnbound.play.PawnboundJoinServerPacket;
-import dev.isxander.controlify.splitscreen.protocol.pawnbound.play.PawnboundParentWindowPacket;
-import dev.isxander.controlify.splitscreen.protocol.pawnbound.play.PawnboundSplitscreenPositionPacket;
-import dev.isxander.controlify.splitscreen.protocol.pawnbound.play.PawnboundWindowFocusStatePacket;
+import dev.isxander.controlify.splitscreen.protocol.pawnbound.play.*;
 import dev.isxander.controlify.splitscreen.window.SplitscreenPosition;
 import dev.isxander.controlify.splitscreen.window.manager.NativeWindowHandle;
 import net.minecraft.network.Connection;
@@ -52,6 +49,11 @@ public void setWindowFocusState(boolean focused) {
         this.connection.send(new PawnboundWindowFocusStatePacket(focused));
     }
 
+    @Override
+    public void closeGame() {
+        this.connection.send(new PawnboundCloseGamePacket());
+    }
+
     @Override
     public SplitscreenPosition getWindowSplitscreenMode() {
         return this.position;

splitscreen/src/main/java/dev/isxander/controlify/splitscreen/server/SplitscreenController.java

@@ -12,6 +12,7 @@
 import dev.isxander.controlify.splitscreen.window.ParentWindowEventHandler;
 import dev.isxander.controlify.splitscreen.window.SplitscreenPosition;
 import dev.isxander.controlify.splitscreen.window.manager.WindowManager;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import org.jetbrains.annotations.NotNull;
@@ -85,6 +86,15 @@ public void setupParentWindow(DisplayData screenSize, ScreenManager screenManage
         }
 
         this.parentWindow = new ParentWindow(this.minecraft, screenSize, screenManager, this, initialTitle);
+
+        executeWhenWindowReady(parentWindow -> {
+            ClientTickEvents.START_CLIENT_TICK.register(client -> {
+                if (this.parentWindow.shouldClose() && this.minecraft.isRunning()) {
+                    this.forEachPawn(SplitscreenPawn::closeGame);
+                }
+            });
+        });
+
     }
 
     @Override