kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

优化NBT#BurstSize

Browse source
This commit is contained in:
17146 2024-12-24 14:17:58 +08:00
parent d26a2b6ee9
commit 19bc16cb52
28 changed files with 17 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/atsuishio/superbwarfare/client/ClickHandler.java
View file

@ -328,7 +328,7 @@ public class ClickHandler {
ClientEventHandler.holdFire = true; ClientEventHandler.holdFire = true;
} }
if (GunsTool.getGunIntTag(stack, "FireMode") == 1 && ClientEventHandler.burstFireSize == 0) { if (GunsTool.getGunIntTag(stack, "FireMode") == 1 && ClientEventHandler.burstFireSize == 0) {
ClientEventHandler.burstFireSize = (int) stack.getOrCreateTag().getDouble("burst_size"); ClientEventHandler.burstFireSize = GunsTool.getGunIntTag(stack, "BurstSize", 1);
} }
} }
} }

17
src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
View file

@ -55,7 +55,7 @@ public class GunsTool {
public static void initGun(Level level, ItemStack stack, String location) { public static void initGun(Level level, ItemStack stack, String location) {
if (level.getServer() == null) return; if (level.getServer() == null) return;
gunsData.get(location).forEach((k, v) -> { gunsData.get(location).forEach((k, v) -> {
if (k.equals("EmptyReloadTime") || k.equals("FireMode") || k.equals("Weight") || k.equals("SoundRadius")) { if (k.equals("EmptyReloadTime") || k.equals("FireMode") || k.equals("Weight") || k.equals("SoundRadius") || k.equals("BurstSize")) {
CompoundTag tag = stack.getOrCreateTag(); CompoundTag tag = stack.getOrCreateTag();
CompoundTag data = tag.getCompound("GunData"); CompoundTag data = tag.getCompound("GunData");
data.putDouble(k, v); data.putDouble(k, v);
@ -69,7 +69,7 @@ public class GunsTool {
public static void initCreativeGun(ItemStack stack, String location) { public static void initCreativeGun(ItemStack stack, String location) {
if (gunsData != null && gunsData.get(location) != null) { if (gunsData != null && gunsData.get(location) != null) {
gunsData.get(location).forEach((k, v) -> { gunsData.get(location).forEach((k, v) -> {
if (k.equals("EmptyReloadTime") || k.equals("FireMode") || k.equals("Weight") || k.equals("SoundRadius")) { if (k.equals("EmptyReloadTime") || k.equals("FireMode") || k.equals("Weight") || k.equals("SoundRadius") || k.equals("BurstSize")) {
CompoundTag tag = stack.getOrCreateTag(); CompoundTag tag = stack.getOrCreateTag();
CompoundTag data = tag.getCompound("GunData"); CompoundTag data = tag.getCompound("GunData");
data.putDouble(k, v); data.putDouble(k, v);
@ -141,6 +141,7 @@ public class GunsTool {
tag.putBoolean("is_empty_reloading", false); tag.putBoolean("is_empty_reloading", false);
} }
/* PerkData */
public static void setPerkIntTag(ItemStack stack, String name, int num) { public static void setPerkIntTag(ItemStack stack, String name, int num) {
CompoundTag tag = stack.getOrCreateTag().getCompound("PerkData"); CompoundTag tag = stack.getOrCreateTag().getCompound("PerkData");
tag.putInt(name, num); tag.putInt(name, num);
@ -174,6 +175,7 @@ public class GunsTool {
return tag.getBoolean(name); return tag.getBoolean(name);
} }
/* Attachments */
public static int getAttachmentType(ItemStack stack, AttachmentType type) { public static int getAttachmentType(ItemStack stack, AttachmentType type) {
CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments"); CompoundTag tag = stack.getOrCreateTag().getCompound("Attachments");
return tag.getInt(type.getName()); return tag.getInt(type.getName());
@ -197,6 +199,7 @@ public class GunsTool {
} }
} }
/* GunData */
public static void setGunIntTag(ItemStack stack, String name, int num) { public static void setGunIntTag(ItemStack stack, String name, int num) {
CompoundTag tag = stack.getOrCreateTag(); CompoundTag tag = stack.getOrCreateTag();
var data = tag.getCompound("GunData"); var data = tag.getCompound("GunData");
@ -205,8 +208,13 @@ public class GunsTool {
} }
public static int getGunIntTag(ItemStack stack, String name) { public static int getGunIntTag(ItemStack stack, String name) {
return getGunIntTag(stack, name, 0);
}
public static int getGunIntTag(ItemStack stack, String name, int defaultValue) {
CompoundTag tag = stack.getOrCreateTag(); CompoundTag tag = stack.getOrCreateTag();
var data = tag.getCompound("GunData"); var data = tag.getCompound("GunData");
if (!data.contains(name)) return defaultValue;
return data.getInt(name); return data.getInt(name);
} }
@ -218,8 +226,13 @@ public class GunsTool {
} }
public static double getGunDoubleTag(ItemStack stack, String name) { public static double getGunDoubleTag(ItemStack stack, String name) {
return getGunDoubleTag(stack, name, 0);
}
public static double getGunDoubleTag(ItemStack stack, String name, double defaultValue) {
CompoundTag tag = stack.getOrCreateTag(); CompoundTag tag = stack.getOrCreateTag();
var data = tag.getCompound("GunData"); var data = tag.getCompound("GunData");
if (!data.contains(name)) return defaultValue;
return data.getDouble(name); return data.getDouble(name);
} }
} }

1
src/main/resources/data/superbwarfare/guns/aa_12.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 64, "normal_reload_time": 64,
"EmptyReloadTime": 85, "EmptyReloadTime": 85,
"BypassesArmor": 0.05, "BypassesArmor": 0.05,

1
src/main/resources/data/superbwarfare/guns/abekiri.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 66, "normal_reload_time": 66,
"EmptyReloadTime": 83, "EmptyReloadTime": 83,
"BypassesArmor": 0.01, "BypassesArmor": 0.01,

1
src/main/resources/data/superbwarfare/guns/ak_12.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 52, "normal_reload_time": 52,
"EmptyReloadTime": 58, "EmptyReloadTime": 58,
"BypassesArmor": 0.23, "BypassesArmor": 0.23,

1
src/main/resources/data/superbwarfare/guns/ak_47.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 52, "normal_reload_time": 52,
"EmptyReloadTime": 65, "EmptyReloadTime": 65,
"BypassesArmor": 0.2, "BypassesArmor": 0.2,

1
src/main/resources/data/superbwarfare/guns/devotion.json
View file

@ -13,7 +13,6 @@
"semi": 0, "semi": 0,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 73, "normal_reload_time": 73,
"EmptyReloadTime": 95, "EmptyReloadTime": 95,
"BypassesArmor": 0.25, "BypassesArmor": 0.25,

1
src/main/resources/data/superbwarfare/guns/glock_17.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 30, "normal_reload_time": 30,
"EmptyReloadTime": 35, "EmptyReloadTime": 35,
"BypassesArmor": 0.15, "BypassesArmor": 0.15,

1
src/main/resources/data/superbwarfare/guns/glock_18.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 30, "normal_reload_time": 30,
"EmptyReloadTime": 35, "EmptyReloadTime": 35,
"BypassesArmor": 0.15, "BypassesArmor": 0.15,

1
src/main/resources/data/superbwarfare/guns/hk_416.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 56, "normal_reload_time": 56,
"EmptyReloadTime": 64, "EmptyReloadTime": 64,
"BypassesArmor": 0.25, "BypassesArmor": 0.25,

1
src/main/resources/data/superbwarfare/guns/hunting_rifle.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"EmptyReloadTime": 64, "EmptyReloadTime": 64,
"BypassesArmor": 0.7, "BypassesArmor": 0.7,
"SoundRadius": 20 "SoundRadius": 20

1
src/main/resources/data/superbwarfare/guns/k_98.json
View file

@ -13,7 +13,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"EmptyReloadTime": 59, "EmptyReloadTime": 59,
"clipLoad": 1, "clipLoad": 1,
"prepare_time": 29, "prepare_time": 29,

1
src/main/resources/data/superbwarfare/guns/m_1911.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 30, "normal_reload_time": 30,
"EmptyReloadTime": 35, "EmptyReloadTime": 35,
"BypassesArmor": 0.2, "BypassesArmor": 0.2,

1
src/main/resources/data/superbwarfare/guns/m_4.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 56, "normal_reload_time": 56,
"EmptyReloadTime": 64, "EmptyReloadTime": 64,
"BypassesArmor": 0.25, "BypassesArmor": 0.25,

1
src/main/resources/data/superbwarfare/guns/m_60.json
View file

@ -12,7 +12,6 @@
"semi": 0, "semi": 0,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 114, "normal_reload_time": 114,
"EmptyReloadTime": 133, "EmptyReloadTime": 133,
"BypassesArmor": 0.25, "BypassesArmor": 0.25,

1
src/main/resources/data/superbwarfare/guns/m_870.json
View file

@ -13,7 +13,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"prepare_time": 7, "prepare_time": 7,
"prepare_load_time": 36, "prepare_load_time": 36,
"iterative_time": 16, "iterative_time": 16,

1
src/main/resources/data/superbwarfare/guns/m_98b.json
View file

@ -16,7 +16,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 60, "normal_reload_time": 60,
"EmptyReloadTime": 78, "EmptyReloadTime": 78,
"BypassesArmor": 0.6, "BypassesArmor": 0.6,

1
src/main/resources/data/superbwarfare/guns/marlin.json
View file

@ -13,7 +13,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"prepare_time": 7, "prepare_time": 7,
"iterative_time": 16, "iterative_time": 16,
"finish_time": 19, "finish_time": 19,

1
src/main/resources/data/superbwarfare/guns/mk_14.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 54, "normal_reload_time": 54,
"EmptyReloadTime": 71, "EmptyReloadTime": 71,
"BypassesArmor": 0.4, "BypassesArmor": 0.4,

1
src/main/resources/data/superbwarfare/guns/mosin_nagant.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"prepare_time": 29, "prepare_time": 29,
"prepare_empty": 16, "prepare_empty": 16,
"iterative_time": 11, "iterative_time": 11,

1
src/main/resources/data/superbwarfare/guns/ntw_20.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 63, "normal_reload_time": 63,
"EmptyReloadTime": 92, "EmptyReloadTime": 92,
"BypassesArmor": 1, "BypassesArmor": 1,

1
src/main/resources/data/superbwarfare/guns/qbz_95.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 60, "normal_reload_time": 60,
"EmptyReloadTime": 74, "EmptyReloadTime": 74,
"BypassesArmor": 0.28, "BypassesArmor": 0.28,

1
src/main/resources/data/superbwarfare/guns/rpk.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 1, "auto": 1,
"burst_size": 1,
"normal_reload_time": 73, "normal_reload_time": 73,
"EmptyReloadTime": 95, "EmptyReloadTime": 95,
"BypassesArmor": 0.23, "BypassesArmor": 0.23,

1
src/main/resources/data/superbwarfare/guns/sentinel.json
View file

@ -14,7 +14,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 59, "normal_reload_time": 59,
"EmptyReloadTime": 89, "EmptyReloadTime": 89,
"BypassesArmor": 0.8, "BypassesArmor": 0.8,

1
src/main/resources/data/superbwarfare/guns/sks.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 54, "normal_reload_time": 54,
"EmptyReloadTime": 75, "EmptyReloadTime": 75,
"BypassesArmor": 0.23, "BypassesArmor": 0.23,

1
src/main/resources/data/superbwarfare/guns/svd.json
View file

@ -13,7 +13,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"normal_reload_time": 56, "normal_reload_time": 56,
"EmptyReloadTime": 70, "EmptyReloadTime": 70,
"BypassesArmor": 0.45, "BypassesArmor": 0.45,

1
src/main/resources/data/superbwarfare/guns/trachelium.json
View file

@ -12,7 +12,6 @@
"semi": 1, "semi": 1,
"burst": 0, "burst": 0,
"auto": 0, "auto": 0,
"burst_size": 1,
"EmptyReloadTime": 65, "EmptyReloadTime": 65,
"BypassesArmor": 0.3, "BypassesArmor": 0.3,
"SoundRadius": 10, "SoundRadius": 10,

2
src/main/resources/data/superbwarfare/guns/vector.json
View file

@ -12,7 +12,7 @@
"semi": 1, "semi": 1,
"burst": 1, "burst": 1,
"auto": 1, "auto": 1,
"burst_size": 3, "BurstSize": 3,
"normal_reload_time": 46, "normal_reload_time": 46,
"EmptyReloadTime": 64, "EmptyReloadTime": 64,
"BypassesArmor": 0.15, "BypassesArmor": 0.15,