From 4001eea509bd321dab156ae22a2568d68afb55cc Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Fri, 14 Jan 2022 20:54:27 +0700 Subject: [PATCH] Update data and datagen for latest added blocks --- src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt | 7 ++++++- .../data/minecraft/tags/blocks/mineable/pickaxe.json | 2 ++ .../data/minecraft/tags/blocks/needs_iron_tool.json | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) 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 07514fbd8..3fa4a06d3 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -14,7 +14,9 @@ import ru.dbotthepony.mc.otm.block.BlockEnergyCounter import ru.dbotthepony.mc.otm.block.BlockMatteryRotatable import ru.dbotthepony.mc.otm.block.BlockPatternStorage import ru.dbotthepony.mc.otm.block.entity.worker.WorkerState -import ru.dbotthepony.mc.otm.datagen.blocks.* +import ru.dbotthepony.mc.otm.datagen.blocks.BatteryBankProvider +import ru.dbotthepony.mc.otm.datagen.blocks.MatterBankProvider +import ru.dbotthepony.mc.otm.datagen.blocks.MatteryBlockStateProvider import ru.dbotthepony.mc.otm.datagen.items.MatteryItemModelProvider import ru.dbotthepony.mc.otm.datagen.loot.MatteryLootTableProvider import ru.dbotthepony.mc.otm.datagen.loot.TileNbtCopy @@ -267,6 +269,7 @@ object DataGen { simpleBlock(Blocks.TRITANIUM_BLOCK) simpleBlock(Blocks.TRITANIUM_STRIPED_BLOCK) simpleBlock(Blocks.MATTER_CABLE) + simpleBlock(Blocks.GRAVITATION_STABILIZER) tile(Blocks.ENERGY_COUNTER, TileNbtCopy("passed"), TileNbtCopy("history"), TileNbtCopy("history_tick")) tile(Blocks.CHEMICAL_GENERATOR, TileNbtCopy("energy"), TileNbtCopy("slots"), TileNbtCopy("working_ticks"), TileNbtCopy("working_ticks_total")) @@ -278,6 +281,8 @@ object DataGen { tile(Blocks.MATTER_DECOMPOSER, TileNbtCopy("work_slots"), TileNbtCopy("matter_capability"), *workerTags) tile(Blocks.MATTER_REPLICATOR, TileNbtCopy("regular_slots"), TileNbtCopy("reserved_slots"), TileNbtCopy("matter_capability"), *workerTags) tile(Blocks.MATTER_SCANNER, TileNbtCopy("work_slots"), *workerTags) + tile(Blocks.PLATE_PRESS, TileNbtCopy("container"), *workerTags) + tile(Blocks.MATTER_PANEL, TileNbtCopy("tasks")) tile(Blocks.PATTERN_STORAGE, TileNbtCopy("patterns")) tile(Blocks.MATTER_CAPACITOR_BANK, TileNbtCopy("matter_container")) diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 1ddf21750..1f276efee 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -19,6 +19,8 @@ "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", 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 index 7253d6267..5e660d6f7 100644 --- a/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/main/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -19,6 +19,8 @@ "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",