From c442d25d1de3fbeff776a4b0edfd84410d7f3875 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 24 Dec 2024 17:28:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#CanSwitchScope?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/atsuishio/superbwarfare/client/ClickHandler.java | 2 +- .../atsuishio/superbwarfare/item/gun/handgun/Trachelium.java | 4 +--- .../com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java index 40201b649..b5d26e18d 100644 --- a/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java @@ -157,7 +157,7 @@ public class ClickHandler { if (stack.is(ModTags.Items.GUN) && ClientEventHandler.zoom) { var tag = stack.getOrCreateTag(); - if (tag.getBoolean("CanSwitchScope")) { + if (GunsTool.getGunBooleanTag(stack, "CanSwitchScope", false)) { ModUtils.PACKET_HANDLER.sendToServer(new SwitchScopeMessage(scroll)); } else if (tag.getBoolean("CanAdjustZoomFov") || stack.is(ModItems.MINIGUN.get())) { ModUtils.PACKET_HANDLER.sendToServer(new AdjustZoomFovMessage(scroll)); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java index a7f4b2ba7..a89bbba88 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/handgun/Trachelium.java @@ -265,7 +265,6 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { int stockType = GunsTool.getAttachmentType(stack, GunsTool.AttachmentType.STOCK); CompoundTag tags = stack.getOrCreateTag().getCompound("Attachments"); - if (stockType == 1) { tags.putInt("Stock", 2); } @@ -292,8 +291,7 @@ public class Trachelium extends GunItem implements GeoItem, AnimatedItem { default -> 1; }; - stack.getOrCreateTag().putBoolean("CanSwitchScope", scopeType == 2); - + GunsTool.setGunBooleanTag(stack, "CanSwitchScope", scopeType == 2); GunsTool.setGunDoubleTag(stack, "CustomZoom", customZoom); } diff --git a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java index ae059ce7d..8da440bd4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java +++ b/src/main/java/com/atsuishio/superbwarfare/item/gun/rifle/M4Item.java @@ -194,7 +194,7 @@ public class M4Item extends GunItem implements GeoItem, AnimatedItem { default -> GunsTool.getGunDoubleTag(stack, "CustomZoom", 0); }; - stack.getOrCreateTag().putBoolean("CanSwitchScope", scopeType == 2); + GunsTool.setGunBooleanTag(stack, "CanSwitchScope", scopeType == 2); stack.getOrCreateTag().putBoolean("CanAdjustZoomFov", scopeType == 3); GunsTool.setGunDoubleTag(stack, "CustomZoom", customZoom); stack.getOrCreateTag().putInt("customMag", customMag);