kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

修改切座位的条件

Browse source
This commit is contained in:
17146 2025-03-15 15:07:58 +08:00
parent c06b4acb7f
commit 3eab28a6b3
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/atsuishio/superbwarfare/mixins/MinecraftMixin.java
View file

@ -7,7 +7,6 @@ import com.atsuishio.superbwarfare.network.message.ChangeVehicleSeatMessage;
import com.atsuishio.superbwarfare.network.message.SwitchVehicleWeaponMessage; import com.atsuishio.superbwarfare.network.message.SwitchVehicleWeaponMessage;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.Options; import net.minecraft.client.Options;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.player.LocalPlayer;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -30,7 +29,7 @@ public class MinecraftMixin {
public Options options; public Options options;
/** /**
* 在可切换座位的载具上，按下shift+数字键时切换座位 * 在可切换座位的载具上，按下潜行键+数字键时切换座位
* 在有武器的载具上，按下数字键时切换武器 * 在有武器的载具上，按下数字键时切换武器
*/ */
@Inject(method = "handleKeybinds()V", at = @At("HEAD"), cancellable = true) @Inject(method = "handleKeybinds()V", at = @At("HEAD"), cancellable = true)
@ -48,7 +47,7 @@ public class MinecraftMixin {
// shift+数字键 座位更改 // shift+数字键 座位更改
if (vehicle.getMaxPassengers() > 1 if (vehicle.getMaxPassengers() > 1
&& Screen.hasShiftDown() && options.keyShift.isDown()
&& index < vehicle.getMaxPassengers() && index < vehicle.getMaxPassengers()
&& vehicle.getNthEntity(index) == null && vehicle.getNthEntity(index) == null
) { ) {
@ -68,7 +67,7 @@ public class MinecraftMixin {
options.keyHotbarSlots[index].consumeClick(); options.keyHotbarSlots[index].consumeClick();
// 数字键 武器切换 // 数字键 武器切换
if (!Screen.hasShiftDown() if (!options.keyShift.isDown()
&& weaponVehicle.hasWeapon(seatIndex) && weaponVehicle.hasWeapon(seatIndex)
&& weaponVehicle.getWeaponIndex(seatIndex) != index) { && weaponVehicle.getWeaponIndex(seatIndex) != index) {
ModUtils.PACKET_HANDLER.sendToServer(new SwitchVehicleWeaponMessage(seatIndex, index, false)); ModUtils.PACKET_HANDLER.sendToServer(new SwitchVehicleWeaponMessage(seatIndex, index, false));