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-05-23 17:14:12 +08:00 • committed by Light_Quanta
parent 414abdd871
commit 79deec6740
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java
View file

@ -2,6 +2,7 @@ package com.atsuishio.superbwarfare.event;
import com.atsuishio.superbwarfare.Mod; import com.atsuishio.superbwarfare.Mod;
import com.atsuishio.superbwarfare.client.ClickHandler; import com.atsuishio.superbwarfare.client.ClickHandler;
import com.atsuishio.superbwarfare.client.overlay.CrossHairOverlay;
import com.atsuishio.superbwarfare.config.client.DisplayConfig; import com.atsuishio.superbwarfare.config.client.DisplayConfig;
import com.atsuishio.superbwarfare.config.server.MiscConfig; import com.atsuishio.superbwarfare.config.server.MiscConfig;
import com.atsuishio.superbwarfare.data.gun.FireMode; import com.atsuishio.superbwarfare.data.gun.FireMode;
@ -206,7 +207,7 @@ public class ClientEventHandler {
static short keysCache = 0; static short keysCache = 0;
@SubscribeEvent @SubscribeEvent
public static void handleClientTick(ClientTickEvent.Pre event) { public static void handleClientTick(ClientTickEvent.Post event) {
LocalPlayer player = Minecraft.getInstance().player; LocalPlayer player = Minecraft.getInstance().player;
if (player == null) return; if (player == null) return;
@ -235,8 +236,6 @@ public class ClientEventHandler {
isProne(player); isProne(player);
beamShoot(player, stack); beamShoot(player, stack);
handleLungeAttack(player, stack);
handleGunMelee(player, stack);
var options = Minecraft.getInstance().options; var options = Minecraft.getInstance().options;
short keys = 0; short keys = 0;
@ -288,8 +287,11 @@ public class ClientEventHandler {
handleVariableDecrease(); handleVariableDecrease();
aimAtVillager(player); aimAtVillager(player);
CrossHairOverlay.handleRenderDamageIndicator();
staminaSystem(); staminaSystem();
handlePlayerSprint(); handlePlayerSprint();
handleLungeAttack(player, stack);
handleGunMelee(player, stack);
} }
@ -438,12 +440,12 @@ public class ClientEventHandler {
public static void handleLungeAttack(Player player, ItemStack stack) { public static void handleLungeAttack(Player player, ItemStack stack) {
if (stack.is(ModItems.LUNGE_MINE.get()) && lungeAttack == 0 && lungeDraw == 0 && holdFire) { if (stack.is(ModItems.LUNGE_MINE.get()) && lungeAttack == 0 && lungeDraw == 0 && holdFire) {
lungeAttack = 36; lungeAttack = 18;
holdFire = false; holdFire = false;
player.playSound(SoundEvents.PLAYER_ATTACK_SWEEP, 1f, 1); player.playSound(SoundEvents.PLAYER_ATTACK_SWEEP, 1f, 1);
} }
if (stack.is(ModItems.LUNGE_MINE.get()) && ((lungeAttack >= 18 && lungeAttack <= 21) || lungeSprint > 0)) { if (stack.is(ModItems.LUNGE_MINE.get()) && ((lungeAttack >= 9 && lungeAttack <= 10.5) || lungeSprint > 0)) {
Entity lookingEntity = TraceTool.findLookingEntity(player, player.entityInteractionRange() + 1.5); Entity lookingEntity = TraceTool.findLookingEntity(player, player.entityInteractionRange() + 1.5);
BlockHitResult result = player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(player.entityInteractionRange() + 0.5)), BlockHitResult result = player.level().clip(new ClipContext(player.getEyePosition(), player.getEyePosition().add(player.getLookAngle().scale(player.entityInteractionRange() + 0.5)),
@ -456,12 +458,12 @@ public class ClientEventHandler {
PacketDistributor.sendToServer(new LungeMineAttackMessage(0, lookingEntity.getUUID(), result.getLocation())); PacketDistributor.sendToServer(new LungeMineAttackMessage(0, lookingEntity.getUUID(), result.getLocation()));
lungeSprint = 0; lungeSprint = 0;
lungeAttack = 0; lungeAttack = 0;
lungeDraw = 30; lungeDraw = 15;
} else if ((blockState.canOcclude() || blockState.getBlock() instanceof DoorBlock || blockState.getBlock() instanceof CrossCollisionBlock || blockState.getBlock() instanceof BellBlock) && lungeSprint == 0) { } else if ((blockState.canOcclude() || blockState.getBlock() instanceof DoorBlock || blockState.getBlock() instanceof CrossCollisionBlock || blockState.getBlock() instanceof BellBlock) && lungeSprint == 0) {
PacketDistributor.sendToServer(new LungeMineAttackMessage(1, player.getUUID(), result.getLocation())); PacketDistributor.sendToServer(new LungeMineAttackMessage(1, player.getUUID(), result.getLocation()));
lungeSprint = 0; lungeSprint = 0;
lungeAttack = 0; lungeAttack = 0;
lungeDraw = 30; lungeDraw = 15;
} }
} }