🐛 Fix not able to use mouse + controller combo

Author: MrCrayfish

common/src/main/java/com/mrcrayfish/controllable/client/VirtualCursor.java

@@ -38,6 +38,7 @@ public final class VirtualCursor
     private boolean visible;
     private boolean snapIfNoMove;
     private boolean initialized;
+    private CursorMode mode = CursorMode.CONTROLLER;
 
     @ApiStatus.Internal
     public VirtualCursor()
@@ -71,7 +72,7 @@ public void resetToCenter()
      */
     public boolean isVisible()
     {
-        return this.visible;
+        return this.mode.isController() && this.visible;
     }
 
     /**
@@ -153,6 +154,25 @@ public double getRenderScreenY()
         return this.renderY * (double) mc.getWindow().getGuiScaledHeight() / (double) mc.getWindow().getHeight();
     }
 
+    /**
+     * @return The current cursor mode
+     */
+    public CursorMode getMode()
+    {
+        return this.mode;
+    }
+
+    /**
+     * Sets the cursor mode.
+     *
+     * @param mode the new cursor mode
+     */
+    @ApiStatus.Internal
+    public void setMode(CursorMode mode)
+    {
+        this.mode = mode;
+    }
+
     /**
      * Updates the movement of the cursor.
      */
@@ -200,6 +220,7 @@ private void updateMovement()
 
             // Let the next update know to try snapping if no input detected
             this.snapIfNoMove = true;
+            this.mode = CursorMode.CONTROLLER;
         }
         else if(this.snapIfNoMove)
         {
@@ -392,4 +413,19 @@ private void snapToContainerSlot()
             }
         }
     }
+
+    public enum CursorMode
+    {
+        CONTROLLER, MOUSE;
+
+        public boolean isController()
+        {
+            return this == CONTROLLER;
+        }
+
+        public boolean isMouse()
+        {
+            return this == MOUSE;
+        }
+    }
 }

common/src/main/java/com/mrcrayfish/controllable/client/input/Controller.java

@@ -1,6 +1,7 @@
 package com.mrcrayfish.controllable.client.input;
 
 import com.mrcrayfish.controllable.Config;
+import com.mrcrayfish.controllable.Controllable;
 import com.mrcrayfish.controllable.client.binding.ButtonBinding;
 import com.mrcrayfish.controllable.client.util.InputHelper;
 import net.minecraft.Util;
@@ -199,6 +200,14 @@ public final boolean isBeingUsed()
         return Util.getMillis() - this.lastInputTime < 4000;
     }
 
