feat: also do not allow AxisToCursorAction actions getting added to triggers

Author: bwRavencl

src/main/java/de/bwravencl/controllerbuddy/gui/EditActionsDialog.java

@@ -21,7 +21,6 @@
 import de.bwravencl.controllerbuddy.input.Mode.Component;
 import de.bwravencl.controllerbuddy.input.Mode.Component.ComponentType;
 import de.bwravencl.controllerbuddy.input.Profile;
-import de.bwravencl.controllerbuddy.input.action.AxisToRelativeAxisAction;
 import de.bwravencl.controllerbuddy.input.action.ButtonToCycleAction;
 import de.bwravencl.controllerbuddy.input.action.ButtonToModeAction;
 import de.bwravencl.controllerbuddy.input.action.IAction;
@@ -93,11 +92,14 @@ public final class EditActionsDialog extends JDialog {
 
 	private static final List<Class<?>> ON_SCREEN_KEYBOARD_ACTION_CLASSES;
 
+	private static final List<Class<?>> TRIGGER_ACTION_CLASSES;
+
 	@Serial
 	private static final long serialVersionUID = 5007388251349678609L;
 
 	static {
 		final List<Class<?>> mutableAxisActionClasses = new ArrayList<>();
+		final List<Class<?>> mutableTriggerActionClasses = new ArrayList<>();
 		final List<Class<?>> mutableButtonActionClasses = new ArrayList<>();
 		final List<Class<?>> mutableCycleActionClasses = new ArrayList<>();
 		final List<Class<?>> mutableOnScreenKeyboardActionClasses = new ArrayList<>();
@@ -119,9 +121,13 @@ public final class EditActionsDialog extends JDialog {
 				// noinspection DataFlowIssue
 				final var category = actionAnnotation.category();
 
-				if (category == ActionCategory.ALL || category == ActionCategory.AXIS) {
+				if (category == ActionCategory.ALL || category == ActionCategory.AXIS
+						|| category == ActionCategory.AXIS_AND_TRIGGER) {
 					mutableAxisActionClasses.add(actionClass);
 				}
+				if (category == ActionCategory.ALL || category == ActionCategory.AXIS_AND_TRIGGER) {
+					mutableTriggerActionClasses.add(actionClass);
+				}
 				if (category == ActionCategory.ALL || category == ActionCategory.BUTTON
 						|| category == ActionCategory.BUTTON_AND_CYCLES) {
 					mutableButtonActionClasses.add(actionClass);
@@ -136,6 +142,7 @@ public final class EditActionsDialog extends JDialog {
 		}
 
 		AXIS_ACTION_CLASSES = Collections.unmodifiableList(mutableAxisActionClasses);
+		TRIGGER_ACTION_CLASSES = Collections.unmodifiableList(mutableTriggerActionClasses);
 		BUTTON_ACTION_CLASSES = Collections.unmodifiableList(mutableButtonActionClasses);
 		CYCLE_ACTION_CLASSES = Collections.unmodifiableList(mutableCycleActionClasses);
 		ON_SCREEN_KEYBOARD_ACTION_CLASSES = Collections.unmodifiableList(mutableOnScreenKeyboardActionClasses);
@@ -367,9 +374,8 @@ private List<Class<?>> getAllowedActionClasses() {
 			final var componentIndex = component.getIndex();
 			if (componentIndex == SDLGamepad.SDL_GAMEPAD_AXIS_LEFT_TRIGGER
 					|| componentIndex == SDLGamepad.SDL_GAMEPAD_AXIS_RIGHT_TRIGGER) {
-				return AXIS_ACTION_CLASSES.stream().filter(clazz -> clazz != AxisToRelativeAxisAction.class).toList();
+				return TRIGGER_ACTION_CLASSES;
 			}
-
 			return AXIS_ACTION_CLASSES;
 		} else if (Profile.DEFAULT_MODE.equals(selectedMode)) {
 			return BUTTON_ACTION_CLASSES;

src/main/java/de/bwravencl/controllerbuddy/input/action/AxisToAxisAction.java

@@ -26,7 +26,7 @@
 import de.bwravencl.controllerbuddy.input.action.gui.MaxAxisValueEditorBuilder;
 import de.bwravencl.controllerbuddy.input.action.gui.MinAxisValueEditorBuilder;
 
-@Action(label = "TO_AXIS_ACTION", category = ActionCategory.AXIS, order = 10)
+@Action(label = "TO_AXIS_ACTION", category = ActionCategory.AXIS_AND_TRIGGER, order = 10)
 public class AxisToAxisAction extends ToAxisAction<Float> implements IAxisToAction, IInitializationAction<Float> {
 
 	private static final float DEFAULT_DEAD_ZONE = 0f;

src/main/java/de/bwravencl/controllerbuddy/input/action/AxisToButtonAction.java

@@ -23,7 +23,7 @@
 import de.bwravencl.controllerbuddy.input.action.gui.AxisValueEditorBuilder;
 import de.bwravencl.controllerbuddy.input.action.gui.LongPressEditorBuilder;
 
-@Action(label = "TO_BUTTON_ACTION", category = ActionCategory.AXIS, order = 20)
+@Action(label = "TO_BUTTON_ACTION", category = ActionCategory.AXIS_AND_TRIGGER, order = 20)
 public final class AxisToButtonAction extends ToButtonAction<Float> implements IAxisToLongPressAction {
 
 	private static final float DEFAULT_MAX_AXIS_VALUE = 1f;

src/main/java/de/bwravencl/controllerbuddy/input/action/AxisToKeyAction.java

@@ -22,7 +22,7 @@
 import de.bwravencl.controllerbuddy.input.action.annotation.ActionProperty;
 import de.bwravencl.controllerbuddy.input.action.gui.AxisValueEditorBuilder;
 
-@Action(label = "TO_KEY_ACTION", category = ActionCategory.AXIS, order = 40)
+@Action(label = "TO_KEY_ACTION", category = ActionCategory.AXIS_AND_TRIGGER, order = 40)
 public final class AxisToKeyAction extends ToKeyAction<Float> implements IAxisToLongPressAction {
 
 	private static final float DEFAULT_MAX_AXIS_VALUE = 1f;

src/main/java/de/bwravencl/controllerbuddy/input/action/AxisToMouseButtonAction.java

@@ -22,7 +22,7 @@
 import de.bwravencl.controllerbuddy.input.action.annotation.ActionProperty;
 import de.bwravencl.controllerbuddy.input.action.gui.AxisValueEditorBuilder;
 
-@Action(label = "TO_MOUSE_BUTTON_ACTION", category = ActionCategory.AXIS, order = 30)
+@Action(label = "TO_MOUSE_BUTTON_ACTION", category = ActionCategory.AXIS_AND_TRIGGER, order = 30)
 public final class AxisToMouseButtonAction extends ToMouseButtonAction<Float> implements IAxisToLongPressAction {
 
 	private static final float DEFAULT_MAX_AXIS_VALUE = 1f;

src/main/java/de/bwravencl/controllerbuddy/input/action/AxisToScrollAction.java

@@ -23,7 +23,7 @@
 import de.bwravencl.controllerbuddy.input.action.gui.DeadZoneEditorBuilder;
 import de.bwravencl.controllerbuddy.input.action.gui.ExponentEditorBuilder;
 
-@Action(label = "TO_SCROLL_ACTION", category = ActionCategory.AXIS, order = 35)
+@Action(label = "TO_SCROLL_ACTION", category = ActionCategory.AXIS_AND_TRIGGER, order = 35)
 public final class AxisToScrollAction extends ToScrollAction<Float> implements IAxisToAction {
 
 	private static final float DEFAULT_DEAD_ZONE = 0.1f;

src/main/java/de/bwravencl/controllerbuddy/input/action/annotation/Action.java

@@ -32,6 +32,6 @@
 	int order();
 
 	enum ActionCategory {
-		ALL, AXIS, BUTTON, BUTTON_AND_CYCLES, ON_SCREEN_KEYBOARD_MODE
+		ALL, AXIS, AXIS_AND_TRIGGER, BUTTON, BUTTON_AND_CYCLES, ON_SCREEN_KEYBOARD_MODE
 	}
 }