djib/Controlify
1
0
Fork 0
forked from Clones/Controlify
Code Pull Requests Activity

✏️ Radial menu: move editing of actions into the config screen as it's more intuitive

Browse Source
This commit is contained in:
isXander
2023-08-06 19:53:13 +01:00
parent ec7a20606a
commit 0d487c780d
4 changed files with 85 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/dev/isxander/controlify/gui/screen/ControllerConfigScreenFactory.java
View File

@ -308,6 +308,20 @@ public class ControllerConfigScreenFactory {
.name(Component.translatable("controlify.gui.group.controls"));
List<OptionBindPair> optionBinds = new ArrayList<>();
ButtonOption editRadialButton = ButtonOption.createBuilder()
.name(Component.translatable("controlify.gui.radial_menu"))
.description(OptionDescription.of(Component.translatable("controlify.gui.radial_menu.tooltip")))
.action((screen, opt) -> Minecraft.getInstance().setScreen(new RadialMenuScreen(controller, true, screen)))
.text(Component.translatable("controlify.gui.radial_menu.btn_text"))
.build();
Option<?> radialBind = controller.bindings().RADIAL_MENU.startYACLOption()
.listener((opt, val) -> updateConflictingBinds(optionBinds))
.build();
optionBinds.add(new OptionBindPair(radialBind, controller.bindings().RADIAL_MENU));
category.option(editRadialButton);
category.option(radialBind);
groupBindings(controller.bindings().registry().values()).forEach((categoryName, bindGroup) -> {
var controlsGroup = OptionGroup.createBuilder()
.name(categoryName);

95
src/main/java/dev/isxander/controlify/gui/screen/RadialMenuScreen.java
View File

@ -27,6 +27,7 @@ import net.minecraft.client.gui.navigation.FocusNavigationEvent;
import net.minecraft.client.gui.navigation.ScreenRectangle;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.resources.sounds.SimpleSoundInstance;
import net.minecraft.network.chat.CommonComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
@ -42,21 +43,23 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
public static final ResourceLocation EMPTY_ACTION = new ResourceLocation("controlify", "empty_action");
private final Controller<?, ?> controller;
public RadialMenuScreen(Controller<?, ?> controller) {
super(Component.empty());
this.controller = controller;
}
private final boolean editMode;
private final Screen parent;
private final RadialButton[] buttons = new RadialButton[8];
private int selectedButton = -1;
private int idleTicks;
private boolean editMode;
private boolean isEditing;
private PositionedComponent<GuideActionRenderer<Object>> editModeGuide;
private ActionSelectList actionSelectList;
public RadialMenuScreen(Controller<?, ?> controller, boolean editMode, Screen parent) {
super(Component.empty());
this.controller = controller;
this.editMode = editMode;
this.parent = parent;
}
@Override
protected void init() {
int centerX = this.width / 2;
@ -79,11 +82,12 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
}
Animator.INSTANCE.play(animation);
editModeGuide = addRenderableWidget(new PositionedComponent<>(
if (editMode) {
var exitGuide = addRenderableWidget(new PositionedComponent<>(
new GuideActionRenderer<>(
new GuideAction<>(
controller.bindings().GUI_ABSTRACT_ACTION_2,
obj -> Optional.of(Component.literal(!editMode ? "Edit Mode" : "Done Editing"))
controller.bindings().GUI_BACK,
obj -> Optional.of(CommonComponents.GUI_DONE)
),
false,
true
@ -93,34 +97,22 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
AnchorPoint.BOTTOM_CENTER
));
editModeGuide.getComponent().updateName(null);
editModeGuide.updatePosition(width, height);
exitGuide.getComponent().updateName(null);
exitGuide.updatePosition(width, height);
}
}
@Override
public void onControllerInput(Controller<?, ?> controller) {
if (this.controller != controller) return;
if (!controller.bindings().RADIAL_MENU.held()) {
if (!isEditing && !editMode) {
if (!editMode && !controller.bindings().RADIAL_MENU.held()) {
if (selectedButton != -1 && buttons[selectedButton].invoke()) {
playClickSound();
}
onClose();
}
}
if (controller.bindings().GUI_ABSTRACT_ACTION_2.justPressed()) {
editMode = !editMode;
editModeGuide.getComponent().updateName(null);
editModeGuide.updatePosition(width, height);
playClickSound();
if (!editMode) {
finishEditing();
}
}
if (!isEditing && controller.state() instanceof GamepadState state) {
float x = state.gamepadAxes().rightStickX();
@ -158,6 +150,18 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
}
}
@Override
public void render(GuiGraphics graphics, int mouseX, int mouseY, float delta) {
if (minecraft.level == null)
renderDirtBackground(graphics);
super.render(graphics, mouseX, mouseY, delta);
if (!editMode) {
graphics.drawCenteredString(font, Component.translatable("controlify.radial_menu.configure_hint"), width / 2, height - 10 - font.lineHeight, -1);
}
}
private void playClickSound() {
minecraft.getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1f));
}
@ -171,7 +175,7 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
@Override
public void onClose() {
Controlify.instance().config().saveIfDirty();
super.onClose();
minecraft.setScreen(parent);
}
public class RadialButton implements Renderable, GuiEventListener, NarratableEntry, ComponentProcessor {
@ -180,24 +184,15 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
private int x, y;
private float translateX, translateY;
private boolean focused;
private final ControllerBinding binding;
private final MultiLineLabel name;
private final RadialIcons.Icon icon;
private ControllerBinding binding;
private MultiLineLabel name;
private RadialIcons.Icon icon;
private RadialButton(int index, int x, int y) {
this.x = x;
this.y = y;
private RadialButton(int index, float x, float y) {
this.setX(x);
this.setY(y);
ResourceLocation binding = controller.config().radialActions[index];
if (!EMPTY_ACTION.equals(binding)) {
this.binding = controller.bindings().get(binding);
this.icon = RadialIcons.getIcons().get(this.binding.radialIcon().orElseThrow());
this.name = MultiLineLabel.create(font, this.binding.name(), 76);
} else {
this.binding = null;
this.name = MultiLineLabel.EMPTY;
this.icon = RadialIcons.getIcons().get(RadialIcons.EMPTY);
}
this.setAction(controller.config().radialActions[index]);
}
@Override
@ -226,6 +221,18 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
return false;
}
public void setAction(ResourceLocation binding) {
if (!EMPTY_ACTION.equals(binding)) {
this.binding = controller.bindings().get(binding);
this.icon = RadialIcons.getIcons().get(this.binding.radialIcon().orElseThrow());
this.name = MultiLineLabel.create(font, this.binding.name(), 76);
} else {
this.binding = null;
this.name = MultiLineLabel.EMPTY;
this.icon = RadialIcons.getIcons().get(RadialIcons.EMPTY);
}
}
public int getX() {
return x;
}
@ -452,6 +459,8 @@ public class RadialMenuScreen extends Screen implements ScreenControllerEventLis
controller.config().radialActions[radialIndex] = binding;
Controlify.instance().config().setDirty();
buttons[radialIndex].setAction(binding);
playClickSound();
finishEditing();
return true;

2
src/main/java/dev/isxander/controlify/ingame/InGameInputHandler.java
View File

@ -109,7 +109,7 @@ public class InGameInputHandler {
shouldShowPlayerList = controller.bindings().SHOW_PLAYER_LIST.held();
if (controller.bindings().RADIAL_MENU.justPressed()) {
minecraft.setScreen(new RadialMenuScreen(controller));
minecraft.setScreen(new RadialMenuScreen(controller, false, null));
}
}

7
src/main/resources/assets/controlify/lang/en_us.json
View File

@ -109,8 +109,9 @@
"controlify.gui.test_vibration": "Test Vibration",
"controlify.gui.test_vibration.tooltip": "Test the vibration of your controller.",
"controlify.gui.group.radial_menu": "Radial Menu",
"controlify.gui.radial_menu_action": "Action #%s",
"controlify.gui.radial_menu": "Radial Menu",
"controlify.gui.radial_menu.tooltip": "Open up the radial menu to configure what each button does.",
"controlify.gui.radial_menu.btn_text": "CONFIGURE",
"controlify.gui.group.controls": "Controls",
"controlify.gui.group.controls.tooltip": "Adjust the controller controls.",
"controlify.gui.bind_input_awaiting": "Press any button",
@ -282,6 +283,8 @@
"controlify.calibration.later": "Maybe Later",
"controlify.calibration.later.tooltip": "You must calibrate to use the controller. Pressing this will deactivate the controller and you will have to use it again to calibrate.",
"controlify.radial_menu.configure_hint": "Configure actions in the controller settings.",
"controlify.beta.title": "Controlify Beta Notice",
"controlify.beta.message": "You are currently using Controlify Beta.\n\nThis mod is a work in progress and will contain many bugs. Please, if you spot a bug in this mod or have a suggestion to make it even better, please create an issue on the %s!\n\nYou can always find the link to the issue tracker in Controlify's settings menu.",
"controlify.beta.message.link": "issue tracker",