MidnightControls 1.7.0 - Fixes & Controller Profiles

- Fix diagonal movement speed (PR #113, thanks @dogtopus, closes #42) - Toggle Sprint and Toggle Sneak can now be enabled separately just for controllers (closes #102) - Added button binding profile support (closes #107) - Fix button binding tooltips intersecting with chat on large GUI scales (closes #106) - Add assets for non-licensed (numbered) PlayStation controllers (closes #110) - Fix reacharound outline color - Fix pixel error in legacy icons (closes #84) - Fix creative flight being slow with Bedrockify installed (just disables the "disableFlyingMomentum" option on launch)
2025-12-14 07:35:10 +01:00 · 2022-10-16 15:53:03 +02:00
parent cdafde01f3
commit 8d08fdedf4
19 changed files with 107 additions and 6 deletions
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/ControllerType.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/ControllerType.java
@@ -32,7 +32,8 @@ public enum ControllerType implements Nameable {
    XBOX(5),
    STEAM_DECK(6),
    STEAM_CONTROLLER(7),
-    OUYA(8);
+    OUYA(8),
+    NUMBERED(9);

    private final int id;
    private final Text text;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/MidnightControlsConfig.java
@@ -17,6 +17,7 @@ import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.Controller;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
+import net.minecraft.client.MinecraftClient;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
@@ -42,6 +43,8 @@ public class MidnightControlsConfig extends MidnightConfig {
    // Gameplay
    @Entry(name = "midnightcontrols.menu.analog_movement") public static boolean analogMovement = true;
    @Entry(name = "midnightcontrols.menu.double_tap_to_sprint") public static boolean doubleTapToSprint = true;
+    @Entry(name = "midnightcontrols.menu.controller_toggle_sneak") public static boolean controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
+    @Entry(name = "midnightcontrols.menu.controller_toggle_sprint") public static boolean controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
    @Entry(name = "midnightcontrols.menu.fast_block_placing") public static boolean fastBlockPlacing = false; // Disabled by default as this behaviour can be considered cheating on multiplayer servers.
    @Entry(name = "midnightcontrols.menu.fly_drifting") public static boolean flyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers. It can also conflict with some other mods.
    @Entry(name = "midnightcontrols.menu.fly_drifting_vertical") public static boolean verticalFlyDrifting = true; // Enabled by default as disabling this behaviour can be considered cheating on multiplayer servers.
@@ -66,7 +69,8 @@ public class MidnightControlsConfig extends MidnightConfig {
    @Entry(name = "Mouse screens") public static List<String> mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui",
            "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375",
            "net.minecraft.class_457", "net.minecraft.class_408", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen",
-            "hardcorequesting.client.interfaces.GuiQuestBook", "hardcorequesting.client.interfaces.GuiReward", "hardcorequesting.client.interfaces.EditTrackerScreen");
+            "hardcorequesting.client.interfaces.GuiQuestBook", "hardcorequesting.client.interfaces.GuiReward", "hardcorequesting.client.interfaces.EditTrackerScreen",
+            "me.shedaniel.clothconfig2.gui.ClothConfigScreen");
    @Entry(name = "Keybindings") public static Map<String, String> BINDING = new HashMap<>();

    private static final Pattern BUTTON_BINDING_PATTERN = Pattern.compile("(-?\\d+)\\+?");
@@ -298,6 +302,8 @@ public class MidnightControlsConfig extends MidnightConfig {
        hudSide = HudSide.LEFT;
        analogMovement = true;
        doubleTapToSprint = true;
+        controllerToggleSneak = MinecraftClient.getInstance().options.getSneakToggled().getValue();
+        controllerToggleSprint = MinecraftClient.getInstance().options.getSprintToggled().getValue();
        fastBlockPlacing = false;
        flyDrifting = true;
        verticalFlyDrifting = true;
@@ -319,7 +325,7 @@ public class MidnightControlsConfig extends MidnightConfig {
        controllerID = 0;
        secondControllerID = -1;
        controllerType = ControllerType.DEFAULT;
-        mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui", "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375", "net.minecraft.class_457", "net.minecraft.class_408", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen");
+        mouseScreens = Lists.newArrayList("me.jellysquid.mods.sodium.client.gui", "net.coderbot.iris.gui", "net.minecraft.client.gui.screen.advancement", "net.minecraft.client.gui.screen.pack.PackScreen", "net.minecraft.class_5375", "net.minecraft.class_457", "net.minecraft.class_408", "me.flashyreese.mods.reeses_sodium_options.client.gui", "dev.emi.emi.screen", "me.shedaniel.clothconfig2.gui.ClothConfigScreen");
        BINDING = new HashMap<>();
        maxAnalogValues = new double[]{1, 1, 1, 1};
        triggerFix = true;
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/BedrockifyCompat.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/BedrockifyCompat.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2022 Motschen <motschen@midnightdust.eu>
+ *
+ * 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 me.juancarloscp52.bedrockify.client.BedrockifyClient;
+import me.juancarloscp52.bedrockify.client.BedrockifyClientSettings;
+import net.minecraft.client.gui.screen.Screen;
+import org.aperlambda.lambdacommon.utils.LambdaReflection;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Optional;
+
+/**
+ * Represents HQM compatibility handler.
+ *
+ * @author Motschen
+ * @version 1.7.0
+ * @since 1.7.0
+ */
+public class BedrockifyCompat implements CompatHandler {
+
+    @Override
+    public void handle(@NotNull MidnightControlsClient mod) {
+        BedrockifyClient.getInstance().settings.disableFlyingMomentum = false;
+    }
+}
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/compat/MidnightControlsCompat.java
@@ -53,6 +53,10 @@ public class MidnightControlsCompat {
            mod.log("Adding HQM compatibility...");
            HANDLERS.add(new HQMCompat());
        }
+        if (FabricLoader.getInstance().isModLoaded("bedrockify")) {
+            mod.log("Adding Bedrockify compatibility...");
+            HANDLERS.add(new BedrockifyCompat());
+        }
        HANDLERS.forEach(handler -> handler.handle(mod));
        InputManager.loadButtonBindings();
    }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/ButtonBinding.java
@@ -88,7 +88,8 @@ public class ButtonBinding {
            .action(InputHandlers.handleInventorySlotPad(0)).onlyInInventory().cooldown().register();
    public static final ButtonBinding SNEAK = new Builder("sneak").buttons(GLFW_GAMEPAD_BUTTON_RIGHT_THUMB)
            .actions(InputHandlers::handleToggleSneak).onlyInGame().cooldown().register();
-    public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB).onlyInGame().register();
+    public static final ButtonBinding SPRINT = new Builder("sprint").buttons(GLFW_GAMEPAD_BUTTON_LEFT_THUMB)
+            .actions(InputHandlers::handleToggleSprint).onlyInGame().register();
    public static final ButtonBinding SWAP_HANDS = new Builder("swap_hands").buttons(GLFW_GAMEPAD_BUTTON_X).onlyInGame().cooldown().register();
    public static final ButtonBinding TAB_LEFT = new Builder("tab_back").buttons(GLFW_GAMEPAD_BUTTON_LEFT_BUMPER)
            .action(InputHandlers.handleHotbar(false)).filter(Predicates.or(InputHandlers::inInventory, InputHandlers::inAdvancements).or((client, binding) -> client.currentScreen != null && client.currentScreen.getClass().toString().contains("sodium"))).cooldown().register();
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/InputHandlers.java
@@ -11,6 +11,7 @@ package eu.midnightdust.midnightcontrols.client.controller;

 import eu.midnightdust.midnightcontrols.client.ButtonState;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightInput;
 import eu.midnightdust.midnightcontrols.client.compat.InventoryTabsCompat;
 import eu.midnightdust.midnightcontrols.client.compat.MidnightControlsCompat;
@@ -254,9 +255,28 @@ public class InputHandlers {
            boolean sneakToggled = client.options.getSneakToggled().getValue();
            if (client.player.getAbilities().flying && sneakToggled)
                client.options.getSneakToggled().setValue(false);
+            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
+                client.options.getSneakToggled().setValue(!sneakToggled);
            binding.setPressed(button.pressed);
            if (client.player.getAbilities().flying && sneakToggled)
                client.options.getSneakToggled().setValue(true);
+            else if (MidnightControlsConfig.controllerToggleSneak != sneakToggled)
+                client.options.getSneakToggled().setValue(sneakToggled);
+        });
+        return true;
+    }
+    public static boolean handleToggleSprint(@NotNull MinecraftClient client, @NotNull ButtonBinding button, float value, @NotNull ButtonState action) {
+        button.asKeyBinding().ifPresent(binding -> {
+            boolean sprintToggled = client.options.getSprintToggled().getValue();
+            if (client.player.getAbilities().flying && sprintToggled)
+                client.options.getSprintToggled().setValue(false);
+            else if (MidnightControlsConfig.controllerToggleSneak != sprintToggled)
+                client.options.getSprintToggled().setValue(!sprintToggled);
+            binding.setPressed(button.pressed);
+            if (client.player.getAbilities().flying && sprintToggled)
+                client.options.getSprintToggled().setValue(true);
+            else if (MidnightControlsConfig.controllerToggleSneak != sprintToggled)
+                client.options.getSprintToggled().setValue(sprintToggled);
        });
        return true;
    }
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/controller/MovementHandler.java
@@ -62,7 +62,7 @@ public final class MovementHandler implements PressAction {
        player.input.pressingLeft = this.pressingLeft;
        player.input.pressingRight = this.pressingRight;

-        // Do a implicit square here
+        // Do an implicit square here
        movementR = this.slowdownFactor * (Math.pow(this.movementSideways, 2) + Math.pow(this.movementForward, 2));
        movementR = MathHelper.clamp(movementR, 0.f, 1.f);
        movementTheta = Math.atan2(this.movementForward, this.movementSideways);
--- a/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
+++ b/src/main/java/eu/midnightdust/midnightcontrols/client/gui/MidnightControlsSettingsScreen.java
@@ -63,6 +63,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
    private final SpruceOption analogMovementOption;
    private final SpruceOption doubleTapToSprintOption;
    private final SpruceOption autoJumpOption;
+    private final SpruceOption controllerToggleSneakOption;
+    private final SpruceOption controllerToggleSprintOption;
    private final SpruceOption fastBlockPlacingOption;
    private final SpruceOption frontBlockPlacingOption;
    private final SpruceOption verticalReacharoundOption;
@@ -199,6 +201,12 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
                () -> this.client.options.getAutoJump().getValue(),
                newValue -> this.client.options.getAutoJump().setValue(newValue),
                null);
