diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt index aaf8e4147..2b23f8acf 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -228,4 +228,21 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.witherImmune.add( MBlocks.BLACK_HOLE, ) + + tagsProvider.androidImmuneEffects.add( + MobEffects.CONDUIT_POWER, + MobEffects.HEAL, + // maybe it makes things go haywire idk + // MobEffects.HARM, + MobEffects.REGENERATION, + MobEffects.WATER_BREATHING, + MobEffects.POISON, + // even skeletons can be withered + // MobEffects.WITHER, + MobEffects.HEALTH_BOOST, + MobEffects.ABSORPTION, + MobEffects.SATURATION, + MobEffects.DOLPHINS_GRACE, + MobEffects.CONFUSION, + ) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt index 4abe105c9..67bbdcb67 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt @@ -187,6 +187,8 @@ class TagsProvider( val items = Delegate(ForgeRegistries.ITEMS) val mobEffects = Delegate(ForgeRegistries.MOB_EFFECTS) + val androidImmuneEffects = mobEffects.appender(MatteryPlayerCapability.ANDROID_IMMUNE_EFFECTS) + val requiresShovel = blocks.appender(BlockTags.MINEABLE_WITH_SHOVEL) val requiresAxe = blocks.appender(BlockTags.MINEABLE_WITH_AXE) val requiresHoe = blocks.appender(BlockTags.MINEABLE_WITH_HOE) diff --git a/src/main/resources/data/overdrive_that_matters/tags/mob_effect/android_immune_effects.json b/src/main/resources/data/overdrive_that_matters/tags/mob_effect/android_immune_effects.json deleted file mode 100644 index 40a9eca7b..000000000 --- a/src/main/resources/data/overdrive_that_matters/tags/mob_effect/android_immune_effects.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "values": [ - "minecraft:conduit_power", - "minecraft:instant_health", - "minecraft:regeneration", - "minecraft:water_breathing", - "minecraft:poison", - "minecraft:health_boost", - "minecraft:absorption", - "minecraft:saturation", - "minecraft:dolphins_grace", - "minecraft:nausea", - "hordes:infected" - ] -} \ No newline at end of file