MidnightControls 0.1.0 (Beta)

Changes from LambdaControls:
- Support for Steam Deck and Dualsense
- Support for L4, L5, R4, R5 buttons
- Updated Libraries
- New Logo and Name
- Lots of Bugfixes
- MidnightConfig backend

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

@@ -0,0 +1,36 @@
+/*
+ * 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.ring;
+
+import com.electronwill.nightconfig.core.Config;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.util.math.MatrixStack;
+import org.jetbrains.annotations.NotNull;
+
+public class DummyRingAction extends RingAction {
+    public DummyRingAction(@NotNull Config config) {
+        super(config);
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return "dummy";
+    }
+
+    @Override
+    public void onAction(@NotNull RingButtonMode mode) {
+
+    }
+
+    @Override
+    public void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
+        drawCenteredText(matrices, textRenderer, this.getName(), x + 25, y + 25 - textRenderer.fontHeight / 2, 0xffffff);
+    }
+}

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

@@ -0,0 +1,66 @@
+/*
+ * 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.ring;
+
+import com.electronwill.nightconfig.core.Config;
+import eu.midnightdust.midnightcontrols.client.util.KeyBindingAccessor;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.TranslatableText;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Supplier;
+
+public class KeyBindingRingAction extends RingAction {
+    public static final Factory FACTORY = new Factory();
+    public final KeyBinding binding;
+
+    public KeyBindingRingAction(@NotNull Config config, @NotNull KeyBinding binding) {
+        super(config);
+        this.binding = binding;
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return this.binding.getTranslationKey();
+    }
+
+    @Override
+    public void onAction(@NotNull RingButtonMode mode) {
+        KeyBindingAccessor accessor = (KeyBindingAccessor) this.binding;
+        switch (mode) {
+            case PRESS, HOLD -> accessor.midnightcontrols$handlePressState(this.activated);
+            case TOGGLE -> {
+                accessor.midnightcontrols$handlePressState(!this.binding.isPressed());
+                this.activated = !this.binding.isPressed();
+            }
+        }
+    }
+
+    @Override
+    public void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
+        drawCenteredText(matrices, textRenderer, new TranslatableText(this.getName()), x + 25, y + 25 - textRenderer.fontHeight / 2, 0xffffff);
+    }
+
+    protected static class Factory implements RingAction.Factory {
+        @Override
+        public @NotNull Supplier<RingAction> newFromGui(@NotNull Screen screen) {
+            return () -> null;
+        }
+
+        @Override
+        public @Nullable RingAction parse(@NotNull Config config) {
+            return null;
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+/*
+ * 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.ring;
+
+import com.electronwill.nightconfig.core.Config;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Represents a key binding ring.
+ *
+ * @author LambdAurora
+ * @version 1.7.0
+ * @since 1.4.0
+ */
+public final class MidnightRing {
+    public static final int ELEMENT_SIZE = 50;
+
+    private final Map<String, RingAction.Factory> actionFactories = new Object2ObjectOpenHashMap<>();
+    private final List<RingPage> pages = new ArrayList<>(Collections.singletonList(RingPage.DEFAULT));
+    private final MidnightControlsClient mod;
+    private int currentPage = 0;
+
+    public MidnightRing(@NotNull MidnightControlsClient mod) {
+        this.mod = mod;
+    }
+
+    public void registerAction(@NotNull String name, @NotNull RingAction.Factory factory) {
+        if (this.actionFactories.containsKey(name)) {
+            this.mod.warn("Tried to register twice a ring action: \"" + name + "\".");
+            return;
+        }
+        this.actionFactories.put(name, factory);
+    }
+
+    /**
+     * 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);
+//        }
+    }
+
+    public @NotNull RingPage getCurrentPage() {
+        if (this.currentPage >= this.pages.size())
+            this.currentPage = this.pages.size() - 1;
+        else if (this.currentPage < 0)
+            this.currentPage = 0;
+        return this.pages.get(this.currentPage);
+    }
+}

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

@@ -0,0 +1,84 @@
+/*
+ * 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.ring;
+
+import com.electronwill.nightconfig.core.Config;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.aperlambda.lambdacommon.utils.Nameable;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Supplier;
+
+/**
+ * Represents a ring action.
+ *
+ * @author LambdAurora
+ * @version 1.5.0
+ * @since 1.4.0
+ */
+public abstract class RingAction extends DrawableHelper implements Nameable {
+    protected Config config;
+    protected boolean activated = false;
+
+    public RingAction(@NotNull Config config) {
+        this.config = config;
+    }
+
+    /**
+     * Gets the text name of the ring action.
+     *
+     * @return the text name
+     */
+    public Text getTextName() {
+        return new TranslatableText(this.getName());
+    }
+
+    /**
+     * Returns whether the action is activated or not.
+     *
+     * @return true if the action is activated, else false
+     */
+    public boolean isActivated() {
+        return this.activated;
+    }
+
+    public void activate(@NotNull RingButtonMode mode) {
+        this.activated = !this.activated;
+
+        this.onAction(mode);
+    }
+
+    public abstract void onAction(@NotNull RingButtonMode mode);
+
+    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered) {
+        fill(matrices, x, y, x + MidnightRing.ELEMENT_SIZE, y + MidnightRing.ELEMENT_SIZE, hovered ? 0xbb777777 : 0xbb000000);
+        drawIcon(matrices, textRenderer, x, y, hovered);
+    }
+
+    public abstract void drawIcon(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int x, int y, boolean hovered);
+
+    /**
+     * Represents a factory for {@link RingAction}.
+     *
+     * @version 1.4.3
+     * @since 1.4.3
+     */
+    public interface Factory {
+        @NotNull Supplier<RingAction> newFromGui(@NotNull Screen screen);
+
+        @Nullable RingAction parse(@NotNull Config config);
+    }
+}

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

