From cb786646763f427f27cd184fed693ffdaaf231b3 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 24 Dec 2024 16:09:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#MinZoom=20&=20MaxZoom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../network/message/AdjustZoomFovMessage.java | 8 ++++---- .../java/com/atsuishio/superbwarfare/tools/GunsTool.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java index fcd44895b..570ad7a9f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java +++ b/src/main/java/com/atsuishio/superbwarfare/network/message/AdjustZoomFovMessage.java @@ -65,10 +65,10 @@ public class AdjustZoomFovMessage { SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f); } } else { - double min_zoom = tag.getDouble("MinZoom") - 1.25; - double max_zoom = tag.getDouble("MaxZoom") - 1.25; - tag.putDouble("CustomZoom", Mth.clamp(tag.getDouble("CustomZoom") + 0.5 * message.scroll, min_zoom, max_zoom)); - if (tag.getDouble("CustomZoom") > min_zoom && tag.getDouble("CustomZoom") < max_zoom) { + double minZoom = GunsTool.getGunDoubleTag(stack, "MinZoom", 0) - 1.25; + double maxZoom = GunsTool.getGunDoubleTag(stack, "MaxZoom", 0) - 1.25; + tag.putDouble("CustomZoom", Mth.clamp(tag.getDouble("CustomZoom") + 0.5 * message.scroll, minZoom, maxZoom)); + if (tag.getDouble("CustomZoom") > minZoom && tag.getDouble("CustomZoom") < maxZoom) { SoundTool.playLocalSound(player, ModSounds.ADJUST_FOV.get(), 1f, 0.7f); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index dcad3bd97..04d218348 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -56,7 +56,7 @@ public class GunsTool { // TODO 临时使用，移植完毕后删除 private static final Set STRING_SET = Set.of("EmptyReloadTime", "FireMode", "Weight", "SoundRadius", "BurstSize", "ProjectileAmount", "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY", "Velocity", "Damage", "BypassesArmor", - "RPM", "Magazine"); + "RPM", "Magazine", "MinZoom", "MaxZoom"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return;