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/ring/MidnightRing.java

@@ -51,16 +51,16 @@ public final class MidnightRing {
      * Loads the ring from configuration.
      */
     public void load() {
-//        List<Config> configPages = MidnightControlsConfig.ringPages;
-//        if (configPages != null) {
-//            this.pages.clear();
-//            for (var configPage : configPages) {
-//                RingPage.parseRingPage(configPage).ifPresent(this.pages::add);
-//            }
-//        }
-//        if (this.pages.isEmpty()) {
-//            this.pages.add(RingPage.DEFAULT);
-//        }
+        List<Config> configPages = null;
+        if (configPages != null) {
+            this.pages.clear();
+            for (var configPage : configPages) {
+                RingPage.parseRingPage(configPage).ifPresent(this.pages::add);
+            }
+        }
+        if (this.pages.isEmpty()) {
+            this.pages.add(RingPage.DEFAULT);
+        }
     }
 
     public @NotNull RingPage getCurrentPage() {

src/main/java/eu/midnightdust/midnightcontrols/client/ring/RingPage.java

@@ -10,11 +10,15 @@
 package eu.midnightdust.midnightcontrols.client.ring;
 
 import com.electronwill.nightconfig.core.Config;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.screen.ChatScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
 
@@ -36,6 +40,11 @@ public class RingPage extends DrawableHelper {
         for (int i = 0; i < 8; i++) {
             this.actions[i] = null;
         }
+        this.actions[0] = new DummyRingAction(null);
+        this.actions[1] = new KeyBindingRingAction(null, MidnightControlsClient.BINDING_LOOK_UP);
+        this.actions[2] = new KeyBindingRingAction(null, MidnightControlsClient.BINDING_LOOK_LEFT);
+        this.actions[3] = new KeyBindingRingAction(null, MidnightControlsClient.BINDING_LOOK_RIGHT);
+        this.actions[4] = new KeyBindingRingAction(null, MidnightControlsClient.BINDING_LOOK_DOWN);
     }
 
     /**
@@ -83,6 +92,52 @@ public class RingPage extends DrawableHelper {
     private static boolean isHovered(int x, int y, int mouseX, int mouseY) {
         return mouseX >= x && mouseY >= y && mouseX <= x + MidnightRing.ELEMENT_SIZE && mouseY <= y + MidnightRing.ELEMENT_SIZE;
     }
+    /**
+     * Renders the ring page.
+     *
+     * @param width the screen width
+     * @param height the screen height
+     * @param mouseX the mouse X-coordinate
+     * @param mouseY the mouse Y-coordinate
+     */
+    public boolean onClick(int width, int height, int mouseX, int mouseY) {
+        int centerX = width / 2;
+        int centerY = height / 2;
+
+        int offset = MidnightRing.ELEMENT_SIZE + (MidnightRing.ELEMENT_SIZE / 2) + 5;
+
+        int y = centerY - offset;
+        int x = centerX - offset;
+        for (int i = 0; i < 3; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += 55;
+        }
+        y += 55;
+        x = centerX - offset;
+        for (int i = 3; i < 5; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += 55 * 2;
+        }
+        y += 55;
+        x = centerX - offset;
+        for (int i = 5; i < 8; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null && isHovered(x,y,mouseX,mouseY)) {
+                ringAction.activate(RingButtonMode.PRESS);
+                return true;
+            }
+            x += 55;
+        }
+        return false;
+    }
 
     /**
      * Tries to parse a ring page configuration.