MidnightControls 1.2.0 - Touchscreen, Modded Keybinds, Bugfixes

- Added #40 (Modded keybind support)
- Added #20 (Touchscreen support)
- Improved #13 (Sodium screen controller support)
- Attempt to fix #31 & #38 (Jittery input on low FPS)
- Fixed #35 (Front placing being broken)
- Fixed #32 (Option to disable double tap to sprint)
- Fixed #27 (Auto-adapt controller icons)
- Fixed #19 (HUD-scaling on big scales)
- Fixed #36 (Crash on game load)
- Fixed reset option
- Fixed scrolling in trading screens
- Disable features that might be considered as cheats (install MidnightControlsExtra to enable)

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ClientPlayerEntityMixin.java

@@ -10,6 +10,7 @@
 package eu.midnightdust.midnightcontrols.client.mixin;
 
 import com.mojang.authlib.GameProfile;
+import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.controller.MovementHandler;
@@ -27,6 +28,7 @@ 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 /**
@@ -53,10 +55,13 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     @Shadow
     protected abstract boolean isCamera();
 
+    @Shadow protected int ticksLeftToDoubleTapSprint;
+
 
     @Inject(method = "move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
     public void onMove(MovementType type, Vec3d movement, CallbackInfo ci) {
-        var mod = MidnightControlsClient.get();
+        if (!MidnightControlsConfig.doubleTapToSprint) ticksLeftToDoubleTapSprint = 0;
+        if (!MidnightControls.isExtrasLoaded) return;
         if (type == MovementType.SELF) {
             if (this.getAbilities().flying && (!MidnightControlsConfig.flyDrifting || !MidnightControlsConfig.verticalFlyDrifting)) {
                 if (!this.hasMovementInput()) {
@@ -79,7 +84,7 @@ public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity
     @Inject(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isCamera()Z"))
     public void onTickMovement(CallbackInfo ci) {
         if (this.getAbilities().flying && this.isCamera()) {
-            if (MidnightControlsConfig.verticalFlyDrifting)
+            if (MidnightControlsConfig.verticalFlyDrifting || !MidnightControls.isExtrasLoaded)
                 return;
             int moving = 0;
             if (this.input.sneaking) {

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/CreativeInventoryScreenAccessor.java

@@ -29,7 +29,9 @@ public interface CreativeInventoryScreenAccessor {
      * @return the selected tab index
      */
     @Accessor("selectedTab")
-    int getSelectedTab();
+    static int getSelectedTab() {
+        return 0;
+    }
 
     /**
      * Sets the selected tab.

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingMixin.java

@@ -28,7 +28,7 @@ public class KeyBindingMixin implements KeyBindingAccessor {
         if (!this.pressed)
             this.pressed = true;
         ++this.timesPressed;
-        return oldPressed != this.pressed;
+        return !oldPressed;
     }
 
     @Override

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/KeyBindingRegistryImplAccessor.java

@@ -0,0 +1,17 @@
+package eu.midnightdust.midnightcontrols.client.mixin;
+
+import net.fabricmc.fabric.impl.client.keybinding.KeyBindingRegistryImpl;
+import net.minecraft.client.option.KeyBinding;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(value = KeyBindingRegistryImpl.class, remap = false)
+public interface KeyBindingRegistryImplAccessor {
+    @Accessor @Final
+    static List<KeyBinding> getModdedKeyBindings() {
+        return null;
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/MinecraftClientMixin.java

@@ -54,10 +54,6 @@ public abstract class MinecraftClientMixin {
     @Nullable
     public ClientPlayerInteractionManager interactionManager;
 
-    @Shadow
-    @Nullable
-    public ClientWorld world;
-
     @Shadow
     @Final
     public GameRenderer gameRenderer;
@@ -104,18 +100,26 @@ public abstract class MinecraftClientMixin {
             this.midnightcontrols$lastTargetSide = side;
         }
         // Removed front placing sprinting as way too cheaty.
-        /*else if (this.player.isSprinting()) {
-            hitResult = midnightcontrolsClient.get().reacharound.getLastReacharoundResult();
+        else if (this.player.isSprinting()) {
+            hitResult = MidnightControlsClient.get().reacharound.getLastReacharoundResult();
             if (hitResult != null) {
                 if (cooldown > 0)
                     this.itemUseCooldown = 0;
             }
-        }*/
+        }
         this.midnightcontrols$lastPos = this.player.getPos();
     }
-
+    // Applied three times for smooth camera turning even on low FPS
+    @Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Recorder;startTick()V", shift = At.Shift.AFTER))
+    private void onPreRender(CallbackInfo ci) {
+        MidnightControlsClient.get().onRender((MinecraftClient) (Object) (this));
+    }
     @Inject(method = "render", at = @At("HEAD"))
-    private void onRender(boolean fullRender, CallbackInfo ci) {
+    private void onRender(CallbackInfo ci) {
+        MidnightControlsClient.get().onRender((MinecraftClient) (Object) (this));
+    }
+    @Inject(method = "render", at = @At("TAIL"))
+    private void onPostRender(CallbackInfo ci) {
         MidnightControlsClient.get().onRender((MinecraftClient) (Object) (this));
     }