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:
Atsuishio 2025-07-02 20:15:13 +08:00 • committed by Light_Quanta
parent f60d19e112
commit 014708a31e
No known key found for this signature in database
GPG key ID: 11A39A1B8C890959
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1357,12 +1357,10 @@ public class ClientEventHandler {
if (entity.hasEffect(ModMobEffects.SHOCK) && Minecraft.getInstance().options.getCameraType() == CameraType.FIRST_PERSON) {
float shakeStrength = (float) DisplayConfig.SHOCK_SCREEN_SHAKE.get() / 100.0f;
if (shakeStrength <= 0.0f) return;
event.setYaw(Minecraft.getInstance().gameRenderer.getMainCamera().getYRot() +
(float) Mth.nextDouble(RandomSource.create(), -3, 3) * shakeStrength);
event.setPitch(Minecraft.getInstance().gameRenderer.getMainCamera().getXRot() +
(float) Mth.nextDouble(RandomSource.create(), -3, 3) * shakeStrength);
event.setRoll((float) Mth.nextDouble(RandomSource.create(), 8, 12) * shakeStrength);
}
}

17
src/main/java/com/atsuishio/superbwarfare/mixins/GameRendererMixin.java
View file

@ -1,6 +1,10 @@
package com.atsuishio.superbwarfare.mixins;
import com.atsuishio.superbwarfare.config.client.DisplayConfig;
import com.atsuishio.superbwarfare.entity.vehicle.base.LandArmorEntity;
import com.atsuishio.superbwarfare.entity.vehicle.base.VehicleEntity;
import com.atsuishio.superbwarfare.event.ClientEventHandler;
import com.atsuishio.superbwarfare.init.ModMobEffects;
import com.atsuishio.superbwarfare.item.gun.GunItem;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
@ -9,6 +13,7 @@ import net.minecraft.client.CameraType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
@ -45,7 +50,17 @@ public class GameRendererMixin {
@Inject(method = "bobHurt(Lcom/mojang/blaze3d/vertex/PoseStack;F)V", at = @At("HEAD"))
public void superbWarfare$renderWorld(PoseStack poseStack, float partialTicks, CallbackInfo ci) {
Entity entity = mainCamera.getEntity();
if (entity != null && !mainCamera.isDetached() && entity.getRootVehicle() instanceof VehicleEntity vehicle) {
poseStack.mulPose(Axis.ZP.rotationDegrees(ClientEventHandler.cameraRoll));
if (entity instanceof Player player && !player.isSpectator() && player.hasEffect(ModMobEffects.SHOCK)) {
float shakeStrength = (float) DisplayConfig.SHOCK_SCREEN_SHAKE.get() / 100.0f;
if (shakeStrength <= 0.0f) return;
poseStack.mulPose(Axis.ZP.rotationDegrees((float) Mth.nextDouble(RandomSource.create(), 8, 12) * shakeStrength));
}
if (entity != null && entity.getRootVehicle() instanceof VehicleEntity vehicle && (!mainCamera.isDetached() || (vehicle instanceof LandArmorEntity && ClientEventHandler.zoomVehicle))) {
// rotate camera
float a = vehicle.getTurretYaw(partialTicks);
float r = (Mth.abs(a) - 90f) / 90f;