From 101ae62310aae7d7628244d726706acf952aa43b Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Tue, 15 Jul 2025 20:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E5=A2=9E=E5=A4=A7=E8=BD=BD=E5=85=B7=E6=A0=87?= =?UTF-8?q?=E8=AF=86=EF=BC=8C=E8=B0=83=E6=95=B4=E9=BC=A0=E6=A0=87=E6=93=8D?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/overlay/VehicleTeamOverlay.java | 2 +- .../entity/vehicle/base/VehicleEntity.java | 3 ++ .../superbwarfare/tools/VectorUtil.java | 49 ------------------- 3 files changed, 4 insertions(+), 50 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java index d2cebbff9..7c36c37eb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/overlay/VehicleTeamOverlay.java @@ -72,7 +72,7 @@ public class VehicleTeamOverlay implements LayeredDraw.Layer { poseStack.pushPose(); poseStack.translate(x, y - 12, 0); - float size = (float) Mth.clamp((50 / VectorUtil.fov) * 0.9f * Math.max((512 - entityRange) / 512, 0.1), 0.1, 1); + float size = (float) Mth.clamp((50 / VectorUtil.fov) * 0.9f * Math.max((512 - entityRange) / 512, 0.1), 0.4, 1); poseStack.scale(size, size, size); var font = Minecraft.getInstance().font; diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java index fd37c9e34..a042dae5f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/base/VehicleEntity.java @@ -950,6 +950,9 @@ public abstract class VehicleEntity extends Entity implements Container { this.handlePartHealth(); } + entityData.set(MOUSE_SPEED_X, entityData.get(MOUSE_SPEED_X) * 0.95f); + entityData.set(MOUSE_SPEED_Y, entityData.get(MOUSE_SPEED_Y) * 0.95f); + this.refreshDimensions(); } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java b/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java index 51ad85b1b..f3832f0e0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/VectorUtil.java @@ -1,17 +1,6 @@ package com.atsuishio.superbwarfare.tools; -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.mojang.blaze3d.vertex.PoseStack; -import com.mojang.math.Axis; import net.minecraft.client.Minecraft; -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.phys.Vec3; import net.neoforged.api.distmarker.Dist; import net.neoforged.bus.api.EventPriority; @@ -59,42 +48,4 @@ public class VectorUtil { fov = event.getFOV(); } } - - @SubscribeEvent(priority = EventPriority.LOWEST) - public static void captureCamera(ViewportEvent.ComputeCameraAngles event) { - float roll; - roll = ClientEventHandler.cameraRoll; - - Entity entity = event.getCamera().getEntity(); - - 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; - roll = (float) Mth.nextDouble(RandomSource.create(), 8, 12) * shakeStrength; - } - - if (entity.getRootVehicle() instanceof VehicleEntity vehicle && (!event.getCamera().isDetached() || vehicle instanceof LandArmorEntity && ClientEventHandler.zoomVehicle)) { - // rotate camera - float a = vehicle.getTurretYaw((float) event.getPartialTick()); - float r = (Mth.abs(a) - 90f) / 90f; - float r2; - if (Mth.abs(a) <= 90f) { - r2 = a / 90f; - } else { - if (a < 0) { - r2 = -(180f + a) / 90f; - } else { - r2 = (180f - a) / 90f; - } - } - - roll = -r * vehicle.getRoll((float) event.getPartialTick()) + r2 * vehicle.getViewXRot((float) event.getPartialTick()); - } - - PoseStack poseStack = new PoseStack(); - poseStack.mulPose(Axis.ZP.rotationDegrees(roll)); - poseStack.mulPose(Axis.XP.rotationDegrees(event.getPitch())); - poseStack.mulPose(Axis.YP.rotationDegrees(event.getYaw() + 180.0F)); - - } }