+        this.controllerToggleSneakOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sneak",
+                () -> MidnightControlsConfig.controllerToggleSneak, value -> MidnightControlsConfig.controllerToggleSneak = value,
+                null);
+        this.controllerToggleSprintOption = new SpruceToggleBooleanOption("midnightcontrols.menu.controller_toggle_sprint",
+                () -> MidnightControlsConfig.controllerToggleSprint, value -> MidnightControlsConfig.controllerToggleSprint = value,
+                null);
        this.fastBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.fast_block_placing", () -> MidnightControlsConfig.fastBlockPlacing,
                value -> MidnightControlsConfig.fastBlockPlacing = value, Text.translatable("midnightcontrols.tooltip.fast_block_placing"));
        this.frontBlockPlacingOption = new SpruceToggleBooleanOption("midnightcontrols.menu.reacharound.horizontal", () -> MidnightControlsConfig.horizontalReacharound,
@@ -329,6 +337,8 @@ public class MidnightControlsSettingsScreen extends SpruceScreen {
        list.setBackground(new MidnightControlsBackground(130));
        list.addSingleOptionEntry(this.analogMovementOption);
        list.addSingleOptionEntry(this.doubleTapToSprintOption);
+        list.addSingleOptionEntry(this.controllerToggleSneakOption);
+        list.addSingleOptionEntry(this.controllerToggleSprintOption);
        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.fastBlockPlacingOption);
        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.frontBlockPlacingOption);
        if (MidnightControls.isExtrasLoaded) list.addSingleOptionEntry(this.verticalReacharoundOption);