From 908390d649ad07ab038b3473b091bca2129b5526 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Thu, 8 Aug 2024 19:43:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96=E6=AD=A6?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84tips?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../superbwarfare/entity/SenpaiEntity.java         |  1 -
 .../superbwarfare/entity/Target1Entity.java        | 14 --------------
 .../mcreator/superbwarfare/tools/TooltipTool.java  | 12 +++++++++++-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java
index 5db93ad07..2b0a00958 100644
--- a/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java
+++ b/src/main/java/net/mcreator/superbwarfare/entity/SenpaiEntity.java
@@ -207,7 +207,6 @@ public class SenpaiEntity extends Spider implements GeoEntity, AnimatedEntity {
     @Override
     public void die(DamageSource source) {
         super.die(source);
-        this.setPose(Pose.SLEEPING);
     }
 
     @Override
diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java
index c93243229..3e2af425c 100644
--- a/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java
+++ b/src/main/java/net/mcreator/superbwarfare/entity/Target1Entity.java
@@ -119,20 +119,6 @@ public class Target1Entity extends PathfinderMob implements GeoEntity, AnimatedE
         return super.hurt(source, amount);
     }
 
-//    @Override
-//    public SpawnGroupData finalizeSpawn(ServerLevelAccessor world, DifficultyInstance difficulty, MobSpawnType reason, @Nullable SpawnGroupData livingdata, @Nullable CompoundTag tag) {
-//        SpawnGroupData data = super.finalizeSpawn(world, difficulty, reason, livingdata, tag);
-//
-//        this.setYRot(0);
-//        this.setXRot(0);
-//        this.setYBodyRot(this.getYRot());
-//        this.setYHeadRot(this.getYRot());
-//        this.yRotO = this.getYRot();
-//        this.xRotO = this.getXRot();
-//
-//        return data;
-//    }
-
     @Override
     public void addAdditionalSaveData(CompoundTag compound) {
         super.addAdditionalSaveData(compound);
diff --git a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
index b8ae5635c..71e5cb735 100644
--- a/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
+++ b/src/main/java/net/mcreator/superbwarfare/tools/TooltipTool.java
@@ -1,6 +1,7 @@
 package net.mcreator.superbwarfare.tools;
 
 import net.mcreator.superbwarfare.entity.DroneEntity;
+import net.mcreator.superbwarfare.perk.AmmoPerk;
 import net.mcreator.superbwarfare.perk.Perk;
 import net.mcreator.superbwarfare.perk.PerkHelper;
 import net.minecraft.ChatFormatting;
@@ -51,6 +52,7 @@ public class TooltipTool {
 
         addLevelTips(tooltip, stack);
         addBypassTips(tooltip, stack);
+        addPerkTips(tooltip, stack);
     }
 
     private static void addLevelTips(List<Component> tooltip, ItemStack stack) {
@@ -77,7 +79,13 @@ public class TooltipTool {
     }
 
     private static void addBypassTips(List<Component> tooltip, ItemStack stack) {
-        double byPassRate = ItemNBTTool.getDouble(stack, "BypassesArmor", 0);
+
+        double perkbypassArmorRate = 0;
+        var perk = PerkHelper.getPerkByType(stack, Perk.Type.AMMO);
+        if (perk instanceof AmmoPerk ammoPerk) {
+            perkbypassArmorRate = ammoPerk.bypassArmorRate;
+        }
+        double byPassRate = ItemNBTTool.getDouble(stack, "BypassesArmor", 0) + perkbypassArmorRate;
 
         tooltip.add(Component.translatable("des.superbwarfare.tips.bypass").withStyle(ChatFormatting.GRAY)
                 .append(Component.literal("").withStyle(ChatFormatting.RESET))
@@ -138,6 +146,7 @@ public class TooltipTool {
 
         addLevelTips(tooltip, stack);
         addBypassTips(tooltip, stack);
+        addPerkTips(tooltip, stack);
     }
 
     public static void addSentinelTips(List<Component> tooltip, ItemStack stack) {
@@ -167,6 +176,7 @@ public class TooltipTool {
 
         addLevelTips(tooltip, stack);
         addBypassTips(tooltip, stack);
+        addPerkTips(tooltip, stack);
 
         stack.getCapability(ForgeCapabilities.ENERGY).ifPresent(
                 e -> tooltip.add(Component.literal(e.getEnergyStored() + " / " + e.getMaxEnergyStored() + " FE").withStyle(ChatFormatting.GRAY))