From 4a809e2338c21621dbe542dacd8f9f3d09ad2676 Mon Sep 17 00:00:00 2001 From: Atsuishio <842960157@qq.com> Date: Sun, 15 Jun 2025 13:51:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E8=BD=BD=E6=93=8D?= =?UTF-8?q?=E6=8E=A7=EF=BC=8C=E5=8A=A0=E5=BC=BA=E9=87=8D=E6=9C=BA=E6=9C=A8?= =?UTF-8?q?=E4=BB=93=E5=A8=81=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../atsuishio/superbwarfare/config/server/VehicleConfig.java | 2 +- .../atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java | 5 +++-- .../atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java | 5 +++-- .../superbwarfare/entity/vehicle/PrismTankEntity.java | 5 +++-- .../atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java | 5 ++--- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java b/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java index 7cb9f3ee9..0865c40f9 100644 --- a/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java +++ b/src/main/java/com/atsuishio/superbwarfare/config/server/VehicleConfig.java @@ -238,7 +238,7 @@ public class VehicleConfig { builder.push("Heavy Machine Gun"); builder.comment("The gun damage of 12.7mm HMG"); - HEAVY_MACHINE_GUN_DAMAGE = builder.defineInRange("heavy_machine_gun_damage", 25, 1, 10000000); + HEAVY_MACHINE_GUN_DAMAGE = builder.defineInRange("heavy_machine_gun_damage", 40, 1, 10000000); builder.pop(); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java index a5c16f3a9..a60694fe0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java @@ -22,6 +22,7 @@ import com.atsuishio.superbwarfare.tools.CustomExplosion; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.ParticleTool; import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.BlockPos; @@ -208,7 +209,7 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, this.getX() + 0.5 * this.getDeltaMovement().x, this.getY() + getSubmergedHeight(this) - 0.2, this.getZ() + 0.5 * this.getDeltaMovement().z, (int) (2 + 10 * this.getDeltaMovement().length()), 0.65, 0, 0.65, 0, true); } - turretAngle(25, 25); + turretAngle(10, 12.5f); this.terrainCompact(4f, 5f); inertiaRotate(1); @@ -738,7 +739,7 @@ public class Bmp2Entity extends ContainerMobileVehicleEntity implements GeoEntit @Override public double getSensitivity(double original, boolean zoom, int seatIndex, boolean isOnGround) { - return zoom ? 0.22 : 0.27; + return zoom ? 0.22 : Minecraft.getInstance().options.getCameraType().isFirstPerson() ? 0.27 : 0.36; } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java index 63602f65d..e95eb7c77 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java @@ -21,6 +21,7 @@ import com.atsuishio.superbwarfare.tools.CustomExplosion; import com.atsuishio.superbwarfare.tools.InventoryTool; import com.atsuishio.superbwarfare.tools.ParticleTool; import com.mojang.math.Axis; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.BlockPos; @@ -160,7 +161,7 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, this.getX() + 0.5 * this.getDeltaMovement().x, this.getY() + getSubmergedHeight(this) - 0.2, this.getZ() + 0.5 * this.getDeltaMovement().z, (int) (2 + 10 * this.getDeltaMovement().length()), 0.65, 0, 0.65, 0, true); } - turretAngle(15, 12.5f); + turretAngle(10, 12.5f); lowHealthWarning(); this.terrainCompact(2.7f, 3.61f); inertiaRotate(1.25f); @@ -601,7 +602,7 @@ public class Lav150Entity extends ContainerMobileVehicleEntity implements GeoEnt @Override public double getSensitivity(double original, boolean zoom, int seatIndex, boolean isOnGround) { - return zoom ? 0.23 : 0.3; + return zoom ? 0.23 : Minecraft.getInstance().options.getCameraType().isFirstPerson() ? 0.3 : 0.4; } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java index 997e84bab..b2f64728b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/PrismTankEntity.java @@ -18,6 +18,7 @@ import com.atsuishio.superbwarfare.network.message.receive.ShakeClientMessage; import com.atsuishio.superbwarfare.tools.*; import com.mojang.math.Axis; import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Font; import net.minecraft.client.gui.GuiGraphics; import net.minecraft.core.BlockPos; @@ -187,7 +188,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo sendParticle(serverLevel, ParticleTypes.BUBBLE_COLUMN_UP, this.getX() + 0.5 * this.getDeltaMovement().x, this.getY() + getSubmergedHeight(this) - 0.2, this.getZ() + 0.5 * this.getDeltaMovement().z, (int) (2 + 10 * this.getDeltaMovement().length()), 0.65, 0, 0.65, 0, true); } - turretAngle(15, 10); + turretAngle(10, 12.5f); this.terrainCompact(4.6375f, 5.171875f); inertiaRotate(1); @@ -782,7 +783,7 @@ public class PrismTankEntity extends ContainerMobileVehicleEntity implements Geo @Override public double getSensitivity(double original, boolean zoom, int seatIndex, boolean isOnGround) { - return zoom ? 0.26 : 0.33; + return zoom ? 0.26 : Minecraft.getInstance().options.getCameraType().isFirstPerson() ? 0.33 : 0.45; } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java index 3c02aa739..ad26c1537 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Yx100Entity.java @@ -1246,9 +1246,9 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti @Override public double getSensitivity(double original, boolean zoom, int seatIndex, boolean isOnGround) { if (seatIndex == 0) { - return zoom ? 0.17 : 0.22; + return zoom ? 0.17 : Minecraft.getInstance().options.getCameraType().isFirstPerson() ? 0.22 : 0.35; } else if (seatIndex == 1) { - return zoom ? 0.25 : 0.35; + return zoom ? 0.25 : Minecraft.getInstance().options.getCameraType().isFirstPerson() ? 0.35 : 0.4; } else return original; } @@ -1302,7 +1302,6 @@ public class Yx100Entity extends ContainerMobileVehicleEntity implements GeoEnti Matrix4f transform = getVehicleTransform(1); Vector4f worldPosition = transformPosition(transform, 0, 1.125f, 0.25f); this.obb.center().set(new Vector3f(worldPosition.x, worldPosition.y, worldPosition.z)); - this.obb.setRotation(VectorTool.combineRotations(1, this)); } }