diff --git a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java index 669de4646..2153ffafb 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/GunEventHandler.java @@ -543,10 +543,11 @@ public class GunEventHandler { MinecraftForge.EVENT_BUS.post(new ReloadEvent.Pre(player, stack)); // 此处判断空仓换弹的时候,是否在准备阶段就需要装填一发,如M870 - if (tag.getDouble("prepare_load_time") != 0 && tag.getInt("ammo") == 0) { + if (GunsTool.getGunIntTag(stack, "PrepareLoadTime", 0) != 0 && tag.getInt("ammo") == 0) { playGunPrepareLoadReloadSounds(player); - tag.putInt("prepare_load", (int) tag.getDouble("prepare_load_time") + 1); - player.getCooldowns().addCooldown(stack.getItem(), (int) tag.getDouble("prepare_load_time")); + int prepareLoadTime = GunsTool.getGunIntTag(stack, "PrepareLoadTime", 0); + tag.putInt("prepare_load", prepareLoadTime + 1); + player.getCooldowns().addCooldown(stack.getItem(), prepareLoadTime); } else if (tag.getDouble("prepare_empty") != 0 && tag.getInt("ammo") == 0) { // 此处判断空仓换弹,如莫辛纳甘 playGunEmptyPrepareSounds(player); diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 21a982f68..beb99b0f4 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -57,7 +57,7 @@ public class GunsTool { 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", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius", "BoltActionTime", "ClipLoad", - "PrepareTime", "IterativeTime"); + "PrepareTime", "IterativeTime", "PrepareLoadTime"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return; diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index b96521841..a537ffdef 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -6,13 +6,12 @@ "Headshot": 1.5, "Velocity": 17, "Magazine": 8, - "force_stop_reloading": 1, "ProjectileAmount": 12, "Weight": 4, "FireMode": 0, "Semi": 1, "PrepareTime": 7, - "prepare_load_time": 36, + "PrepareLoadTime": 36, "IterativeTime": 16, "finish_time": 12, "BypassesArmor": 0.05, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 4a9644369..c20870207 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -6,7 +6,6 @@ "Headshot": 2.5, "Velocity": 38, "Magazine": 8, - "force_stop_reloading": 1, "Weight": 3, "FireMode": 0, "Semi": 1,