diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java index 7b077cb4c..4dd6656bd 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientEventHandler.java @@ -870,7 +870,7 @@ public class ClientEventHandler { float pitch = event.getPitch(); float roll = event.getRoll(); ItemStack stack = entity.getMainHandItem(); - double amplitude = 15000 * stack.getOrCreateTag().getDouble("recoil_y") * stack.getOrCreateTag().getDouble("recoil_x"); + double amplitude = 15000 * GunsTool.getGunDoubleTag(stack, "RecoilY", 0) * GunsTool.getGunDoubleTag(stack, "RecoilX", 0); if (fireRecoilTime > 0) { firePosTimer = 0.001; @@ -994,7 +994,7 @@ public class ClientEventHandler { rpm = (double) stack.getOrCreateTag().getInt("rpm") / 1800; } - float gunRecoilX = (float) tag.getDouble("recoil_x") * 60; + float gunRecoilX = (float) GunsTool.getGunDoubleTag(stack, "RecoilX", 0) * 60; recoilHorizon = Mth.lerp(0.2 * times, recoilHorizon, 0) + recoilY; recoilY = 0; diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 72fd2d0c6..aa3b64cf3 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -55,7 +55,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"); + "Spread", "NormalReloadTime", "Headshot", "Semi", "Burst", "Auto", "RecoilX", "RecoilY"); public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return; diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 0812b7492..d6b51f83e 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -1,7 +1,7 @@ { "Spread": 3.5, - "recoil_x": 0.006, - "recoil_y": 0.018, + "RecoilX": 0.006, + "RecoilY": 0.018, "damage": 2.5, "Headshot": 1.5, "velocity": 17, diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json index d8cdcb799..e4e7b1a89 100644 --- a/src/main/resources/data/superbwarfare/guns/abekiri.json +++ b/src/main/resources/data/superbwarfare/guns/abekiri.json @@ -1,7 +1,7 @@ { "Spread": 4, - "recoil_x": 0.005, - "recoil_y": 0.026, + "RecoilX": 0.005, + "RecoilY": 0.026, "damage": 5, "Headshot": 1.5, "velocity": 15, diff --git a/src/main/resources/data/superbwarfare/guns/ak_12.json b/src/main/resources/data/superbwarfare/guns/ak_12.json index ad975e566..9cca56677 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_12.json +++ b/src/main/resources/data/superbwarfare/guns/ak_12.json @@ -2,8 +2,8 @@ "MinZoom": 1.25, "MaxZoom": 6, "Spread": 3.5, - "recoil_x": 0.0015, - "recoil_y": 0.01, + "RecoilX": 0.0015, + "RecoilY": 0.01, "damage": 7.7, "Headshot": 2, "velocity": 44.5, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index 4ded71583..4fa040635 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -2,8 +2,8 @@ "MinZoom": 1.25, "MaxZoom": 6, "Spread": 4, - "recoil_x": 0.002, - "recoil_y": 0.012, + "RecoilX": 0.002, + "RecoilY": 0.012, "damage": 8.5, "Headshot": 2, "velocity": 36, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index c0b7092f8..0f34ab5f0 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -1,8 +1,8 @@ { "CustomZoom": 0.75, "Spread": 5, - "recoil_x": 0.0018, - "recoil_y": 0.01, + "RecoilX": 0.0018, + "RecoilY": 0.01, "damage": 9.5, "Headshot": 2, "velocity": 40, diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json index 2e4a4b1b7..a0dcb0362 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_17.json +++ b/src/main/resources/data/superbwarfare/guns/glock_17.json @@ -1,7 +1,7 @@ { "Spread": 2.5, - "recoil_x": 0.004, - "recoil_y": 0.013, + "RecoilX": 0.004, + "RecoilY": 0.013, "damage": 5.5, "Headshot": 1.5, "velocity": 17, diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json index cac27745f..9c90e2be2 100644 --- a/src/main/resources/data/superbwarfare/guns/glock_18.json +++ b/src/main/resources/data/superbwarfare/guns/glock_18.json @@ -1,7 +1,7 @@ { "Spread": 2.5, - "recoil_x": 0.004, - "recoil_y": 0.013, + "RecoilX": 0.004, + "RecoilY": 0.013, "damage": 5.5, "Headshot": 1.5, "velocity": 17, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 55316a4f0..ddc43843d 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -2,8 +2,8 @@ "MinZoom": 1.25, "MaxZoom": 6, "Spread": 3.5, - "recoil_x": 0.0016, - "recoil_y": 0.009, + "RecoilX": 0.0016, + "RecoilY": 0.009, "damage": 7.5, "Headshot": 2, "velocity": 44, diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json index d3349effc..0ce7b58cd 100644 --- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json +++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json @@ -1,7 +1,7 @@ { "Spread": 7, - "recoil_x": 0.004, - "recoil_y": 0.04, + "RecoilX": 0.004, + "RecoilY": 0.04, "damage": 65, "Headshot": 3, "velocity": 38, diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json index 6abf101a9..4e30a78ed 100644 --- a/src/main/resources/data/superbwarfare/guns/k_98.json +++ b/src/main/resources/data/superbwarfare/guns/k_98.json @@ -1,7 +1,7 @@ { "Spread": 5, - "recoil_x": 0.002, - "recoil_y": 0.063, + "RecoilX": 0.002, + "RecoilY": 0.063, "damage": 35, "Headshot": 3, "velocity": 37.75, diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json index 03bac8f72..d8ed2ab39 100644 --- a/src/main/resources/data/superbwarfare/guns/m_1911.json +++ b/src/main/resources/data/superbwarfare/guns/m_1911.json @@ -1,7 +1,7 @@ { "Spread": 2.5, - "recoil_x": 0.006, - "recoil_y": 0.018, + "RecoilX": 0.006, + "RecoilY": 0.018, "damage": 9.5, "Headshot": 1.5, "velocity": 15, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index b26668066..e1b6dc4d6 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -2,8 +2,8 @@ "MinZoom": 4, "MaxZoom": 8, "Spread": 4, - "recoil_x": 0.0015, - "recoil_y": 0.011, + "RecoilX": 0.0015, + "RecoilY": 0.011, "damage": 7, "Headshot": 2, "velocity": 44, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 59bcdddea..cb4d4f9bc 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -1,7 +1,7 @@ { "Spread": 5, - "recoil_x": 0.004, - "recoil_y": 0.014, + "RecoilX": 0.004, + "RecoilY": 0.014, "damage": 9, "Headshot": 2, "velocity": 43, diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json index b9ede7e17..f099a2ea9 100644 --- a/src/main/resources/data/superbwarfare/guns/m_79.json +++ b/src/main/resources/data/superbwarfare/guns/m_79.json @@ -1,7 +1,7 @@ { "Spread": 1.5, - "recoil_x": 0.004, - "recoil_y": 0.023, + "RecoilX": 0.004, + "RecoilY": 0.023, "damage": 40, "ExplosionDamage": 80, "ExplosionRadius": 5, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 17f61294d..a879f58c7 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -1,7 +1,7 @@ { "Spread": 3, - "recoil_x": 0.009, - "recoil_y": 0.04, + "RecoilX": 0.009, + "RecoilY": 0.04, "damage": 3, "Headshot": 1.5, "velocity": 17, diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json index 85f4284ec..5a870c62d 100644 --- a/src/main/resources/data/superbwarfare/guns/m_98b.json +++ b/src/main/resources/data/superbwarfare/guns/m_98b.json @@ -3,8 +3,8 @@ "min_zoom": 4, "max_zoom": 8, "Spread": 6, - "recoil_x": 0.007, - "recoil_y": 0.013, + "RecoilX": 0.007, + "RecoilY": 0.013, "damage": 38, "Headshot": 3, "velocity": 47.2, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 35d9392ba..e6ea3a2b1 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -1,7 +1,7 @@ { "Spread": 2, - "recoil_x": 0.004, - "recoil_y": 0.031, + "RecoilX": 0.004, + "RecoilY": 0.031, "damage": 16, "Headshot": 2.5, "velocity": 38, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index fd6bb2421..349014693 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -1,7 +1,7 @@ { "Spread": 1.5, - "recoil_x": 0.003, - "recoil_y": 0.02, + "RecoilX": 0.003, + "RecoilY": 0.02, "damage": 8, "Headshot": 2, "velocity": 46, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index f7e925350..0fc0e53c3 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -2,8 +2,8 @@ "MinZoom": 1.25, "MaxZoom": 6, "Spread": 5, - "recoil_x": 0.006, - "recoil_y": 0.014, + "RecoilX": 0.006, + "RecoilY": 0.014, "damage": 12, "Headshot": 2.5, "velocity": 42.5, diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json index dae5b564a..9d4f69714 100644 --- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json +++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json @@ -1,8 +1,8 @@ { "CustomZoom": 2.25, "Spread": 4.8, - "recoil_x": 0.002, - "recoil_y": 0.063, + "RecoilX": 0.002, + "RecoilY": 0.063, "damage": 33, "Headshot": 3, "velocity": 42, diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json index 17fe7b3e1..cdf26a638 100644 --- a/src/main/resources/data/superbwarfare/guns/ntw_20.json +++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json @@ -1,8 +1,8 @@ { "CustomZoom": 3.75, "Spread": 8, - "recoil_x": 0.01, - "recoil_y": 0.038, + "RecoilX": 0.01, + "RecoilY": 0.038, "damage": 140, "Headshot": 3, "velocity": 36, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 906dfe530..bdc63c228 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -2,8 +2,8 @@ "MinZoom": 4, "MaxZoom": 8, "Spread": 3.7, - "recoil_x": 0.0013, - "recoil_y": 0.009, + "RecoilX": 0.0013, + "RecoilY": 0.009, "damage": 8.25, "Headshot": 2, "velocity": 46, diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json index 8d213e485..ead575a5c 100644 --- a/src/main/resources/data/superbwarfare/guns/rpg.json +++ b/src/main/resources/data/superbwarfare/guns/rpg.json @@ -1,7 +1,7 @@ { "Spread": 5, - "recoil_x": 0.008, - "recoil_y": 0.018, + "RecoilX": 0.008, + "RecoilY": 0.018, "damage": 200, "ExplosionDamage": 150, "ExplosionRadius": 10, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index be800ef97..213ad9a1e 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -1,7 +1,7 @@ { "Spread": 5.5, - "recoil_x": 0.0018, - "recoil_y": 0.012, + "RecoilX": 0.0018, + "RecoilY": 0.012, "damage": 8.75, "Headshot": 2, "velocity": 38, diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json index f2deae6f0..1df3a690d 100644 --- a/src/main/resources/data/superbwarfare/guns/sentinel.json +++ b/src/main/resources/data/superbwarfare/guns/sentinel.json @@ -1,8 +1,8 @@ { "CustomZoom": 1.75, "Spread": 6, - "recoil_x": 0.007, - "recoil_y": 0.018, + "RecoilX": 0.007, + "RecoilY": 0.018, "damage": 35, "mag": 5, "Headshot": 3, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index 42b2b5546..388aae5ce 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -1,7 +1,7 @@ { "Spread": 4.5, - "recoil_x": 0.004, - "recoil_y": 0.015, + "RecoilX": 0.004, + "RecoilY": 0.015, "damage": 9.5, "Headshot": 2, "velocity": 36, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index d5c012826..6d8be0de9 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -1,8 +1,8 @@ { "CustomZoom": 2.75, "Spread": 5.5, - "recoil_x": 0.004, - "recoil_y": 0.009, + "RecoilX": 0.004, + "RecoilY": 0.009, "damage": 18, "Headshot": 2, "velocity": 42, diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json index 8d4afe899..1d83af780 100644 --- a/src/main/resources/data/superbwarfare/guns/taser.json +++ b/src/main/resources/data/superbwarfare/guns/taser.json @@ -1,7 +1,7 @@ { "Spread": 2, - "recoil_x": 0.0001, - "recoil_y": 0.002, + "RecoilX": 0.0001, + "RecoilY": 0.002, "damage": 5, "velocity": 3, "mag": 1, diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json index 664183823..758bfbb7f 100644 --- a/src/main/resources/data/superbwarfare/guns/trachelium.json +++ b/src/main/resources/data/superbwarfare/guns/trachelium.json @@ -1,7 +1,7 @@ { "Spread": 3, - "recoil_x": 0.005, - "recoil_y": 0.032, + "RecoilX": 0.005, + "RecoilY": 0.032, "damage": 19, "Headshot": 2, "velocity": 24, diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json index 33a147f1a..9638f7e44 100644 --- a/src/main/resources/data/superbwarfare/guns/vector.json +++ b/src/main/resources/data/superbwarfare/guns/vector.json @@ -1,7 +1,7 @@ { "Spread": 2.3, - "recoil_x": 0.002, - "recoil_y": 0.007, + "RecoilX": 0.002, + "RecoilY": 0.007, "damage": 6, "Headshot": 1.5, "velocity": 16,