Merge branch 'feature/radial-menu' into 1.20.x/dev

# Conflicts:
#	src/main/java/dev/isxander/controlify/config/ControlifyConfig.java
#	src/main/java/dev/isxander/controlify/controller/ControllerConfig.java
#	src/main/resources/assets/controlify/lang/en_us.json

src/main/java/dev/isxander/controlify/bindings/ControllerBindingImpl.java

@@ -25,10 +25,7 @@ import net.minecraft.resources.ResourceLocation;
 import org.apache.commons.lang3.Validate;
 import org.jetbrains.annotations.ApiStatus;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.function.BooleanSupplier;
 
 public class ControllerBindingImpl<T extends ControllerState> implements ControllerBinding {
@@ -39,11 +36,14 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
     private final ResourceLocation id;
     private final Component name, description, category;
     private final Set<BindContext> contexts;
+    private final ResourceLocation radialIcon;
     private final KeyMappingOverride override;
 
     private static final Map<Controller<?, ?>, Set<IBind<?>>> pressedBinds = new HashMap<>();
 
-    private ControllerBindingImpl(Controller<T, ?> controller, IBind<T> defaultBind, ResourceLocation id, KeyMappingOverride vanillaOverride, Component name, Component description, Component category, Set<BindContext> contexts) {
+    private int fakePressState = 0;
+
+    private ControllerBindingImpl(Controller<T, ?> controller, IBind<T> defaultBind, ResourceLocation id, KeyMappingOverride vanillaOverride, Component name, Component description, Component category, Set<BindContext> contexts, ResourceLocation icon) {
         this.controller = controller;
         this.bind = this.defaultBind = defaultBind;
         this.renderer = new BindRendererImpl(bind);
@@ -53,33 +53,38 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
         this.description = description;
         this.category = category;
         this.contexts = ImmutableSet.copyOf(contexts);
+        this.radialIcon = icon;
     }
 
     @Override
     public float state() {
+        if (fakePressState == 1)
+            return 1f;
         return bind.state(controller.state());
     }
 
     @Override
     public float prevState() {
+        if (fakePressState == 2)
+            return 1f;
         return bind.state(controller.prevState());
     }
 
     @Override
     public boolean held() {
-        return bind.held(controller.state());
+        return fakePressState == 2 || bind.held(controller.state());
     }
 
     @Override
     public boolean prevHeld() {
-        return bind.held(controller.prevState());
+        return fakePressState == 3 || bind.held(controller.prevState());
     }
 
     @Override
     public boolean justPressed() {
         if (hasBindPressed(this)) return false;
 
-        if (held() && !prevHeld()) {
+        if ((held() && !prevHeld()) || fakePressState == 2) {
             addPressedBind(this);
             return true;
         } else {
@@ -91,7 +96,7 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
     public boolean justReleased() {
         if (hasBindPressed(this)) return false;
 
-        if (!held() && prevHeld()) {
+        if ((!held() && prevHeld()) || fakePressState == 3) {
             addPressedBind(this);
             return true;
         } else {
@@ -99,6 +104,24 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
         }
     }
 
+    @Override
+    public void fakePress() {
+        this.fakePressState = 1;
+    }
+
+    @Override
+    public void tick() {
+        if (fakePressState > 0)
+            fakePressState++;
+        if (fakePressState >= 4)
+            fakePressState = 0;
+    }
+
+    @Override
+    public Optional<ResourceLocation> radialIcon() {
+        return Optional.ofNullable(this.radialIcon);
+    }
+
     public IBind<T> currentBind() {
         return bind;
     }
@@ -214,6 +237,7 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
         private Component name = null, description = null, category = null;
         private KeyMappingOverride override = null;
         private final Set<BindContext> contexts = new HashSet<>();
+        private ResourceLocation radialIcon = null;
 
         public ControllerBindingBuilderImpl(Controller<T, ?> controller) {
             this.controller = controller;
@@ -271,6 +295,12 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
             return this;
         }
 
+        @Override
+        public ControllerBindingBuilder<T> radialCandidate(ResourceLocation icon) {
+            this.radialIcon = icon;
+            return this;
+        }
+
         @Override
         public ControllerBindingBuilder<T> vanillaOverride(KeyMapping keyMapping, BooleanSupplier toggleable) {
             this.override = new KeyMappingOverride(keyMapping, toggleable);
@@ -299,7 +329,7 @@ public class ControllerBindingImpl<T extends ControllerState> implements Control
                 }
             }
 
-            return new ControllerBindingImpl<>(controller, bind, id, override, name, description, category, contexts);
+            return new ControllerBindingImpl<>(controller, bind, id, override, name, description, category, contexts, radialIcon);
         }
     }