stuff to make splitscreen work with 3.0.0

isXander · isXander · commit 9440eb06748e · 2026-02-03T20:29:14.000Z
diff --git a/splitscreen/src/main/java/dev/isxander/splitscreen/client/integrations/ControlifyExtension.java b/splitscreen/src/main/java/dev/isxander/splitscreen/client/integrations/ControlifyExtension.java
@@ -7,6 +7,8 @@
 import dev.isxander.controlify.api.bind.InputBinding;
 import dev.isxander.controlify.api.bind.InputBindingSupplier;
 import dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint;
+import dev.isxander.controlify.api.entrypoint.InitContext;
+import dev.isxander.controlify.api.entrypoint.PreInitContext;
 import dev.isxander.controlify.api.event.ControlifyEvents;
 import dev.isxander.controlify.controller.ControllerEntity;
 import dev.isxander.controlify.controller.ControllerUID;
@@ -44,8 +46,8 @@ public void onControllersDiscovered(ControlifyApi controlify) {
     }
 
     @Override
-    public void onControlifyInit(ControlifyApi controlifyApi) {
-        ADD_PLAYER_BIND = ControlifyBindApi.get().registerBinding(builder -> builder
+    public void onControlifyPreInit(PreInitContext ctx) {
+        ADD_PLAYER_BIND = ctx.bindings().registerBinding(builder -> builder
                 .id(CSUtil.rl("add_player"))
                 .category(BINDING_CATEGORY));
 
@@ -56,6 +58,11 @@ public void onControlifyInit(ControlifyApi controlifyApi) {
         ClientTickEvents.START_CLIENT_TICK.register(this::onClientTick);
     }
 
+    @Override
+    public void onControlifyInit(InitContext ctx) {
+
+    }
+
     private void onControllerStateUpdate(ControlifyEvents.ControllerStateUpdate event) {
         ControllerEntity controller = event.controller();
         Controlify controlify = Controlify.instance();
@@ -69,7 +76,7 @@ private void onControllerStateUpdate(ControlifyEvents.ControllerStateUpdate even
 
                 ControllerEntity currentController = controlify.getCurrentController().orElse(null);
 
-                if (ADD_PLAYER_BIND.on(controller).longPressed(true)) {
+                if (ADD_PLAYER_BIND.on(controller).justPressed()) {
                     if (controllersConnected == 1) {
                         // in the case where there is only one controller connected, we initialise
                         // splitscreen as Player 1: KB&M, Player 2: Controller 1
diff --git a/splitscreen/src/main/java/dev/isxander/splitscreen/client/mixins/controlify/ControlifyConfigMixin.java b/splitscreen/src/main/java/dev/isxander/splitscreen/client/mixins/controlify/ControlifyConfigMixin.java
@@ -2,21 +2,22 @@
 
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import dev.isxander.controlify.config.ControlifyConfig;
-import dev.isxander.splitscreen.client.SplitscreenBootstrapper;
+import dev.isxander.controlify.config.ConfigManager;import dev.isxander.splitscreen.client.SplitscreenBootstrapper;
 import org.spongepowered.asm.mixin.Mixin;
 
-@Mixin(ControlifyConfig.class)
+@Mixin(ConfigManager.class)
 public class ControlifyConfigMixin {
     /**
      * Don't allow saving the config is we're a pawn client,
      * only the controller should modify controller config.
+     *
      * @param original the original method call
      */
     @WrapMethod(method = "save")
-    private void preventSaveIfPawn(Operation<Void> original) {
+    private boolean preventSaveIfPawn(Operation<Boolean> original) {
         if (SplitscreenBootstrapper.getPawn().isEmpty()) {
-            original.call();
+            return original.call();
         }
+        return true;
     }
 }
diff --git a/splitscreen/src/main/java/dev/isxander/splitscreen/client/mixins/controlify/ControlifyMixin.java b/splitscreen/src/main/java/dev/isxander/splitscreen/client/mixins/controlify/ControlifyMixin.java
@@ -3,10 +3,12 @@
 import com.llamalad7.mixinextras.expression.Definition;
 import com.llamalad7.mixinextras.expression.Expression;
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
 import dev.isxander.controlify.Controlify;
 import dev.isxander.controlify.api.bind.InputBinding;
 import dev.isxander.controlify.controller.ControllerEntity;
+import dev.isxander.splitscreen.client.SplitscreenBootstrapper;
 import dev.isxander.splitscreen.client.integrations.ControlifyExtension;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
@@ -36,4 +38,15 @@ private MutableComponent modifyHotplugControllerDescription(MutableComponent com
         }
         return component;
     }
+
+    @WrapWithCondition(
+            method = "tickInactiveController",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Ldev/isxander/controlify/Controlify;setCurrentController(Ldev/isxander/controlify/controller/ControllerEntity;Z)V"
+            )
+    )
+    private boolean preventAutoSwitchIfSplitscreen(Controlify instance, ControllerEntity controller, boolean notify) {
+        return !SplitscreenBootstrapper.isSplitscreen();
+    }
 }
diff --git a/splitscreen/src/main/resources/assets/controlify_splitscreen/lang/en_us.json b/splitscreen/src/main/resources/assets/controlify_splitscreen/lang/en_us.json
@@ -34,5 +34,5 @@
   "controlify.splitscreen.config.basic.music_method.priority": "Priority",
   "controlify.splitscreen.open_button": "Splitscreen...",
   "controlify.splitscreen.toast.long_press_to_join.title": "Splitscreen",
-  "controlify.splitscreen.toast.long_press_to_join": "Long-press %s to start splitscreen"
+  "controlify.splitscreen.toast.long_press_to_join": "Press %s to start splitscreen"
 }
diff --git a/splitscreen/versions/1.21.5-fabric/gradle.properties b/splitscreen/versions/1.21.5-fabric/gradle.properties
diff --git a/splitscreen/versions/1.21.8-fabric/gradle.properties b/splitscreen/versions/1.21.8-fabric/gradle.properties
@@ -1 +1 @@
-modstitch.platform=loom
+modstitch.platform=fabric-loom-remap
diff --git a/src/main/java/dev/isxander/controlify/Controlify.java b/src/main/java/dev/isxander/controlify/Controlify.java
@@ -547,6 +547,10 @@ private void tickInactiveController(ControllerEntity controller) {
         if (thisControllerGivingInput && !activeControllerGivingInput) {
             this.setCurrentController(controller, true);
         }
+
+        if (this.currentInputMode().isController()) {
+            ControlifyEvents.INACTIVE_CONTROLLER_TICKED.invoke(new ControlifyEvents.ControllerStateUpdate(controller));
+        }
     }
 
     public ConfigManager config() {
diff --git a/src/main/java/dev/isxander/controlify/api/event/ControlifyEvents.java b/src/main/java/dev/isxander/controlify/api/event/ControlifyEvents.java
@@ -23,6 +23,11 @@ public final class ControlifyEvents {
      */
     public static final EventHandler<ControllerStateUpdate> ACTIVE_CONTROLLER_TICKED = EventHandler.createPlatformBackedEvent();
 
+    /**
+     * Triggers every tick when a non-active connected controller's state has been updated.
+     */
+    public static final EventHandler<ControllerStateUpdate> INACTIVE_CONTROLLER_TICKED = EventHandler.createPlatformBackedEvent();
+
     /**
      * @deprecated Use {@link #ACTIVE_CONTROLLER_TICKED} instead.
      */
diff --git a/src/main/java/dev/isxander/controlify/config/dto/ControlifyConfig.java b/src/main/java/dev/isxander/controlify/config/dto/ControlifyConfig.java
@@ -4,18 +4,19 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.isxander.controlify.config.dto.device.DeviceConfig;
 import dev.isxander.controlify.config.dto.profile.ProfileConfig;
+import dev.isxander.controlify.controller.ControllerUID;
 
 import java.util.List;
 import java.util.Map;
 
 public record ControlifyConfig(
         List<ProfileConfig> profileConfig,
         GlobalConfig globalConfig,
-        Map<String, DeviceConfig> deviceConfig
+        Map<ControllerUID, DeviceConfig> deviceConfig
 ) {
     public static final Codec<ControlifyConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
             ProfileConfig.CODEC.listOf().fieldOf("profiles").forGetter(ControlifyConfig::profileConfig),
             GlobalConfig.CODEC.fieldOf("global").forGetter(ControlifyConfig::globalConfig),
-            Codec.unboundedMap(Codec.STRING, DeviceConfig.CODEC).fieldOf("devices").forGetter(ControlifyConfig::deviceConfig)
+            Codec.unboundedMap(ControllerUID.CODEC, DeviceConfig.CODEC).fieldOf("devices").forGetter(ControlifyConfig::deviceConfig)
     ).apply(instance, ControlifyConfig::new));
 }
diff --git a/src/main/java/dev/isxander/controlify/config/settings/ControlifySettings.java b/src/main/java/dev/isxander/controlify/config/settings/ControlifySettings.java
@@ -3,6 +3,7 @@
 import dev.isxander.controlify.config.dto.ControlifyConfig;
 import dev.isxander.controlify.config.settings.device.DeviceSettings;
 import dev.isxander.controlify.config.settings.profile.ProfileSettings;
+import dev.isxander.controlify.controller.ControllerUID;
 import net.minecraft.resources.Identifier;
 
 import java.util.ArrayList;
@@ -13,7 +14,7 @@
 public class ControlifySettings {
     private final List<ProfileSettings> profileSettings;
     private final GlobalSettings globalSettings;
-    private final Map<String, DeviceSettings> deviceSettings;
+    private final Map<ControllerUID, DeviceSettings> deviceSettings;
 
     private ControlifySettings() {
         this.profileSettings = new ArrayList<>();
@@ -24,7 +25,7 @@ private ControlifySettings() {
     public ControlifySettings(
             List<ProfileSettings> controllerSettings,
             GlobalSettings globalSettings,
-            Map<String, DeviceSettings> deviceSettings
+            Map<ControllerUID, DeviceSettings> deviceSettings
     ) {
         this.profileSettings = new ArrayList<>(controllerSettings);
         this.globalSettings = globalSettings;
@@ -59,7 +60,7 @@ public ProfileSettings getOrCreateProfileSettings(Identifier controllerType) {
         return settings;
     }
 
-    public DeviceSettings getOrCreateDeviceSettings(String uid) {
+    public DeviceSettings getOrCreateDeviceSettings(ControllerUID uid) {
         return deviceSettings.computeIfAbsent(uid, id -> DeviceSettings.defaults());
     }
 
diff --git a/src/main/java/dev/isxander/controlify/controller/ControllerUID.java b/src/main/java/dev/isxander/controlify/controller/ControllerUID.java
@@ -1,5 +1,6 @@
 package dev.isxander.controlify.controller;
 
+import com.mojang.serialization.Codec;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -10,6 +11,8 @@
  * @param string The string representation of the UID.
  */
 public record ControllerUID(@NotNull String string) {
+    public static final Codec<ControllerUID> CODEC = Codec.STRING.xmap(ControllerUID::new, ControllerUID::string);
+
     public static @Nullable ControllerUID fromNullableString(@Nullable String value) {
         return value == null ? null : new ControllerUID(value);
     }
diff --git a/src/main/java/dev/isxander/controlify/controllermanager/AbstractControllerManager.java b/src/main/java/dev/isxander/controlify/controllermanager/AbstractControllerManager.java
@@ -89,7 +89,7 @@ public void tick(boolean outOfFocus) {
     protected void onControllerConnected(ControllerEntity controller, boolean hotplug) {
         logger.log("Controller connected: {}", ControllerUtils.createControllerString(controller));
 
-        this.controlify.onControllerAdded(controller, hotplug, false);
+        ControlifyEvents.CONTROLLER_CONNECTED.invoke(new ControlifyEvents.ControllerConnected(controller, hotplug, false));
     }
 
     protected void onControllerRemoved(ControllerEntity controller) {
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -82,6 +82,8 @@ val releaseModVersions by tasks.registering {
 }
 
 nmcpAggregation {
+    allowDuplicateProjectNames = true
+
     centralPortal {
         username = secrets.gradleProperty("mcentral.username")
         password = secrets.gradleProperty("mcentral.password")

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,5 @@`
`34`	`34`	`"controlify.splitscreen.config.basic.music_method.priority": "Priority",`
`35`	`35`	`"controlify.splitscreen.open_button": "Splitscreen...",`
`36`	`36`	`"controlify.splitscreen.toast.long_press_to_join.title": "Splitscreen",`
`37`		`- "controlify.splitscreen.toast.long_press_to_join": "Long-press %s to start splitscreen"`
	`37`	`+ "controlify.splitscreen.toast.long_press_to_join": "Press %s to start splitscreen"`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-modstitch.platform=loom`
	`1`	`+modstitch.platform=fabric-loom-remap`
Original file line number	Diff line number	Diff line change
`@@ -547,6 +547,10 @@ private void tickInactiveController(ControllerEntity controller) {`
`547`	`547`	`if (thisControllerGivingInput && !activeControllerGivingInput) {`
`548`	`548`	`this.setCurrentController(controller, true);`
`549`	`549`	`}`
	`550`	`+`
	`551`	`+ if (this.currentInputMode().isController()) {`
	`552`	`+ ControlifyEvents.INACTIVE_CONTROLLER_TICKED.invoke(new ControlifyEvents.ControllerStateUpdate(controller));`
	`553`	`+ }`
`550`	`554`	`}`
`551`	`555`
`552`	`556`	`public ConfigManager config() {`