From 14eece598a8dc3b2056ed4e3729b638881f84104 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Tue, 6 Sep 2022 21:45:53 +0700 Subject: [PATCH] Datagen tags --- .../ru/dbotthepony/mc/otm/datagen/DataGen.kt | 7 +- .../mc/otm/datagen/loot/LootTables.kt | 11 + .../dbotthepony/mc/otm/datagen/tags/Tags.kt | 82 ++++++ .../mc/otm/datagen/tags/TagsProvider.kt | 275 ++++++++++++++++++ .../forge/tags/blocks/ores/tritanium.json | 6 - .../forge/tags/items/circuits/advanced.json | 6 - .../data/forge/tags/items/circuits/basic.json | 6 - .../forge/tags/items/ingots/tritanium.json | 6 - .../data/forge/tags/items/ores/tritanium.json | 7 - .../data/forge/tags/items/pistons.json | 6 - .../data/forge/tags/items/plates/iron.json | 6 - .../forge/tags/items/plates/tritanium.json | 6 - .../tags/items/raw_blocks/tritanium.json | 6 - .../forge/tags/items/raw_ores/tritanium.json | 6 - .../data/forge/tags/items/wires/copper.json | 6 - .../data/forge/tags/items/wires/gold.json | 6 - .../minecraft/tags/blocks/dragon_immune.json | 8 - .../minecraft/tags/blocks/mineable/.gitkeep | 0 .../tags/blocks/mineable/pickaxe.json | 128 -------- .../tags/blocks/needs_iron_tool.json | 119 -------- .../tags/blocks/needs_stone_tool.json | 13 - .../minecraft/tags/blocks/wither_immune.json | 6 - 22 files changed, 373 insertions(+), 349 deletions(-) create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt create mode 100644 src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt delete mode 100644 src/main/resources/data/forge/tags/blocks/ores/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/circuits/advanced.json delete mode 100644 src/main/resources/data/forge/tags/items/circuits/basic.json delete mode 100644 src/main/resources/data/forge/tags/items/ingots/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/ores/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/pistons.json delete mode 100644 src/main/resources/data/forge/tags/items/plates/iron.json delete mode 100644 src/main/resources/data/forge/tags/items/plates/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/raw_blocks/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/raw_ores/tritanium.json delete mode 100644 src/main/resources/data/forge/tags/items/wires/copper.json delete mode 100644 src/main/resources/data/forge/tags/items/wires/gold.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/dragon_immune.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/.gitkeep delete mode 100644 src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/wither_immune.json 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 27956101e..665b87a93 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -34,6 +34,8 @@ import ru.dbotthepony.mc.otm.datagen.lang.MatteryLanguageProvider import ru.dbotthepony.mc.otm.datagen.loot.addLootModifiers import ru.dbotthepony.mc.otm.datagen.loot.addLootTables import ru.dbotthepony.mc.otm.datagen.recipes.addCraftingTableRecipes +import ru.dbotthepony.mc.otm.datagen.tags.TagsProvider +import ru.dbotthepony.mc.otm.datagen.tags.addTags import ru.dbotthepony.mc.otm.registry.objects.ColoredDecorativeBlock import ru.dbotthepony.mc.otm.registry.objects.DecorativeBlock @@ -119,7 +121,6 @@ object DataGen { private fun decoratives(list: ColoredDecorativeBlock) { for (block in list.coloredBlocks) { decorativeCubeAll(block) - lootTableProvider.dropsSelf(block) } for (item in list.coloredItems) { @@ -130,7 +131,6 @@ object DataGen { private fun decoratives(list: DecorativeBlock) { for (block in list.blocks) { decorativeCubeAll(block) - lootTableProvider.dropsSelf(block) } for (item in list.items) { @@ -150,6 +150,9 @@ object DataGen { lootModifier = LootModifiers(event.generator) languageProvider = MatteryLanguageProvider(event.generator) + val tagsProvider = TagsProvider(event) + + addTags(tagsProvider) AddEnglishLanguage(languageProvider) event.generator.addProvider(true, blockModelProvider) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt index c63037808..baf8b310e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTables.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.datagen.loot import com.mojang.datafixers.util.Pair +import it.unimi.dsi.fastutil.objects.ObjectArraySet import net.minecraft.data.DataGenerator import net.minecraft.data.loot.LootTableProvider import net.minecraft.resources.ResourceLocation @@ -42,7 +43,13 @@ class LootTables(generator: DataGenerator) : LootTableProvider(generator) { providers.add(Pair(Supplier {provider}, LootContextParamSets.BLOCK)) } + private val seenStuff = ObjectArraySet() + fun dropsSelf(block: Block) { + if (!seenStuff.add(block)) { + throw IllegalStateException("Already seen $block") + } + block { it.accept(block.lootTable, singleLootPool { it.add(LootItem.lootTableItem(block)) @@ -59,6 +66,10 @@ class LootTables(generator: DataGenerator) : LootTableProvider(generator) { } fun tile(block: Block, f: (CopyNbtFunction.Builder) -> Unit = {}) { + if (!seenStuff.add(block)) { + throw IllegalStateException("Already seen $block") + } + block { it.accept(block.lootTable, singleLootPool { it.add(LootItem.lootTableItem(block).also { 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 new file mode 100644 index 000000000..18a19a22e --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/Tags.kt @@ -0,0 +1,82 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import net.minecraft.world.item.Items +import net.minecraft.world.item.Tiers +import ru.dbotthepony.mc.otm.registry.MBlocks +import ru.dbotthepony.mc.otm.registry.MItems +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.ingots.add("tritanium", MItems.TRITANIUM_INGOT) + + tagsProvider.ore("tritanium", MBlocks.TRITANIUM_ORE) + tagsProvider.ore("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE) + tagsProvider.clump("tritanium", MItems.TRITANIUM_ORE_CLUMP, MBlocks.TRITANIUM_RAW_BLOCK) + + tagsProvider.wires.add("copper", MItems.COPPER_WIRING) + tagsProvider.wires.add("gold", MItems.GOLD_WIRING) + + tagsProvider.requiresPickaxe( + MBlocks.MATTER_CABLE, + MBlocks.STORAGE_CABLE + ) + + tagsProvider.requiresPickaxe(listOf( + MBlocks.ANDROID_STATION, + MBlocks.BATTERY_BANK, + MBlocks.MATTER_DECOMPOSER, + MBlocks.MATTER_CAPACITOR_BANK, + MBlocks.PATTERN_STORAGE, + MBlocks.MATTER_SCANNER, + MBlocks.MATTER_PANEL, + MBlocks.MATTER_REPLICATOR, + MBlocks.MATTER_BOTTLER, + MBlocks.ENERGY_COUNTER, + MBlocks.CHEMICAL_GENERATOR, + MBlocks.PLATE_PRESS, + MBlocks.MATTER_RECYCLER, + + MBlocks.STORAGE_BUS, + MBlocks.STORAGE_IMPORTER, + MBlocks.STORAGE_EXPORTER, + + MBlocks.DRIVE_VIEWER, + MBlocks.DRIVE_RACK, + MBlocks.ITEM_MONITOR, + MBlocks.STORAGE_POWER_SUPPLIER, + ), Tiers.IRON) + + tagsProvider.requiresPickaxe(MBlocks.TRITANIUM_STRIPED_BLOCK, Tiers.IRON) + tagsProvider.requiresPickaxe(MBlocks.CARBON_FIBRE_BLOCK, Tiers.IRON) + + tagsProvider.requiresPickaxe(MRegistry.VENT.blocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.VENT_ALTERNATIVE.blocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_BLOCK.blocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_BLOCK.blocks, Tiers.IRON) + tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.coloredBlocks) + + tagsProvider.requiresShovel(MRegistry.UNREFINED_FLOOR_TILES.coloredBlocks) + + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.blocks, Tiers.STONE) + tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS_PANE.blocks, Tiers.STONE) + tagsProvider.requiresPickaxe(MBlocks.CRATE_LIST, Tiers.STONE) + + tagsProvider.requiresPickaxe(listOf( + MBlocks.GRAVITATION_STABILIZER, + MBlocks.GRAVITATION_STABILIZER_LENS, + ), Tiers.DIAMOND) + + tagsProvider.dragonImmune.add( + MBlocks.BLACK_HOLE, + MBlocks.GRAVITATION_STABILIZER, + MBlocks.GRAVITATION_STABILIZER_LENS, + ) + + tagsProvider.witherImmune.add( + MBlocks.BLACK_HOLE, + ) +} 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 new file mode 100644 index 000000000..93b3d92ee --- /dev/null +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt @@ -0,0 +1,275 @@ +package ru.dbotthepony.mc.otm.datagen.tags + +import it.unimi.dsi.fastutil.objects.ObjectArraySet +import net.minecraft.core.Registry +import net.minecraft.resources.ResourceLocation +import net.minecraft.tags.BlockTags +import net.minecraft.tags.TagKey +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.data.event.GatherDataEvent +import ru.dbotthepony.mc.otm.datagen.DataGen +import net.minecraft.data.tags.TagsProvider as MinecraftTagsProvider + +interface MTagAppender { + fun add(value: T): TagsProvider + fun addSafe(value: T): Boolean + fun add(vararg values: T): TagsProvider + fun addSafe(vararg values: T): Boolean { + var any = false + for (value in values) any = addSafe(value) + return any + } + + fun add(values: List): TagsProvider + + fun addSafe(values: List): Boolean { + var any = false + for (value in values) any = addSafe(value) + return any + } +} + +interface ForgeTagAppender : MTagAppender { + fun add(key: String, value: T): TagsProvider + fun addSafe(key: String, value: T): Boolean + fun add(key: String, vararg values: T): TagsProvider + fun addSafe(key: String, vararg values: T): Boolean { + var any = false + for (value in values) any = addSafe(key, value) + return any + } + + fun add(key: String, values: List): TagsProvider + + fun addSafe(key: String, values: List): Boolean { + var any = false + for (value in values) any = addSafe(key, value) + return any + } +} + +class TagsProvider( + private val event: GatherDataEvent +) { + inner class Delegate(registry: Registry) : MinecraftTagsProvider(event.generator, registry, DataGen.MOD_ID, event.existingFileHelper) { + private val tags = HashMap, ObjectArraySet>() + + override fun addTags() { + if (tags.isEmpty()) { + return + } + + for ((tag, values) in tags) { + tag(tag).also { + for (value in values) { + it.add(value) + } + } + } + } + + fun getSet(tag: TagKey): MutableSet { + return tags.computeIfAbsent(tag) { ObjectArraySet() } + } + + fun getSet(location: ResourceLocation) = getSet(TagKey.create(registry.key(), location)) + + fun appender(tag: TagKey, message: ((T) -> Any) = { "$it is already in $tag" }): MTagAppender { + val list = getSet(tag) + + return object : MTagAppender { + override fun add(value: T): TagsProvider { + if (!list.add(value)) { + throw IllegalStateException(message.invoke(value).toString()) + } + + return this@TagsProvider + } + + override fun add(values: List): TagsProvider { + for (value in values) add(value) + return this@TagsProvider + } + + override fun addSafe(value: T): Boolean { + return list.add(value) + } + + override fun add(vararg values: T): TagsProvider { + values.forEach(this::add) + return this@TagsProvider + } + } + } + + fun forge(path: String): ForgeTagAppender { + val parent by lazy { appender(ResourceLocation("forge", path)) } + + return object : ForgeTagAppender { + override fun add(key: String, value: T): TagsProvider { + val tag = TagKey.create(registry.key(), ResourceLocation("forge", "$path/$key")) + + if (!getSet(tag).add(value)) { + throw IllegalStateException("$value is already in $tag") + } + + return this@TagsProvider + } + + override fun addSafe(key: String, value: T): Boolean { + val tag = TagKey.create(registry.key(), ResourceLocation("forge", "$path/$key")) + return getSet(tag).add(value) + } + + override fun add(key: String, vararg values: T): TagsProvider { + for (value in values) add(key, value) + return this@TagsProvider + } + + override fun add(key: String, values: List): TagsProvider { + for (value in values) add(key, value) + return this@TagsProvider + } + + override fun add(value: T): TagsProvider { + return parent.add(value) + } + + override fun addSafe(value: T): Boolean { + return parent.addSafe(value) + } + + override fun add(vararg values: T): TagsProvider { + return parent.add(*values) + } + + override fun add(values: List): TagsProvider { + return parent.add(values) + } + } + } + + fun appender(location: ResourceLocation): MTagAppender { + return appender(TagKey.create(registry.key(), location)) + } + + fun appender(location: ResourceLocation, message: (T) -> Any): MTagAppender { + return appender(TagKey.create(registry.key(), location), message) + } + } + + val blocks = Delegate(Registry.BLOCK) + val items = Delegate(Registry.ITEM) + + val requiresShovel = blocks.appender(BlockTags.MINEABLE_WITH_SHOVEL) + val requiresAxe = blocks.appender(BlockTags.MINEABLE_WITH_AXE) + val requiresHoe = blocks.appender(BlockTags.MINEABLE_WITH_HOE) + val requiresPickaxe = blocks.appender(BlockTags.MINEABLE_WITH_PICKAXE) + + val requiresStoneTool = blocks.appender(BlockTags.NEEDS_STONE_TOOL) + val requiresIronTool = blocks.appender(BlockTags.NEEDS_IRON_TOOL) + val requiresDiamondTool = blocks.appender(BlockTags.NEEDS_DIAMOND_TOOL) + + val witherImmune = blocks.appender(BlockTags.WITHER_IMMUNE) + val dragonImmune = blocks.appender(BlockTags.DRAGON_IMMUNE) + + fun ore(key: String, block: Block): TagsProvider { + val forgeKey = ResourceLocation("forge", "ores/$key") + val b = TagKey.create(Registry.BLOCK_REGISTRY, forgeKey) + val i = TagKey.create(Registry.ITEM_REGISTRY, forgeKey) + + items.getSet(i).add(block.asItem()) + blocks.getSet(b).add(block) + + return this + } + + fun clump(key: String, clump: Item): TagsProvider { + itemOres.add(key, clump) + rawOres.add(key, clump) + return this + } + + fun clump(key: String, clump: Item, rawBlock: Block): TagsProvider { + itemOres.add(key, clump) + rawOres.add(key, clump) + rawBlocksAsItem.add(key, rawBlock.asItem()) + rawBlocksAsBlock.add(key, rawBlock) + return this + } + + val circuits = items.forge("circuits") + val ingots = items.forge("ingots") + val itemOres = items.forge("ores") + val blockOres = blocks.forge("ores") + val plates = items.forge("plates") + val rawBlocksAsItem = items.forge("raw_blocks") + val rawBlocksAsBlock = blocks.forge("raw_blocks") + val rawOres = items.forge("raw_ores") + val wires = items.forge("wires") + + init { + event.generator.addProvider(true, blocks) + event.generator.addProvider(true, items) + } + + fun requiresPickaxe(block: Block, tier: Tier? = null): TagsProvider { + requiresPickaxe.add(block) + + when (tier) { + Tiers.STONE -> requiresStoneTool.add(block) + Tiers.IRON -> requiresIronTool.add(block) + Tiers.DIAMOND, Tiers.NETHERITE -> requiresDiamondTool.add(block) + } + + return this + } + + fun requiresPickaxe(blocks: List, tier: Tier? = null): TagsProvider { + for (block in blocks) requiresPickaxe(block, tier) + return this + } + + fun requiresPickaxe(vararg blocks: Block, tier: Tier? = null): TagsProvider { + for (block in blocks) requiresPickaxe(block, tier) + return this + } + + fun requiresShovel(block: Block, tier: Tier? = null): TagsProvider { + requiresShovel.add(block) + + when (tier) { + Tiers.STONE -> requiresStoneTool.add(block) + Tiers.IRON -> requiresIronTool.add(block) + Tiers.DIAMOND, Tiers.NETHERITE -> requiresDiamondTool.add(block) + } + + return this + } + + fun requiresShovel(blocks: List, tier: Tier? = null): TagsProvider { + for (block in blocks) requiresShovel(block, tier) + return this + } + + fun requiresAxe(block: Block, tier: Tier? = null): TagsProvider { + requiresAxe.add(block) + + when (tier) { + Tiers.STONE -> requiresStoneTool.add(block) + Tiers.IRON -> requiresIronTool.add(block) + Tiers.DIAMOND, Tiers.NETHERITE -> requiresDiamondTool.add(block) + } + + return this + } + + fun requiresAxe(blocks: List, tier: Tier? = null): TagsProvider { + for (block in blocks) requiresAxe(block, tier) + return this + } +} + diff --git a/src/main/resources/data/forge/tags/blocks/ores/tritanium.json b/src/main/resources/data/forge/tags/blocks/ores/tritanium.json deleted file mode 100644 index baea581f9..000000000 --- a/src/main/resources/data/forge/tags/blocks/ores/tritanium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_ore" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/circuits/advanced.json b/src/main/resources/data/forge/tags/items/circuits/advanced.json deleted file mode 100644 index 743bbe1be..000000000 --- a/src/main/resources/data/forge/tags/items/circuits/advanced.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:advanced_control_circuit" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/circuits/basic.json b/src/main/resources/data/forge/tags/items/circuits/basic.json deleted file mode 100644 index e43bca4e7..000000000 --- a/src/main/resources/data/forge/tags/items/circuits/basic.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:basic_control_circuit" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/tritanium.json b/src/main/resources/data/forge/tags/items/ingots/tritanium.json deleted file mode 100644 index c15cbe2b4..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/tritanium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_ingot" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/tritanium.json b/src/main/resources/data/forge/tags/items/ores/tritanium.json deleted file mode 100644 index bf20f920a..000000000 --- a/src/main/resources/data/forge/tags/items/ores/tritanium.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_ore", - "overdrive_that_matters:tritanium_ore_clump" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/pistons.json b/src/main/resources/data/forge/tags/items/pistons.json deleted file mode 100644 index 35e87b669..000000000 --- a/src/main/resources/data/forge/tags/items/pistons.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:piston" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/iron.json b/src/main/resources/data/forge/tags/items/plates/iron.json deleted file mode 100644 index e7f6dfbd6..000000000 --- a/src/main/resources/data/forge/tags/items/plates/iron.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:iron_plate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/tritanium.json b/src/main/resources/data/forge/tags/items/plates/tritanium.json deleted file mode 100644 index 108e07793..000000000 --- a/src/main/resources/data/forge/tags/items/plates/tritanium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_plate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_blocks/tritanium.json b/src/main/resources/data/forge/tags/items/raw_blocks/tritanium.json deleted file mode 100644 index 90d0730dc..000000000 --- a/src/main/resources/data/forge/tags/items/raw_blocks/tritanium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_raw_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_ores/tritanium.json b/src/main/resources/data/forge/tags/items/raw_ores/tritanium.json deleted file mode 100644 index 3c3c0b652..000000000 --- a/src/main/resources/data/forge/tags/items/raw_ores/tritanium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:tritanium_ore_clump" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/wires/copper.json b/src/main/resources/data/forge/tags/items/wires/copper.json deleted file mode 100644 index 1dfb4c760..000000000 --- a/src/main/resources/data/forge/tags/items/wires/copper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:copper_wiring" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/wires/gold.json b/src/main/resources/data/forge/tags/items/wires/gold.json deleted file mode 100644 index 1e584d906..000000000 --- a/src/main/resources/data/forge/tags/items/wires/gold.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:gold_wiring" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json b/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json deleted file mode 100644 index 69d14f6e2..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/dragon_immune.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:black_hole", - "overdrive_that_matters:gravitation_stabilizer", - "overdrive_that_matters:gravitation_stabilizer_lens" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/.gitkeep b/src/main/resources/data/minecraft/tags/blocks/mineable/.gitkeep deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json deleted file mode 100644 index 443d95e34..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:android_station", - "overdrive_that_matters:battery_bank", - "overdrive_that_matters:matter_decomposer", - "overdrive_that_matters:matter_capacitor_bank", - "overdrive_that_matters:matter_cable", - "overdrive_that_matters:pattern_storage", - "overdrive_that_matters:matter_scanner", - "overdrive_that_matters:matter_panel", - "overdrive_that_matters:matter_replicator", - "overdrive_that_matters:matter_bottler", - "overdrive_that_matters:drive_viewer", - "overdrive_that_matters:matter_recycler", - - "overdrive_that_matters:tritanium_block", - - "overdrive_that_matters:tritanium_block_white", - "overdrive_that_matters:tritanium_block_orange", - "overdrive_that_matters:tritanium_block_magenta", - "overdrive_that_matters:tritanium_block_light_blue", - "overdrive_that_matters:tritanium_block_yellow", - "overdrive_that_matters:tritanium_block_lime", - "overdrive_that_matters:tritanium_block_pink", - "overdrive_that_matters:tritanium_block_gray", - "overdrive_that_matters:tritanium_block_light_gray", - "overdrive_that_matters:tritanium_block_cyan", - "overdrive_that_matters:tritanium_block_purple", - "overdrive_that_matters:tritanium_block_blue", - "overdrive_that_matters:tritanium_block_brown", - "overdrive_that_matters:tritanium_block_green", - "overdrive_that_matters:tritanium_block_red", - "overdrive_that_matters:tritanium_block_black", - - "overdrive_that_matters:floor_tiles_white", - "overdrive_that_matters:floor_tiles_orange", - "overdrive_that_matters:floor_tiles_magenta", - "overdrive_that_matters:floor_tiles_light_blue", - "overdrive_that_matters:floor_tiles_yellow", - "overdrive_that_matters:floor_tiles_lime", - "overdrive_that_matters:floor_tiles_pink", - "overdrive_that_matters:floor_tiles_gray", - "overdrive_that_matters:floor_tiles_light_gray", - "overdrive_that_matters:floor_tiles_cyan", - "overdrive_that_matters:floor_tiles_purple", - "overdrive_that_matters:floor_tiles_blue", - "overdrive_that_matters:floor_tiles_brown", - "overdrive_that_matters:floor_tiles_green", - "overdrive_that_matters:floor_tiles_red", - "overdrive_that_matters:floor_tiles_black", - - "overdrive_that_matters:tritanium_striped_block", - "overdrive_that_matters:carbon_fibre_block", - - "overdrive_that_matters:energy_counter", - "overdrive_that_matters:chemical_generator", - "overdrive_that_matters:plate_press", - "overdrive_that_matters:gravitation_stabilizer", - - "overdrive_that_matters:crate_red", - "overdrive_that_matters:crate_blue", - "overdrive_that_matters:crate_yellow", - "overdrive_that_matters:crate_green", - "overdrive_that_matters:crate_black", - "overdrive_that_matters:crate_pink", - "overdrive_that_matters:crate_purple", - "overdrive_that_matters:cargo_crate", - - "overdrive_that_matters:cargo_crate", - "overdrive_that_matters:cargo_crate_white", - "overdrive_that_matters:cargo_crate_orange", - "overdrive_that_matters:cargo_crate_magenta", - "overdrive_that_matters:cargo_crate_light_blue", - "overdrive_that_matters:cargo_crate_yellow", - "overdrive_that_matters:cargo_crate_lime", - "overdrive_that_matters:cargo_crate_pink", - "overdrive_that_matters:cargo_crate_gray", - "overdrive_that_matters:cargo_crate_light_gray", - "overdrive_that_matters:cargo_crate_cyan", - "overdrive_that_matters:cargo_crate_purple", - "overdrive_that_matters:cargo_crate_blue", - "overdrive_that_matters:cargo_crate_brown", - "overdrive_that_matters:cargo_crate_green", - "overdrive_that_matters:cargo_crate_red", - "overdrive_that_matters:cargo_crate_black", - - "overdrive_that_matters:industrial_glass", - "overdrive_that_matters:industrial_glass_pane", - - "overdrive_that_matters:industrial_glass_white", - "overdrive_that_matters:industrial_glass_pane_white", - "overdrive_that_matters:industrial_glass_orange", - "overdrive_that_matters:industrial_glass_pane_orange", - "overdrive_that_matters:industrial_glass_magenta", - "overdrive_that_matters:industrial_glass_pane_magenta", - "overdrive_that_matters:industrial_glass_light_blue", - "overdrive_that_matters:industrial_glass_pane_light_blue", - "overdrive_that_matters:industrial_glass_yellow", - "overdrive_that_matters:industrial_glass_pane_yellow", - "overdrive_that_matters:industrial_glass_lime", - "overdrive_that_matters:industrial_glass_pane_lime", - "overdrive_that_matters:industrial_glass_pink", - "overdrive_that_matters:industrial_glass_pane_pink", - "overdrive_that_matters:industrial_glass_gray", - "overdrive_that_matters:industrial_glass_pane_gray", - "overdrive_that_matters:industrial_glass_light_gray", - "overdrive_that_matters:industrial_glass_pane_light_gray", - "overdrive_that_matters:industrial_glass_cyan", - "overdrive_that_matters:industrial_glass_pane_cyan", - "overdrive_that_matters:industrial_glass_purple", - "overdrive_that_matters:industrial_glass_pane_purple", - "overdrive_that_matters:industrial_glass_blue", - "overdrive_that_matters:industrial_glass_pane_blue", - "overdrive_that_matters:industrial_glass_brown", - "overdrive_that_matters:industrial_glass_pane_brown", - "overdrive_that_matters:industrial_glass_green", - "overdrive_that_matters:industrial_glass_pane_green", - "overdrive_that_matters:industrial_glass_red", - "overdrive_that_matters:industrial_glass_pane_red", - "overdrive_that_matters:industrial_glass_black", - "overdrive_that_matters:industrial_glass_pane_black", - - "overdrive_that_matters:tritanium_ore", - "overdrive_that_matters:deepslate_tritanium_ore", - "overdrive_that_matters:tritanium_raw_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json deleted file mode 100644 index bbdd945c1..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:android_station", - "overdrive_that_matters:battery_bank", - "overdrive_that_matters:matter_decomposer", - "overdrive_that_matters:matter_capacitor_bank", - "overdrive_that_matters:matter_cable", - "overdrive_that_matters:pattern_storage", - "overdrive_that_matters:matter_scanner", - "overdrive_that_matters:matter_panel", - "overdrive_that_matters:matter_replicator", - "overdrive_that_matters:matter_bottler", - "overdrive_that_matters:drive_viewer", - "overdrive_that_matters:matter_recycler", - - "overdrive_that_matters:tritanium_block", - - "overdrive_that_matters:tritanium_block_white", - "overdrive_that_matters:tritanium_block_orange", - "overdrive_that_matters:tritanium_block_magenta", - "overdrive_that_matters:tritanium_block_light_blue", - "overdrive_that_matters:tritanium_block_yellow", - "overdrive_that_matters:tritanium_block_lime", - "overdrive_that_matters:tritanium_block_pink", - "overdrive_that_matters:tritanium_block_gray", - "overdrive_that_matters:tritanium_block_light_gray", - "overdrive_that_matters:tritanium_block_cyan", - "overdrive_that_matters:tritanium_block_purple", - "overdrive_that_matters:tritanium_block_blue", - "overdrive_that_matters:tritanium_block_brown", - "overdrive_that_matters:tritanium_block_green", - "overdrive_that_matters:tritanium_block_red", - "overdrive_that_matters:tritanium_block_black", - - "overdrive_that_matters:floor_tiles_white", - "overdrive_that_matters:floor_tiles_orange", - "overdrive_that_matters:floor_tiles_magenta", - "overdrive_that_matters:floor_tiles_light_blue", - "overdrive_that_matters:floor_tiles_yellow", - "overdrive_that_matters:floor_tiles_lime", - "overdrive_that_matters:floor_tiles_pink", - "overdrive_that_matters:floor_tiles_gray", - "overdrive_that_matters:floor_tiles_light_gray", - "overdrive_that_matters:floor_tiles_cyan", - "overdrive_that_matters:floor_tiles_purple", - "overdrive_that_matters:floor_tiles_blue", - "overdrive_that_matters:floor_tiles_brown", - "overdrive_that_matters:floor_tiles_green", - "overdrive_that_matters:floor_tiles_red", - "overdrive_that_matters:floor_tiles_black", - - "overdrive_that_matters:tritanium_striped_block", - "overdrive_that_matters:carbon_fibre_block", - - "overdrive_that_matters:cargo_crate", - "overdrive_that_matters:cargo_crate_white", - "overdrive_that_matters:cargo_crate_orange", - "overdrive_that_matters:cargo_crate_magenta", - "overdrive_that_matters:cargo_crate_light_blue", - "overdrive_that_matters:cargo_crate_yellow", - "overdrive_that_matters:cargo_crate_lime", - "overdrive_that_matters:cargo_crate_pink", - "overdrive_that_matters:cargo_crate_gray", - "overdrive_that_matters:cargo_crate_light_gray", - "overdrive_that_matters:cargo_crate_cyan", - "overdrive_that_matters:cargo_crate_purple", - "overdrive_that_matters:cargo_crate_blue", - "overdrive_that_matters:cargo_crate_brown", - "overdrive_that_matters:cargo_crate_green", - "overdrive_that_matters:cargo_crate_red", - "overdrive_that_matters:cargo_crate_black", - - "overdrive_that_matters:industrial_glass", - "overdrive_that_matters:industrial_glass_pane", - - "overdrive_that_matters:industrial_glass_white", - "overdrive_that_matters:industrial_glass_pane_white", - "overdrive_that_matters:industrial_glass_orange", - "overdrive_that_matters:industrial_glass_pane_orange", - "overdrive_that_matters:industrial_glass_magenta", - "overdrive_that_matters:industrial_glass_pane_magenta", - "overdrive_that_matters:industrial_glass_light_blue", - "overdrive_that_matters:industrial_glass_pane_light_blue", - "overdrive_that_matters:industrial_glass_yellow", - "overdrive_that_matters:industrial_glass_pane_yellow", - "overdrive_that_matters:industrial_glass_lime", - "overdrive_that_matters:industrial_glass_pane_lime", - "overdrive_that_matters:industrial_glass_pink", - "overdrive_that_matters:industrial_glass_pane_pink", - "overdrive_that_matters:industrial_glass_gray", - "overdrive_that_matters:industrial_glass_pane_gray", - "overdrive_that_matters:industrial_glass_light_gray", - "overdrive_that_matters:industrial_glass_pane_light_gray", - "overdrive_that_matters:industrial_glass_cyan", - "overdrive_that_matters:industrial_glass_pane_cyan", - "overdrive_that_matters:industrial_glass_purple", - "overdrive_that_matters:industrial_glass_pane_purple", - "overdrive_that_matters:industrial_glass_blue", - "overdrive_that_matters:industrial_glass_pane_blue", - "overdrive_that_matters:industrial_glass_brown", - "overdrive_that_matters:industrial_glass_pane_brown", - "overdrive_that_matters:industrial_glass_green", - "overdrive_that_matters:industrial_glass_pane_green", - "overdrive_that_matters:industrial_glass_red", - "overdrive_that_matters:industrial_glass_pane_red", - "overdrive_that_matters:industrial_glass_black", - "overdrive_that_matters:industrial_glass_pane_black", - - "overdrive_that_matters:energy_counter", - "overdrive_that_matters:chemical_generator", - "overdrive_that_matters:plate_press", - "overdrive_that_matters:gravitation_stabilizer", - - "overdrive_that_matters:tritanium_ore", - "overdrive_that_matters:deepslate_tritanium_ore", - "overdrive_that_matters:tritanium_raw_block" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json deleted file mode 100644 index 21f629574..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:crate_red", - "overdrive_that_matters:crate_blue", - "overdrive_that_matters:crate_yellow", - "overdrive_that_matters:crate_green", - "overdrive_that_matters:crate_black", - "overdrive_that_matters:crate_pink", - "overdrive_that_matters:crate_purple", - "overdrive_that_matters:cargo_crate" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json b/src/main/resources/data/minecraft/tags/blocks/wither_immune.json deleted file mode 100644 index 7190f6b59..000000000 --- a/src/main/resources/data/minecraft/tags/blocks/wither_immune.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "overdrive_that_matters:black_hole" - ] -} \ No newline at end of file