From a277fb444d13374e5b793cd01e3330284e4b8a07 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Tue, 24 Dec 2024 16:21:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96NBT#ExplosionDamage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/tooltip/ClientLauncherImageTooltip.java          | 3 +--
 .../superbwarfare/network/message/FireMessage.java          | 6 +++---
 .../java/com/atsuishio/superbwarfare/tools/GunsTool.java    | 2 +-
 src/main/resources/data/superbwarfare/guns/javelin.json     | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java
index 56fa0c78a..d62f97c33 100644
--- a/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java
+++ b/src/main/java/com/atsuishio/superbwarfare/client/tooltip/ClientLauncherImageTooltip.java
@@ -2,7 +2,6 @@ package com.atsuishio.superbwarfare.client.tooltip;
 
 import com.atsuishio.superbwarfare.client.tooltip.component.GunImageComponent;
 import com.atsuishio.superbwarfare.tools.GunsTool;
-import com.atsuishio.superbwarfare.tools.ItemNBTTool;
 import com.atsuishio.superbwarfare.tools.TooltipTool;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
@@ -18,7 +17,7 @@ public class ClientLauncherImageTooltip extends ClientGunImageTooltip {
     @Override
     protected Component getDamageComponent() {
         double damage = GunsTool.getGunDoubleTag(stack, "Damage", 0) * TooltipTool.perkDamage(stack);
-        double explosionDamage = ItemNBTTool.getDouble(stack, "ExplosionDamage", 0);
+        double explosionDamage = GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0);
 
         return Component.translatable("des.superbwarfare.tips.damage").withStyle(ChatFormatting.GRAY)
                 .append(Component.literal("").withStyle(ChatFormatting.RESET))
diff --git a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java
index 96db47120..0c0faabe6 100644
--- a/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java
+++ b/src/main/java/com/atsuishio/superbwarfare/network/message/FireMessage.java
@@ -371,7 +371,7 @@ public class FireMessage {
                 Level level = player.level();
                 if (!level.isClientSide()) {
                     GunGrenadeEntity gunGrenadeEntity = new GunGrenadeEntity(player, level,
-                            (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) stack.getOrCreateTag().getDouble("ExplosionDamage"), (float) stack.getOrCreateTag().getDouble("ExplosionRadius"));
+                            (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) stack.getOrCreateTag().getDouble("ExplosionRadius"));
 
                     var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE);
                     if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) {
@@ -422,7 +422,7 @@ public class FireMessage {
 
             if (!level.isClientSide()) {
                 RpgRocketEntity rocketEntity = new RpgRocketEntity(player, level,
-                        (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) tag.getDouble("ExplosionDamage"), (float) tag.getDouble("ExplosionRadius"));
+                        (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) tag.getDouble("ExplosionRadius"));
 
                 var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE);
                 if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) {
@@ -486,7 +486,7 @@ public class FireMessage {
 
         if (!level.isClientSide()) {
             JavelinMissileEntity missileEntity = new JavelinMissileEntity(player, level,
-                    (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) tag.getDouble("ExplosionDamage"), (float) tag.getDouble("ExplosionRadius"));
+                    (float) GunsTool.getGunDoubleTag(stack, "Damage", 0), (float) GunsTool.getGunDoubleTag(stack, "ExplosionDamage", 0), (float) tag.getDouble("ExplosionRadius"));
 
             var dmgPerk = PerkHelper.getPerkByType(stack, Perk.Type.DAMAGE);
             if (dmgPerk == ModPerks.MONSTER_HUNTER.get()) {
diff --git a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
index 02d7db98d..455ea9e3f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
+++ b/src/main/java/com/atsuishio/superbwarfare/tools/GunsTool.java
@@ -56,7 +56,7 @@ public class GunsTool {
     // TODO 临时使用，移植完毕后删除
     private static final Set<String> 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");
+            "RPM", "Magazine", "MinZoom", "MaxZoom", "CustomZoom", "ExplosionDamage");
 
     public static void initGun(Level level, ItemStack stack, String location) {
         if (level.getServer() == null) return;
diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json
index 98ee92681..55e458af2 100644
--- a/src/main/resources/data/superbwarfare/guns/javelin.json
+++ b/src/main/resources/data/superbwarfare/guns/javelin.json
@@ -1,7 +1,6 @@
 {
   "CustomZoom": 1.75,
   "Spread": 5,
-  "zoomSpread": 5,
   "Magazine": 1,
   "Weight": 10,
   "EmptyReloadTime": 78,