diff --git a/src/main/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json b/src/generated/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json
similarity index 91%
rename from src/main/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json
rename to src/generated/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json
index 6a139e606..350fd0c20 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/always_hurts_ender_dragons.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:projectile_boom",
     "superbwarfare:custom_explosion",
diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
similarity index 78%
rename from src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json
rename to src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
index a27494e02..a1f59ca50 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_armor.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:gunfire_absolute",
     "superbwarfare:gunfire_headshot_absolute",
@@ -7,9 +6,9 @@
     "superbwarfare:cannon_fire",
     "superbwarfare:laser",
     "superbwarfare:laser_headshot",
+    "superbwarfare:laser_static",
     "superbwarfare:vehicle_strike",
     "superbwarfare:vehicle_explosion",
-    "superbwarfare:air_crash",
-    "superbwarfare:laser_static"
+    "superbwarfare:air_crash"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
similarity index 78%
rename from src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json
rename to src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
index 408df7e44..a1f59ca50 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_effects.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_effects.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:gunfire_absolute",
     "superbwarfare:gunfire_headshot_absolute",
@@ -7,9 +6,9 @@
     "superbwarfare:cannon_fire",
     "superbwarfare:laser",
     "superbwarfare:laser_headshot",
+    "superbwarfare:laser_static",
     "superbwarfare:vehicle_strike",
-    "superbwarfare:air_crash",
     "superbwarfare:vehicle_explosion",
-    "superbwarfare:laser_static"
+    "superbwarfare:air_crash"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
similarity index 78%
rename from src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
rename to src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
index 408df7e44..a1f59ca50 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_enchantments.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:gunfire_absolute",
     "superbwarfare:gunfire_headshot_absolute",
@@ -7,9 +6,9 @@
     "superbwarfare:cannon_fire",
     "superbwarfare:laser",
     "superbwarfare:laser_headshot",
+    "superbwarfare:laser_static",
     "superbwarfare:vehicle_strike",
-    "superbwarfare:air_crash",
     "superbwarfare:vehicle_explosion",
-    "superbwarfare:laser_static"
+    "superbwarfare:air_crash"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
similarity index 78%
rename from src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
rename to src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
index 408df7e44..a1f59ca50 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_resistance.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:gunfire_absolute",
     "superbwarfare:gunfire_headshot_absolute",
@@ -7,9 +6,9 @@
     "superbwarfare:cannon_fire",
     "superbwarfare:laser",
     "superbwarfare:laser_headshot",
+    "superbwarfare:laser_static",
     "superbwarfare:vehicle_strike",
-    "superbwarfare:air_crash",
     "superbwarfare:vehicle_explosion",
-    "superbwarfare:laser_static"
+    "superbwarfare:air_crash"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/damage_type/is_explosion.json b/src/generated/resources/data/minecraft/tags/damage_type/is_explosion.json
similarity index 86%
rename from src/main/resources/data/minecraft/tags/damage_type/is_explosion.json
rename to src/generated/resources/data/minecraft/tags/damage_type/is_explosion.json
index 53da754e4..54c1909b4 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/is_explosion.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/is_explosion.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:projectile_boom",
     "superbwarfare:custom_explosion",
diff --git a/src/main/resources/data/minecraft/tags/damage_type/is_fire.json b/src/generated/resources/data/minecraft/tags/damage_type/is_fire.json
similarity index 69%
rename from src/main/resources/data/minecraft/tags/damage_type/is_fire.json
rename to src/generated/resources/data/minecraft/tags/damage_type/is_fire.json
index 1cc272e83..8e96704ed 100644
--- a/src/main/resources/data/minecraft/tags/damage_type/is_fire.json
+++ b/src/generated/resources/data/minecraft/tags/damage_type/is_fire.json
@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "superbwarfare:burn"
   ]
diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java
index 94c7e7f4d..591832090 100644
--- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java
+++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModDamageTypeTagProvider.java
@@ -7,6 +7,7 @@ import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.tags.DamageTypeTagsProvider;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.DamageTypeTags;
 import net.minecraft.world.damagesource.DamageTypes;
 import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
