1
0
forked from Clones/Controlify

scrollable vmouse, YACL compat, toggle sneak/sprint, 22w06a, custom name

This commit is contained in:
isXander
2023-02-08 21:54:01 +00:00
parent 6c5108469c
commit ab801e37b4
26 changed files with 400 additions and 91 deletions

View File

@ -3,12 +3,15 @@ package dev.isxander.controlify.ingame;
import dev.isxander.controlify.controller.Controller;
import net.minecraft.client.Minecraft;
import net.minecraft.client.player.Input;
import net.minecraft.client.player.LocalPlayer;
public class ControllerPlayerMovement extends Input {
private final Controller controller;
private final LocalPlayer player;
public ControllerPlayerMovement(Controller controller) {
public ControllerPlayerMovement(Controller controller, LocalPlayer player) {
this.controller = controller;
this.player = player;
}
@Override
@ -42,6 +45,13 @@ public class ControllerPlayerMovement extends Input {
}
this.jumping = bindings.JUMP.held();
this.shiftKeyDown = bindings.SNEAK.held();
if (player.getAbilities().flying || !controller.config().toggleSneak) {
this.shiftKeyDown = bindings.SNEAK.held();
} else {
if (bindings.SNEAK.justPressed()) {
this.shiftKeyDown = !this.shiftKeyDown;
}
}
}
}

View File

@ -21,7 +21,7 @@ public class InGameInputHandler {
this.controller = controller;
this.minecraft = Minecraft.getInstance();
this.controllerInput = new ControllerPlayerMovement(controller);
this.controllerInput = new ControllerPlayerMovement(controller, minecraft.player);
this.keyboardInput = new KeyboardInput(minecraft.options);
ControlifyEvents.INPUT_MODE_CHANGED.register(mode -> {
@ -45,9 +45,6 @@ public class InGameInputHandler {
if (controller.bindings().PAUSE.justPressed()) {
minecraft.pauseGame(false);
}
if (controller.bindings().TOGGLE_DEBUG_MENU.justPressed()) {
minecraft.options.renderDebug = !minecraft.options.renderDebug;
}
if (minecraft.player != null) {
if (controller.bindings().NEXT_SLOT.justPressed()) {
minecraft.player.getInventory().swapPaint(-1);
@ -73,9 +70,9 @@ public class InGameInputHandler {
var delta = time - deltaTime;
deltaTime = time;
var hsensitivity = controller.config().horizontalLookSensitivity * 8.0 + 2.0;
var hsensitivity = controller.config().horizontalLookSensitivity * 9.6 + 2.0;
var hsensCubed = hsensitivity * hsensitivity * hsensitivity;
var vsensitivity = controller.config().verticalLookSensitivity * 8.0 + 2.0;
var vsensitivity = controller.config().verticalLookSensitivity * 9.6 + 2.0;
var vsensCubed = vsensitivity * vsensitivity * vsensitivity;
var dx = accumulatedDX * delta;
@ -93,7 +90,6 @@ public class InGameInputHandler {
accumulatedDY -= Math.max(dy * 20, accumulatedDY);
}
if (minecraft.player != null)
minecraft.player.turn(dx * hsensCubed, dy * vsensCubed);
}