(half) working port to 1.21.11 splitscreen

Author: isXander

splitscreen/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 modstitch {
     metadata {
-        modVersion = "0.1.0-alpha.2+${stonecutter.current.version}"
+        modVersion = "0.1.0-alpha.3+${stonecutter.current.version}"
         modId = "controlify_splitscreen"
         modName = "Controlify (Splitscreen)"
     }
@@ -31,7 +31,7 @@ repositories {
 }
 
 val lwjglVersion = when (project.mcVersion) {
-    "1.21.8" -> "3.3.3"
+    "1.21.11" -> "3.3.3"
     else -> throw IllegalStateException("Can't get LWJGL version for: $mcVersion")
 }
 

splitscreen/src/main/java/dev/isxander/splitscreen/client/ControllerBridge.java

@@ -31,5 +31,5 @@ public interface ControllerBridge extends Bridge {
     /**
      * The client's music manager has attempted to play a track.
      */
-    void requestPlayMusic(@Nullable Music music, float volume);
+    void requestPlayMusic(@Nullable Music music);
 }

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

@@ -9,7 +9,7 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.multiplayer.resolver.ServerAddress;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -47,7 +47,7 @@ public void joinServer(String host, int port, byte @Nullable [] nonce) {
 
     @Override
     public void disconnectFromServer() {
-        PauseScreen.disconnectFromWorld(this.minecraft, ClientLevel.DEFAULT_QUIT_MESSAGE);
+        this.minecraft.disconnectFromWorld(ClientLevel.DEFAULT_QUIT_MESSAGE);
     }
 
     @Override
@@ -76,7 +76,7 @@ public void useInputMethod(InputMethod inputMethod) {
     }
 
     @Override
-    public void onConfigSave(ResourceLocation config) {
+    public void onConfigSave(Identifier config) {
         ConfigSyncRegistry.onSave(config);
     }
 

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

@@ -1,6 +1,6 @@
 package dev.isxander.splitscreen.client;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -50,7 +50,7 @@ public interface SplitscreenPawn extends Bridge {
      * Tells the pawns to load a specific config as it has been saved on the controller.
      * @param config the id of the config that was saved
      */
-    void onConfigSave(ResourceLocation config);
+    void onConfigSave(Identifier config);
 
     /**
      * @return the associated controller UID for this pawn, or null if no controller is associated

splitscreen/src/main/java/dev/isxander/splitscreen/client/config/SplitscreenConfig.java

@@ -11,12 +11,12 @@
 import dev.isxander.yacl3.config.v3.JsonFileCodecConfig;
 import dev.isxander.yacl3.config.v3.ReadonlyConfigEntry;
 import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 @SuppressWarnings("UnstableApiUsage")
 public class SplitscreenConfig extends JsonFileCodecConfig<SplitscreenConfig> {
     public static final SplitscreenConfig INSTANCE = new SplitscreenConfig();
-    public static final ResourceLocation CONFIG_ID = CSUtil.rl("config");
+    public static final Identifier CONFIG_ID = CSUtil.rl("config");
 
     public SplitscreenConfig() {
         super(FabricLoader.getInstance().getConfigDir().resolve("splitscreen.json"));

splitscreen/src/main/java/dev/isxander/splitscreen/client/engine/impl/reparenting/ReparentingHostSplitscreenEngine.java

@@ -93,7 +93,7 @@ public void initWindow(
         LOGGER.info("Setting up parent window");
 
         this.parentWindow = new ParentWindow(this.minecraft, screenSize, screenManager, this, initialTitle);
-        this.localPawn = new LocalReparentingPawn(this.minecraft, this.windowManager.getNativeWindowHandle(this.minecraft.getWindow().getWindow()));
+        this.localPawn = new LocalReparentingPawn(this.minecraft, this.windowManager.getNativeWindowHandle(this.minecraft.getWindow().handle()));
         this.registerPawn(this.localInputMethod, this.localPawn);
 
         this.parentWindow.setIcon(minecraft.getVanillaPackResources(), SharedConstants.getCurrentVersion().stable() ? IconSet.RELEASE : IconSet.SNAPSHOT);
@@ -207,7 +207,7 @@ public void onResizeParentWindow(int width, int height) {
     public void onFocusParentWindow(boolean focused) {
         if (focused) {
             this.windowManager.setWindowForeground(this.parentWindow.getNativeWindowHandle());
-            this.windowManager.setWindowFocused(this.windowManager.getNativeWindowHandle(this.minecraft.getWindow().getWindow()));
+            this.windowManager.setWindowFocused(this.windowManager.getNativeWindowHandle(this.minecraft.getWindow().handle()));
         }
     }
 

splitscreen/src/main/java/dev/isxander/splitscreen/client/engine/impl/reparenting/ReparentingRemoteSplitscreenEngine.java

@@ -56,7 +56,7 @@ public static Optional<ReparentingRemoteSplitscreenEngine> tryGet(RemotePawnMain
 
     public void onWindowInit() {
         Window window = this.minecraft.getWindow();
-        NativeWindowHandle nativeHandle = this.windowManager.getNativeWindowHandle(window.getWindow());
+        NativeWindowHandle nativeHandle = this.windowManager.getNativeWindowHandle(window.handle());
 
         this.localPawn = new LocalReparentingPawn(this.minecraft, nativeHandle);
         this.payloadSender.sendPayload(new ControllerboundThisIsMyWindowPayload(nativeHandle));

splitscreen/src/main/java/dev/isxander/splitscreen/client/features/configsync/ConfigSyncRegistry.java

@@ -2,27 +2,27 @@
 
 import dev.isxander.splitscreen.client.SplitscreenBootstrapper;
 import dev.isxander.splitscreen.client.config.SplitscreenConfig;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public final class ConfigSyncRegistry {
-    private static final Map<ResourceLocation, Runnable> savers = new HashMap<>();
+    private static final Map<Identifier, Runnable> savers = new HashMap<>();
 
     static {
         registerSaver(SplitscreenConfig.CONFIG_ID, SplitscreenConfig.INSTANCE::loadFromFile);
     }
 
-    public static void registerSaver(ResourceLocation location, Runnable saver) {
+    public static void registerSaver(Identifier location, Runnable saver) {
         if (savers.containsKey(location)) {
             throw new IllegalArgumentException("Duplicate saver location: " + location);
         }
 
         savers.put(location, saver);
     }
 
-    public static void onSave(ResourceLocation location) {
+    public static void onSave(Identifier location) {
         SplitscreenBootstrapper.getController().ifPresent(controller -> {
             controller.forEachPawn(pawn -> pawn.onConfigSave(location));
         });

splitscreen/src/main/java/dev/isxander/splitscreen/client/host/HostLocalSplitscreenPawn.java

@@ -3,7 +3,7 @@
 import dev.isxander.splitscreen.client.InputMethod;
 import dev.isxander.splitscreen.client.LocalSplitscreenPawn;
 import net.minecraft.client.Minecraft;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 public class HostLocalSplitscreenPawn extends LocalSplitscreenPawn {
@@ -30,7 +30,7 @@ public void joinServer(String host, int port, byte @Nullable [] nonce) {
      * @param config the id of the config that was saved
      */
     @Override
-    public void onConfigSave(ResourceLocation config) {
+    public void onConfigSave(Identifier config) {
         // no-op
     }
 }

splitscreen/src/main/java/dev/isxander/splitscreen/client/host/LocalControllerBridge.java

@@ -62,12 +62,12 @@ public void signalRemoteClientReady(boolean finished, float progress, RemoteSpli
     }
 
     @Override
-    public void requestPlayMusic(@Nullable Music music, float volume) {
-        this.requestPlayMusicRemote(music, volume, this.controller.getLocalPawn());
+    public void requestPlayMusic(@Nullable Music music) {
+        this.requestPlayMusicRemote(music, this.controller.getLocalPawn());
     }
 
-    public void requestPlayMusicRemote(@Nullable Music music, float volume, SplitscreenPawn pawn) {
-        this.controller.getPawnMusicManager().onRequest(music, volume, pawn);
+    public void requestPlayMusicRemote(@Nullable Music music, SplitscreenPawn pawn) {
+        this.controller.getPawnMusicManager().onRequest(music, pawn);
     }
 
     @Override