Rad & acid resistance tags

src/main/java/com/github/alexmodguy/alexscaves/server/block/AcidBlock.java

@@ -59,15 +59,15 @@ public void entityInside(BlockState blockState, Level level, BlockPos pos, Entit
                 for (EquipmentSlot slot : EquipmentSlot.values()) {
                     if (slot.isArmor()) {
                         ItemStack item = living.getItemBySlot(slot);
-                        if (item != null && item.isDamageableItem() && !(item.getItem() instanceof HazmatArmorItem)) {
+                        if (item != null && item.isDamageableItem() && !(living.getItemBySlot(slot).is(ACTagRegistry.ACID_PROT))) {
                             armor = true;
                             if (living.getRandom().nextFloat() < 0.05F && !(entity instanceof Player player && player.isCreative())) {
                                 item.hurtAndBreak(1, living, e -> e.broadcastBreakEvent(slot));
                             }
                         }
                     }
                 }
-                dmgMultiplier = 1.0F - (HazmatArmorItem.getWornAmount(living) / 4F);
+                dmgMultiplier = 1.0F - (HazmatArmorItem.getAcidAmount(living) / 4F);
             }
             if (armor) {
                 ACAdvancementTriggerRegistry.ENTER_ACID_WITH_ARMOR.triggerForEntity(entity);

src/main/java/com/github/alexmodguy/alexscaves/server/item/HazmatArmorItem.java

@@ -1,6 +1,7 @@
 package com.github.alexmodguy.alexscaves.server.item;
 
 import com.github.alexmodguy.alexscaves.AlexsCaves;
+import com.github.alexmodguy.alexscaves.server.misc.ACTagRegistry;
 import com.github.alexmodguy.alexscaves.client.particle.ACParticleRegistry;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
@@ -52,16 +53,33 @@ public String getArmorTexture(ItemStack stack, Entity entity, EquipmentSlot slot
 
     public static int getWornAmount(LivingEntity entity) {
         int i = 0;
-        if (entity.getItemBySlot(EquipmentSlot.HEAD).is(ACItemRegistry.HAZMAT_MASK.get())) {
+        if (entity.getItemBySlot(EquipmentSlot.HEAD).is(ACTagRegistry.HAZMAT_PROT)) {
             i++;
         }
-        if (entity.getItemBySlot(EquipmentSlot.CHEST).is(ACItemRegistry.HAZMAT_CHESTPLATE.get())) {
+        if (entity.getItemBySlot(EquipmentSlot.CHEST).is(ACTagRegistry.HAZMAT_PROT)) {
             i++;
         }
-        if (entity.getItemBySlot(EquipmentSlot.LEGS).is(ACItemRegistry.HAZMAT_LEGGINGS.get())) {
+        if (entity.getItemBySlot(EquipmentSlot.LEGS).is(ACTagRegistry.HAZMAT_PROT)) {
             i++;
         }
-        if (entity.getItemBySlot(EquipmentSlot.FEET).is(ACItemRegistry.HAZMAT_BOOTS.get())) {
+        if (entity.getItemBySlot(EquipmentSlot.FEET).is(ACTagRegistry.HAZMAT_PROT)) {
+            i++;
+        }
+        return i;
+    }
+
+    public static int getAcidAmount(LivingEntity entity) {
+        int i = 0;
+        if (entity.getItemBySlot(EquipmentSlot.HEAD).is(ACTagRegistry.ACID_PROT)) {
+            i++;
+        }
+        if (entity.getItemBySlot(EquipmentSlot.CHEST).is(ACTagRegistry.ACID_PROT)) {
+            i++;
+        }
+        if (entity.getItemBySlot(EquipmentSlot.LEGS).is(ACTagRegistry.ACID_PROT)) {
+            i++;
+        }
+        if (entity.getItemBySlot(EquipmentSlot.FEET).is(ACTagRegistry.ACID_PROT)) {
             i++;
         }
         return i;

src/main/java/com/github/alexmodguy/alexscaves/server/misc/ACTagRegistry.java

@@ -93,6 +93,8 @@ public class ACTagRegistry {
     public static final TagKey<Structure> GINGERBREAD_MEN_WANDER_THROUGH = registerStructureTag("gingerbread_men_wander_through");
     public static final TagKey<DamageType> DEEP_ONE_IGNORES = registerDamageTypeTag("deep_one_ignores");
     public static final TagKey<Fluid> DOES_NOT_FLOW_INTO_WATERLOGGABLE_BLOCKS = registerFluidTag("does_not_flow_into_waterloggable_blocks");
+    public static final TagKey<Item> HAZMAT_PROT = registerItemTag("hazmat_prot");
+    public static final TagKey<Item> ACID_PROT = registerItemTag("acid_prot");
 
     private static TagKey<EntityType<?>> registerEntityTag(String name) {
         return TagKey.create(Registries.ENTITY_TYPE, new ResourceLocation(AlexsCaves.MODID, name));

src/main/resources/data/alexscaves/tags/items/acid_prot.json

@@ -0,0 +1,8 @@
+{
+    "values": [
+      "alexscaves:hazmat_mask",
+      "alexscaves:hazmat_chestplate",
+      "alexscaves:hazmat_leggings",
+      "alexscaves:hazmat_boots"
+    ]
+  }

src/main/resources/data/alexscaves/tags/items/hazmat_prot.json

@@ -0,0 +1,8 @@
+{
+    "values": [
+      "alexscaves:hazmat_mask",
+      "alexscaves:hazmat_chestplate",
+      "alexscaves:hazmat_leggings",
+      "alexscaves:hazmat_boots"
+    ]
+  }