feat!: add tag to replace config as soul gem entity deny list

klikli-dev · Aug 3, 2023 · 5e251a6 · 5e251a6
1 parent c1a13d2
commit 5e251a6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java b/src/main/java/com/klikli_dev/occultism/common/item/tool/SoulGemItem.java
@@ -23,6 +23,7 @@
 package com.klikli_dev.occultism.common.item.tool;
 
 import com.klikli_dev.occultism.Occultism;
+import com.klikli_dev.occultism.registry.OccultismTags;
 import com.klikli_dev.occultism.util.EntityUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -138,7 +139,7 @@ public InteractionResult interactLivingEntity(ItemStack stack, Player player, Li
             return InteractionResult.FAIL;
 
         //do not capture entities on deny lists
-        if (Occultism.SERVER_CONFIG.itemSettings.soulgemEntityTypeDenyList.get().contains(target.getEncodeId())) {
+        if (target.getType().is(OccultismTags.SOUL_GEM_DENY_LIST)) {
             player.sendSystemMessage(
                     Component.translatable(this.getDescriptionId() + ".message.entity_type_denied"));
             return InteractionResult.FAIL;

diff --git a/src/main/java/com/klikli_dev/occultism/config/OccultismServerConfig.java b/src/main/java/com/klikli_dev/occultism/config/OccultismServerConfig.java
@@ -53,18 +53,10 @@ public OccultismServerConfig() {
     }
 
     public static class ItemSettings {
-        public final ConfigValue<List<String>> soulgemEntityTypeDenyList;
 
         public ItemSettings(ForgeConfigSpec.Builder builder) {
             builder.comment("Item Settings").push("items");
 
-            List<String> defaultSoulgemEntityDenyList =
-                    Stream.of("minecraft:wither", "minecraft:ender_dragon")
-                            .collect(Collectors.toList());
-            this.soulgemEntityTypeDenyList =
-                    builder.comment("Entity types that cannot be captured in a soul gem. Specify by their full id, e.g \"minecraft:zombie\"")
-                            .define("soulgemEntityDenyList", defaultSoulgemEntityDenyList);
-
             builder.pop();
         }
     }

diff --git a/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java b/src/main/java/com/klikli_dev/occultism/registry/OccultismTags.java
@@ -45,6 +45,7 @@ public class OccultismTags {
     public static final TagKey<Item> FRUITS = makeItemTag(new ResourceLocation("forge", "fruits"));
 
     //Entity Tags
+    public static final TagKey<EntityType<?>> SOUL_GEM_DENY_LIST = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "soul_gem_deny_list"));
     public static final TagKey<EntityType<?>> AFRIT_ALLIES = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "afrit_allies"));
     public static final TagKey<EntityType<?>> WILD_HUNT = makeEntityTypeTag(new ResourceLocation(Occultism.MODID, "wild_hunt"));
 

diff --git a/src/main/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json b/src/main/resources/data/occultism/tags/entity_types/soul_gem_deny_list.json
@@ -0,0 +1,7 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:wither",
+    "minecraft:ender_dragon"
+  ]
+}