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/compat/EmotecraftCompat.java

@@ -1,49 +0,0 @@
-/*
- * Copyright © 2021 LambdAurora <aurora42lambda@gmail.com>
- *
- * This file is part of midnightcontrols.
- *
- * Licensed under the MIT license. For more information,
- * see the LICENSE file.
- */
-
-package eu.midnightdust.midnightcontrols.client.compat;
-
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
-import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
-import io.github.kosmx.emotes.arch.gui.screen.ingame.FastChosseScreen;
-import io.github.kosmx.emotes.main.network.ClientEmotePlay;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Represents a compatibility handler for Emotecraft.
- *
- * @author Motschen
- * @version 1.4.3
- * @since 1.0.0
- */
-public class EmotecraftCompat implements CompatHandler {
-    @Override
-    public void handle(@NotNull MidnightControlsClient mod) {
-        new ButtonBinding.Builder("key.emotecraft.fastchoose")
-                .buttons(16)
-                .onlyInGame()
-                .cooldown(true)
-                .category(ButtonBinding.MISC_CATEGORY)
-                .action((client, button, value, action) -> {
-                    client.setScreen(new FastChosseScreen(null));
-                    return true;
-                })
-                .register();
-        new ButtonBinding.Builder("key.emotecraft.stop")
-                .buttons(17)
-                .onlyInGame()
-                .cooldown(true)
-                .category(ButtonBinding.MISC_CATEGORY)
-                .action((client, button, value, action) -> {
-                    ClientEmotePlay.clientStopLocalEmote();
-                    return true;
-                })
-                .register();
-    }
-}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java

@@ -53,10 +53,6 @@ public class MidnightControlsCompat {
             mod.log("Adding HQM compatibility...");
             HANDLERS.add(new HQMCompat());
         }
-        if (FabricLoader.getInstance().isModLoaded("emotecraft")) {
-            mod.log("Adding Emotecraft compatibility...");
-            HANDLERS.add(new EmotecraftCompat());
-        }
         HANDLERS.forEach(handler -> handler.handle(mod));
         InputManager.loadButtonBindings();
     }

src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsMixinPlugin.java

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
+import net.fabricmc.loader.api.FabricLoader;
 import org.jetbrains.annotations.NotNull;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
@@ -33,6 +34,7 @@ public class MidnightControlsMixinPlugin implements IMixinConfigPlugin {
         this.putConditionalMixin("EntryWidgetAccessor", MidnightControlsCompat.isReiPresent());
         this.putConditionalMixin("RecipeViewingScreenAccessor", MidnightControlsCompat.isReiPresent());
         this.putConditionalMixin("VillagerRecipeViewingScreenAccessor", MidnightControlsCompat.isReiPresent());
+        this.putConditionalMixin("SodiumOptionsGUIAccessor", FabricLoader.getInstance().isModLoaded("sodium"));
     }
 
     private void putConditionalMixin(@NotNull String path, boolean condition) {

src/main/java/eu/midnightdust/midnightcontrols/client/compat/SodiumCompat.java

@@ -0,0 +1,40 @@
+package eu.midnightdust.midnightcontrols.client.compat;
+
+import eu.midnightdust.midnightcontrols.MidnightControls;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.compat.mixin.SodiumOptionsGUIAccessor;
+import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
+import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.Screen;
+
+public class SodiumCompat {
+    private static final MinecraftClient client = MinecraftClient.getInstance();
+    public static void handleInput(Screen screen, boolean direction) {
+        if (screen instanceof SodiumOptionsGUI optionsGUI) {
+            SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;
+            final int max = accessor.getControls().size()-1;
+
+            var option = accessor.getControls().stream().filter(ControlElement::isHovered).findFirst().orElse(accessor.getControls().get(0));
+            int i = accessor.getControls().indexOf(option);
+            i = (direction ? ((max > i) ? ++i : 0) : (i > 0 ? --i : max));
+
+            var dimensions = accessor.getControls().get(i).getDimensions();
+            InputManager.INPUT_MANAGER.targetMouseX = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterX());
+            InputManager.INPUT_MANAGER.targetMouseY = (int) (client.getWindow().getScaleFactor() * dimensions.getCenterY());
+            MidnightControlsClient.get().input.actionGuiCooldown = 5;
+            MidnightControls.get().log(i+" "+accessor.getControls().size()+" | " + dimensions.getCenterX() + " " + dimensions.getCenterY());
+        }
+    }
+    public static void handleTabs(Screen screen, boolean direction) {
+        if (screen instanceof SodiumOptionsGUI optionsGUI) {
+            SodiumOptionsGUIAccessor accessor = (SodiumOptionsGUIAccessor) optionsGUI;
+            final int max = accessor.getPages().size()-1;
+            int i = accessor.getPages().indexOf(accessor.getCurrentPage());
+            i = (direction ? ((max > i) ? ++i : 0) : (i > 0 ? --i : max));
+            MidnightControls.get().log(""+i);
+            optionsGUI.setPage(accessor.getPages().get(i));
+        }
+    }
+}

src/main/java/eu/midnightdust/midnightcontrols/client/compat/mixin/SodiumOptionsGUIAccessor.java

@@ -0,0 +1,19 @@
+package eu.midnightdust.midnightcontrols.client.compat.mixin;
+
+import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
+import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
+import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.List;
+
+@Mixin(value = SodiumOptionsGUI.class, remap = false)
+public interface SodiumOptionsGUIAccessor {
+    @Accessor
+    List<ControlElement<?>> getControls();
+    @Accessor
+    List<OptionPage> getPages();
+    @Accessor
+    OptionPage getCurrentPage();
+}