From b8432ab5ea4bef6146ff27cd2d449ec4b5c7e92e Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Tue, 24 Dec 2024 17:12:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96data=20NBT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/tools/GunsTool.java | 31 +++++-------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java index 634306ce5..34c1b4b3e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java +++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java @@ -19,7 +19,6 @@ import net.minecraftforge.network.PacketDistributor; import java.io.InputStreamReader; import java.util.HashMap; -import java.util.Set; import java.util.UUID; @Mod.EventBusSubscriber(modid = ModUtils.MODID) @@ -53,37 +52,23 @@ 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", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage", "ExplosionRadius", "BoltActionTime", "ClipLoad", - "PrepareTime", "IterativeTime", "PrepareLoadTime", "FinishTime", "PrepareEmptyTime"); - public static void initGun(Level level, ItemStack stack, String location) { if (level.getServer() == null) return; gunsData.get(location).forEach((k, v) -> { - if (STRING_SET.contains(k)) { - CompoundTag tag = stack.getOrCreateTag(); - CompoundTag data = tag.getCompound("GunData"); - data.putDouble(k, v); - stack.addTagElement("GunData", data); - } else { - stack.getOrCreateTag().putDouble(k, v); - } + CompoundTag tag = stack.getOrCreateTag(); + CompoundTag data = tag.getCompound("GunData"); + data.putDouble(k, v); + stack.addTagElement("GunData", data); }); } public static void initCreativeGun(ItemStack stack, String location) { if (gunsData != null && gunsData.get(location) != null) { gunsData.get(location).forEach((k, v) -> { - if (STRING_SET.contains(k)) { - CompoundTag tag = stack.getOrCreateTag(); - CompoundTag data = tag.getCompound("GunData"); - data.putDouble(k, v); - stack.addTagElement("GunData", data); - } else { - stack.getOrCreateTag().putDouble(k, v); - } + CompoundTag tag = stack.getOrCreateTag(); + CompoundTag data = tag.getCompound("GunData"); + data.putDouble(k, v); + stack.addTagElement("GunData", data); }); stack.getOrCreateTag().putInt("ammo", GunsTool.getGunIntTag(stack, "Magazine", 0) + stack.getOrCreateTag().getInt("customMag")); }