[TouchController] 实现状态切换功能

fifth-light · fifth-light · commit 1fff33bdb9c5 · 2026-03-20T02:33:38.000+08:00
diff --git a/touchcontroller/common/event/block/BlockBreakEvents.kt b/touchcontroller/common/event/block/BlockBreakEvents.kt
@@ -1,11 +1,17 @@
 package top.fifthlight.touchcontroller.common.event.block
 
+import top.fifthlight.touchcontroller.common.config.GlobalConfig
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder
 import top.fifthlight.touchcontroller.common.model.ControllerHudModel
 
 object BlockBreakEvents {
     fun afterBlockBreak() {
-        if (GlobalConfigHolder.config.value.regular.vibration) {
+        val config = GlobalConfigHolder.config.value
+        if (config.status.status == StatusConfig.Status.DISABLED) {
+            return
+        }
+        if (config.regular.vibration) {
             ControllerHudModel.status.vibrate = true
         }
     }
diff --git a/touchcontroller/common/event/connection/BUILD.bazel b/touchcontroller/common/event/connection/BUILD.bazel
@@ -4,6 +4,9 @@ kt_merge_library(
     name = "connection",
     srcs = glob(["*.kt"]),
     merge_deps = [
+        "//touchcontroller/common/config",
+        "//touchcontroller/common/config/data",
+        "//touchcontroller/common/config/holder",
         "//touchcontroller/common/gal/action",
         "//touchcontroller/common/platform",
         "//touchcontroller/common/platform/provider",
diff --git a/touchcontroller/common/event/connection/ConnectionEvents.kt b/touchcontroller/common/event/connection/ConnectionEvents.kt
@@ -4,6 +4,8 @@ import top.fifthlight.combine.data.Text
 import top.fifthlight.combine.data.TextFactory
 import top.fifthlight.combine.data.TextFactoryFactory
 import top.fifthlight.touchcontroller.assets.Texts
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig
+import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder
 import top.fifthlight.touchcontroller.common.gal.action.GameAction
 import top.fifthlight.touchcontroller.common.gal.action.GameActionFactory
 import top.fifthlight.touchcontroller.common.platform.provider.PlatformProvider
@@ -12,6 +14,10 @@ import top.fifthlight.touchcontroller.common.platform.warning.WarningProvider
 
 object ConnectionEvents {
     fun onJoinedWorld() {
+        val config = GlobalConfigHolder.config.value
+        if (config.status.status == StatusConfig.Status.DISABLED) {
+            return
+        }
         val platform = PlatformProvider.platform
         if (platform == null) {
             GameAction.sendMessage(Text.translatable(Texts.WARNING_PROXY_NOT_CONNECTED))
diff --git a/touchcontroller/common/event/render/RenderEvents.kt b/touchcontroller/common/event/render/RenderEvents.kt
@@ -8,7 +8,10 @@ import top.fifthlight.combine.paint.Canvas
 import top.fifthlight.data.IntOffset
 import top.fifthlight.data.Offset
 import top.fifthlight.touchcontroller.common.config.condition.input.BuiltinLayerCondition
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder
+import top.fifthlight.touchcontroller.common.config.preset.LayoutPreset
+import top.fifthlight.touchcontroller.common.config.preset.info.PresetControlInfo
 import top.fifthlight.touchcontroller.common.event.window.WindowEvents
 import top.fifthlight.touchcontroller.common.gal.gamestate.GameState
 import top.fifthlight.touchcontroller.common.gal.player.PlayerHandleFactory
@@ -56,6 +59,10 @@ object RenderEvents {
         }
 
         val config = GlobalConfigHolder.config.value
+        if (config.status.status == StatusConfig.Status.DISABLED) {
+            return
+        }
+
         val playerHandle = PlayerHandleFactory.current()
         val platform = PlatformProvider.platform
         if (platform != null) {
@@ -157,7 +164,10 @@ object RenderEvents {
             keyBindingHandler.getState(DefaultKeyBindingType.SNEAK).clearLock()
         }
 
-        val preset = GlobalConfigHolder.currentPreset.value
+        val preset = when (config.status.status) {
+            StatusConfig.Status.ENABLED -> GlobalConfigHolder.currentPreset.value
+            StatusConfig.Status.ONLY_VIEW, StatusConfig.Status.DISABLED -> LayoutPreset()
+        }
         val currentPresetUuid = GlobalConfigHolder.currentPresetUuid.value
         if (ControllerHudModel.status.previousPresetUuid != currentPresetUuid) {
             ControllerHudModel.status.previousPresetUuid = currentPresetUuid
diff --git a/touchcontroller/versions/fabric/1.21.11/BUILD.bazel b/touchcontroller/versions/fabric/1.21.11/BUILD.bazel
@@ -47,6 +47,8 @@ kt_merge_library(
     ]),
     merge_deps = [
         "//touchcontroller/buildinfo",
+        "//touchcontroller/common/config",
+        "//touchcontroller/common/config/data",
         "//touchcontroller/common/config/holder",
         "//touchcontroller/common/event/block",
         "//touchcontroller/common/event/connection",
diff --git a/touchcontroller/versions/fabric/1.21.11/TouchController.kt b/touchcontroller/versions/fabric/1.21.11/TouchController.kt
@@ -15,6 +15,7 @@ import net.minecraft.client.KeyMapping
 import top.fifthlight.combine.backend.minecraft.render.v1_21_11.CanvasImpl
 import top.fifthlight.combine.backend.minecraft.identifier.v1_21_11.toMinecraft
 import top.fifthlight.touchcontroller.buildinfo.BuildInfo
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder
 import top.fifthlight.touchcontroller.common.event.block.BlockBreakEvents
 import top.fifthlight.touchcontroller.common.event.connection.ConnectionEvents
@@ -66,7 +67,7 @@ class TouchController : ClientModInitializer {
         }
 
         WorldRenderEvents.BEFORE_BLOCK_OUTLINE.register { _, _ ->
-            ControllerHudModel.result.showBlockOutline
+            GlobalConfigHolder.config.value.status.status == StatusConfig.Status.DISABLED || ControllerHudModel.result.showBlockOutline
         }
         ClientTickEvents.END_CLIENT_TICK.register {
             TickEvents.clientTick()
diff --git a/touchcontroller/versions/fabric/1.21.11/mixin/KeyBindingMixin.java b/touchcontroller/versions/fabric/1.21.11/mixin/KeyBindingMixin.java
@@ -11,6 +11,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import top.fifthlight.touchcontroller.common.config.GlobalConfig;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 import top.fifthlight.touchcontroller.extension.v1_21_11.ClickableKeyBinding;
 import top.fifthlight.touchcontroller.fabric.v1_21_11.TouchController;
@@ -24,10 +26,7 @@ public abstract class KeyBindingMixin implements ClickableKeyBinding {
     private int clickCount;
 
     @Unique
-    private static boolean touchController$doCancelKey(KeyMapping keyMapping) {
-        var configHolder = GlobalConfigHolder.INSTANCE;
-        var config = configHolder.getConfig().getValue();
-
+    private static boolean touchController$doCancelKey(GlobalConfig config, KeyMapping keyMapping) {
         var client = Minecraft.getInstance();
         if (keyMapping == client.options.keyAttack || keyMapping == client.options.keyUse) {
             return config.getRegular().getDisableMouseClick() || config.getDebug().getEnableTouchEmulation();
@@ -44,11 +43,18 @@ public abstract class KeyBindingMixin implements ClickableKeyBinding {
 
     @WrapOperation(method = "forAllKeyMappings", at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V"))
     private static <T> void forAllKeyMappings(Consumer<T> instance, T keyMapping, Operation<Void> original) {
+        var configHolder = GlobalConfigHolder.INSTANCE;
+        var config = configHolder.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            original.call(instance, keyMapping);
+            return;
+        }
+
         if (!(keyMapping instanceof KeyMapping key)) {
             original.call(instance, keyMapping);
             return;
         }
-        if (touchController$doCancelKey(key)) {
+        if (touchController$doCancelKey(config, key)) {
             return;
         }
         original.call(instance, keyMapping);
diff --git a/touchcontroller/versions/fabric/26.1/BUILD.bazel b/touchcontroller/versions/fabric/26.1/BUILD.bazel
@@ -31,6 +31,8 @@ kt_merge_library(
     actual = True,
     merge_deps = [
         "//touchcontroller/buildinfo",
+        "//touchcontroller/common/config",
+        "//touchcontroller/common/config/data",
         "//touchcontroller/common/config/holder",
         "//touchcontroller/common/event/block",
         "//touchcontroller/common/event/connection",
diff --git a/touchcontroller/versions/fabric/26.1/TouchController.kt b/touchcontroller/versions/fabric/26.1/TouchController.kt
@@ -15,6 +15,7 @@ import net.minecraft.client.KeyMapping
 import top.fifthlight.combine.backend.minecraft.render.v26_1.CanvasImpl
 import top.fifthlight.combine.backend.minecraft.identifier.v26_1.toMinecraft
 import top.fifthlight.touchcontroller.buildinfo.BuildInfo
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder
 import top.fifthlight.touchcontroller.common.event.block.BlockBreakEvents
 import top.fifthlight.touchcontroller.common.event.connection.ConnectionEvents
@@ -66,7 +67,7 @@ class TouchController : ClientModInitializer {
         }
 
         LevelRenderEvents.BEFORE_BLOCK_OUTLINE.register { _, _ ->
-            ControllerHudModel.result.showBlockOutline
+            GlobalConfigHolder.config.value.status.status == StatusConfig.Status.DISABLED || ControllerHudModel.result.showBlockOutline
         }
         ClientTickEvents.END_CLIENT_TICK.register {
             TickEvents.clientTick()
diff --git a/touchcontroller/versions/fabric/26.1/mixin/KeyBindingMixin.java b/touchcontroller/versions/fabric/26.1/mixin/KeyBindingMixin.java
@@ -11,6 +11,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import top.fifthlight.touchcontroller.common.config.GlobalConfig;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 import top.fifthlight.touchcontroller.extension.v26_1.ClickableKeyBinding;
 import top.fifthlight.touchcontroller.fabric.v26_1.TouchController;
@@ -24,10 +26,7 @@ public abstract class KeyBindingMixin implements ClickableKeyBinding {
     private int clickCount;
 
     @Unique
-    private static boolean touchController$doCancelKey(KeyMapping keyMapping) {
-        var configHolder = GlobalConfigHolder.INSTANCE;
-        var config = configHolder.getConfig().getValue();
-
+    private static boolean touchController$doCancelKey(GlobalConfig config, KeyMapping keyMapping) {
         var client = Minecraft.getInstance();
         if (keyMapping == client.options.keyAttack || keyMapping == client.options.keyUse) {
             return config.getRegular().getDisableMouseClick() || config.getDebug().getEnableTouchEmulation();
@@ -44,11 +43,18 @@ public abstract class KeyBindingMixin implements ClickableKeyBinding {
 
     @WrapOperation(method = "forAllKeyMappings", at = @At(value = "INVOKE", target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V"))
     private static <T> void forAllKeyMappings(Consumer<T> instance, T keyMapping, Operation<Void> original) {
+        var configHolder = GlobalConfigHolder.INSTANCE;
+        var config = configHolder.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            original.call(instance, keyMapping);
+            return;
+        }
+
         if (!(keyMapping instanceof KeyMapping key)) {
             original.call(instance, keyMapping);
             return;
         }
-        if (touchController$doCancelKey(key)) {
+        if (touchController$doCancelKey(config, key)) {
             return;
         }
         original.call(instance, keyMapping);
diff --git a/touchcontroller/versions/mixin/1.21.11/BUILD.bazel b/touchcontroller/versions/mixin/1.21.11/BUILD.bazel
@@ -4,6 +4,7 @@ java_merge_library(
     name = "1.21.11",
     srcs = glob(["*.java"]),
     merge_deps = [
+        "//touchcontroller/common/config/data",
         "//touchcontroller/common/config/holder",
         "//touchcontroller/common/event/render",
         "//touchcontroller/common/model",
diff --git a/touchcontroller/versions/mixin/1.21.11/DisableMouseDirectionMixin.java b/touchcontroller/versions/mixin/1.21.11/DisableMouseDirectionMixin.java
@@ -5,6 +5,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 
 @Mixin(MouseHandler.class)
@@ -20,10 +21,10 @@ abstract class DisableMouseDirectionMixin {
     )
     private void turnPlayer(CallbackInfo ci) {
         var configHolder = GlobalConfigHolder.INSTANCE;
-        if (configHolder == null) {
+        var config = configHolder.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
             return;
         }
-        var config = configHolder.getConfig().getValue();
         if (config.getRegular().getDisableMouseMove()) {
             ci.cancel();
         }
diff --git a/touchcontroller/versions/mixin/1.21.11/InGameHudMixin.java b/touchcontroller/versions/mixin/1.21.11/InGameHudMixin.java
@@ -14,6 +14,8 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
+import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 import top.fifthlight.touchcontroller.common.event.render.RenderEvents;
 import top.fifthlight.touchcontroller.common.model.ControllerHudModel;
 
@@ -42,6 +44,10 @@ public abstract class InGameHudMixin {
             cancellable = true
     )
     public void renderCrosshair(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo callbackInfo) {
+        var config = GlobalConfigHolder.INSTANCE.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            return;
+        }
         var shouldRender = RenderEvents.INSTANCE.shouldRenderCrosshair();
         if (!shouldRender) {
             if (this.minecraft.options.attackIndicator().get() == AttackIndicatorStatus.CROSSHAIR) {
@@ -74,6 +80,10 @@ public void renderCrosshair(GuiGraphics context, DeltaTracker tickCounter, Callb
             )
     )
     private void renderHotbar(GuiGraphics context, DeltaTracker deltaTracker, CallbackInfo ci) {
+        var config = GlobalConfigHolder.INSTANCE.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            return;
+        }
         var player = minecraft.player;
         if (player != null) {
             var controllerHudModel = ControllerHudModel.Global;
diff --git a/touchcontroller/versions/mixin/1.21.11/InputConstantsMixin.java b/touchcontroller/versions/mixin/1.21.11/InputConstantsMixin.java
@@ -1,30 +1,30 @@
 package top.fifthlight.touchcontroller.mixin.v1_21_11;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.platform.Window;
-import org.lwjgl.glfw.GLFW;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 
-import static org.lwjgl.glfw.GLFW.GLFW_CURSOR;
-
 @Mixin(InputConstants.class)
 public abstract class InputConstantsMixin {
     @Shadow
     @Final
     public static int CURSOR_NORMAL;
 
-    @Inject(at = @At("TAIL"), method = "grabOrReleaseMouse")
-    private static void setCursorParameters(Window window, int cursorMode, double xpos, double ypos, CallbackInfo ci) {
+    @ModifyArg(method = "grabOrReleaseMouse", at = @At(value = "INVOKE", target = "Lorg/lwjgl/glfw/GLFW;glfwSetInputMode(JII)V"), index = 2)
+    private static int setCursorParameters(long window, int mode, int value) {
         var configHolder = GlobalConfigHolder.INSTANCE;
         var config = configHolder.getConfig().getValue();
-        if (config.getRegular().getDisableMouseLock()) {
-            GLFW.glfwSetInputMode(window.handle(), GLFW_CURSOR, CURSOR_NORMAL);
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            return value;
+        }
+        if (!config.getRegular().getDisableMouseLock()) {
+            return value;
         }
+        return CURSOR_NORMAL;
     }
 }
diff --git a/touchcontroller/versions/mixin/1.21.11/MultiPlayerGameModeMixin.java b/touchcontroller/versions/mixin/1.21.11/MultiPlayerGameModeMixin.java
@@ -19,6 +19,8 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import top.fifthlight.combine.backend.minecraft.item.v1_21_11.ItemImpl;
+import top.fifthlight.touchcontroller.common.config.GlobalConfig;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 import top.fifthlight.touchcontroller.common.util.crosshair.CrosshairTargetHelper;
 import top.fifthlight.touchcontroller.extension.v1_21_11.GameModeWithBreakingProgress;
@@ -55,16 +57,19 @@ public abstract class MultiPlayerGameModeMixin implements GameModeWithBreakingPr
     protected abstract void startPrediction(ClientLevel world, PredictiveAction packetCreator);
 
     @Unique
-    private boolean touchcontroller$crosshairAimingContainItem(Item item) {
-        var globalConfigHolder = GlobalConfigHolder.INSTANCE;
-        var globalConfig = globalConfigHolder.getConfig().getValue();
-        return globalConfig.getItem().getCrosshairAimingItems().contains(new ItemImpl(item));
+    private boolean touchcontroller$crosshairAimingContainItem(GlobalConfig config, Item item) {
+        return config.getItem().getCrosshairAimingItems().contains(new ItemImpl(item));
     }
 
     @Unique
     public void touchcontroller$interactBefore(Player player, InteractionHand hand) {
+        var config = GlobalConfigHolder.INSTANCE.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
+            return;
+        }
+
         var itemStack = player.getItemInHand(hand);
-        if (!touchcontroller$crosshairAimingContainItem(itemStack.getItem())) {
+        if (!touchcontroller$crosshairAimingContainItem(config, itemStack.getItem())) {
             return;
         }
 
diff --git a/touchcontroller/versions/mixin/26.1/BUILD.bazel b/touchcontroller/versions/mixin/26.1/BUILD.bazel
@@ -4,6 +4,7 @@ java_merge_library(
     name = "26.1",
     srcs = glob(["*.java"]),
     merge_deps = [
+        "//touchcontroller/common/config/data",
         "//touchcontroller/common/config/holder",
         "//touchcontroller/common/event/render",
         "//touchcontroller/common/model",
diff --git a/touchcontroller/versions/mixin/26.1/DisableMouseDirectionMixin.java b/touchcontroller/versions/mixin/26.1/DisableMouseDirectionMixin.java
@@ -5,6 +5,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import top.fifthlight.touchcontroller.common.config.data.StatusConfig;
 import top.fifthlight.touchcontroller.common.config.holder.GlobalConfigHolder;
 
 @Mixin(MouseHandler.class)
@@ -20,10 +21,10 @@ abstract class DisableMouseDirectionMixin {
     )
     private void turnPlayer(CallbackInfo ci) {
         var configHolder = GlobalConfigHolder.INSTANCE;
-        if (configHolder == null) {
+        var config = configHolder.getConfig().getValue();
+        if (config.getStatus().getStatus() == StatusConfig.Status.DISABLED) {
             return;
         }
-        var config = configHolder.getConfig().getValue();
         if (config.getRegular().getDisableMouseMove()) {
             ci.cancel();
         }
diff --git a/touchcontroller/versions/mixin/26.1/InGameHudMixin.java b/touchcontroller/versions/mixin/26.1/InGameHudMixin.java
diff --git a/touchcontroller/versions/mixin/26.1/InputConstantsMixin.java b/touchcontroller/versions/mixin/26.1/InputConstantsMixin.java
diff --git a/touchcontroller/versions/mixin/26.1/MultiPlayerGameModeMixin.java b/touchcontroller/versions/mixin/26.1/MultiPlayerGameModeMixin.java
