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

reduce bow sensitivity option

Browse Source
This commit is contained in:
isXander
2023-03-26 22:32:53 +01:00
parent 09a2262faf
commit b426312a8e
5 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/dev/isxander/controlify/compatibility/yacl/YACLScreenProcessor.java
View File

@ -1,5 +1,8 @@
package dev.isxander.controlify.compatibility.yacl;
import dev.isxander.controlify.api.buttonguide.ButtonGuideApi;
import dev.isxander.controlify.api.buttonguide.ButtonGuidePredicate;
import dev.isxander.controlify.api.buttonguide.ButtonRenderPosition;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.screenop.ScreenProcessor;
import dev.isxander.yacl.gui.YACLScreen;
@ -11,6 +14,12 @@ public class YACLScreenProcessor extends ScreenProcessor<YACLScreen> {
@Override
protected void handleComponentNavigation(Controller<?, ?> controller) {
if (controller.bindings().GUI_ABSTRACT_ACTION_1.justPressed()) {
this.playClackSound();
screen.finishedSaveButton.onPress();
return;
}
if (controller.bindings().GUI_NEXT_TAB.justPressed()) {
var idx = screen.getCurrentCategoryIdx() + 1;
if (idx >= screen.config.categories().size()) idx = 0;
@ -25,6 +34,12 @@ public class YACLScreenProcessor extends ScreenProcessor<YACLScreen> {
super.handleComponentNavigation(controller);
}
@Override
public void onWidgetRebuild() {
// currently doesn't work because TextScaledButtonWidget overrides renderString
ButtonGuideApi.addGuideToButton(screen.finishedSaveButton, bindings -> bindings.GUI_ABSTRACT_ACTION_1, ButtonRenderPosition.TEXT, ButtonGuidePredicate.ALWAYS);
}
@Override
protected void setInitialFocus() {
screen.setFocused(screen.optionList);

6
src/main/java/dev/isxander/controlify/config/gui/YACLHelper.java
View File

@ -153,6 +153,12 @@ public class YACLHelper {
.tooltip(Component.translatable("controlify.gui.chat_screen_offset.tooltip"))
.binding(def.chatKeyboardHeight, () -> config.chatKeyboardHeight, v -> config.chatKeyboardHeight = v)
.controller(opt -> new FloatSliderController(opt, 0f, 0.8f, 0.1f, percentFormatter))
.build())
.option(Option.createBuilder(boolean.class)
.name(Component.translatable("controlify.gui.reduce_bow_sensitivity"))
.tooltip(Component.translatable("controlify.gui.reduce_bow_sensitivity.tooltip"))
.binding(def.reduceBowSensitivity, () -> config.reduceBowSensitivity, v -> config.reduceBowSensitivity = v)
.controller(TickBoxController::new)
.build());
if (controller instanceof GamepadController gamepad) {

2
src/main/java/dev/isxander/controlify/controller/ControllerConfig.java
View File

@ -21,6 +21,8 @@ public abstract class ControllerConfig {
public float chatKeyboardHeight = 0f;
public boolean reduceBowSensitivity = true;
public boolean calibrated = false;
public abstract void setDeadzone(int axis, float deadzone);

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

@ -6,6 +6,8 @@ import dev.isxander.controlify.api.event.ControlifyEvents;
import net.minecraft.client.Minecraft;
import net.minecraft.client.player.KeyboardInput;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.ProjectileWeaponItem;
public class InGameInputHandler {
private final Controller<?, ?> controller;
@ -63,9 +65,14 @@ public class InGameInputHandler {
var impulseY = controller.bindings().LOOK_DOWN.state() - controller.bindings().LOOK_UP.state();
var impulseX = controller.bindings().LOOK_RIGHT.state() - controller.bindings().LOOK_LEFT.state();
if (minecraft.mouseHandler.isMouseGrabbed() && minecraft.isWindowActive()) {
if (minecraft.mouseHandler.isMouseGrabbed() && minecraft.isWindowActive() && minecraft.player != null) {
lookInputX = impulseX * Math.abs(impulseX) * controller.config().horizontalLookSensitivity;
lookInputY = impulseY * Math.abs(impulseY) * controller.config().verticalLookSensitivity;
if (controller.config().reduceBowSensitivity && minecraft.player.getUseItem().getItem() instanceof ProjectileWeaponItem) {
lookInputX *= Math.abs(impulseX) * 0.6;
lookInputY *= Math.abs(impulseY) * 0.6;
}
} else {
lookInputX = lookInputY = 0;
}