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 74b3e4eeb..3218e8555 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 @@ -7,6 +7,7 @@ import net.minecraft.world.effect.MobEffects import net.minecraft.world.item.Items import net.minecraft.world.item.Tiers import net.minecraft.world.level.block.Blocks +import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.registry.MBlockTags import ru.dbotthepony.mc.otm.registry.MBlocks import ru.dbotthepony.mc.otm.registry.MItemTags @@ -20,6 +21,7 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.dusts.add("tritanium", MItems.TRITANIUM_DUST) tagsProvider.ingots.add("tritanium", MItems.TRITANIUM_INGOT) + tagsProvider.items.Appender(ItemTags.BEACON_PAYMENT_ITEMS).add(MItems.TRITANIUM_INGOT) tagsProvider.plates.add("tritanium", MItems.TRITANIUM_PLATE) tagsProvider.plates.add("iron", MItems.IRON_PLATE) @@ -30,6 +32,7 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK) tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK) + tagsProvider.blocks.Appender(BlockTags.BEACON_BASE_BLOCKS).add(MBlocks.TRITANIUM_INGOT_BLOCK) tagsProvider.stoneOre("tritanium", MBlocks.TRITANIUM_ORE) tagsProvider.deepslateOre("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE) @@ -91,29 +94,30 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.blocks.Appender(MBlockTags.MACHINES).add(MItems.MACHINES.stream().map { it!!.block }) tagsProvider.blocks.Appender(BlockTags.ANVIL).add(MBlocks.TRITANIUM_ANVIL) + tagsProvider.items.Appender(ItemTags.ANVIL).add(MItems.TRITANIUM_ANVIL) tagsProvider.items.Appender(MItemTags.TRITANIUM_NUGGETS).add(MItems.TRITANIUM_NUGGET) tagsProvider.items.Appender(MItemTags.NUGGETS).add(MItems.TRITANIUM_NUGGET) - tagsProvider.items.forge("armors") - .add("helmets", MItems.TRITANIUM_HELMET) - .add("chestplates", MItems.TRITANIUM_CHESTPLATE) - .add("leggings", MItems.TRITANIUM_PANTS) - .add("boots", MItems.TRITANIUM_BOOTS) - .add("helmets", MItems.SIMPLE_TRITANIUM_HELMET) - .add("chestplates", MItems.SIMPLE_TRITANIUM_CHESTPLATE) - .add("leggings", MItems.SIMPLE_TRITANIUM_PANTS) - .add("boots", MItems.SIMPLE_TRITANIUM_BOOTS) + tagsProvider.items.Appender(Tags.Items.ARMORS_HELMETS) + .add(MItems.TRITANIUM_HELMET, MItems.SIMPLE_TRITANIUM_HELMET) + tagsProvider.items.Appender(Tags.Items.ARMORS_CHESTPLATES) + .add(MItems.TRITANIUM_CHESTPLATE, MItems.SIMPLE_TRITANIUM_CHESTPLATE) + tagsProvider.items.Appender(Tags.Items.ARMORS_LEGGINGS) + .add(MItems.TRITANIUM_PANTS, MItems.SIMPLE_TRITANIUM_PANTS) + tagsProvider.items.Appender(Tags.Items.ARMORS_BOOTS) + .add(MItems.TRITANIUM_BOOTS, MItems.SIMPLE_TRITANIUM_BOOTS) - tagsProvider.items.minecraft("trimmable_armor").add(MItems.SIMPLE_TRITANIUM_ARMOR) + tagsProvider.items.Appender(ItemTags.TRIMMABLE_ARMOR).add(MItems.SIMPLE_TRITANIUM_ARMOR) + tagsProvider.items.Appender(ItemTags.FREEZE_IMMUNE_WEARABLES).add(MItems.TRITANIUM_ARMOR) - tagsProvider.items.minecraft("swords").add(MItems.TRITANIUM_SWORD) - tagsProvider.items.minecraft("axes").add(MItems.TRITANIUM_AXE) - tagsProvider.items.minecraft("pickaxes").add(MItems.TRITANIUM_PICKAXE) - tagsProvider.items.minecraft("shovels").add(MItems.TRITANIUM_SHOVEL) - tagsProvider.items.minecraft("hoes").add(MItems.TRITANIUM_HOE) - tagsProvider.items.forge("shears").add(MItems.TRITANIUM_SHEARS) - tagsProvider.items.forge("shields").add(MItems.TRITANIUM_SHIELD) + tagsProvider.items.Appender(ItemTags.SWORDS).add(MItems.TRITANIUM_SWORD).add(MItems.ENERGY_SWORD) + tagsProvider.items.Appender(ItemTags.AXES).add(MItems.TRITANIUM_AXE) + tagsProvider.items.Appender(ItemTags.PICKAXES).add(MItems.TRITANIUM_PICKAXE) + tagsProvider.items.Appender(ItemTags.SHOVELS).add(MItems.TRITANIUM_SHOVEL) + tagsProvider.items.Appender(ItemTags.SHOVELS).add(MItems.TRITANIUM_HOE) + tagsProvider.items.Appender(Tags.Items.SHEARS).add(MItems.TRITANIUM_SHEARS) + tagsProvider.items.Appender(Tags.Items.TOOLS_SHIELDS).add(MItems.TRITANIUM_SHIELD) tagsProvider.items.Appender(MItemTags.UPGRADES).add(MItems.CreativeUpgrades.LIST) @@ -134,6 +138,12 @@ fun addTags(tagsProvider: TagsProvider) { .add(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks) .add(MBlocks.TRITANIUM_STRIPED_WALL) + tagsProvider.items.Appender(ItemTags.STAIRS) + .add(MRegistry.FLOOR_TILES_STAIRS.items.values) + .add(MRegistry.TRITANIUM_STAIRS.allItems.values) + .add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatItems) + .add(MItems.TRITANIUM_STRIPED_STAIRS) + tagsProvider.items.Appender(ItemTags.SLABS) .add(MRegistry.TRITANIUM_SLAB.allItems.values) .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatItems) @@ -257,6 +267,8 @@ fun addTags(tagsProvider: TagsProvider) { MBlockTags.CARGO_CRATES, ) + tagsProvider.impermeable.add(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) + tagsProvider.androidImmuneEffects.add( MobEffects.CONDUIT_POWER, MobEffects.HEAL, 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 636f88fa5..b40a2b563 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 @@ -14,6 +14,7 @@ import net.minecraft.world.item.Item import net.minecraft.world.item.Tier import net.minecraft.world.item.Tiers import net.minecraft.world.level.block.Block +import net.minecraftforge.common.Tags import net.minecraftforge.data.event.GatherDataEvent import net.minecraftforge.registries.ForgeRegistries import net.minecraftforge.registries.IForgeRegistry @@ -183,6 +184,7 @@ class TagsProvider(private val event: GatherDataEvent) { val witherImmune = blocks.Appender(BlockTags.WITHER_IMMUNE) val dragonImmune = blocks.Appender(BlockTags.DRAGON_IMMUNE) val guardedByPiglins = blocks.Appender(BlockTags.GUARDED_BY_PIGLINS) + val impermeable = blocks.Appender(BlockTags.IMPERMEABLE) fun stoneOre(key: String, block: Block): TagsProvider { ore(key, block) @@ -244,28 +246,28 @@ class TagsProvider(private val event: GatherDataEvent) { } val circuits = items.forge("circuits") - val dusts = items.forge("dusts") - val ingots = items.forge("ingots") - val itemOres = items.forge("ores") - val blockOres = blocks.forge("ores") + val dusts = items.Appender(Tags.Items.DUSTS) + val ingots = items.Appender(Tags.Items.INGOTS) + val itemOres = items.Appender(Tags.Items.ORES) + val blockOres = blocks.Appender(Tags.Blocks.ORES) val plates = items.forge("plates") - val storageBlocksAsItem = items.forge("storage_blocks") - val storageBlocksAsBlock = blocks.forge("storage_blocks") - val rawMaterials = items.forge("raw_materials") + val storageBlocksAsItem = items.Appender(Tags.Items.STORAGE_BLOCKS) + val storageBlocksAsBlock = blocks.Appender(Tags.Blocks.STORAGE_BLOCKS) + val rawMaterials = items.Appender(Tags.Items.RAW_MATERIALS) val wires = items.forge("wires") - val blockGroundOresStone = blocks.forge("ores_in_ground/stone") - val blockGroundOresDeepslate = blocks.forge("ores_in_ground/deepslate") + val blockGroundOresStone = blocks.Appender(Tags.Blocks.ORES_IN_GROUND_STONE) + val blockGroundOresDeepslate = blocks.Appender(Tags.Blocks.ORES_IN_GROUND_DEEPSLATE) // val blockGroundOresNetherrack = blocks.forge("ores_in_ground/netherrack") - val itemGroundOresStone = items.forge("ores_in_ground/stone") - val itemGroundOresDeepslate = items.forge("ores_in_ground/deepslate") + val itemGroundOresStone = items.Appender(Tags.Items.ORES_IN_GROUND_STONE) + val itemGroundOresDeepslate = items.Appender(Tags.Items.ORES_IN_GROUND_DEEPSLATE) // val itemGroundOresNetherrack = items.forge("ores_in_ground/netherrack") // val blockOreRatesSparse = blocks.forge("ore_rates/sparse") - val blockOreRatesSingular = blocks.forge("ore_rates/singular") + val blockOreRatesSingular = blocks.Appender(Tags.Blocks.ORE_RATES_SINGULAR) // val blockOreRatesDense = blocks.forge("ore_rates/dense") // val itemOreRatesSparse = items.forge("ore_rates/sparse") - val itemOreRatesSingular = items.forge("ore_rates/singular") + val itemOreRatesSingular = items.Appender(Tags.Items.ORE_RATES_SINGULAR) // val itemOreRatesDense = items.forge("ore_rates/dense") val gameEvents = Delegate(Registries.GAME_EVENT)