+    /**
+     * @return True if controller input has been used recently
+     */
+    public final boolean isUsingVirtualCursor()
+    {
+        return this.isBeingUsed() && Controllable.getCursor().getMode().isController();
+    }
+
     /**
      * Gets the pressed value of a button. This value ranges from 0 to 1 (inclusive). If the value
      * is greater than zero, it is considered pressed. Binary buttons will only be either 0 or 1,

common/src/main/java/com/mrcrayfish/controllable/client/overlay/VirtualCursorOverlay.java

@@ -23,7 +23,7 @@ public class VirtualCursorOverlay implements IOverlay
     public boolean isVisible()
     {
         Controller controller = Controllable.getController();
-        return Minecraft.getInstance().getOverlay() == null && Minecraft.getInstance().screen != null && controller != null && controller.isBeingUsed() && Controllable.getCursor().isVisible();
+        return Minecraft.getInstance().getOverlay() == null && Minecraft.getInstance().screen != null && controller != null && controller.isUsingVirtualCursor() && Controllable.getCursor().isVisible();
     }
 
     @Override

common/src/main/java/com/mrcrayfish/controllable/mixin/client/GameRendererMixin.java

@@ -29,7 +29,7 @@ private void controllableLastRender(DeltaTracker tracker, boolean running, Callb
     private int controllableModifyMouseX(int original)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             return (int) Controllable.getCursor().getRenderScreenX();
         }
@@ -40,7 +40,7 @@ private int controllableModifyMouseX(int original)
     private int controllableModifyMouseY(int original)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             return (int) Controllable.getCursor().getRenderScreenY();
         }

common/src/main/java/com/mrcrayfish/controllable/mixin/client/MouseHandlerMixin.java

@@ -0,0 +1,23 @@
+package com.mrcrayfish.controllable.mixin.client;
+
+import com.mrcrayfish.controllable.Controllable;
+import com.mrcrayfish.controllable.client.VirtualCursor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.MouseHandler;
+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;
+
+@Mixin(MouseHandler.class)
+public class MouseHandlerMixin
+{
+    @Inject(method = "onMove", at = @At(value = "HEAD"))
+    private void controllableOnMouseMoved(long windowId, double mouseX, double mouseY, CallbackInfo ci)
+    {
+        if(windowId == Minecraft.getInstance().getWindow().getWindow())
+        {
+            Controllable.getCursor().setMode(VirtualCursor.CursorMode.MOUSE);
+        }
+    }
+}

common/src/main/java/com/mrcrayfish/controllable/mixin/client/MouseHelperMixin.java

@@ -64,7 +64,7 @@ private void controllableBeforeUpdateLook(CallbackInfo ci)
     private void controllableGrabCursor(CallbackInfo ci)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed() && !this.controllable$releaseBypass)
+        if(controller != null && controller.isUsingVirtualCursor() && !this.controllable$releaseBypass)
         {
             ci.cancel();
         }

common/src/main/java/com/mrcrayfish/controllable/mixin/client/jei/MouseUtilMixin.java

@@ -25,7 +25,7 @@ public class MouseUtilMixin
     private static void controllableGetX(CallbackInfoReturnable<Double> cir)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             cir.setReturnValue(Controllable.getCursor().getRenderScreenX());
         }
@@ -35,7 +35,7 @@ private static void controllableGetX(CallbackInfoReturnable<Double> cir)
     private static void controllableGetY(CallbackInfoReturnable<Double> cir)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             cir.setReturnValue(Controllable.getCursor().getRenderScreenY());
         }

common/src/main/java/com/mrcrayfish/controllable/mixin/client/rei/PointHelperMixin.java

@@ -21,7 +21,7 @@ public class PointHelperMixin
     private static void controllableMouse(CallbackInfoReturnable<Point> cir)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             double mouseX = Controllable.getCursor().getRenderScreenX();
             double mouseY = Controllable.getCursor().getRenderScreenY();
@@ -33,7 +33,7 @@ private static void controllableMouse(CallbackInfoReturnable<Point> cir)
     private static void controllableFloatMouse(CallbackInfoReturnable<FloatingPoint> cir)
     {
         Controller controller = Controllable.getController();
-        if(controller != null && controller.isBeingUsed())
+        if(controller != null && controller.isUsingVirtualCursor())
         {
             double mouseX = Controllable.getCursor().getRenderScreenX();
             double mouseY = Controllable.getCursor().getRenderScreenY();

common/src/main/resources/controllable.common.mixins.json

@@ -1,31 +1,32 @@
 {
-    "required": true,
-    "package": "com.mrcrayfish.controllable.mixin",
-    "compatibilityLevel": "JAVA_21",
-    "minVersion": "0.8",
-    "refmap": "controllable.refmap.json",
-    "client": [
-        "client.ContainerScreenMixin",
-        "client.GameRendererMixin",
-        "client.GuiMixin",
-        "client.LocalPlayerMixin",
-        "client.MinecraftMixin",
-        "client.MouseHelperMixin",
-        "client.OverlayRecipeButtonAccessor",
-        "client.OverlayRecipeComponentAccessor",
-        "client.RecipeBookComponentAccessor",
-        "client.RecipeBookPageAccessor",
-        "client.RecipeBookPageMixin",
-        "client.TimerAccessor",
-        "client.jei.GuiIconToggleButtonMixin",
-        "client.jei.IngredientGridMixin",
-        "client.jei.IngredientGridWithNavigationMixin",
-        "client.jei.IngredientListOverlayMixin",
-        "client.jei.MouseUtilMixin",
-        "client.jei.PageNavigationMixin",
-        "client.rei.PointHelperMixin"
-    ],
-    "injectors": {
-        "defaultRequire": 1
-    }
+  "required": true,
+  "package": "com.mrcrayfish.controllable.mixin",
+  "compatibilityLevel": "JAVA_21",
+  "minVersion": "0.8",
+  "refmap": "controllable.refmap.json",
+  "client": [
+    "client.ContainerScreenMixin",
+    "client.GameRendererMixin",
+    "client.GuiMixin",
+    "client.LocalPlayerMixin",
+    "client.MinecraftMixin",
+    "client.MouseHandlerMixin",
+    "client.MouseHelperMixin",
+    "client.OverlayRecipeButtonAccessor",
+    "client.OverlayRecipeComponentAccessor",
+    "client.RecipeBookComponentAccessor",
+    "client.RecipeBookPageAccessor",
+    "client.RecipeBookPageMixin",
+    "client.TimerAccessor",
+    "client.jei.GuiIconToggleButtonMixin",
+    "client.jei.IngredientGridMixin",
+    "client.jei.IngredientGridWithNavigationMixin",
+    "client.jei.IngredientListOverlayMixin",
+    "client.jei.MouseUtilMixin",
+    "client.jei.PageNavigationMixin",
+    "client.rei.PointHelperMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
 }