@@ -39,5 +40,22 @@ public class ModDamageTypeTagProvider extends DamageTypeTagsProvider {
                 .addOptional(ResourceLocation.fromNamespaceAndPath("sona", "injury"));
         this.tag(ModTags.DamageTypes.VEHICLE_NOT_ABSORB)
                 .add(DamageTypes.EXPLOSION, DamageTypes.PLAYER_EXPLOSION, ModDamageTypes.CUSTOM_EXPLOSION, ModDamageTypes.MINE, ModDamageTypes.PROJECTILE_BOOM);
+
+        this.tag(DamageTypeTags.ALWAYS_HURTS_ENDER_DRAGONS).add(ModDamageTypes.PROJECTILE_BOOM, ModDamageTypes.CUSTOM_EXPLOSION,
+                ModDamageTypes.CANNON_FIRE, ModDamageTypes.LASER, ModDamageTypes.LASER_HEADSHOT, ModDamageTypes.LASER_STATIC);
+        this.tag(DamageTypeTags.BYPASSES_ARMOR).add(ModDamageTypes.GUN_FIRE_ABSOLUTE, ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE,
+                ModDamageTypes.SHOCK, ModDamageTypes.CANNON_FIRE, ModDamageTypes.LASER, ModDamageTypes.LASER_HEADSHOT, ModDamageTypes.LASER_STATIC,
+                ModDamageTypes.VEHICLE_STRIKE, ModDamageTypes.VEHICLE_EXPLOSION, ModDamageTypes.AIR_CRASH);
+        this.tag(DamageTypeTags.BYPASSES_EFFECTS).add(ModDamageTypes.GUN_FIRE_ABSOLUTE, ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE,
+                ModDamageTypes.SHOCK, ModDamageTypes.CANNON_FIRE, ModDamageTypes.LASER, ModDamageTypes.LASER_HEADSHOT, ModDamageTypes.LASER_STATIC,
+                ModDamageTypes.VEHICLE_STRIKE, ModDamageTypes.VEHICLE_EXPLOSION, ModDamageTypes.AIR_CRASH);
+        this.tag(DamageTypeTags.BYPASSES_ENCHANTMENTS).add(ModDamageTypes.GUN_FIRE_ABSOLUTE, ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE,
+                ModDamageTypes.SHOCK, ModDamageTypes.CANNON_FIRE, ModDamageTypes.LASER, ModDamageTypes.LASER_HEADSHOT, ModDamageTypes.LASER_STATIC,
+                ModDamageTypes.VEHICLE_STRIKE, ModDamageTypes.VEHICLE_EXPLOSION, ModDamageTypes.AIR_CRASH);
+        this.tag(DamageTypeTags.BYPASSES_RESISTANCE).add(ModDamageTypes.GUN_FIRE_ABSOLUTE, ModDamageTypes.GUN_FIRE_HEADSHOT_ABSOLUTE,
+                ModDamageTypes.SHOCK, ModDamageTypes.CANNON_FIRE, ModDamageTypes.LASER, ModDamageTypes.LASER_HEADSHOT, ModDamageTypes.LASER_STATIC,
+                ModDamageTypes.VEHICLE_STRIKE, ModDamageTypes.VEHICLE_EXPLOSION, ModDamageTypes.AIR_CRASH);
+        this.tag(DamageTypeTags.IS_EXPLOSION).add(ModDamageTypes.PROJECTILE_BOOM, ModDamageTypes.CUSTOM_EXPLOSION, ModDamageTypes.LUNGE_MINE);
+        this.tag(DamageTypeTags.IS_FIRE).add(ModDamageTypes.BURN);
     }
 }
diff --git a/src/main/resources/data/minecraft/tags/damage_type/no_knockback.json b/src/main/resources/data/minecraft/tags/damage_type/no_knockback.json
deleted file mode 100644
index d8424febb..000000000
--- a/src/main/resources/data/minecraft/tags/damage_type/no_knockback.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "replace": false,
-  "values": [
-    "superbwarfare:projectile_boom",
-    "superbwarfare:custom_explosion",
-    "superbwarfare:laser",
-    "superbwarfare:laser_headshot",
-    "superbwarfare:laser_static"
-  ]
-}
\ No newline at end of file