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:
Light_Quanta 2025-05-04 19:50:13 +08:00
parent 080e299a21
commit 6404bada53
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -735,7 +735,8 @@ public class ClientEventHandler {
public static void handleShakeClient(double time, double radius, double amplitude, double x, double y, double z) { public static void handleShakeClient(double time, double radius, double amplitude, double x, double y, double z) {
Player player = Minecraft.getInstance().player; Player player = Minecraft.getInstance().player;
if (player == null) return; if (player == null || player.isSpectator()) return;
float shakeStrength = (float) DisplayConfig.EXPLOSION_SCREEN_SHAKE.get() / 100.0f; float shakeStrength = (float) DisplayConfig.EXPLOSION_SCREEN_SHAKE.get() / 100.0f;
if (shakeStrength <= 0.0f) return; if (shakeStrength <= 0.0f) return;
@ -1190,6 +1191,17 @@ public class ClientEventHandler {
shake[1] = (float) (4.2 * amplitude * (1 / 6.3 * (fireRotTimer - 0.5)) * Math.sin(6.3 * (fireRotTimer - 0.5)) * (3 - Math.pow(fireRotTimer, 2)) shake[1] = (float) (4.2 * amplitude * (1 / 6.3 * (fireRotTimer - 0.5)) * Math.sin(6.3 * (fireRotTimer - 0.5)) * (3 - Math.pow(fireRotTimer, 2))
+ 3 * Mth.clamp(0.5 - fireRotTimer, 0, 0.5) * (2 * Math.random() - 1)) * (float) (DisplayConfig.WEAPON_SCREEN_SHAKE.get() / 100.0); + 3 * Mth.clamp(0.5 - fireRotTimer, 0, 0.5) * (2 * Math.random() - 1)) * (float) (DisplayConfig.WEAPON_SCREEN_SHAKE.get() / 100.0);
if (firePosTimer >= 1) {
firePosTimer = 0;
}
if (fireRotTimer >= 1.732) {
fireRotTimer = 0;
fireRot = 0;
}
if (entity instanceof Player player && player.isSpectator()) return;
if (0 < fireRotTimer && fireRotTimer < 1.732) { if (0 < fireRotTimer && fireRotTimer < 1.732) {
fireRot = 1 / 6.3 * (fireRotTimer - 0.5) * Math.sin(6.3 * (fireRotTimer - 0.5)) * (3 - Math.pow(fireRotTimer, 2)); fireRot = 1 / 6.3 * (fireRotTimer - 0.5) * Math.sin(6.3 * (fireRotTimer - 0.5)) * (3 - Math.pow(fireRotTimer, 2));
if (recoilY > 0) { if (recoilY > 0) {
@ -1202,14 +1214,6 @@ public class ClientEventHandler {
event.setRoll((float) (roll - shake[1] * rpm)); event.setRoll((float) (roll - shake[1] * rpm));
} }
} }
if (firePosTimer >= 1) {
firePosTimer = 0;
}
if (fireRotTimer >= 1.732) {
fireRotTimer = 0;
fireRot = 0;
}
} }
private static void handleWeaponShell() { private static void handleWeaponShell() {
@ -1341,16 +1345,15 @@ public class ClientEventHandler {
public static void handleReloadShake(double boneRotX, double boneRotY, double boneRotZ) { public static void handleReloadShake(double boneRotX, double boneRotY, double boneRotZ) {
LocalPlayer player = Minecraft.getInstance().player; LocalPlayer player = Minecraft.getInstance().player;
if (player == null || player.isSpectator()) return;
float shakeStrength = (float) DisplayConfig.WEAPON_SCREEN_SHAKE.get() / 100.0f; float shakeStrength = (float) DisplayConfig.WEAPON_SCREEN_SHAKE.get() / 100.0f;
if (shakeStrength <= 0.0f) return; if (shakeStrength <= 0.0f) return;
if (player != null) {
cameraRot[0] = -boneRotX * shakeStrength; cameraRot[0] = -boneRotX * shakeStrength;
cameraRot[1] = -boneRotY * shakeStrength; cameraRot[1] = -boneRotY * shakeStrength;
cameraRot[2] = -boneRotZ * shakeStrength; cameraRot[2] = -boneRotZ * shakeStrength;
} }
}
private static void handlePlayerCamera(ViewportEvent.ComputeCameraAngles event) { private static void handlePlayerCamera(ViewportEvent.ComputeCameraAngles event) {
double yaw = event.getYaw(); double yaw = event.getYaw();