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

improve bindings

Browse Source
This commit is contained in:
isXander
2023-03-29 17:56:43 +01:00
parent 8f5d42e5aa
commit 0d9ddc27fc
17 changed files with 606 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/dev/isxander/controlify/api/bind/ControlifyBindingsApi.java
View File

@ -8,6 +8,7 @@ import net.minecraft.client.KeyMapping;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BooleanSupplier;
import java.util.function.UnaryOperator;
/**
* Handles registering new bindings for controllers.
@ -15,6 +16,8 @@ import java.util.function.BooleanSupplier;
* Should be called within {@link dev.isxander.controlify.api.entrypoint.ControlifyEntrypoint#onControlifyPreInit(ControlifyApi)}
*/
public interface ControlifyBindingsApi {
BindingSupplier registerBind(ResourceLocation id, UnaryOperator<ControllerBindingBuilder<?>> builder);
/**
* Registers a custom binding for all available controllers.
* If the controller is not a gamepad, the binding with be empty by default.
@ -23,6 +26,7 @@ public interface ControlifyBindingsApi {
* @param id the identifier for the binding, the namespace should be your modid.
* @return the binding supplier to fetch the binding for a specific controller.
*/
@Deprecated
BindingSupplier registerBind(GamepadBinds bind, ResourceLocation id);
/**
@ -35,8 +39,11 @@ public interface ControlifyBindingsApi {
* @param toggleOverride a supplier that returns true if the vanilla keybind should be treated as a {@link net.minecraft.client.ToggleKeyMapping}
* @return the binding supplier to fetch the binding for a specific controller.
*/
@Deprecated
BindingSupplier registerBind(GamepadBinds bind, ResourceLocation id, KeyMapping override, BooleanSupplier toggleOverride);
void excludeVanillaBind(KeyMapping... keyMapping);
static ControlifyBindingsApi get() {
return ControllerBindings.Api.INSTANCE;
}

38
src/main/java/dev/isxander/controlify/api/bind/ControllerBindingBuilder.java Normal file
View File

@ -0,0 +1,38 @@
package dev.isxander.controlify.api.bind;
import dev.isxander.controlify.bindings.ControllerBinding;
import dev.isxander.controlify.bindings.GamepadBinds;
import dev.isxander.controlify.bindings.IBind;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.controller.ControllerState;
import net.minecraft.client.KeyMapping;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import java.util.function.BooleanSupplier;
public interface ControllerBindingBuilder<T extends ControllerState> {
static <T extends ControllerState> ControllerBindingBuilder<T> create(Controller<T, ?> controller) {
return new ControllerBinding.ControllerBindingBuilderImpl<>(controller);
}
ControllerBindingBuilder<T> identifier(ResourceLocation id);
ControllerBindingBuilder<T> identifier(String namespace, String path);
ControllerBindingBuilder<T> defaultBind(IBind<T> bind);
ControllerBindingBuilder<T> defaultBind(GamepadBinds gamepadBind);
ControllerBindingBuilder<T> name(Component name);
ControllerBindingBuilder<T> description(Component description);
ControllerBindingBuilder<T> category(Component category);
ControllerBindingBuilder<T> vanillaOverride(KeyMapping keyMapping, BooleanSupplier toggleable);
ControllerBindingBuilder<T> vanillaOverride(KeyMapping keyMapping);
ControllerBinding<T> build();
}