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

➕ Remove vanilla override for swap hand, inventory, change perspective

Browse Source
This commit is contained in:
isXander
2023-05-14 22:55:36 +01:00
parent 4945e5e698
commit 460de0d73f
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/dev/isxander/controlify/bindings/ControllerBindings.java
View File

@ -200,14 +200,12 @@ public class ControllerBindings<T extends ControllerState> {
.defaultBind(GamepadBinds.BACK)
.category(GAMEPLAY_CATEGORY)
.context(BindContexts.INGAME)
.vanillaOverride(options.keyTogglePerspective, () -> false)
.build());
register(SWAP_HANDS = ControllerBindingBuilder.create(controller)
.identifier("controlify", "swap_hands")
.defaultBind(GamepadBinds.X_BUTTON)
.category(INVENTORY_CATEGORY)
.context(BindContexts.INGAME, BindContexts.INVENTORY)
.vanillaOverride(options.keySwapOffhand, () -> false)
.build());
register(OPEN_CHAT = ControllerBindingBuilder.create(controller)
.identifier("controlify", "open_chat")

1
src/main/java/dev/isxander/controlify/gui/layout/RenderComponent.java
View File

@ -1,5 +1,4 @@
package dev.isxander.controlify.gui.layout;
import com.mojang.blaze3d.vertex.PoseStack;
import org.joml.Vector2ic;

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

@ -6,13 +6,16 @@ import dev.isxander.controlify.api.ingameinput.LookInputModifier;
import dev.isxander.controlify.controller.Controller;
import dev.isxander.controlify.api.event.ControlifyEvents;
import dev.isxander.controlify.controller.gamepad.GamepadController;
import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.inventory.InventoryScreen;
import net.minecraft.client.player.KeyboardInput;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.world.InteractionHand;
import java.util.function.BiFunction;
import java.util.function.UnaryOperator;
public class InGameInputHandler {
private final Controller<?, ?> controller;
@ -61,6 +64,29 @@ public class InGameInputHandler {
minecraft.player.drop(false);
minecraft.player.swing(InteractionHand.MAIN_HAND);
}
if (controller.bindings().SWAP_HANDS.justPressed()) {
minecraft.player.connection.send(new ServerboundPlayerActionPacket(ServerboundPlayerActionPacket.Action.SWAP_ITEM_WITH_OFFHAND, BlockPos.ZERO, Direction.DOWN));
}
}
if (controller.bindings().INVENTORY.justPressed()) {
if (minecraft.gameMode.isServerControlledInventory()) {
minecraft.player.sendOpenInventory();
} else {
minecraft.getTutorial().onOpenInventory();
minecraft.setScreen(new InventoryScreen(minecraft.player));
}
}
if (controller.bindings().CHANGE_PERSPECTIVE.justPressed()) {
CameraType cameraType = minecraft.options.getCameraType();
minecraft.options.setCameraType(minecraft.options.getCameraType().cycle());
if (cameraType.isFirstPerson() != minecraft.options.getCameraType().isFirstPerson()) {
minecraft.gameRenderer.checkEntityPostEffect(minecraft.options.getCameraType().isFirstPerson() ? minecraft.getCameraEntity() : null);
}
minecraft.levelRenderer.needsUpdate();
}
if (controller.bindings().INVENTORY.justPressed()) {