@@ -0,0 +1,71 @@
+/*
+ * 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.ring;
+
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import org.aperlambda.lambdacommon.utils.Nameable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Represents the mode of a ring button.
+ *
+ * @author LambdAurora
+ * @version 1.4.0
+ * @since 1.4.0
+ */
+public enum RingButtonMode implements Nameable {
+    PRESS("press"),
+    HOLD("hold"),
+    TOGGLE("toggle");
+
+    private final String name;
+    private final Text text;
+
+    RingButtonMode(@NotNull String name) {
+        this.name = name;
+        this.text = new TranslatableText(this.getTranslationKey());
+    }
+
+    /**
+     * Returns the next ring button mode available.
+     *
+     * @return the next ring button mode
+     */
+    public @NotNull RingButtonMode next() {
+        var v = values();
+        if (v.length == this.ordinal() + 1)
+            return v[0];
+        return v[this.ordinal() + 1];
+    }
+
+    /**
+     * Returns the translation key of this ring button mode.
+     *
+     * @return the translation key of this ring button mode
+     */
+    public @NotNull String getTranslationKey() {
+        return "midnightcontrols.ring.button_mode." + this.getName();
+    }
+
+    /**
+     * Gets the translated name of this ring button mode.
+     *
+     * @return the translated name of this ring button mode
+     */
+    public @NotNull Text getTranslatedText() {
+        return this.text;
+    }
+
+    @Override
+    public @NotNull String getName() {
+        return this.name;
+    }
+}

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

@@ -0,0 +1,105 @@
+/*
+ * 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.ring;
+
+import com.electronwill.nightconfig.core.Config;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.client.util.math.MatrixStack;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Represents a ring page.
+ *
+ * @author LambdAurora
+ * @version 1.5.0
+ * @since 1.4.0
+ */
+public class RingPage extends DrawableHelper {
+    public static final RingPage DEFAULT = new RingPage("Default");
+
+    public final String name;
+    private RingAction[] actions = new RingAction[8];
+
+    public RingPage(@NotNull String name) {
+        this.name = name;
+        for (int i = 0; i < 8; i++) {
+            this.actions[i] = null;
+        }
+    }
+
+    /**
+     * Renders the ring page.
+     *
+     * @param matrices the matrices
+     * @param width the screen width
+     * @param height the screen height
+     * @param mouseX the mouse X-coordinate
+     * @param mouseY the mouse Y-coordinate
+     * @param tickDelta the tick delta
+     */
+    public void render(@NotNull MatrixStack matrices, @NotNull TextRenderer textRenderer, int width, int height, int mouseX, int mouseY, float tickDelta) {
+        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)
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
+            x += 55;
+        }
+        y += 55;
+        x = centerX - offset;
+        for (int i = 3; i < 5; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null)
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
+            x += 55 * 2;
+        }
+        y += 55;
+        x = centerX - offset;
+        for (int i = 5; i < 8; i++) {
+            var ringAction = this.actions[i];
+            if (ringAction != null)
+                ringAction.render(matrices, textRenderer, x, y, isHovered(x, y, mouseX, mouseY));
+            x += 55;
+        }
+    }
+
+    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;
+    }
+
+    /**
+     * Tries to parse a ring page configuration.
+     *
+     * @param config the configuration
+     * @return an optional ring page
+     */
+    public static @NotNull Optional<RingPage> parseRingPage(@NotNull Config config) {
+        String name = config.get("name");
+        if (name == null)
+            return Optional.empty();
+
+        var page = new RingPage(name);
+
+        List<Config> actionConfigs = config.get("actions");
+
+
+        return Optional.of(page);
+    }
+}