From 1353b8f4a43f33e40a5748e5dae53106f54e38b0 Mon Sep 17 00:00:00 2001
From: Reece Mackie <20544390+Rover656@users.noreply.github.com>
Date: Sun, 30 Jul 2023 16:52:33 +0100
Subject: [PATCH 1/2] Check boss tag

---
 .../com/enderio/base/common/util/EntityCaptureUtils.java   | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java b/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java
index 2773244d2e..9c7ed556b8 100644
--- a/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java
+++ b/src/main/java/com/enderio/base/common/util/EntityCaptureUtils.java
@@ -10,6 +10,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.DefaultAttributes;
+import net.minecraftforge.common.Tags;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.jetbrains.annotations.Nullable;
 
@@ -87,10 +88,6 @@ public static CapturableStatus getCapturableStatus(EntityType<? extends LivingEn
     }
 
     public static boolean isBlacklistedBoss(Entity entity) {
-        return EntityUtil.getEntityTypeRL(entity)
-            .map(resourceLocation ->
-                EntityUtil.isBoss(entity)
-                && !"minecraft".equals(resourceLocation.getNamespace()))
-            .orElse(false);
+        return entity.getType().is(Tags.EntityTypes.BOSSES);
     }
 }

From 2be26fe307d28208b6bc3fd9407c1c1cec31fad3 Mon Sep 17 00:00:00 2001
From: Reece Mackie <20544390+Rover656@users.noreply.github.com>
Date: Sun, 30 Jul 2023 16:55:03 +0100
Subject: [PATCH 2/2] Remove old bosses blacklist

---
 .../data/enderio/tags/entity_types/soul_vial_blacklist.json   | 4 +---
 .../com/enderio/base/data/tags/EIOEntityTagsProvider.java     | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json b/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json
index e80aa5aa66..f72d209df7 100644
--- a/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json
+++ b/src/generated/resources/data/enderio/tags/entity_types/soul_vial_blacklist.json
@@ -1,5 +1,3 @@
 {
-  "values": [
-    "#forge:bosses"
-  ]
+  "values": []
 }
\ No newline at end of file
diff --git a/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java b/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java
index a3d563746b..41aac752f5 100644
--- a/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java
+++ b/src/main/java/com/enderio/base/data/tags/EIOEntityTagsProvider.java
@@ -18,6 +18,6 @@ public EIOEntityTagsProvider(PackOutput packOutput, CompletableFuture<HolderLook
 
     @Override
     protected void addTags(HolderLookup.Provider pProvider) {
-        this.tag(EIOTags.EntityTypes.SOUL_VIAL_BLACKLIST).addTag(Tags.EntityTypes.BOSSES);
+        this.tag(EIOTags.EntityTypes.SOUL_VIAL_BLACKLIST);
     }
 }