From 4888dad2dde7becce7a374da1d8ddb2ce475a330 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 20 Jan 2025 20:40:30 +0700 Subject: [PATCH] Split tags file into several files --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 10 + .../mc/otm/datagen/tags/ConstructionTags.kt | 105 ++++++ .../mc/otm/datagen/tags/DyeTags.kt | 54 +++ .../mc/otm/datagen/tags/EquipmentTags.kt | 46 +++ .../mc/otm/datagen/tags/MineableTags.kt | 124 +++++++ .../mc/otm/datagen/tags/ResourceTags.kt | 61 ++++ .../dbotthepony/mc/otm/datagen/tags/Tags.kt | 336 +----------------- .../dbotthepony/mc/otm/registry/MBlockTags.kt | 2 + 8 files changed, 408 insertions(+), 330 deletions(-) create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt index 29c59f6b5..71e0d09db 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -48,6 +48,11 @@ import ru.dbotthepony.mc.otm.datagen.loot.* import ru.dbotthepony.mc.otm.datagen.loot.LootModifiers import ru.dbotthepony.mc.otm.datagen.recipes.* import ru.dbotthepony.mc.otm.datagen.tags.TagsProvider +import ru.dbotthepony.mc.otm.datagen.tags.addConstructionTags +import ru.dbotthepony.mc.otm.datagen.tags.addDyeTags +import ru.dbotthepony.mc.otm.datagen.tags.addEquipmentTags +import ru.dbotthepony.mc.otm.datagen.tags.addMineableTags +import ru.dbotthepony.mc.otm.datagen.tags.addResourceTags import ru.dbotthepony.mc.otm.datagen.tags.addSuspiciousTags import ru.dbotthepony.mc.otm.datagen.tags.addTags import ru.dbotthepony.mc.otm.datagen.textures.ColorizedSpritesProvider @@ -517,6 +522,11 @@ object DataGen { addTags(tagsProvider) addSuspiciousTags(tagsProvider) + addConstructionTags(tagsProvider) + addResourceTags(tagsProvider) + addEquipmentTags(tagsProvider) + addMineableTags(tagsProvider) + addDyeTags(tagsProvider) event.generator.addProvider(event.includeClient(), colorizedSpritesProvider) event.generator.addProvider(event.includeClient(), blockModelProvider) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt new file mode 100644 index 000000000..628aad72f --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ConstructionTags.kt @@ -0,0 +1,105 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import net.minecraft.tags.BlockTags +import net.minecraft.tags.ItemTags +import net.minecraft.world.item.Items +import net.minecraft.world.level.block.Blocks +import ru.dbotthepony.mc.otm.registry.MBlockTags +import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.MRegistry + +fun addConstructionTags(tagsProvider: TagsProvider) { + tagsProvider.blocks.Appender(BlockTags.BEACON_BASE_BLOCKS).add(MBlocks.TRITANIUM_INGOT_BLOCK) + + tagsProvider.blocks.Appender(MBlockTags.MULTIBLOCK_STRUCTURE) + .add(MBlockTags.MULTIBLOCK_HARD_STRUCTURE, MBlockTags.MULTIBLOCK_SOFT_STRUCTURE) + + tagsProvider.blocks.Appender(MBlockTags.MULTIBLOCK_SOFT_STRUCTURE) + .add(MBlockTags.HARDENED_GLASS) + + tagsProvider.blocks.Appender(MBlockTags.MULTIBLOCK_HARD_STRUCTURE) + .add(MRegistry.VENT.allBlocks.values) + .add(MRegistry.VENT_ALTERNATIVE.allBlocks.values) + .add(MRegistry.TRITANIUM_BLOCK.allBlocks.values) + .add(MRegistry.TRITANIUM_STRIPED_BLOCK.blocks.values.stream().flatMap { it.values.stream() }) + + tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES).add(Items.CRAFTING_TABLE) + tagsProvider.items.Appender(MItemTags.WORKBENCHES).add(Items.CRAFTING_TABLE) + tagsProvider.items.Appender(MItemTags.WORKBENCH).add(Items.CRAFTING_TABLE) + tagsProvider.items.Appender(MItemTags.FURNACES).add(Items.FURNACE) + + tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE) + tagsProvider.blocks.Appender(MBlockTags.WORKBENCHES).add(Blocks.CRAFTING_TABLE) + tagsProvider.blocks.Appender(MBlockTags.WORKBENCH).add(Blocks.CRAFTING_TABLE) + + tagsProvider.items.forge("hardened_glass").add(MRegistry.INDUSTRIAL_GLASS.allItems.values) + tagsProvider.items.forge("hardened_glass/colorless").add(MRegistry.INDUSTRIAL_GLASS.item) + tagsProvider.items.forge("hardened_glass/tinted").add(MRegistry.INDUSTRIAL_GLASS.items.values) + + tagsProvider.items.forge("hardened_glass_panes").add(MRegistry.INDUSTRIAL_GLASS_PANE.allItems.values) + tagsProvider.items.forge("hardened_glass_panes/colorless").add(MRegistry.INDUSTRIAL_GLASS_PANE.item) + tagsProvider.items.forge("hardened_glass_panes/tinted").add(MRegistry.INDUSTRIAL_GLASS_PANE.items.values) + + tagsProvider.blocks.forge("hardened_glass").add(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) + tagsProvider.blocks.forge("hardened_glass/colorless").add(MRegistry.INDUSTRIAL_GLASS.block) + tagsProvider.blocks.forge("hardened_glass/tinted").add(MRegistry.INDUSTRIAL_GLASS.blocks.values) + + tagsProvider.blocks.forge("hardened_glass_panes").add(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values) + tagsProvider.blocks.forge("hardened_glass_panes/colorless").add(MRegistry.INDUSTRIAL_GLASS_PANE.block) + tagsProvider.blocks.forge("hardened_glass_panes/tinted").add(MRegistry.INDUSTRIAL_GLASS_PANE.blocks.values) + + MRegistry.INDUSTRIAL_GLASS.forEachItem { s, _, item -> tagsProvider.items.forge("hardened_glass/$s").add(item) } + MRegistry.INDUSTRIAL_GLASS_PANE.forEachItem { s, _, item -> tagsProvider.items.forge("hardened_glass_panes/$s").add(item) } + + MRegistry.INDUSTRIAL_GLASS.forEachBlock { s, _, block -> tagsProvider.blocks.forge("hardened_glass/$s").add(block) } + MRegistry.INDUSTRIAL_GLASS_PANE.forEachBlock { s, _, block -> tagsProvider.blocks.forge("hardened_glass_panes/$s").add(block) } + + tagsProvider.items.Appender(MItemTags.INDUSTRIAL_GLASS).add(MRegistry.INDUSTRIAL_GLASS.allItems.values) + tagsProvider.blocks.Appender(MBlockTags.INDUSTRIAL_GLASS).add(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) + tagsProvider.blocks.Appender(MBlockTags.CARGO_CRATES).add(MRegistry.CARGO_CRATES.allBlocks.values) + + tagsProvider.items.Appender(ItemTags.DOORS).add(MItems.TRITANIUM_DOOR.values) + tagsProvider.blocks.Appender(BlockTags.DOORS).add(MBlocks.TRITANIUM_DOOR.values) + + tagsProvider.items.Appender(ItemTags.TRAPDOORS).add(MItems.TRITANIUM_TRAPDOOR.values) + tagsProvider.blocks.Appender(BlockTags.TRAPDOORS).add(MBlocks.TRITANIUM_TRAPDOOR.values) + + tagsProvider.blocks.Appender(BlockTags.PRESSURE_PLATES).add(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values) + + tagsProvider.blocks.Appender(BlockTags.STAIRS) + .add(MRegistry.FLOOR_TILES_STAIRS.blocks.values) + .add(MRegistry.TRITANIUM_STAIRS.allBlocks.values) + .add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks) + .add(MBlocks.TRITANIUM_STRIPED_STAIRS.values) + + tagsProvider.blocks.Appender(BlockTags.SLABS) + .add(MRegistry.TRITANIUM_SLAB.allBlocks.values) + .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks) + .add(MRegistry.FLOOR_TILES_SLAB.blocks.values) + .add(MBlocks.TRITANIUM_STRIPED_SLAB.values) + + tagsProvider.blocks.Appender(BlockTags.WALLS) + .add(MRegistry.TRITANIUM_WALL.allBlocks.values) + .add(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks) + .add(MBlocks.TRITANIUM_STRIPED_WALL.values) + + 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.values) + + tagsProvider.items.Appender(ItemTags.SLABS) + .add(MRegistry.TRITANIUM_SLAB.allItems.values) + .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatItems) + .add(MRegistry.FLOOR_TILES_SLAB.items.values) + .add(MItems.TRITANIUM_STRIPED_SLAB.values) + + tagsProvider.items.Appender(ItemTags.WALLS) + .add(MRegistry.TRITANIUM_WALL.allItems.values) + .add(MRegistry.TRITANIUM_STRIPED_WALL.flatItems) + .add(MItems.TRITANIUM_STRIPED_WALL.values) + +} diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt new file mode 100644 index 000000000..37e26be08 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/DyeTags.kt @@ -0,0 +1,54 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import ru.dbotthepony.mc.otm.registry.MItems +import ru.dbotthepony.mc.otm.registry.MRegistry + +fun addDyeTags(tagsProvider: TagsProvider) { + tagsProvider.addToDyeTags(MRegistry.CARGO_CRATES.allItems) + + tagsProvider.addToDyeTags(MRegistry.INDUSTRIAL_GLASS.allItems) + tagsProvider.addToDyeTags(MRegistry.INDUSTRIAL_GLASS_PANE.allItems) + + tagsProvider.addToDyeTags(MRegistry.DECORATIVE_CRATE.items) + + tagsProvider.addToDyeTags(MItems.TRITANIUM_DOOR) + tagsProvider.addToDyeTags(MItems.TRITANIUM_TRAPDOOR) + tagsProvider.addToDyeTags(MRegistry.TRITANIUM_PRESSURE_PLATE.allItems) + + tagsProvider.addToDyeTags(MRegistry.FLOOR_TILES_STAIRS.items) + tagsProvider.addToDyeTags(MRegistry.TRITANIUM_STAIRS.items) + + tagsProvider.addToDyeTags(MRegistry.TRITANIUM_SLAB.items) + tagsProvider.addToDyeTags(MRegistry.FLOOR_TILES_SLAB.items) + tagsProvider.addToDyeTags(MRegistry.UNREFINED_FLOOR_TILES.items) + + tagsProvider.addToDyeTags(MRegistry.TRITANIUM_WALL.items) + + tagsProvider.addToDyeTags(MItems.ANDROID_STATION) + tagsProvider.addToDyeTags(MItems.ENERGY_SERVO) + tagsProvider.addToDyeTags(MItems.MATTER_DECOMPOSER) + tagsProvider.addToDyeTags(MItems.MATTER_CAPACITOR_BANK) + tagsProvider.addToDyeTags(MItems.BATTERY_BANK) + tagsProvider.addToDyeTags(MItems.MATTER_SCANNER) + tagsProvider.addToDyeTags(MItems.MATTER_PANEL) + tagsProvider.addToDyeTags(MItems.MATTER_REPLICATOR) + tagsProvider.addToDyeTags(MItems.MATTER_BOTTLER) + tagsProvider.addToDyeTags(MItems.ENERGY_COUNTER) + tagsProvider.addToDyeTags(MItems.CHEMICAL_GENERATOR) + tagsProvider.addToDyeTags(MItems.PLATE_PRESS) + tagsProvider.addToDyeTags(MItems.TWIN_PLATE_PRESS) + tagsProvider.addToDyeTags(MItems.MATTER_RECYCLER) + + tagsProvider.addToDyeTags(MItems.POWERED_FURNACE) + tagsProvider.addToDyeTags(MItems.POWERED_SMOKER) + tagsProvider.addToDyeTags(MItems.POWERED_BLAST_FURNACE) + + tagsProvider.addToDyeTags(MItems.DRIVE_VIEWER) + tagsProvider.addToDyeTags(MItems.ITEM_MONITOR) + tagsProvider.addToDyeTags(MItems.STORAGE_POWER_SUPPLIER) + + tagsProvider.addToDyeTags(MItems.COBBLESTONE_GENERATOR) + tagsProvider.addToDyeTags(MItems.ESSENCE_STORAGE) + tagsProvider.addToDyeTags(MItems.MATTER_RECONSTRUCTOR) + tagsProvider.addToDyeTags(MItems.ANDROID_CHARGER) +} diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt new file mode 100644 index 000000000..3f717dbcb --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/EquipmentTags.kt @@ -0,0 +1,46 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import net.minecraft.tags.ItemTags +import net.neoforged.neoforge.common.Tags +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems + +fun addEquipmentTags(tagsProvider: TagsProvider) { + + // TODO: is new tag appropriate for modded armors? + tagsProvider.items.Appender(Tags.Items.ARMORS) + .add(MItems.TRITANIUM_HELMET, MItems.SIMPLE_TRITANIUM_HELMET) + .add(MItems.TRITANIUM_CHESTPLATE, MItems.SIMPLE_TRITANIUM_CHESTPLATE, MItems.PORTABLE_GRAVITATION_STABILIZER) + .add(MItems.TRITANIUM_PANTS, MItems.SIMPLE_TRITANIUM_PANTS) + .add(MItems.TRITANIUM_BOOTS, MItems.SIMPLE_TRITANIUM_BOOTS) + + tagsProvider.items.Appender(ItemTags.DYEABLE).add(MItems.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.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.HOES).add(MItems.TRITANIUM_HOE) + tagsProvider.items.Appender(Tags.Items.TOOLS_SHEAR).add(MItems.TRITANIUM_SHEARS) + tagsProvider.items.Appender(Tags.Items.TOOLS_SHIELD).add(MItems.TRITANIUM_SHIELD) + + tagsProvider.items.Appender(MItemTags.TOOLS_HAMMERS).add(MItems.EXPLOSIVE_HAMMER) + tagsProvider.items.forge("tools").add(MItemTags.TOOLS_HAMMERS) + + tagsProvider.items.Appender(ItemTags.DURABILITY_ENCHANTABLE) + .add(MItems.EXPLOSIVE_HAMMER) + .add(MItems.TRITANIUM_SHEARS) + .add(MItems.TRITANIUM_SHIELD) + + tagsProvider.items.Appender(ItemTags.MINING_ENCHANTABLE) + .add(MItems.TRITANIUM_SHEARS) + + tagsProvider.items.Appender(ItemTags.EQUIPPABLE_ENCHANTABLE) + .add(MItems.PORTABLE_GRAVITATION_STABILIZER) + + tagsProvider.items.Appender(ItemTags.VANISHING_ENCHANTABLE) + .add(MItems.PORTABLE_GRAVITATION_STABILIZER) + +} diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt new file mode 100644 index 000000000..e4ff8f226 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/MineableTags.kt @@ -0,0 +1,124 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import net.minecraft.world.item.Tiers +import net.minecraft.world.level.block.Block +import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.MRegistry + +fun addMineableTags(tagsProvider: TagsProvider) { + tagsProvider.requiresPickaxe( + MBlocks.MATTER_CABLE, + MBlocks.STORAGE_CABLE + ) + + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_DOOR.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_TRAPDOOR.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.PAINTER, Tiers.STONE) + tagsProvider.requiresPickaxe(MBlocks.ENERGY_CABLES.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MBlocks.GRILL.values, Tiers.STONE) + + tagsProvider.requiresPickaxe(listOf( + *MBlocks.ANDROID_STATION.values.toTypedArray(), + *MBlocks.BATTERY_BANK.values.toTypedArray(), + *MBlocks.MATTER_DECOMPOSER.values.toTypedArray(), + *MBlocks.MATTER_CAPACITOR_BANK.values.toTypedArray(), + MBlocks.PATTERN_STORAGE, + *MBlocks.MATTER_SCANNER.values.toTypedArray(), + *MBlocks.MATTER_PANEL.values.toTypedArray(), + *MBlocks.MATTER_REPLICATOR.values.toTypedArray(), + *MBlocks.MATTER_BOTTLER.values.toTypedArray(), + *MBlocks.ENERGY_COUNTER.values.toTypedArray(), + *MBlocks.CHEMICAL_GENERATOR.values.toTypedArray(), + *MBlocks.PLATE_PRESS.values.toTypedArray(), + *MBlocks.TWIN_PLATE_PRESS.values.toTypedArray(), + *MBlocks.MATTER_RECYCLER.values.toTypedArray(), + MBlocks.MATTER_ENTANGLER, + + *MBlocks.POWERED_FURNACE.values.toTypedArray(), + *MBlocks.POWERED_SMOKER.values.toTypedArray(), + *MBlocks.POWERED_BLAST_FURNACE.values.toTypedArray(), + + MBlocks.STORAGE_BUS, + MBlocks.STORAGE_IMPORTER, + MBlocks.STORAGE_EXPORTER, + + *MBlocks.DRIVE_VIEWER.values.toTypedArray(), + MBlocks.DRIVE_RACK, + *MBlocks.ITEM_MONITOR.values.toTypedArray(), + *MBlocks.STORAGE_POWER_SUPPLIER.values.toTypedArray(), + + MBlocks.PHANTOM_ATTRACTOR, + *MBlocks.ENERGY_SERVO.values.toTypedArray(), + + MBlocks.TRITANIUM_INGOT_BLOCK, + MBlocks.METAL_JUNK, + MBlocks.METAL_MESH, + MBlocks.TRITANIUM_BARS, + MBlocks.METAL_RAILING, + + MBlocks.ENGINE, + MBlocks.HOLO_SIGN, + *MBlocks.COBBLESTONE_GENERATOR.values.toTypedArray(), + *MBlocks.ESSENCE_STORAGE.values.toTypedArray(), + *MBlocks.MATTER_RECONSTRUCTOR.values.toTypedArray(), + MBlocks.FLUID_TANK, + *MBlocks.ANDROID_CHARGER.values.toTypedArray(), + + MBlocks.BLACK_HOLE_GENERATOR, + MBlocks.ITEM_INPUT_HATCH, + MBlocks.ITEM_OUTPUT_HATCH, + ), Tiers.IRON) + + tagsProvider.requiresPickaxe(listOf( + MBlocks.DILITHIUM_ORE, + MBlocks.DEEPSLATE_DILITHIUM_ORE, + + MBlocks.GRAVITATION_STABILIZER, + MBlocks.GRAVITATION_STABILIZER_LENS, + ), Tiers.DIAMOND) + + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_ANVIL, Tiers.IRON) + + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_ORE, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.DEEPSLATE_TRITANIUM_ORE, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_RAW_BLOCK, Tiers.IRON) + + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_STAIRS.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_WALL.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_SLAB.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.CARBON_FIBRE_BLOCK, Tiers.IRON) + + tagsProvider.requiresPickaxe(MBlocks.INFINITE_WATER_SOURCE, Tiers.STONE) + + tagsProvider.requiresPickaxe(MRegistry.CARGO_CRATES.allBlocks.values, Tiers.IRON) + + tagsProvider.requiresPickaxe(MRegistry.VENT.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.COMPUTER_TERMINAL.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.STAR_CHAIR.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_SLAB.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_WALL.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STAIRS.allBlocks.values, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_BLOCK.flatBlocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks, Tiers.IRON) + + tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.blocks.values) + tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_STAIRS.blocks.values) + tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_SLAB.blocks.values) + tagsProvider.requiresShovel(MRegistry.UNREFINED_FLOOR_TILES.blocks.values) + + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.DECORATIVE_CRATE.allBlocks.values, Tiers.STONE) + + tagsProvider.requiresPickaxe(MBlocks.LABORATORY_LAMP, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.LABORATORY_LAMP_INVERTED, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.METAL_BEAM, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.DANGER_STRIPE_BLOCK) + +} diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt new file mode 100644 index 000000000..7a66fe0c3 --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/ResourceTags.kt @@ -0,0 +1,61 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import ru.dbotthepony.mc.otm.registry.MBlockTags +import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.MItemTags +import ru.dbotthepony.mc.otm.registry.MItems + +fun addResourceTags(tagsProvider: TagsProvider) { + tagsProvider.circuits.add("basic", MItems.BASIC_CONTROL_CIRCUIT) + tagsProvider.circuits.add("advanced", MItems.ADVANCED_CONTROL_CIRCUIT) + + tagsProvider.stoneOre("tritanium", MBlocks.TRITANIUM_ORE) + tagsProvider.stoneOre("dilithium", MBlocks.DILITHIUM_ORE) + + tagsProvider.deepslateOre("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE) + tagsProvider.deepslateOre("dilithium", MBlocks.DEEPSLATE_DILITHIUM_ORE) + + tagsProvider.plates.add("tritanium", MItems.TRITANIUM_PLATE) + tagsProvider.plates.add("iron", MItems.IRON_PLATE) + tagsProvider.plates.add("gold", MItems.GOLD_PLATE) + tagsProvider.plates.add("carbon", MItems.CARBON_MESH) + + tagsProvider.dusts.add("tritanium", MItems.TRITANIUM_DUST) + tagsProvider.ingots.add("tritanium", MItems.TRITANIUM_INGOT) + + tagsProvider.wires.add("copper", MItems.COPPER_WIRING) + tagsProvider.wires.add("gold", MItems.GOLD_WIRING) + + tagsProvider.items.Appender(MItemTags.TRITANIUM_NUGGETS).add(MItems.TRITANIUM_NUGGET) + tagsProvider.items.Appender(MItemTags.NUGGETS).add(MItems.TRITANIUM_NUGGET) + + tagsProvider.items.forge("reinforced_tritanium").add(MItems.REINFORCED_TRITANIUM_PLATE) + + tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK) + tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK) + + tagsProvider.singleDropOre( + MBlocks.TRITANIUM_ORE, + MBlocks.DEEPSLATE_TRITANIUM_ORE + ) + + tagsProvider.denseDropOre( + MBlocks.DILITHIUM_ORE, + MBlocks.DEEPSLATE_DILITHIUM_ORE, + ) + + tagsProvider.clump("tritanium", MItems.TRITANIUM_ORE_CLUMP, MBlocks.TRITANIUM_RAW_BLOCK) + + tagsProvider.gems.add(MItems.DILITHIUM_CRYSTAL) + + tagsProvider.items.Appender(MItemTags.DILITHIUM_ORES) + .add(MItems.DILITHIUM_ORE) + .add(MItems.DEEPSLATE_DILITHIUM_ORE) + + tagsProvider.blocks.Appender(MBlockTags.DILITHIUM_ORES) + .add(MBlocks.DILITHIUM_ORE) + .add(MBlocks.DEEPSLATE_DILITHIUM_ORE) + + tagsProvider.items.forge("gems/dilithium").add(MItems.DILITHIUM_CRYSTAL) + +} 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 e4fd58613..dbd3760b4 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 @@ -18,207 +18,41 @@ import ru.dbotthepony.mc.otm.registry.MRegistry fun addTags(tagsProvider: TagsProvider) { tagsProvider.items.forge("pistons").add(Items.PISTON) - tagsProvider.circuits.add("basic", MItems.BASIC_CONTROL_CIRCUIT) - tagsProvider.circuits.add("advanced", MItems.ADVANCED_CONTROL_CIRCUIT) - 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) - tagsProvider.plates.add("gold", MItems.GOLD_PLATE) - tagsProvider.plates.add("carbon", MItems.CARBON_MESH) + tagsProvider.items.Appender(ItemTags.BEACON_PAYMENT_ITEMS) + .add(MItems.TRITANIUM_INGOT) + .add(MItems.DILITHIUM_CRYSTAL) tagsProvider.items.Appender(ItemTags.MEAT).add(MItems.NUTRIENT_PASTE) tagsProvider.fluids.forge("experience").add(MFluids.LIQUID_XP).add(MFluids.LIQUID_XP_FLOWING) tagsProvider.fluidTypes.forge("experience").add(MFluids.LIQUID_XP_TYPE) - tagsProvider.items.forge("reinforced_tritanium").add(MItems.REINFORCED_TRITANIUM_PLATE) - - 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.blocks.Appender(MBlockTags.MULTIBLOCK_STRUCTURE) - .add(MBlockTags.MULTIBLOCK_HARD_STRUCTURE, MBlockTags.MULTIBLOCK_SOFT_STRUCTURE) - - tagsProvider.blocks.Appender(MBlockTags.MULTIBLOCK_SOFT_STRUCTURE) - .add(MBlockTags.HARDENED_GLASS) - - tagsProvider.blocks.Appender(MBlockTags.MULTIBLOCK_HARD_STRUCTURE) - .add(MRegistry.VENT.allBlocks.values) - .add(MRegistry.VENT_ALTERNATIVE.allBlocks.values) - .add(MRegistry.TRITANIUM_BLOCK.allBlocks.values) - .add(MRegistry.TRITANIUM_STRIPED_BLOCK.blocks.values.stream().flatMap { it.values.stream() }) - - tagsProvider.stoneOre("tritanium", MBlocks.TRITANIUM_ORE) - tagsProvider.stoneOre("dilithium", MBlocks.DILITHIUM_ORE) - - tagsProvider.deepslateOre("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE) - tagsProvider.deepslateOre("dilithium", MBlocks.DEEPSLATE_DILITHIUM_ORE) - - tagsProvider.singleDropOre( - MBlocks.TRITANIUM_ORE, - MBlocks.DEEPSLATE_TRITANIUM_ORE - ) - - tagsProvider.denseDropOre( - MBlocks.DILITHIUM_ORE, - MBlocks.DEEPSLATE_DILITHIUM_ORE, - ) - - tagsProvider.clump("tritanium", MItems.TRITANIUM_ORE_CLUMP, MBlocks.TRITANIUM_RAW_BLOCK) - - tagsProvider.gems.add(MItems.DILITHIUM_CRYSTAL) - tagsProvider.items.forge("gems/dilithium").add(MItems.DILITHIUM_CRYSTAL) - - tagsProvider.wires.add("copper", MItems.COPPER_WIRING) - tagsProvider.wires.add("gold", MItems.GOLD_WIRING) - - tagsProvider.requiresPickaxe( - MBlocks.MATTER_CABLE, - MBlocks.STORAGE_CABLE - ) - - tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES).add(Items.CRAFTING_TABLE) - tagsProvider.items.Appender(MItemTags.WORKBENCHES).add(Items.CRAFTING_TABLE) - tagsProvider.items.Appender(MItemTags.WORKBENCH).add(Items.CRAFTING_TABLE) - tagsProvider.items.Appender(MItemTags.FURNACES).add(Items.FURNACE) - tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES).add(Blocks.CRAFTING_TABLE) - tagsProvider.blocks.Appender(MBlockTags.WORKBENCHES).add(Blocks.CRAFTING_TABLE) - tagsProvider.blocks.Appender(MBlockTags.WORKBENCH).add(Blocks.CRAFTING_TABLE) - tagsProvider.items.Appender(MItemTags.CRAFTING_TABLES) .add(MItemTags.WORKBENCHES) .add(MItemTags.WORKBENCH) + tagsProvider.blocks.Appender(MBlockTags.CRAFTING_TABLES) .add(MBlockTags.WORKBENCHES) .add(MBlockTags.WORKBENCH) tagsProvider.items.Appender(MItemTags.MINECART_CARGO_CRATES).add(MItems.CARGO_CRATE_MINECARTS.values) - tagsProvider.items.forge("hardened_glass").add(MRegistry.INDUSTRIAL_GLASS.allItems.values) - tagsProvider.items.forge("hardened_glass/colorless").add(MRegistry.INDUSTRIAL_GLASS.item) - tagsProvider.items.forge("hardened_glass/tinted").add(MRegistry.INDUSTRIAL_GLASS.items.values) - - tagsProvider.items.forge("hardened_glass_panes").add(MRegistry.INDUSTRIAL_GLASS_PANE.allItems.values) - tagsProvider.items.forge("hardened_glass_panes/colorless").add(MRegistry.INDUSTRIAL_GLASS_PANE.item) - tagsProvider.items.forge("hardened_glass_panes/tinted").add(MRegistry.INDUSTRIAL_GLASS_PANE.items.values) - - MRegistry.INDUSTRIAL_GLASS.forEachItem { s, _, item -> tagsProvider.items.forge("hardened_glass/$s").add(item) } - MRegistry.INDUSTRIAL_GLASS_PANE.forEachItem { s, _, item -> tagsProvider.items.forge("hardened_glass_panes/$s").add(item) } - - tagsProvider.blocks.forge("hardened_glass").add(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) - tagsProvider.blocks.forge("hardened_glass/colorless").add(MRegistry.INDUSTRIAL_GLASS.block) - tagsProvider.blocks.forge("hardened_glass/tinted").add(MRegistry.INDUSTRIAL_GLASS.blocks.values) - - tagsProvider.blocks.forge("hardened_glass_panes").add(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values) - tagsProvider.blocks.forge("hardened_glass_panes/colorless").add(MRegistry.INDUSTRIAL_GLASS_PANE.block) - tagsProvider.blocks.forge("hardened_glass_panes/tinted").add(MRegistry.INDUSTRIAL_GLASS_PANE.blocks.values) - - MRegistry.INDUSTRIAL_GLASS.forEachBlock { s, _, block -> tagsProvider.blocks.forge("hardened_glass/$s").add(block) } - MRegistry.INDUSTRIAL_GLASS_PANE.forEachBlock { s, _, block -> tagsProvider.blocks.forge("hardened_glass_panes/$s").add(block) } - - tagsProvider.items.Appender(MItemTags.INDUSTRIAL_GLASS).add(MRegistry.INDUSTRIAL_GLASS.allItems.values) - tagsProvider.blocks.Appender(MBlockTags.INDUSTRIAL_GLASS).add(MRegistry.INDUSTRIAL_GLASS.allBlocks.values) - tagsProvider.blocks.Appender(MBlockTags.CARGO_CRATES).add(MRegistry.CARGO_CRATES.allBlocks.values) - - tagsProvider.items.Appender(ItemTags.DOORS).add(MItems.TRITANIUM_DOOR.values) - tagsProvider.blocks.Appender(BlockTags.DOORS).add(MBlocks.TRITANIUM_DOOR.values) - - tagsProvider.items.Appender(ItemTags.TRAPDOORS).add(MItems.TRITANIUM_TRAPDOOR.values) - tagsProvider.blocks.Appender(BlockTags.TRAPDOORS).add(MBlocks.TRITANIUM_TRAPDOOR.values) - - tagsProvider.blocks.Appender(BlockTags.PRESSURE_PLATES).add(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values) - tagsProvider.items.Appender(MItemTags.MACHINES).add(MItems.MACHINES) 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) - - // TODO: is new tag appropriate for modded armors? - tagsProvider.items.Appender(Tags.Items.ARMORS) - .add(MItems.TRITANIUM_HELMET, MItems.SIMPLE_TRITANIUM_HELMET) - .add(MItems.TRITANIUM_CHESTPLATE, MItems.SIMPLE_TRITANIUM_CHESTPLATE, MItems.PORTABLE_GRAVITATION_STABILIZER) - .add(MItems.TRITANIUM_PANTS, MItems.SIMPLE_TRITANIUM_PANTS) - .add(MItems.TRITANIUM_BOOTS, MItems.SIMPLE_TRITANIUM_BOOTS) - - tagsProvider.items.Appender(ItemTags.DYEABLE).add(MItems.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.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.HOES).add(MItems.TRITANIUM_HOE) - tagsProvider.items.Appender(Tags.Items.TOOLS_SHEAR).add(MItems.TRITANIUM_SHEARS) - tagsProvider.items.Appender(Tags.Items.TOOLS_SHIELD).add(MItems.TRITANIUM_SHIELD) - - tagsProvider.items.Appender(MItemTags.TOOLS_HAMMERS).add(MItems.EXPLOSIVE_HAMMER) - tagsProvider.items.forge("tools").add(MItemTags.TOOLS_HAMMERS) - - tagsProvider.items.Appender(ItemTags.DURABILITY_ENCHANTABLE) - .add(MItems.EXPLOSIVE_HAMMER) - .add(MItems.TRITANIUM_SHEARS) - .add(MItems.TRITANIUM_SHIELD) - - tagsProvider.items.Appender(ItemTags.MINING_ENCHANTABLE) - .add(MItems.TRITANIUM_SHEARS) - - tagsProvider.items.Appender(ItemTags.EQUIPPABLE_ENCHANTABLE) - .add(MItems.PORTABLE_GRAVITATION_STABILIZER) - - tagsProvider.items.Appender(ItemTags.VANISHING_ENCHANTABLE) - .add(MItems.PORTABLE_GRAVITATION_STABILIZER) - tagsProvider.items.Appender(MItemTags.UPGRADES) .add(MItems.MachineUpgrades.Basic.LIST) .add(MItems.MachineUpgrades.Normal.LIST) .add(MItems.MachineUpgrades.Advanced.LIST) .add(MItems.MachineUpgrades.Creative.LIST) - tagsProvider.blocks.Appender(BlockTags.STAIRS) - .add(MRegistry.FLOOR_TILES_STAIRS.blocks.values) - .add(MRegistry.TRITANIUM_STAIRS.allBlocks.values) - .add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks) - .add(MBlocks.TRITANIUM_STRIPED_STAIRS.values) - - tagsProvider.blocks.Appender(BlockTags.SLABS) - .add(MRegistry.TRITANIUM_SLAB.allBlocks.values) - .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks) - .add(MRegistry.FLOOR_TILES_SLAB.blocks.values) - .add(MBlocks.TRITANIUM_STRIPED_SLAB.values) - - tagsProvider.blocks.Appender(BlockTags.WALLS) - .add(MRegistry.TRITANIUM_WALL.allBlocks.values) - .add(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks) - .add(MBlocks.TRITANIUM_STRIPED_WALL.values) - - 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.values) - - tagsProvider.items.Appender(ItemTags.SLABS) - .add(MRegistry.TRITANIUM_SLAB.allItems.values) - .add(MRegistry.TRITANIUM_STRIPED_SLAB.flatItems) - .add(MRegistry.FLOOR_TILES_SLAB.items.values) - .add(MItems.TRITANIUM_STRIPED_SLAB.values) - - tagsProvider.items.Appender(ItemTags.WALLS) - .add(MRegistry.TRITANIUM_WALL.allItems.values) - .add(MRegistry.TRITANIUM_STRIPED_WALL.flatItems) - .add(MItems.TRITANIUM_STRIPED_WALL.values) - tagsProvider.items.Appender(MItemTags.NO_REPLICATION) + .add(MItemTags.DILITHIUM_GEMS) + .add(MItemTags.DILITHIUM_ORES) .add(Items.WRITTEN_BOOK) .add(Tags.Items.ORES) .add(Tags.Items.RAW_MATERIALS) @@ -235,164 +69,6 @@ fun addTags(tagsProvider: TagsProvider) { .add(MItems.ExopackUpgrades.INVENTORY_UPGRADE_WITHER) .add(MItems.ExopackUpgrades.INVENTORY_UPGRADE_ENDER_DRAGON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_DOOR.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_TRAPDOOR.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.PAINTER, Tiers.STONE) - tagsProvider.requiresPickaxe(MBlocks.ENERGY_CABLES.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MBlocks.GRILL.values, Tiers.STONE) - - tagsProvider.requiresPickaxe(listOf( - *MBlocks.ANDROID_STATION.values.toTypedArray(), - *MBlocks.BATTERY_BANK.values.toTypedArray(), - *MBlocks.MATTER_DECOMPOSER.values.toTypedArray(), - *MBlocks.MATTER_CAPACITOR_BANK.values.toTypedArray(), - MBlocks.PATTERN_STORAGE, - *MBlocks.MATTER_SCANNER.values.toTypedArray(), - *MBlocks.MATTER_PANEL.values.toTypedArray(), - *MBlocks.MATTER_REPLICATOR.values.toTypedArray(), - *MBlocks.MATTER_BOTTLER.values.toTypedArray(), - *MBlocks.ENERGY_COUNTER.values.toTypedArray(), - *MBlocks.CHEMICAL_GENERATOR.values.toTypedArray(), - *MBlocks.PLATE_PRESS.values.toTypedArray(), - *MBlocks.TWIN_PLATE_PRESS.values.toTypedArray(), - *MBlocks.MATTER_RECYCLER.values.toTypedArray(), - MBlocks.MATTER_ENTANGLER, - - *MBlocks.POWERED_FURNACE.values.toTypedArray(), - *MBlocks.POWERED_SMOKER.values.toTypedArray(), - *MBlocks.POWERED_BLAST_FURNACE.values.toTypedArray(), - - MBlocks.STORAGE_BUS, - MBlocks.STORAGE_IMPORTER, - MBlocks.STORAGE_EXPORTER, - - *MBlocks.DRIVE_VIEWER.values.toTypedArray(), - MBlocks.DRIVE_RACK, - *MBlocks.ITEM_MONITOR.values.toTypedArray(), - *MBlocks.STORAGE_POWER_SUPPLIER.values.toTypedArray(), - - MBlocks.PHANTOM_ATTRACTOR, - *MBlocks.ENERGY_SERVO.values.toTypedArray(), - - MBlocks.TRITANIUM_INGOT_BLOCK, - MBlocks.METAL_JUNK, - MBlocks.METAL_MESH, - MBlocks.TRITANIUM_BARS, - MBlocks.METAL_RAILING, - - MBlocks.ENGINE, - MBlocks.HOLO_SIGN, - *MBlocks.COBBLESTONE_GENERATOR.values.toTypedArray(), - *MBlocks.ESSENCE_STORAGE.values.toTypedArray(), - *MBlocks.MATTER_RECONSTRUCTOR.values.toTypedArray(), - MBlocks.FLUID_TANK, - *MBlocks.ANDROID_CHARGER.values.toTypedArray(), - - MBlocks.BLACK_HOLE_GENERATOR, - MBlocks.ITEM_INPUT_HATCH, - MBlocks.ITEM_OUTPUT_HATCH, - ), Tiers.IRON) - - tagsProvider.addToDyeTags(MRegistry.CARGO_CRATES.allItems) - - tagsProvider.addToDyeTags(MRegistry.INDUSTRIAL_GLASS.allItems) - tagsProvider.addToDyeTags(MRegistry.INDUSTRIAL_GLASS_PANE.allItems) - - tagsProvider.addToDyeTags(MRegistry.DECORATIVE_CRATE.items) - - tagsProvider.addToDyeTags(MItems.TRITANIUM_DOOR) - tagsProvider.addToDyeTags(MItems.TRITANIUM_TRAPDOOR) - tagsProvider.addToDyeTags(MRegistry.TRITANIUM_PRESSURE_PLATE.allItems) - - tagsProvider.addToDyeTags(MRegistry.FLOOR_TILES_STAIRS.items) - tagsProvider.addToDyeTags(MRegistry.TRITANIUM_STAIRS.items) - - tagsProvider.addToDyeTags(MRegistry.TRITANIUM_SLAB.items) - tagsProvider.addToDyeTags(MRegistry.FLOOR_TILES_SLAB.items) - tagsProvider.addToDyeTags(MRegistry.UNREFINED_FLOOR_TILES.items) - - tagsProvider.addToDyeTags(MRegistry.TRITANIUM_WALL.items) - - tagsProvider.addToDyeTags(MItems.ANDROID_STATION) - tagsProvider.addToDyeTags(MItems.ENERGY_SERVO) - tagsProvider.addToDyeTags(MItems.MATTER_DECOMPOSER) - tagsProvider.addToDyeTags(MItems.MATTER_CAPACITOR_BANK) - tagsProvider.addToDyeTags(MItems.BATTERY_BANK) - tagsProvider.addToDyeTags(MItems.MATTER_SCANNER) - tagsProvider.addToDyeTags(MItems.MATTER_PANEL) - tagsProvider.addToDyeTags(MItems.MATTER_REPLICATOR) - tagsProvider.addToDyeTags(MItems.MATTER_BOTTLER) - tagsProvider.addToDyeTags(MItems.ENERGY_COUNTER) - tagsProvider.addToDyeTags(MItems.CHEMICAL_GENERATOR) - tagsProvider.addToDyeTags(MItems.PLATE_PRESS) - tagsProvider.addToDyeTags(MItems.TWIN_PLATE_PRESS) - tagsProvider.addToDyeTags(MItems.MATTER_RECYCLER) - - tagsProvider.addToDyeTags(MItems.POWERED_FURNACE) - tagsProvider.addToDyeTags(MItems.POWERED_SMOKER) - tagsProvider.addToDyeTags(MItems.POWERED_BLAST_FURNACE) - - tagsProvider.addToDyeTags(MItems.DRIVE_VIEWER) - tagsProvider.addToDyeTags(MItems.ITEM_MONITOR) - tagsProvider.addToDyeTags(MItems.STORAGE_POWER_SUPPLIER) - - tagsProvider.addToDyeTags(MItems.COBBLESTONE_GENERATOR) - tagsProvider.addToDyeTags(MItems.ESSENCE_STORAGE) - tagsProvider.addToDyeTags(MItems.MATTER_RECONSTRUCTOR) - tagsProvider.addToDyeTags(MItems.ANDROID_CHARGER) - - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_ANVIL, Tiers.IRON) - - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_ORE, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.DEEPSLATE_TRITANIUM_ORE, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_RAW_BLOCK, Tiers.IRON) - - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_STAIRS.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_WALL.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_SLAB.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.CARBON_FIBRE_BLOCK, Tiers.IRON) - - tagsProvider.requiresPickaxe(MBlocks.INFINITE_WATER_SOURCE, Tiers.STONE) - - tagsProvider.requiresPickaxe(MRegistry.CARGO_CRATES.allBlocks.values, Tiers.IRON) - - tagsProvider.requiresPickaxe(MRegistry.VENT.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.COMPUTER_TERMINAL.allBlocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MRegistry.STAR_CHAIR.allBlocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_SLAB.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_WALL.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_PRESSURE_PLATE.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STAIRS.allBlocks.values, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_BLOCK.flatBlocks, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks, Tiers.IRON) - tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks, Tiers.IRON) - - tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.blocks.values) - tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_STAIRS.blocks.values) - tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_SLAB.blocks.values) - tagsProvider.requiresShovel(MRegistry.UNREFINED_FLOOR_TILES.blocks.values) - - tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.allBlocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS_PANE.allBlocks.values, Tiers.STONE) - tagsProvider.requiresPickaxe(MRegistry.DECORATIVE_CRATE.allBlocks.values, Tiers.STONE) - - tagsProvider.requiresPickaxe(MBlocks.LABORATORY_LAMP, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.LABORATORY_LAMP_INVERTED, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.METAL_BEAM, Tiers.IRON) - tagsProvider.requiresPickaxe(MBlocks.DANGER_STRIPE_BLOCK) - - tagsProvider.requiresPickaxe(listOf( - MBlocks.DILITHIUM_ORE, - MBlocks.DEEPSLATE_DILITHIUM_ORE, - - MBlocks.GRAVITATION_STABILIZER, - MBlocks.GRAVITATION_STABILIZER_LENS, - ), Tiers.DIAMOND) - tagsProvider.dragonImmune.add( MBlocks.BLACK_HOLE, MBlocks.GRAVITATION_STABILIZER, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt index 8a925eb96..517b35bbc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockTags.kt @@ -17,6 +17,8 @@ object MBlockTags { val REQUIRES_TRITANIUM_TOOL: TagKey = BlockTags.create(ResourceLocation("minecraft", "requires_tritanium_tool")) + val DILITHIUM_ORES: TagKey = BlockTags.create(ResourceLocation("c", "ores/dilithium")) + val HARDENED_GLASS_PANES: TagKey = BlockTags.create(ResourceLocation("c", "hardened_glass_panes")) val HARDENED_GLASS_PANES_BLACK: TagKey = BlockTags.create(ResourceLocation("c", "hardened_glass_panes/black")) val HARDENED_GLASS_PANES_BLUE: TagKey = BlockTags.create(ResourceLocation("c", "hardened_glass_panes/blue"))