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

➕ Controller conflict detection

Browse Source
This commit is contained in:
isXander
2023-05-07 12:47:32 +01:00
parent 63ebf2dc61
commit fa1e1293c7
10 changed files with 258 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/dev/isxander/controlify/config/gui/AbstractBindController.java
View File

@ -12,6 +12,7 @@ import dev.isxander.yacl.api.Option;
import dev.isxander.yacl.api.utils.Dimension;
import dev.isxander.yacl.gui.YACLScreen;
import dev.isxander.yacl.gui.controllers.ControllerWidget;
import dev.isxander.yacl.gui.utils.GuiUtils;
import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component;
import org.lwjgl.glfw.GLFW;
@ -21,6 +22,7 @@ import java.util.Optional;
public abstract class AbstractBindController<T extends ControllerState> implements Controller<IBind<T>> {
private final Option<IBind<T>> option;
public final dev.isxander.controlify.controller.Controller<T, ?> controller;
private boolean conflicting;
public AbstractBindController(Option<IBind<T>> option, dev.isxander.controlify.controller.Controller<T, ?> controller) {
this.option = option;
@ -37,6 +39,14 @@ public abstract class AbstractBindController<T extends ControllerState> implemen
return Component.empty();
}
public void setConflicting(boolean conflicting) {
this.conflicting = conflicting;
}
public boolean getConflicting() {
return this.conflicting;
}
@Override
public abstract AbstractBindControllerElement<T> provideWidget(YACLScreen yaclScreen, Dimension<Integer> dimension);
@ -85,14 +95,16 @@ public abstract class AbstractBindController<T extends ControllerState> implemen
public boolean overrideControllerButtons(ScreenProcessor<?> screen, dev.isxander.controlify.controller.Controller<?, ?> controller) {
if (controller != control.controller) return true;
if (controller.bindings().CLEAR_BINDING.justPressed()) {
control.option().requestSet(new EmptyBind<>());
return true;
}
if (!justTookInput && !awaitingControllerInput) {
if (controller.bindings().CLEAR_BINDING.justPressed()) {
control.option().requestSet(new EmptyBind<>());
return true;
}
if (controller.bindings().GUI_PRESS.justPressed() && !awaitingControllerInput) {
ControllerBindHandler.setBindListener(this);
return awaitingControllerInput = true;
if (controller.bindings().GUI_PRESS.justPressed()) {
ControllerBindHandler.setBindListener(this);
return awaitingControllerInput = true;
}
}
if (justTookInput) {
@ -136,6 +148,11 @@ public abstract class AbstractBindController<T extends ControllerState> implemen
return control.option().pendingValue().drawSize().width();
}
@Override
protected int getValueColor() {
return control.conflicting ? 0xFF5555 : super.getValueColor();
}
public abstract Optional<IBind<T>> getPressedBind();
}
}