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 f15538f74..20e84e1d1 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DataGen.kt @@ -516,8 +516,10 @@ object DataGen { event.generator.addProvider(event.includeServer(), blockStateProvider) event.generator.addProvider(event.includeClient(), itemModelProvider) event.generator.addProvider(event.includeServer(), recipeProvider) - event.generator.addProvider(event.includeClient(), MatterBankProvider(event)) - event.generator.addProvider(event.includeClient(), BatteryBankProvider(event)) + DyeColor.entries.forEach { event.generator.addProvider(event.includeClient(), MatterBankProvider(event, it)) } + event.generator.addProvider(event.includeClient(), MatterBankProvider(event, null)) + DyeColor.entries.forEach { event.generator.addProvider(event.includeClient(), BatteryBankProvider(event, it)) } + event.generator.addProvider(event.includeClient(), BatteryBankProvider(event, null)) event.generator.addProvider(event.includeServer(), lootTableProvider) event.generator.addProvider(event.includeServer(), lootModifier) event.generator.addProvider(event.includeServer(), SoundDataProvider(event)) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt index 7a8db81c5..5906c96cf 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/advancements/MachineAdvancementsData.kt @@ -102,30 +102,30 @@ fun addMachineAdvancements(serializer: Consumer, lang: Matter CraftEntry(MItems.TWIN_PLATE_PRESS.values, "Twice the Thud", russianName = "Двойной стук").make(serializer, press, translation) - val scanner = CraftEntry(MItems.MATTER_SCANNER, "Scanning Things that Matter", + val scanner = CraftEntry(MItems.MATTER_SCANNER.values, "Scanning Things that Matter", russianName = "Сканируем вещи которые материальны") - val decomposer = CraftEntry(MItems.MATTER_DECOMPOSER, "Decaying the Atoms", "Keep your limbs outside of the working chamber at all times", + val decomposer = CraftEntry(MItems.MATTER_DECOMPOSER.values, "Decaying the Atoms", "Keep your limbs outside of the working chamber at all times", russianName = "Разлагаем атомы", russianSuffix = "Во всех ситуациях держите свои конечности вне рабочей камеры") val panel = CraftEntry(MItems.MATTER_PANEL, "Indexing the Library", russianName = "Индексируем библиотеку") - val replicator = CraftEntry(MItems.MATTER_REPLICATOR, "Cook with (Im)Perfection", "Now let's bake some perfect bread", + val replicator = CraftEntry(MItems.MATTER_REPLICATOR.values, "Cook with (Im)Perfection", "Now let's bake some perfect bread", russianName = "Повар с (не) идеальностями", russianSuffix = "А теперь давайте выпечем немного идеального хлеба") - val bottler = CraftEntry(MItems.MATTER_BOTTLER, "Transfusing Pure Matter", "For those who loved to play with water in their childhood", + val bottler = CraftEntry(MItems.MATTER_BOTTLER.values, "Transfusing Pure Matter", "For those who loved to play with water in their childhood", russianName = "Переливаем чистую материю", russianSuffix = "Для тех, кто любил играться в воде в детстве") val recycler = CraftEntry(MItems.MATTER_RECYCLER, "Refine and Redefine", "This is what waste recycling should look like", russianName = "Переработка и перегонка", russianSuffix = "Вот он, пик переработки отходов") - val capacitor = CraftEntry(MItems.MATTER_CAPACITOR_BANK, "Modular Matter Tank", + val capacitor = CraftEntry(MItems.MATTER_CAPACITOR_BANK.values, "Modular Matter Tank", russianName = "Модульный бак материи") val counter = CraftEntry(MItems.ENERGY_COUNTER, "Visualize Power Burn", russianName = "Визуализация сжигания энергии") - val battery = CraftEntry(MItems.BATTERY_BANK, "Batteries Not Included", "By all means avoid the urge to hammer incompatible batteries into the power bus.", + val battery = CraftEntry(MItems.BATTERY_BANK.values, "Batteries Not Included", "By all means avoid the urge to hammer incompatible batteries into the power bus.", russianName = "Батарейки в комплект не входят", russianSuffix = "Пожалуйста, воздержитесь от вбивания кувалдой несовместимых батарей в энергетическую шину.") val pattern = CraftEntry(MItems.PATTERN_STORAGE, "Digital Knowledge Library", russianName = "Цифровая библиотека знаний") - val reconstructor = CraftEntry(MItems.MATTER_RECONSTRUCTOR, "Flipping Hourglass", + val reconstructor = CraftEntry(MItems.MATTER_RECONSTRUCTOR.values, "Flipping Hourglass", russianName = "Переворачиваем песочные часы") decomposer.make(serializer, press, translation).also { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt index 7302eeb0c..acc27d924 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/Banks.kt @@ -1,5 +1,6 @@ package ru.dbotthepony.mc.otm.datagen.blocks +import net.minecraft.world.item.DyeColor import net.minecraft.world.level.block.Block import net.minecraftforge.client.model.generators.BlockStateProvider import net.minecraftforge.client.model.generators.ConfiguredModel @@ -18,16 +19,16 @@ private fun nothingOrNumber(input: Int): String { return (input - 1).toString() } -open class BatteryBankProvider(event: GatherDataEvent) : BlockStateProvider(event.generator.packOutput, DataGen.MOD_ID, event.existingFileHelper) { +open class BatteryBankProvider(event: GatherDataEvent, val color: DyeColor?) : BlockStateProvider(event.generator.packOutput, DataGen.MOD_ID, event.existingFileHelper) { protected var block = "battery_bank" protected var batteryPath = "block/battery/battery" - protected var registry: Block = MBlocks.BATTERY_BANK + protected var registry: Block = MBlocks.BATTERY_BANK[color]!! override fun registerStatesAndModels() { with(getVariantBuilder(registry)) { forAllStates { ConfiguredModel.builder() - .modelFile(models().getExistingFile(modLocation("block/$block"))) + .modelFile(models().getExistingFile(modLocation("block/$block${if (color != null) "_${color.name.lowercase()}" else ""}"))) .rotationY(it[BlockRotationFreedom.HORIZONTAL.property].front.yRotationBlockstateNorth()) .build() } @@ -35,18 +36,18 @@ open class BatteryBankProvider(event: GatherDataEvent) : BlockStateProvider(even } override fun getName(): String { - return "Battery Bank Model Provider" + return "Battery Bank Model Provider for color $color" } } -class MatterBankProvider(event: GatherDataEvent) : BatteryBankProvider(event) { +class MatterBankProvider(event: GatherDataEvent, color: DyeColor?) : BatteryBankProvider(event, color) { init { block = "matter_capacitor_bank" batteryPath = "block/battery/matter_capacitor" - registry = MBlocks.MATTER_CAPACITOR_BANK + registry = MBlocks.MATTER_CAPACITOR_BANK[color]!! } override fun getName(): String { - return "Matter Bank Model Provider" + return "Matter Bank Model Provider for color $color" } } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt index 3dba552b8..e831fc197 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockModels.kt @@ -12,8 +12,21 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { coloredMachine(MBlocks.COBBLESTONE_GENERATOR, listOf("0", "particle")) coloredMachine(MBlocks.ESSENCE_STORAGE, listOf("0", "particle")) + coloredMachine(MBlocks.ITEM_MONITOR, listOf("0", "particle")) + coloredMachine(MBlocks.MATTER_RECONSTRUCTOR, listOf("0", "particle")) + + colored("matter_capacitor_bank", mapOf("1" to "mattercapacitorbank_frame", "particle" to "mattercapacitorbank_frame")) + colored("battery_bank", mapOf("1" to "batterybank_frame", "particle" to "batterybank_frame")) coloredMachineCombined("plate_press", "plate_press2", listOf("idle", "error", "working"), listOf("0", "particle")) coloredMachineCombined("twin_plate_press", "plate_press2", listOf("idle", "error", "working"), listOf("0", "particle")) + coloredMachineCombined("matter_recycler", "matter_recycler", listOf("idle", "error", "working"), listOf("0", "particle")) + coloredMachineCombined("matter_scanner", "matter_scanner", listOf("idle", "error", "working"), listOf("texture", "particle")) + coloredMachineCombined("matter_bottler", "matter_bottler", listOf("idle", "error", "working"), listOf("texture", "particle")) + coloredMachineCombined("matter_decomposer", "matter_decomposer", listOf("idle", "error", "working"), listOf("texture", "particle")) + + colored("matter_replicator", "idle", mapOf("1" to "matter_replicator_base", "particle" to "matter_replicator_base", "texture" to "matter_replicator_offline")) + colored("matter_replicator", "error", mapOf("1" to "matter_replicator_base", "particle" to "matter_replicator_base", "texture" to "matter_replicator_halted")) + colored("matter_replicator", "working", mapOf("1" to "matter_replicator_base", "particle" to "matter_replicator_base", "texture" to "matter_replicator")) } } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt index 978834388..ee2725561 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/blocks/BlockStates.kt @@ -30,8 +30,8 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.METAL_MESH) provider.block(MBlocks.CHEMICAL_GENERATOR) - provider.block(MBlocks.MATTER_SCANNER) - provider.block(MBlocks.ITEM_MONITOR) + provider.block(MBlocks.MATTER_SCANNER.values) + provider.block(MBlocks.ITEM_MONITOR.values) provider.block(MBlocks.HOLO_SIGN) provider.exec { @@ -59,40 +59,42 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { } } - with(provider.getMultipartBuilder(MBlocks.MATTER_BOTTLER)) { - for (dir in BlockRotationFreedom.HORIZONTAL.possibleValues) { - for (enum in WorkerState.SEMI_WORKER_STATE.possibleValues) { - part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name.lowercase()}"))) - .rotationY(dir.front.yRotationBlockstateNorth()) - .addModel() - .condition(BlockRotationFreedom.HORIZONTAL.property, dir) - .condition(WorkerState.WORKER_STATE, enum) - .end() + for (block in MBlocks.MATTER_BOTTLER.values) { + with(provider.getMultipartBuilder(block)) { + for (dir in BlockRotationFreedom.HORIZONTAL.possibleValues) { + for (enum in WorkerState.SEMI_WORKER_STATE.possibleValues) { + part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name.lowercase()}"))) + .rotationY(dir.front.yRotationBlockstateNorth()) + .addModel() + .condition(BlockRotationFreedom.HORIZONTAL.property, dir) + .condition(WorkerState.WORKER_STATE, enum) + .end() + } } - } - for (dir in BlockRotationFreedom.HORIZONTAL.possibleValues) { - for (enum in MatterBottlerBlock.SLOT_PROPERTIES) { - part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name}_open"))) - .rotationY(dir.front.yRotationBlockstateNorth()) - .addModel() - .condition(BlockRotationFreedom.HORIZONTAL.property, dir) - .condition(enum, false) - .end() + for (dir in BlockRotationFreedom.HORIZONTAL.possibleValues) { + for (enum in MatterBottlerBlock.SLOT_PROPERTIES) { + part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name}_open"))) + .rotationY(dir.front.yRotationBlockstateNorth()) + .addModel() + .condition(BlockRotationFreedom.HORIZONTAL.property, dir) + .condition(enum, false) + .end() - part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name}_closed"))) - .rotationY(dir.front.yRotationBlockstateNorth()) - .addModel() - .condition(BlockRotationFreedom.HORIZONTAL.property, dir) - .condition(enum, true) - .end() + part().modelFile(provider.models().getExistingFile(modLocation("matter_bottler_${enum.name}_closed"))) + .rotationY(dir.front.yRotationBlockstateNorth()) + .addModel() + .condition(BlockRotationFreedom.HORIZONTAL.property, dir) + .condition(enum, true) + .end() + } } } } } - provider.block(MBlocks.MATTER_DECOMPOSER) - provider.block(MBlocks.MATTER_REPLICATOR) + provider.block(MBlocks.MATTER_DECOMPOSER.values) + provider.block(MBlocks.MATTER_REPLICATOR.values) provider.block(MBlocks.PLATE_PRESS.values) provider.block(MBlocks.TWIN_PLATE_PRESS.values) provider.block(MBlocks.GRAVITATION_STABILIZER) @@ -104,7 +106,7 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.STORAGE_POWER_SUPPLIER) provider.block(MBlocks.MATTER_RECYCLER) - provider.block(MBlocks.MATTER_RECONSTRUCTOR) + provider.block(MBlocks.MATTER_RECONSTRUCTOR.values) provider.block(MBlocks.ENERGY_SERVO) provider.block(MBlocks.COBBLESTONE_GENERATOR.values) provider.block(MBlocks.ESSENCE_STORAGE.values) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt index 21e5437f7..52797e34f 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/items/ItemModels.kt @@ -8,8 +8,8 @@ import ru.dbotthepony.mc.otm.registry.MRegistry fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.ANDROID_STATION, "android_station_working") - provider.block(MItems.BATTERY_BANK) - provider.block(MItems.MATTER_CAPACITOR_BANK) + provider.coloredWithBaseBlock(MItems.BATTERY_BANK, "matter_capacitor_bank") + provider.coloredWithBaseBlock(MItems.MATTER_CAPACITOR_BANK, "matter_capacitor_bank") provider.block(MItems.PATTERN_STORAGE) provider.exec { @@ -28,7 +28,7 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.TRITANIUM_STRIPED_BLOCK) provider.block(MItems.TRITANIUM_RAW_BLOCK) provider.block(MItems.TRITANIUM_INGOT_BLOCK) - provider.block(MItems.ITEM_MONITOR) + provider.coloredWithBaseBlock(MItems.ITEM_MONITOR, "item_monitor") provider.block(MItems.PHANTOM_ATTRACTOR) provider.block(MItems.HOLO_SIGN) @@ -168,12 +168,14 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.CHEMICAL_GENERATOR, "chemical_generator_working") provider.block(MItems.ENERGY_COUNTER, "energy_counter_down") - provider.block(MItems.MATTER_BOTTLER, "matter_bottler_working") + provider.coloredWithBaseBlock(MItems.MATTER_BOTTLER, "matter_bottler", "_idle") + provider.coloredWithBaseBlock(MItems.MATTER_SCANNER, "matter_scanner", "_idle") + provider.coloredWithBaseBlock(MItems.MATTER_REPLICATOR, "matter_replicator", "_idle") provider.block(MItems.MATTER_CABLE, "matter_cable_core") - provider.block(MItems.MATTER_DECOMPOSER, "matter_decomposer_working") + provider.coloredWithBaseBlock(MItems.MATTER_DECOMPOSER, "matter_decomposer", "_idle") provider.block(MItems.ENERGY_SERVO, "energy_servo") provider.coloredWithBaseBlock(MItems.ESSENCE_STORAGE, "essence_storage") - provider.block(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor") + provider.coloredWithBaseBlock(MItems.MATTER_RECONSTRUCTOR, "matter_reconstructor") provider.block(MItems.POWERED_BLAST_FURNACE, "powered_blast_furnace_working") provider.block(MItems.POWERED_FURNACE, "powered_furnace_working") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt index fb1c20267..cbea1fe86 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/English.kt @@ -417,23 +417,23 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.ANDROID_STATION, "Android Station") add(MBlocks.ANDROID_CHARGER, "Wireless Charger") add(MBlocks.ANDROID_CHARGER, "desc", "Charges nearby androids and exopacks") - add(MBlocks.BATTERY_BANK, "Battery Bank") - add(MBlocks.MATTER_DECOMPOSER, "Matter Decomposer") - add(MBlocks.MATTER_CAPACITOR_BANK, "Matter Capacitor Bank") + addBlock(MBlocks.BATTERY_BANK.values, "Battery Bank") + addBlock(MBlocks.MATTER_DECOMPOSER.values, "Matter Decomposer") + addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Matter Capacitor Bank") add(MBlocks.MATTER_CABLE, "Matter Network Cable") add(MBlocks.PATTERN_STORAGE, "Pattern Storage") - add(MBlocks.MATTER_SCANNER, "Matter Scanner") + addBlock(MBlocks.MATTER_SCANNER.values, "Matter Scanner") add(MBlocks.MATTER_PANEL, "Pattern Monitor") - add(MBlocks.MATTER_REPLICATOR, "Matter Replicator") - add(MBlocks.MATTER_BOTTLER, "Matter Bottler") + addBlock(MBlocks.MATTER_REPLICATOR.values, "Matter Replicator") + addBlock(MBlocks.MATTER_BOTTLER.values, "Matter Bottler") add(MBlocks.DRIVE_VIEWER, "Drive Viewer") add(MBlocks.BLACK_HOLE, "Local Anomalous Spacetime Dilation Singular Point") addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Cobblestone Generator") add(MBlocks.INFINITE_WATER_SOURCE, "Infinite Water Source") addBlock(MBlocks.ESSENCE_STORAGE.values, "Essence Storage") addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Allows to store and retrieve experience levels") - add(MBlocks.MATTER_RECONSTRUCTOR, "Matter Reconstructor") - add(MBlocks.MATTER_RECONSTRUCTOR, "desc", "Repairs tools using matter") + addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Matter Reconstructor") + addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Repairs tools using matter") add(MBlocks.DEV_CHEST, "Dev Chest") add(MBlocks.DEV_CHEST, "desc", "Contains all items present in game") add(MBlocks.PAINTER, "Painting Table") @@ -458,7 +458,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.CHEMICAL_GENERATOR, "Chemical Generator") add(MBlocks.DRIVE_RACK, "Condensation Drive Rack") - add(MBlocks.ITEM_MONITOR, "Item Monitor") + addBlock(MBlocks.ITEM_MONITOR.values, "Item Monitor") addBlock(MBlocks.PLATE_PRESS.values, "Plate Press") addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Twin Plate Press") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt index f24fe6dc1..c8d77d378 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/lang/Russian.kt @@ -419,23 +419,23 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.ANDROID_STATION, "Станция андроидов") add(MBlocks.ANDROID_CHARGER, "Беспроводной зарядник") add(MBlocks.ANDROID_CHARGER, "desc", "Заряжает ближайших андроидов и экзопаки") - add(MBlocks.BATTERY_BANK, "Банк аккумуляторов") - add(MBlocks.MATTER_DECOMPOSER, "Декомпозитор материи") - add(MBlocks.MATTER_CAPACITOR_BANK, "Банк накопителей материи") + addBlock(MBlocks.BATTERY_BANK.values, "Банк аккумуляторов") + addBlock(MBlocks.MATTER_DECOMPOSER.values, "Декомпозитор материи") + addBlock(MBlocks.MATTER_CAPACITOR_BANK.values, "Банк накопителей материи") add(MBlocks.MATTER_CABLE, "Кабель сети материи") add(MBlocks.PATTERN_STORAGE, "Хранилище шаблонов") - add(MBlocks.MATTER_SCANNER, "Сканер материи") + addBlock(MBlocks.MATTER_SCANNER.values, "Сканер материи") add(MBlocks.MATTER_PANEL, "Монитор шаблонов") - add(MBlocks.MATTER_REPLICATOR, "Репликатор материи") - add(MBlocks.MATTER_BOTTLER, "Бутилировщик материи") + addBlock(MBlocks.MATTER_REPLICATOR.values, "Репликатор материи") + addBlock(MBlocks.MATTER_BOTTLER.values, "Бутилировщик материи") add(MBlocks.DRIVE_VIEWER, "Просмотрщик дисков конденсации") add(MBlocks.BLACK_HOLE, "Локализированная сингулярная точка аномального искажения пространства-времени") addBlock(MBlocks.COBBLESTONE_GENERATOR.values, "Генератор булыжника") add(MBlocks.INFINITE_WATER_SOURCE, "Неиссякаемый источник воды") addBlock(MBlocks.ESSENCE_STORAGE.values, "Хранилище эссенции") addBlock(MBlocks.ESSENCE_STORAGE.values, "desc", "Позволяет хранить очки опыта") - add(MBlocks.MATTER_RECONSTRUCTOR, "Материальный реконструктор") - add(MBlocks.MATTER_RECONSTRUCTOR, "desc", "Чинит инструменты используя материю") + addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "Материальный реконструктор") + addBlock(MBlocks.MATTER_RECONSTRUCTOR.values, "desc", "Чинит инструменты используя материю") add(MBlocks.DEV_CHEST, "Сундук разработчика") add(MBlocks.DEV_CHEST, "desc", "Хранит все предметы, которые есть в игре") add(MBlocks.PAINTER, "Стол маляра") @@ -460,7 +460,7 @@ private fun blocks(provider: MatteryLanguageProvider) { add(MBlocks.CHEMICAL_GENERATOR, "Химический генератор") add(MBlocks.DRIVE_RACK, "Стеллаж дисков конденсации") - add(MBlocks.ITEM_MONITOR, "Монитор предметов") + addBlock(MBlocks.ITEM_MONITOR.values, "Монитор предметов") addBlock(MBlocks.PLATE_PRESS.values, "Пресс пластин") addBlock(MBlocks.TWIN_PLATE_PRESS.values, "Двойной пресс пластин") diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt index eb14cda0b..e42a1bcff 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesData.kt @@ -133,7 +133,7 @@ fun addLootTables(lootTables: LootTables) { lootTables.tile(MBlocks.COBBLESTONE_GENERATOR.values) lootTables.tile(MBlocks.ESSENCE_STORAGE.values) - lootTables.tile(MBlocks.MATTER_RECONSTRUCTOR) + lootTables.tile(MBlocks.MATTER_RECONSTRUCTOR.values) lootTables.tile(MBlocks.FLUID_TANK) lootTables.tile(MBlocks.PAINTER) lootTables.tile(MBlocks.MATTER_ENTANGLER) @@ -145,7 +145,7 @@ fun addLootTables(lootTables: LootTables) { lootTables.tile(MBlocks.STORAGE_CABLE) lootTables.tile(MBlocks.ANDROID_STATION) lootTables.tile(MBlocks.ANDROID_CHARGER) - lootTables.tile(MBlocks.BATTERY_BANK) + lootTables.tile(MBlocks.BATTERY_BANK.values) lootTables.tile(MBlocks.DRIVE_VIEWER) lootTables.tile(MBlocks.STORAGE_BUS) @@ -154,10 +154,10 @@ fun addLootTables(lootTables: LootTables) { lootTables.tile(MBlocks.STORAGE_POWER_SUPPLIER) lootTables.tile(MBlocks.DRIVE_RACK) - lootTables.tile(MBlocks.MATTER_DECOMPOSER) - lootTables.tile(MBlocks.MATTER_REPLICATOR) + lootTables.tile(MBlocks.MATTER_DECOMPOSER.values) + lootTables.tile(MBlocks.MATTER_REPLICATOR.values) lootTables.tile(MBlocks.MATTER_RECYCLER) - lootTables.tile(MBlocks.MATTER_SCANNER) + lootTables.tile(MBlocks.MATTER_SCANNER.values) lootTables.tile(MBlocks.PLATE_PRESS.values) lootTables.tile(MBlocks.TWIN_PLATE_PRESS.values) @@ -167,6 +167,6 @@ fun addLootTables(lootTables: LootTables) { lootTables.tile(MBlocks.MATTER_PANEL) lootTables.tile(MBlocks.PATTERN_STORAGE) - lootTables.tile(MBlocks.MATTER_CAPACITOR_BANK) - lootTables.tile(MBlocks.MATTER_BOTTLER) + lootTables.tile(MBlocks.MATTER_CAPACITOR_BANK.values) + lootTables.tile(MBlocks.MATTER_BOTTLER.values) } diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt index 113e69a4f..af597596c 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/models/MatteryModelProvider.kt @@ -126,6 +126,18 @@ class MatteryBlockModelProvider(event: GatherDataEvent) : BlockModelProvider(eve } } + fun colored(modelName: String, suffix: String, textureKeys: Map) { + for (color in DyeColor.entries) { + exec { + val model = withExistingParent(modelName + "_${color.name.lowercase()}_$suffix", modLocation(modelName)) + + for ((key, value) in textureKeys) { + model.texture(key, modLocation("block/$value/${color.name.lowercase()}")) + } + } + } + } + fun coloredMachineCombined(modelName: String, textureName: String, states: Collection, textureKeys: Collection) { exec { for (color in DyeColor.entries) { diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt index 7f56a681d..5c1f2280b 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt @@ -99,14 +99,14 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .build(consumer) // Блоки - MatteryRecipe(MItems.MATTER_CAPACITOR_BANK, category = machinesCategory) + MatteryRecipe(MItems.MATTER_CAPACITOR_BANK[null]!!, category = machinesCategory) .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS) .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES) .row(MItems.MATTER_CABLE, MItems.MATTER_IO_PORT, MItems.MATTER_CABLE) .unlockedBy(MItems.MATTER_CABLE) .build(consumer) - MatteryRecipe(MItems.BATTERY_BANK, category = machinesCategory) + MatteryRecipe(MItems.BATTERY_BANK[null]!!, category = machinesCategory) .row(Tags.Items.GLASS, MItemTags.IRON_PLATES, Tags.Items.GLASS) .row(MItemTags.IRON_PLATES, MItems.MACHINE_FRAME, MItemTags.IRON_PLATES) .row(MItems.ELECTRIC_PARTS, MItems.ENERGY_BUS, MItems.ELECTRIC_PARTS) @@ -405,16 +405,18 @@ fun addCraftingTableRecipes(consumer: RecipeOutput) { .rowB(Tags.Items.RODS_WOODEN) .build(consumer) - MatteryRecipe(MItems.MATTER_RECONSTRUCTOR, category = machinesCategory) - .setUpgradeSource(MItems.MATTER_REPLICATOR) - .addUpgradeOps( - UpgradeRecipe.Indirect("BlockEntityTag.${MatteryBlockEntity.ENERGY_KEY}", "BlockEntityTag.energy"), - UpgradeRecipe.Indirect("BlockEntityTag.${MatteryBlockEntity.MATTER_STORAGE_KEY}", "BlockEntityTag.matter"), - ) - .row(MItemTags.ADVANCED_CIRCUIT, Tags.Items.GEMS_EMERALD, MItemTags.ADVANCED_CIRCUIT) - .row(MItems.ELECTRIC_PARTS, MItems.MATTER_REPLICATOR, MItems.ELECTRIC_PARTS) - .row(MItems.ELECTROMAGNET, MItems.ELECTROMAGNET, MItems.ELECTROMAGNET) - .build(consumer) + for ((dye, item) in MItems.MATTER_REPLICATOR) { + MatteryRecipe(MItems.MATTER_RECONSTRUCTOR[dye]!!, category = machinesCategory) + .setUpgradeSource(item) + .addUpgradeOps( + UpgradeRecipe.Indirect("BlockEntityTag.${MatteryBlockEntity.ENERGY_KEY}", "BlockEntityTag.energy"), + UpgradeRecipe.Indirect("BlockEntityTag.${MatteryBlockEntity.MATTER_STORAGE_KEY}", "BlockEntityTag.matter"), + ) + .row(MItemTags.ADVANCED_CIRCUIT, Tags.Items.GEMS_EMERALD, MItemTags.ADVANCED_CIRCUIT) + .row(MItems.ELECTRIC_PARTS, item, MItems.ELECTRIC_PARTS) + .row(MItems.ELECTROMAGNET, MItems.ELECTROMAGNET, MItems.ELECTROMAGNET) + .build(consumer) + } MatteryRecipe(MItems.FLUID_CAPSULE, category = RecipeCategory.TOOLS, count = 8) .row(MItemTags.TRITANIUM_NUGGETS, MItemTags.TRITANIUM_NUGGETS, MItemTags.TRITANIUM_NUGGETS) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt index 23694cb1d..4dd3e6afc 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/PainterRecipes.kt @@ -271,10 +271,25 @@ fun addPainterRecipes(consumer: RecipeOutput) { generate(consumer, MItems.TRITANIUM_DOOR[null]!!, MItems.TRITANIUM_DOOR) generate(consumer, MItems.TRITANIUM_TRAPDOOR[null]!!, MItems.TRITANIUM_TRAPDOOR) - generate(consumer, MItems.COBBLESTONE_GENERATOR[null]!!, MItems.COBBLESTONE_GENERATOR) - generate(consumer, MItems.ESSENCE_STORAGE[null]!!, MItems.ESSENCE_STORAGE) - generate(consumer, MItems.PLATE_PRESS[null]!!, MItems.PLATE_PRESS) - generate(consumer, MItems.TWIN_PLATE_PRESS[null]!!, MItems.TWIN_PLATE_PRESS) + val blocks = listOf( + MItems.COBBLESTONE_GENERATOR, + MItems.ESSENCE_STORAGE, + MItems.PLATE_PRESS, + MItems.TWIN_PLATE_PRESS, + MItems.ITEM_MONITOR, + MItems.MATTER_BOTTLER, + MItems.MATTER_RECONSTRUCTOR, + MItems.MATTER_REPLICATOR, + MItems.MATTER_SCANNER, + MItems.MATTER_CAPACITOR_BANK, + MItems.BATTERY_BANK, + MItems.MATTER_DECOMPOSER, + ) + + for (list in blocks) { + generate(consumer, list[null]!!,list) + } + generate(consumer, MRegistry.COMPUTER_TERMINAL.item, MRegistry.COMPUTER_TERMINAL.items) generate(consumer, MRegistry.VENT.item, MRegistry.VENT.items) 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 0e2712d35..879d3f3f4 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 @@ -6,6 +6,7 @@ import net.minecraft.tags.ItemTags import net.minecraft.world.effect.MobEffects import net.minecraft.world.item.Items import net.minecraft.world.item.Tiers +import net.minecraft.world.level.block.Block import net.minecraft.world.level.block.Blocks import net.minecraftforge.common.Tags import ru.dbotthepony.mc.otm.registry.MBlockTags @@ -178,16 +179,16 @@ fun addTags(tagsProvider: TagsProvider) { tagsProvider.requiresPickaxe(MBlocks.PAINTER, Tiers.STONE) tagsProvider.requiresPickaxe(MBlocks.ENERGY_CABLES.values, Tiers.STONE) - tagsProvider.requiresPickaxe(listOf( + tagsProvider.requiresPickaxe(listOf( MBlocks.ANDROID_STATION, - MBlocks.BATTERY_BANK, - MBlocks.MATTER_DECOMPOSER, - MBlocks.MATTER_CAPACITOR_BANK, + *MBlocks.BATTERY_BANK.values.toTypedArray(), + *MBlocks.MATTER_DECOMPOSER.values.toTypedArray(), + *MBlocks.MATTER_CAPACITOR_BANK.values.toTypedArray(), MBlocks.PATTERN_STORAGE, - MBlocks.MATTER_SCANNER, + *MBlocks.MATTER_SCANNER.values.toTypedArray(), MBlocks.MATTER_PANEL, - MBlocks.MATTER_REPLICATOR, - MBlocks.MATTER_BOTTLER, + *MBlocks.MATTER_REPLICATOR.values.toTypedArray(), + *MBlocks.MATTER_BOTTLER.values.toTypedArray(), MBlocks.ENERGY_COUNTER, MBlocks.CHEMICAL_GENERATOR, *MBlocks.PLATE_PRESS.values.toTypedArray(), @@ -205,7 +206,7 @@ fun addTags(tagsProvider: TagsProvider) { MBlocks.DRIVE_VIEWER, MBlocks.DRIVE_RACK, - MBlocks.ITEM_MONITOR, + *MBlocks.ITEM_MONITOR.values.toTypedArray(), MBlocks.STORAGE_POWER_SUPPLIER, MBlocks.PHANTOM_ATTRACTOR, @@ -220,7 +221,7 @@ fun addTags(tagsProvider: TagsProvider) { MBlocks.HOLO_SIGN, *MBlocks.COBBLESTONE_GENERATOR.values.toTypedArray(), *MBlocks.ESSENCE_STORAGE.values.toTypedArray(), - MBlocks.MATTER_RECONSTRUCTOR, + *MBlocks.MATTER_RECONSTRUCTOR.values.toTypedArray(), MBlocks.FLUID_TANK, MBlocks.ANDROID_CHARGER, ), Tiers.IRON) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt index 7dd4a1876..ab6cf9e08 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterBottlerBlock.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level @@ -22,7 +23,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterBottlerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterBottlerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return MatterBottlerBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt index 8dd5f1d73..ff66222dd 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterCapacitorBankBlock.kt @@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos import net.minecraft.core.Direction +import net.minecraft.world.item.DyeColor import net.minecraft.world.item.context.BlockPlaceContext import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.block.Block @@ -18,7 +19,7 @@ import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterCapacitorBankBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterCapacitorBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return MatterCapacitorBankBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt index 8a3034140..dbaa8d39b 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterDecomposerBlock.kt @@ -4,6 +4,7 @@ import net.minecraft.MethodsReturnNonnullByDefault import javax.annotation.ParametersAreNonnullByDefault import net.minecraft.world.level.block.EntityBlock import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import net.minecraft.world.level.block.state.BlockState import net.minecraft.world.level.block.entity.BlockEntity import ru.dbotthepony.mc.otm.block.entity.matter.MatterDecomposerBlockEntity @@ -22,7 +23,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterDecomposerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterDecomposerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return MatterDecomposerBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt index 56b036df7..268b31ddc 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReconstructorBlock.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.EntityBlock @@ -17,7 +18,7 @@ import ru.dbotthepony.mc.otm.block.getShapeForEachState import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterReconstructorBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterReconstructorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(pPos: BlockPos, pState: BlockState): BlockEntity { return MatterReconstructorBlockEntity(pPos, pState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt index a51b83ae5..b20b79b6d 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterReplicatorBlock.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -20,7 +21,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterReplicatorBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterReplicatorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return MatterReplicatorBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt index 53cc306ca..b7ae511aa 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/matter/MatterScannerBlock.kt @@ -1,6 +1,7 @@ package ru.dbotthepony.mc.otm.block.matter import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level import net.minecraft.world.level.block.Block @@ -20,7 +21,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -class MatterScannerBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class MatterScannerBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return MatterScannerBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt index 8944f7265..957dbc9e8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/storage/ItemMonitorBlock.kt @@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.block.storage import net.minecraft.core.BlockPos import net.minecraft.network.chat.Component +import net.minecraft.world.item.DyeColor import net.minecraft.world.item.ItemStack import net.minecraft.world.item.TooltipFlag import net.minecraft.world.level.BlockGetter @@ -22,7 +23,7 @@ import ru.dbotthepony.mc.otm.core.get import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -class ItemMonitorBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class ItemMonitorBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun newBlockEntity(blockPos: BlockPos, blockState: BlockState): BlockEntity { return ItemMonitorBlockEntity(blockPos, blockState) } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt index c5f7f9c87..9bee0b46c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/tech/BatteryBankBlock.kt @@ -12,6 +12,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType import net.minecraft.world.level.block.entity.BlockEntityTicker import net.minecraft.world.level.block.state.StateDefinition import net.minecraft.core.BlockPos +import net.minecraft.world.item.DyeColor import ru.dbotthepony.mc.otm.block.entity.tech.BatteryBankBlockEntity import net.minecraft.world.level.BlockGetter import net.minecraft.world.level.Level @@ -25,9 +26,7 @@ import ru.dbotthepony.mc.otm.oncePre import ru.dbotthepony.mc.otm.registry.MBlockEntities import ru.dbotthepony.mc.otm.shapes.BlockShapes -@MethodsReturnNonnullByDefault -@ParametersAreNonnullByDefault -class BatteryBankBlock : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { +class BatteryBankBlock(val color: DyeColor?) : RotatableMatteryBlock(DEFAULT_MACHINE_PROPERTIES), EntityBlock { override fun getTicker( level: Level, p_153213_: BlockState, diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt index 22f6bdcd8..ce94da256 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jei/JEIPlugin.kt @@ -71,7 +71,7 @@ class JEIPlugin : IModPlugin { registration.addRecipeCatalyst(ItemStack(MItems.POWERED_SMOKER), RecipeTypes.SMOKING) registration.addRecipeCatalyst(ItemStack(MItems.POWERED_SMOKER), MicrowaveRecipeCategory.recipeType) registration.addRecipeCatalyst(ItemStack(MItems.ExopackUpgrades.CRAFTING_UPGRADE), RecipeTypes.CRAFTING) - registration.addRecipeCatalyst(ItemStack(MItems.ITEM_MONITOR), RecipeTypes.CRAFTING) + registration.addRecipeCatalyst(ItemStack(MItems.ITEM_MONITOR[null]!!), RecipeTypes.CRAFTING) MItems.PLATE_PRESS.values.forEach { registration.addRecipeCatalyst(ItemStack(it), PlatePressRecipeCategory.recipeType) } MItems.TWIN_PLATE_PRESS.values.forEach { registration.addRecipeCatalyst(ItemStack(it), PlatePressRecipeCategory.recipeType) } registration.addRecipeCatalyst(ItemStack(MItems.PAINTER), PainterRecipeCategory.recipeType) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt index 0189e278e..b63e48283 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlockEntities.kt @@ -45,21 +45,21 @@ object MBlockEntities { } val ANDROID_STATION by register(MNames.ANDROID_STATION, ::AndroidStationBlockEntity, MBlocks::ANDROID_STATION) - val BATTERY_BANK by register(MNames.BATTERY_BANK, ::BatteryBankBlockEntity, MBlocks::BATTERY_BANK) - val MATTER_DECOMPOSER by register(MNames.MATTER_DECOMPOSER, ::MatterDecomposerBlockEntity, MBlocks::MATTER_DECOMPOSER) - val MATTER_CAPACITOR_BANK by register(MNames.MATTER_CAPACITOR_BANK, ::MatterCapacitorBankBlockEntity, MBlocks::MATTER_CAPACITOR_BANK) + val BATTERY_BANK by register(MNames.BATTERY_BANK, ::BatteryBankBlockEntity, *MBlocks.BATTERY_BANK.asSupplierArray()) + val MATTER_DECOMPOSER by register(MNames.MATTER_DECOMPOSER, ::MatterDecomposerBlockEntity, *MBlocks.MATTER_DECOMPOSER.asSupplierArray()) + val MATTER_CAPACITOR_BANK by register(MNames.MATTER_CAPACITOR_BANK, ::MatterCapacitorBankBlockEntity, *MBlocks.MATTER_CAPACITOR_BANK.asSupplierArray()) val MATTER_CABLE by register(MNames.MATTER_CABLE, ::MatterCableBlockEntity, MBlocks::MATTER_CABLE) val STORAGE_CABLE by register(MNames.STORAGE_CABLE, ::StorageCableBlockEntity, MBlocks::STORAGE_CABLE) val PATTERN_STORAGE by register(MNames.PATTERN_STORAGE, ::PatternStorageBlockEntity, MBlocks::PATTERN_STORAGE) - val MATTER_SCANNER by register(MNames.MATTER_SCANNER, ::MatterScannerBlockEntity, MBlocks::MATTER_SCANNER) + val MATTER_SCANNER by register(MNames.MATTER_SCANNER, ::MatterScannerBlockEntity, *MBlocks.MATTER_SCANNER.asSupplierArray()) val MATTER_PANEL by register(MNames.MATTER_PANEL, ::MatterPanelBlockEntity, MBlocks::MATTER_PANEL) - val MATTER_REPLICATOR by register(MNames.MATTER_REPLICATOR, ::MatterReplicatorBlockEntity, MBlocks::MATTER_REPLICATOR) - val MATTER_BOTTLER by register(MNames.MATTER_BOTTLER, ::MatterBottlerBlockEntity, MBlocks::MATTER_BOTTLER) + val MATTER_REPLICATOR by register(MNames.MATTER_REPLICATOR, ::MatterReplicatorBlockEntity, *MBlocks.MATTER_REPLICATOR.asSupplierArray()) + val MATTER_BOTTLER by register(MNames.MATTER_BOTTLER, ::MatterBottlerBlockEntity, *MBlocks.MATTER_BOTTLER.asSupplierArray()) val DRIVE_VIEWER by register(MNames.DRIVE_VIEWER, ::DriveViewerBlockEntity, MBlocks::DRIVE_VIEWER) val BLACK_HOLE by register(MNames.BLACK_HOLE, ::BlackHoleBlockEntity, MBlocks::BLACK_HOLE) val CARGO_CRATE by register(MNames.CARGO_CRATE, ::CargoCrateBlockEntity, *MRegistry.CARGO_CRATES.blocks.asSupplierArray()) val DRIVE_RACK by register(MNames.DRIVE_RACK, ::DriveRackBlockEntity, MBlocks::DRIVE_RACK) - val ITEM_MONITOR by register(MNames.ITEM_MONITOR, ::ItemMonitorBlockEntity, MBlocks::ITEM_MONITOR) + val ITEM_MONITOR by register(MNames.ITEM_MONITOR, ::ItemMonitorBlockEntity, *MBlocks.ITEM_MONITOR.asSupplierArray()) val ENERGY_COUNTER by register(MNames.ENERGY_COUNTER, ::EnergyCounterBlockEntity, MBlocks::ENERGY_COUNTER) val CHEMICAL_GENERATOR by register(MNames.CHEMICAL_GENERATOR, ::ChemicalGeneratorBlockEntity, MBlocks::CHEMICAL_GENERATOR) val PLATE_PRESS by register(MNames.PLATE_PRESS, ::PlatePressBlockEntity, *MBlocks.PLATE_PRESS.asSupplierArray()) @@ -69,7 +69,7 @@ object MBlockEntities { val ENERGY_SERVO by register(MNames.ENERGY_SERVO, ::EnergyServoBlockEntity, MBlocks::ENERGY_SERVO) val COBBLESTONE_GENERATOR by register(MNames.COBBLESTONE_GENERATOR, ::CobblerBlockEntity, *MBlocks.COBBLESTONE_GENERATOR.asSupplierArray()) val ESSENCE_STORAGE by register(MNames.ESSENCE_STORAGE, ::EssenceStorageBlockEntity, *MBlocks.ESSENCE_STORAGE.asSupplierArray()) - val MATTER_RECONSTRUCTOR by register(MNames.MATTER_RECONSTRUCTOR, ::MatterReconstructorBlockEntity, MBlocks::MATTER_RECONSTRUCTOR) + val MATTER_RECONSTRUCTOR by register(MNames.MATTER_RECONSTRUCTOR, ::MatterReconstructorBlockEntity, *MBlocks.MATTER_RECONSTRUCTOR.asSupplierArray()) val FLUID_TANK by register(MNames.FLUID_TANK, ::FluidTankBlockEntity, MBlocks::FLUID_TANK) val ANDROID_CHARGER by register(MNames.ANDROID_CHARGER, ::AndroidChargerBlockEntity, MBlocks::ANDROID_CHARGER) val ANDROID_CHARGER_MIDDLE by register(MNames.ANDROID_CHARGER + "_middle", ::AndroidChargerMiddleBlockEntity, MBlocks::ANDROID_CHARGER) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt index 46706719a..11b002f9c 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt @@ -99,15 +99,15 @@ object MBlocks { val ANDROID_STATION: Block by registry.register(MNames.ANDROID_STATION) { AndroidStationBlock() } val ANDROID_CHARGER: Block by registry.register(MNames.ANDROID_CHARGER) { AndroidChargerBlock() } - val BATTERY_BANK: Block by registry.register(MNames.BATTERY_BANK) { BatteryBankBlock() } - val MATTER_DECOMPOSER: Block by registry.register(MNames.MATTER_DECOMPOSER) { MatterDecomposerBlock() } - val MATTER_CAPACITOR_BANK: Block by registry.register(MNames.MATTER_CAPACITOR_BANK) { MatterCapacitorBankBlock() } + val BATTERY_BANK = registry.coloredWithBase(MNames.BATTERY_BANK) { color, _ -> BatteryBankBlock(color) } + val MATTER_DECOMPOSER = registry.coloredWithBase(MNames.MATTER_DECOMPOSER) { color, _ -> MatterDecomposerBlock(color) } + val MATTER_CAPACITOR_BANK = registry.coloredWithBase(MNames.MATTER_CAPACITOR_BANK) { color, _ -> MatterCapacitorBankBlock(color) } val MATTER_CABLE: Block by registry.register(MNames.MATTER_CABLE) { MatterCableBlock() } val PATTERN_STORAGE: Block by registry.register(MNames.PATTERN_STORAGE) { PatternStorageBlock() } - val MATTER_SCANNER: Block by registry.register(MNames.MATTER_SCANNER) { MatterScannerBlock() } + val MATTER_SCANNER = registry.coloredWithBase(MNames.MATTER_SCANNER) { color, _ -> MatterScannerBlock(color) } val MATTER_PANEL: Block by registry.register(MNames.MATTER_PANEL) { MatterPanelBlock() } - val MATTER_REPLICATOR: Block by registry.register(MNames.MATTER_REPLICATOR) { MatterReplicatorBlock() } - val MATTER_BOTTLER: Block by registry.register(MNames.MATTER_BOTTLER) { MatterBottlerBlock() } + val MATTER_REPLICATOR = registry.coloredWithBase(MNames.MATTER_REPLICATOR) { color, _ -> MatterReplicatorBlock(color) } + val MATTER_BOTTLER = registry.coloredWithBase(MNames.MATTER_BOTTLER) { color, _ -> MatterBottlerBlock(color) } val ENERGY_COUNTER: Block by registry.register(MNames.ENERGY_COUNTER) { EnergyCounterBlock() } val CHEMICAL_GENERATOR: Block by registry.register(MNames.CHEMICAL_GENERATOR) { ChemicalGeneratorBlock() } val PLATE_PRESS = registry.coloredWithBase(MNames.PLATE_PRESS) { color, _ -> PlatePressBlock(color) } @@ -120,7 +120,7 @@ object MBlocks { val COBBLESTONE_GENERATOR = registry.coloredWithBase(MNames.COBBLESTONE_GENERATOR) { color, _ -> CobblerBlock(color) } val INFINITE_WATER_SOURCE: Block by registry.register(MNames.INFINITE_WATER_SOURCE) { InfiniteWaterSourceBlock() } val ESSENCE_STORAGE = registry.coloredWithBase(MNames.ESSENCE_STORAGE) { color, _ -> EssenceStorageBlock(color) } - val MATTER_RECONSTRUCTOR: MatterReconstructorBlock by registry.register(MNames.MATTER_RECONSTRUCTOR) { MatterReconstructorBlock() } + val MATTER_RECONSTRUCTOR = registry.coloredWithBase(MNames.MATTER_RECONSTRUCTOR) { color, _ -> MatterReconstructorBlock(color) } val PAINTER: PainterBlock by registry.register(MNames.PAINTER) { PainterBlock() } val MATTER_ENTANGLER: MatterEntanglerBlock by registry.register(MNames.MATTER_ENTANGLER) { MatterEntanglerBlock() } @@ -134,7 +134,7 @@ object MBlocks { val DRIVE_VIEWER: Block by registry.register(MNames.DRIVE_VIEWER) { DriveViewerBlock() } val DRIVE_RACK: Block by registry.register(MNames.DRIVE_RACK) { DriveRackBlock() } - val ITEM_MONITOR: Block by registry.register(MNames.ITEM_MONITOR) { ItemMonitorBlock() } + val ITEM_MONITOR = registry.coloredWithBase(MNames.ITEM_MONITOR) { color, _ -> ItemMonitorBlock(color) } val STORAGE_CABLE: Block by registry.register(MNames.STORAGE_CABLE) { StorageCableBlock() } val STORAGE_POWER_SUPPLIER: Block by registry.register(MNames.STORAGE_POWER_SUPPLIER) { StoragePowerSupplierBlock() } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt index 534054183..437ffb988 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt @@ -57,15 +57,15 @@ object MItems { val ANDROID_STATION: BlockItem by registry.register(MNames.ANDROID_STATION) { BlockItem(MBlocks.ANDROID_STATION, DEFAULT_PROPERTIES) } val ANDROID_CHARGER: BlockItem by registry.register(MNames.ANDROID_CHARGER) { BlockItem(MBlocks.ANDROID_CHARGER, DEFAULT_PROPERTIES) } - val BATTERY_BANK: BlockItem by registry.register(MNames.BATTERY_BANK) { BlockItem(MBlocks.BATTERY_BANK, DEFAULT_PROPERTIES) } - val MATTER_DECOMPOSER: BlockItem by registry.register(MNames.MATTER_DECOMPOSER) { BlockItem(MBlocks.MATTER_DECOMPOSER, DEFAULT_PROPERTIES) } - val MATTER_CAPACITOR_BANK: BlockItem by registry.register(MNames.MATTER_CAPACITOR_BANK) { BlockItem(MBlocks.MATTER_CAPACITOR_BANK, DEFAULT_PROPERTIES) } + val BATTERY_BANK = registry.coloredWithBase(MNames.BATTERY_BANK) { color, _ -> BlockItem(MBlocks.BATTERY_BANK[color]!!, DEFAULT_PROPERTIES) } + val MATTER_DECOMPOSER = registry.coloredWithBase(MNames.MATTER_DECOMPOSER) { color, _ -> BlockItem(MBlocks.MATTER_DECOMPOSER[color]!!, DEFAULT_PROPERTIES) } + val MATTER_CAPACITOR_BANK = registry.coloredWithBase(MNames.MATTER_CAPACITOR_BANK) { color, _ -> BlockItem(MBlocks.MATTER_CAPACITOR_BANK[color]!!, DEFAULT_PROPERTIES) } val MATTER_CABLE: BlockItem by registry.register(MNames.MATTER_CABLE) { BlockItem(MBlocks.MATTER_CABLE, DEFAULT_PROPERTIES) } val PATTERN_STORAGE: BlockItem by registry.register(MNames.PATTERN_STORAGE) { BlockItem(MBlocks.PATTERN_STORAGE, DEFAULT_PROPERTIES) } - val MATTER_SCANNER: BlockItem by registry.register(MNames.MATTER_SCANNER) { BlockItem(MBlocks.MATTER_SCANNER, DEFAULT_PROPERTIES) } + val MATTER_SCANNER = registry.coloredWithBase(MNames.MATTER_SCANNER) { color, _ -> BlockItem(MBlocks.MATTER_SCANNER[color]!!, DEFAULT_PROPERTIES) } val MATTER_PANEL: BlockItem by registry.register(MNames.MATTER_PANEL) { BlockItem(MBlocks.MATTER_PANEL, DEFAULT_PROPERTIES) } - val MATTER_REPLICATOR: BlockItem by registry.register(MNames.MATTER_REPLICATOR) { BlockItem(MBlocks.MATTER_REPLICATOR, DEFAULT_PROPERTIES) } - val MATTER_BOTTLER: BlockItem by registry.register(MNames.MATTER_BOTTLER) { BlockItem(MBlocks.MATTER_BOTTLER, DEFAULT_PROPERTIES) } + val MATTER_REPLICATOR = registry.coloredWithBase(MNames.MATTER_REPLICATOR) { color, _ -> BlockItem(MBlocks.MATTER_REPLICATOR[color]!!, DEFAULT_PROPERTIES) } + val MATTER_BOTTLER = registry.coloredWithBase(MNames.MATTER_BOTTLER) { color, _ -> BlockItem(MBlocks.MATTER_BOTTLER[color]!!, DEFAULT_PROPERTIES) } val TRITANIUM_ORE: BlockItem by registry.register(MNames.TRITANIUM_ORE) { BlockItem(MBlocks.TRITANIUM_ORE, DEFAULT_PROPERTIES) } val DEEPSLATE_TRITANIUM_ORE: BlockItem by registry.register(MNames.DEEPSLATE_TRITANIUM_ORE) { BlockItem(MBlocks.DEEPSLATE_TRITANIUM_ORE, DEFAULT_PROPERTIES) } @@ -85,7 +85,7 @@ object MItems { val STORAGE_EXPORTER: BlockItem by registry.register(MNames.STORAGE_EXPORTER) { BlockItem(MBlocks.STORAGE_EXPORTER, DEFAULT_PROPERTIES) } val DRIVE_VIEWER: BlockItem by registry.register(MNames.DRIVE_VIEWER) { BlockItem(MBlocks.DRIVE_VIEWER, DEFAULT_PROPERTIES) } val DRIVE_RACK: BlockItem by registry.register(MNames.DRIVE_RACK) { BlockItem(MBlocks.DRIVE_RACK, DEFAULT_PROPERTIES) } - val ITEM_MONITOR: BlockItem by registry.register(MNames.ITEM_MONITOR) { BlockItem(MBlocks.ITEM_MONITOR, DEFAULT_PROPERTIES) } + val ITEM_MONITOR = registry.coloredWithBase(MNames.ITEM_MONITOR) { color, _ -> BlockItem(MBlocks.ITEM_MONITOR[color]!!, DEFAULT_PROPERTIES) } val STORAGE_CABLE: BlockItem by registry.register(MNames.STORAGE_CABLE) { BlockItem(MBlocks.STORAGE_CABLE, DEFAULT_PROPERTIES) } val STORAGE_POWER_SUPPLIER: BlockItem by registry.register(MNames.STORAGE_POWER_SUPPLIER) { BlockItem(MBlocks.STORAGE_POWER_SUPPLIER, DEFAULT_PROPERTIES) } @@ -97,7 +97,7 @@ object MItems { val INFINITE_WATER_SOURCE: BlockItem by registry.register(MNames.INFINITE_WATER_SOURCE) { BlockItem(MBlocks.INFINITE_WATER_SOURCE, DEFAULT_PROPERTIES) } val ESSENCE_STORAGE: Map = registry.coloredWithBase(MNames.ESSENCE_STORAGE) { color, _ -> BlockItem(MBlocks.ESSENCE_STORAGE[color]!!, DEFAULT_PROPERTIES) } - val MATTER_RECONSTRUCTOR: BlockItem by registry.register(MNames.MATTER_RECONSTRUCTOR) { BlockItem(MBlocks.MATTER_RECONSTRUCTOR, DEFAULT_PROPERTIES) } + val MATTER_RECONSTRUCTOR = registry.coloredWithBase(MNames.MATTER_RECONSTRUCTOR) { color, _ -> BlockItem(MBlocks.MATTER_RECONSTRUCTOR[color]!!, DEFAULT_PROPERTIES) } val DEV_CHEST: BlockItem by registry.register(MNames.DEV_CHEST) { BlockItem(MBlocks.DEV_CHEST, DEFAULT_PROPERTIES) } val PAINTER: BlockItem by registry.register(MNames.PAINTER) { BlockItem(MBlocks.PAINTER, DEFAULT_PROPERTIES) } @@ -116,7 +116,7 @@ object MItems { machines.add(::ANDROID_STATION) machines.add(::ANDROID_CHARGER) - machines.add(::BATTERY_BANK) + machines.addAll(BATTERY_BANK.asSupplierArray().iterator()) machines.add(::ENERGY_COUNTER) machines.add(::CHEMICAL_GENERATOR) machines.add(::ENERGY_SERVO) @@ -125,14 +125,14 @@ object MItems { machines.addAll(COBBLESTONE_GENERATOR.asSupplierArray().iterator()) machines.addAll(ESSENCE_STORAGE.asSupplierArray().iterator()) - machines.add(::MATTER_DECOMPOSER) - machines.add(::MATTER_CAPACITOR_BANK) + machines.addAll(MATTER_DECOMPOSER.asSupplierArray().iterator()) + machines.addAll(MATTER_CAPACITOR_BANK.asSupplierArray().iterator()) machines.add(::MATTER_CABLE) machines.add(::PATTERN_STORAGE) - machines.add(::MATTER_SCANNER) + machines.addAll(MATTER_SCANNER.asSupplierArray().iterator()) machines.add(::MATTER_PANEL) - machines.add(::MATTER_REPLICATOR) - machines.add(::MATTER_BOTTLER) + machines.addAll(MATTER_REPLICATOR.asSupplierArray().iterator()) + machines.addAll(MATTER_BOTTLER.asSupplierArray().iterator()) machines.add(::MATTER_ENTANGLER) machines.add(::MATTER_RECYCLER) @@ -141,7 +141,7 @@ object MItems { machines.add(::STORAGE_EXPORTER) machines.add(::DRIVE_VIEWER) machines.add(::DRIVE_RACK) - machines.add(::ITEM_MONITOR) + machines.addAll(ITEM_MONITOR.asSupplierArray().iterator()) machines.add(::STORAGE_CABLE) machines.add(::STORAGE_POWER_SUPPLIER) diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json index 0ead5fb39..db7a07bee 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator.json @@ -1,10 +1,12 @@ { "credit": "Made with Blockbench", - "ambientocclusion": false, - "texture_size": [32, 64], + "parent": "block/block", + "render_type": "translucent", + "texture_size": [32, 32], "textures": { - "particle": "matter_replicator", - "texture": "matter_replicator" + "1": "overdrive_that_matters:block/matter_replicator_base", + "particle": "overdrive_that_matters:block/matter_replicator_base", + "texture": "overdrive_that_matters:block/matter_replicator" }, "elements": [ { @@ -12,12 +14,12 @@ "from": [15, 0, 0], "to": [16, 11, 16], "faces": { - "north": {"uv": [0, 1.25, 0.5, 4], "texture": "#texture"}, - "east": {"uv": [0, 5.25, 8, 8], "texture": "#texture"}, - "south": {"uv": [15.5, 1.25, 16, 4], "texture": "#texture"}, - "west": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, - "up": {"uv": [0, 8, 0.5, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [8, 8, 8.5, 12], "texture": "#texture"} + "north": {"uv": [0, 2.5, 0.5, 8], "texture": "#texture"}, + "east": {"uv": [0, 2.5, 8, 8], "texture": "#1"}, + "south": {"uv": [15.5, 2.5, 16, 8], "texture": "#texture"}, + "west": {"uv": [8, 9.5, 16, 15], "texture": "#1"}, + "up": {"uv": [0, 8, 0.5, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8, 8, 8.5, 16], "texture": "#1"} } }, { @@ -25,12 +27,12 @@ "from": [0, 0, 0], "to": [1, 11, 16], "faces": { - "north": {"uv": [7.5, 1.25, 8, 4], "texture": "#texture"}, - "east": {"uv": [8, 9, 16, 11.75], "texture": "#texture"}, - "south": {"uv": [8, 1.25, 8.5, 4], "texture": "#texture"}, - "west": {"uv": [8, 5.25, 16, 8], "texture": "#texture"}, - "up": {"uv": [7.5, 8, 8, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [15.5, 8, 16, 12], "texture": "#texture"} + "north": {"uv": [7.5, 2.5, 8, 8], "texture": "#texture"}, + "east": {"uv": [8, 9.5, 16, 15], "texture": "#1"}, + "south": {"uv": [8, 2.5, 8.5, 8], "texture": "#1"}, + "west": {"uv": [8, 2.5, 16, 8], "texture": "#1"}, + "up": {"uv": [7.5, 8, 8, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [15.5, 8, 16, 16], "texture": "#1"} } }, { @@ -38,12 +40,10 @@ "from": [0, 11, 1], "to": [8, 16, 6], "faces": { - "north": {"uv": [4, 13.25, 8, 14.5], "texture": "#texture"}, - "east": {"uv": [0, 0, 5, 5], "texture": "#missing"}, - "south": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, - "west": {"uv": [8.5, 4, 11, 5.25], "texture": "#texture"}, - "up": {"uv": [4, 12, 8, 13.25], "texture": "#texture"}, - "down": {"uv": [0, 0, 8, 5], "texture": "#missing"} + "north": {"uv": [4, 10.5, 8, 13], "texture": "#texture"}, + "south": {"uv": [4, 13, 8, 15.5], "texture": "#texture"}, + "west": {"uv": [8.5, 0, 11, 2.5], "texture": "#1"}, + "up": {"uv": [4, 8, 8, 10.5], "texture": "#texture"} } }, { @@ -51,77 +51,99 @@ "from": [8, 11, 0], "to": [16, 16, 6], "faces": { - "north": {"uv": [0, 0, 4, 1.25], "texture": "#texture"}, - "east": {"uv": [5, 4, 8, 5.25], "texture": "#texture"}, - "south": {"uv": [0, 12.25, 4, 13.5], "texture": "#texture"}, - "west": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, - "up": {"uv": [0, 12, 4, 13.5], "texture": "#texture"}, - "down": {"uv": [0, 0, 8, 6], "texture": "#missing"} + "north": {"uv": [0, 0, 4, 2.5], "texture": "#texture"}, + "east": {"uv": [5, 0, 8, 2.5], "texture": "#1"}, + "south": {"uv": [0, 8.5, 4, 11], "rotation": 180, "texture": "#texture"}, + "west": {"uv": [5, 0, 8, 2.5], "texture": "#1"}, + "up": {"uv": [0, 8, 4, 11], "texture": "#texture"} + } + }, + { + "name": "canisterlight", + "from": [5, 11, 11], + "to": [14, 15, 15], + "faces": { + "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "canister", + "from": [14, 11, 11], + "to": [15, 15, 15], + "faces": { + "north": {"uv": [15.5, 0, 16, 2], "rotation": 180, "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, + "up": {"uv": [15.5, 0, 16, 2], "texture": "#texture"} } }, { "name": "canister", "from": [3, 11, 11], - "to": [15, 15, 15], + "to": [5, 15, 15], "faces": { - "north": {"uv": [10, 12, 16, 13], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, - "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, - "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, - "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + "north": {"uv": [10, 0, 11, 2], "rotation": 180, "texture": "#texture"}, + "south": {"uv": [10, 0, 11, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [10, 0, 11, 2], "texture": "#texture"} } }, { "name": "canister", "from": [3, 11, 6], + "to": [5, 15, 10], + "faces": { + "south": {"uv": [10, 0, 11, 2], "texture": "#texture"}, + "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "up": {"uv": [10, 0, 11, 2], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + } + }, + { + "name": "canisterlight", + "from": [5, 11, 6], + "to": [14, 15, 10], + "faces": { + "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, + "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} + }, + "forge_data": { "block_light": 15, "sky_light": 15 } + }, + { + "name": "canister", + "from": [14, 11, 6], "to": [15, 15, 10], "faces": { - "north": {"uv": [0, 0, 6, 1], "texture": "#missing"}, - "east": {"uv": [8, 12, 10, 13], "texture": "#texture"}, - "south": {"uv": [10, 12, 16, 13], "texture": "#texture"}, - "west": {"uv": [8, 12, 10, 13], "texture": "#texture"}, - "up": {"uv": [10, 12, 16, 13], "texture": "#texture"}, + "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, + "south": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, + "up": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} } }, { "name": "pipe", - "from": [1, 11, 7], + "from": [0, 11, 7], "to": [3, 14, 9], "faces": { - "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, - "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} + "north": {"uv": [1, 12, 0, 13.5], "texture": "#texture"}, + "south": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, + "west": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, + "up": {"uv": [0, 11, 1, 12], "texture": "#texture"} } }, { "name": "pipe", - "from": [1, 11, 12], + "from": [0, 11, 12], "to": [3, 14, 14], "faces": { - "north": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 1, 0.75], "texture": "#missing"}, - "south": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "west": {"uv": [0, 14, 1, 14.75], "texture": "#texture"}, - "up": {"uv": [0, 13.5, 1, 14], "texture": "#texture"}, - "down": {"uv": [0, 0, 1, 0.5], "texture": "#missing"} - } - }, - { - "name": "frame", - "from": [0, 11, 15], - "to": [0.5, 16, 16], - "faces": { - "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + "north": {"uv": [1, 12, 0, 13.5], "texture": "#texture"}, + "south": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, + "west": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, + "up": {"uv": [0, 11, 1, 12], "texture": "#texture"} } }, { @@ -129,12 +151,11 @@ "from": [15.5, 11, 15], "to": [16, 16, 16], "faces": { - "north": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "down": {"uv": [0, 0, 0, 1], "texture": "#missing"} + "north": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "west": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [2, 15, 2.5, 15.5], "texture": "#texture"} } }, { @@ -142,12 +163,22 @@ "from": [15.5, 15, 6], "to": [16, 16, 15], "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "down": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"} + "east": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, + "west": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, + "up": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"} + } + }, + { + "name": "frame", + "from": [0, 11, 15], + "to": [0.5, 16, 16], + "faces": { + "north": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "east": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "south": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "west": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, + "up": {"uv": [2, 15, 2.5, 15.5], "texture": "#texture"} } }, { @@ -155,120 +186,143 @@ "from": [0, 15, 6], "to": [0.5, 16, 15], "faces": { - "north": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "east": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "south": {"uv": [0, 0, 0, 1], "texture": "#missing"}, - "west": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "up": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"}, - "down": {"uv": [14.5, 0, 16, 0.75], "texture": "#texture"} + "east": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, + "west": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, + "up": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"}, + "down": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"} } }, { + "name": "body", "from": [1, 0, 0], "to": [15, 1, 16], "faces": { - "north": {"uv": [0.5, 3.75, 7.5, 4], "texture": "#texture"}, - "east": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, - "south": {"uv": [8.5, 3.75, 15.5, 4], "texture": "#texture"}, - "west": {"uv": [0, 0, 8, 0.25], "texture": "#missing"}, - "up": {"uv": [0.5, 8, 7.5, 12], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [8.5, 8, 15.5, 12], "texture": "#texture"} + "north": {"uv": [0.5, 7.5, 7.5, 8], "texture": "#texture"}, + "south": {"uv": [8.5, 7.5, 15.5, 8], "texture": "#texture"}, + "up": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8.5, 8, 15.5, 16], "texture": "#1"} } }, { + "name": "body", "from": [8, 7, 0], "to": [15, 11, 1], "faces": { - "north": {"uv": [0.5, 1.25, 4, 2.25], "texture": "#texture"}, - "east": {"uv": [0, 0, 0.5, 0.75], "texture": "#missing"}, - "south": {"uv": [0, 0, 3.5, 1], "texture": "#texture"}, - "west": {"uv": [3.5, 1.25, 4, 2], "texture": "#texture"}, - "up": {"uv": [0, 0, 3.5, 0.25], "texture": "#missing"}, - "down": {"uv": [0.5, 2, 4, 2.25], "texture": "#texture"} + "north": {"uv": [0.5, 2.5, 4, 4.5], "texture": "#texture"}, + "south": {"uv": [4, 2.5, 0.5, 4.5], "texture": "#texture"}, + "west": {"uv": [3.5, 2.5, 4, 4.5], "texture": "#texture"}, + "down": {"uv": [0.5, 4, 4, 4.5], "texture": "#texture"} } }, { + "name": "body", "from": [1, 9, 0], "to": [8, 11, 1], "faces": { - "north": {"uv": [4, 1.25, 7.5, 1.75], "texture": "#texture"}, + "north": {"uv": [4, 2.5, 7, 3.5], "texture": "#texture"}, "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "south": {"uv": [4, 1.25, 7, 1.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "up": {"uv": [4, 11.75, 7.5, 12], "texture": "#texture"}, - "down": {"uv": [1.5, 3.5, 5, 3.75], "texture": "#texture"} + "south": {"uv": [4, 3, 7, 3.5], "rotation": 180, "texture": "#texture"}, + "up": {"uv": [4, 15.5, 7.5, 16], "texture": "#1"}, + "down": {"uv": [4, 3, 7, 3.5], "rotation": 180, "texture": "#texture"} } }, { + "name": "body", "from": [1, 1, 0], "to": [2, 9, 1], "faces": { - "north": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, - "east": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, - "south": {"uv": [7, 1.75, 7.5, 3.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0.5, 2], "texture": "#missing"}, - "up": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + "north": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"}, + "east": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"}, + "south": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"} } }, { + "name": "body", "from": [14, 1, 0], "to": [15, 7, 1], "faces": { - "north": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 0.5, 1.75], "texture": "#missing"}, - "south": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, - "west": {"uv": [0.5, 2.25, 1, 3.75], "texture": "#texture"}, - "up": {"uv": [0.5, 3.25, 1, 3.5], "texture": "#texture"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + "north": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"}, + "south": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"}, + "west": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"} } }, { + "name": "body", "from": [2, 1, 0], "to": [14, 2, 1], "faces": { - "north": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, - "east": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, - "south": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"}, - "up": {"uv": [1, 3.5, 7, 3.75], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 0.25], "texture": "#missing"} + "north": {"uv": [1, 7, 7, 7.5], "texture": "#texture"}, + "south": {"uv": [1, 7, 7, 7.5], "texture": "#texture"}, + "up": {"uv": [1, 7, 7, 7.5], "texture": "#texture"} } }, { + "name": "body", "from": [1, 10, 1], "to": [15, 11, 15], "faces": { - "north": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, - "east": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, - "south": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, - "west": {"uv": [0, 0, 7, 0.25], "texture": "#missing"}, - "up": {"uv": [0.5, 8.25, 7.5, 11.75], "rotation": 180, "texture": "#texture"}, - "down": {"uv": [8.5, 8.25, 15.5, 11.75], "texture": "#texture"} + "up": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#1"}, + "down": {"uv": [8.5, 8.5, 15.5, 15.5], "texture": "#1"} } }, { + "name": "body", "from": [1, 1, 15], "to": [15, 11, 16], "faces": { - "north": {"uv": [8.5, 9, 15.5, 11.5], "texture": "#texture"}, - "east": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, - "south": {"uv": [8.5, 1.25, 15.5, 3.75], "texture": "#texture"}, - "west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"}, - "up": {"uv": [0.5, 8, 7.5, 8.25], "texture": "#texture"}, - "down": {"uv": [0, 0, 7, 0.25], "texture": "#missing"} + "north": {"uv": [8.5, 9.5, 15.5, 14.5], "texture": "#1"}, + "south": {"uv": [8.5, 2.5, 15.5, 7.5], "texture": "#texture"}, + "up": {"uv": [0.5, 8, 7.5, 8.5], "texture": "#1"} } }, { + "name": "body", "from": [3, 1, 3], "to": [13, 2, 13], "faces": { - "north": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, - "east": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, - "south": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, - "west": {"uv": [10.5, 13, 16, 13.25], "texture": "#texture"}, - "up": {"uv": [10.5, 13, 16, 15.75], "texture": "#texture"}, - "down": {"uv": [0, 0, 0.5, 0.25], "texture": "#missing"} + "north": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, + "east": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, + "south": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, + "west": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, + "up": {"uv": [10.5, 8, 16, 13.5], "texture": "#texture"} + } + }, + { + "from": [-2, 10, 7.1], + "to": [0, 14, 8.9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "south": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "west": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "up": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#texture"}, + "down": {"uv": [8.5, 11.5, 9.5, 12.5], "texture": "#texture"} + } + }, + { + "name": "pipestuff", + "from": [-2, 10, 12.1], + "to": [0, 14, 13.9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 13]}, + "faces": { + "north": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "south": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "west": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, + "up": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#texture"}, + "down": {"uv": [8.5, 11.5, 9.5, 12.5], "texture": "#texture"} + } + }, + { + "name": "pipestuff", + "from": [-2, 10, 12.1], + "to": [0, 14, 13.9], + "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]}, + "faces": { + "north": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, + "south": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, + "west": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, + "up": {"uv": [8.5, 13.25, 9.5, 13.75], "texture": "#texture"}, + "down": {"uv": [8.5, 14.75, 9.5, 15.25], "texture": "#texture"} } } ] diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json index 676bb08aa..40e58257d 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_error.json @@ -1,5 +1,5 @@ { - "parent": "overdrive_that_matters:block/matter_replicator_working", + "parent": "overdrive_that_matters:block/matter_replicator", "texture_size": [32, 32], "textures": { "1": "overdrive_that_matters:block/matter_replicator_base", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json index dc7a117ad..94e64e6cc 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_idle.json @@ -1,5 +1,5 @@ { - "parent": "overdrive_that_matters:block/matter_replicator_working", + "parent": "overdrive_that_matters:block/matter_replicator", "texture_size": [32, 32], "textures": { "1": "overdrive_that_matters:block/matter_replicator_base", diff --git a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json index db7a07bee..5f5466b60 100644 --- a/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json +++ b/src/main/resources/assets/overdrive_that_matters/models/block/matter_replicator_working.json @@ -1,329 +1,9 @@ { - "credit": "Made with Blockbench", - "parent": "block/block", - "render_type": "translucent", + "parent": "overdrive_that_matters:block/matter_replicator", "texture_size": [32, 32], "textures": { "1": "overdrive_that_matters:block/matter_replicator_base", "particle": "overdrive_that_matters:block/matter_replicator_base", "texture": "overdrive_that_matters:block/matter_replicator" - }, - "elements": [ - { - "name": "body", - "from": [15, 0, 0], - "to": [16, 11, 16], - "faces": { - "north": {"uv": [0, 2.5, 0.5, 8], "texture": "#texture"}, - "east": {"uv": [0, 2.5, 8, 8], "texture": "#1"}, - "south": {"uv": [15.5, 2.5, 16, 8], "texture": "#texture"}, - "west": {"uv": [8, 9.5, 16, 15], "texture": "#1"}, - "up": {"uv": [0, 8, 0.5, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [8, 8, 8.5, 16], "texture": "#1"} - } - }, - { - "name": "body", - "from": [0, 0, 0], - "to": [1, 11, 16], - "faces": { - "north": {"uv": [7.5, 2.5, 8, 8], "texture": "#texture"}, - "east": {"uv": [8, 9.5, 16, 15], "texture": "#1"}, - "south": {"uv": [8, 2.5, 8.5, 8], "texture": "#1"}, - "west": {"uv": [8, 2.5, 16, 8], "texture": "#1"}, - "up": {"uv": [7.5, 8, 8, 16], "rotation": 180, "texture": "#1"}, - "down": {"uv": [15.5, 8, 16, 16], "texture": "#1"} - } - }, - { - "name": "controlpanel", - "from": [0, 11, 1], - "to": [8, 16, 6], - "faces": { - "north": {"uv": [4, 10.5, 8, 13], "texture": "#texture"}, - "south": {"uv": [4, 13, 8, 15.5], "texture": "#texture"}, - "west": {"uv": [8.5, 0, 11, 2.5], "texture": "#1"}, - "up": {"uv": [4, 8, 8, 10.5], "texture": "#texture"} - } - }, - { - "name": "computer", - "from": [8, 11, 0], - "to": [16, 16, 6], - "faces": { - "north": {"uv": [0, 0, 4, 2.5], "texture": "#texture"}, - "east": {"uv": [5, 0, 8, 2.5], "texture": "#1"}, - "south": {"uv": [0, 8.5, 4, 11], "rotation": 180, "texture": "#texture"}, - "west": {"uv": [5, 0, 8, 2.5], "texture": "#1"}, - "up": {"uv": [0, 8, 4, 11], "texture": "#texture"} - } - }, - { - "name": "canisterlight", - "from": [5, 11, 11], - "to": [14, 15, 15], - "faces": { - "north": {"uv": [11, 0, 15.5, 2], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"} - }, - "forge_data": { "block_light": 15, "sky_light": 15 } - }, - { - "name": "canister", - "from": [14, 11, 11], - "to": [15, 15, 15], - "faces": { - "north": {"uv": [15.5, 0, 16, 2], "rotation": 180, "texture": "#texture"}, - "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, - "south": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, - "up": {"uv": [15.5, 0, 16, 2], "texture": "#texture"} - } - }, - { - "name": "canister", - "from": [3, 11, 11], - "to": [5, 15, 15], - "faces": { - "north": {"uv": [10, 0, 11, 2], "rotation": 180, "texture": "#texture"}, - "south": {"uv": [10, 0, 11, 2], "texture": "#texture"}, - "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, - "up": {"uv": [10, 0, 11, 2], "texture": "#texture"} - } - }, - { - "name": "canister", - "from": [3, 11, 6], - "to": [5, 15, 10], - "faces": { - "south": {"uv": [10, 0, 11, 2], "texture": "#texture"}, - "west": {"uv": [8, 0, 10, 2], "texture": "#texture"}, - "up": {"uv": [10, 0, 11, 2], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} - } - }, - { - "name": "canisterlight", - "from": [5, 11, 6], - "to": [14, 15, 10], - "faces": { - "south": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "up": {"uv": [11, 0, 15.5, 2], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} - }, - "forge_data": { "block_light": 15, "sky_light": 15 } - }, - { - "name": "canister", - "from": [14, 11, 6], - "to": [15, 15, 10], - "faces": { - "east": {"uv": [8, 0, 10, 2], "texture": "#texture"}, - "south": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, - "up": {"uv": [15.5, 0, 16, 2], "texture": "#texture"}, - "down": {"uv": [0, 0, 6, 1], "texture": "#missing"} - } - }, - { - "name": "pipe", - "from": [0, 11, 7], - "to": [3, 14, 9], - "faces": { - "north": {"uv": [1, 12, 0, 13.5], "texture": "#texture"}, - "south": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, - "west": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, - "up": {"uv": [0, 11, 1, 12], "texture": "#texture"} - } - }, - { - "name": "pipe", - "from": [0, 11, 12], - "to": [3, 14, 14], - "faces": { - "north": {"uv": [1, 12, 0, 13.5], "texture": "#texture"}, - "south": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, - "west": {"uv": [0, 12, 1, 13.5], "texture": "#texture"}, - "up": {"uv": [0, 11, 1, 12], "texture": "#texture"} - } - }, - { - "name": "frame", - "from": [15.5, 11, 15], - "to": [16, 16, 16], - "faces": { - "north": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "east": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "south": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "up": {"uv": [2, 15, 2.5, 15.5], "texture": "#texture"} - } - }, - { - "name": "frame", - "from": [15.5, 15, 6], - "to": [16, 16, 15], - "faces": { - "east": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, - "west": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, - "up": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"}, - "down": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"} - } - }, - { - "name": "frame", - "from": [0, 11, 15], - "to": [0.5, 16, 16], - "faces": { - "north": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "east": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "south": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "west": {"uv": [0, 15, 2.5, 15.5], "rotation": 270, "texture": "#texture"}, - "up": {"uv": [2, 15, 2.5, 15.5], "texture": "#texture"} - } - }, - { - "name": "frame", - "from": [0, 15, 6], - "to": [0.5, 16, 15], - "faces": { - "east": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, - "west": {"uv": [0, 15.5, 4.5, 16], "texture": "#texture"}, - "up": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"}, - "down": {"uv": [0, 15.5, 4.5, 16], "rotation": 90, "texture": "#texture"} - } - }, - { - "name": "body", - "from": [1, 0, 0], - "to": [15, 1, 16], - "faces": { - "north": {"uv": [0.5, 7.5, 7.5, 8], "texture": "#texture"}, - "south": {"uv": [8.5, 7.5, 15.5, 8], "texture": "#texture"}, - "up": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [8.5, 8, 15.5, 16], "texture": "#1"} - } - }, - { - "name": "body", - "from": [8, 7, 0], - "to": [15, 11, 1], - "faces": { - "north": {"uv": [0.5, 2.5, 4, 4.5], "texture": "#texture"}, - "south": {"uv": [4, 2.5, 0.5, 4.5], "texture": "#texture"}, - "west": {"uv": [3.5, 2.5, 4, 4.5], "texture": "#texture"}, - "down": {"uv": [0.5, 4, 4, 4.5], "texture": "#texture"} - } - }, - { - "name": "body", - "from": [1, 9, 0], - "to": [8, 11, 1], - "faces": { - "north": {"uv": [4, 2.5, 7, 3.5], "texture": "#texture"}, - "east": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"}, - "south": {"uv": [4, 3, 7, 3.5], "rotation": 180, "texture": "#texture"}, - "up": {"uv": [4, 15.5, 7.5, 16], "texture": "#1"}, - "down": {"uv": [4, 3, 7, 3.5], "rotation": 180, "texture": "#texture"} - } - }, - { - "name": "body", - "from": [1, 1, 0], - "to": [2, 9, 1], - "faces": { - "north": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"}, - "east": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"}, - "south": {"uv": [7, 3.5, 7.5, 7], "texture": "#texture"} - } - }, - { - "name": "body", - "from": [14, 1, 0], - "to": [15, 7, 1], - "faces": { - "north": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"}, - "south": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"}, - "west": {"uv": [0.5, 4.5, 1, 7], "texture": "#texture"} - } - }, - { - "name": "body", - "from": [2, 1, 0], - "to": [14, 2, 1], - "faces": { - "north": {"uv": [1, 7, 7, 7.5], "texture": "#texture"}, - "south": {"uv": [1, 7, 7, 7.5], "texture": "#texture"}, - "up": {"uv": [1, 7, 7, 7.5], "texture": "#texture"} - } - }, - { - "name": "body", - "from": [1, 10, 1], - "to": [15, 11, 15], - "faces": { - "up": {"uv": [0.5, 8.5, 7.5, 15.5], "rotation": 180, "texture": "#1"}, - "down": {"uv": [8.5, 8.5, 15.5, 15.5], "texture": "#1"} - } - }, - { - "name": "body", - "from": [1, 1, 15], - "to": [15, 11, 16], - "faces": { - "north": {"uv": [8.5, 9.5, 15.5, 14.5], "texture": "#1"}, - "south": {"uv": [8.5, 2.5, 15.5, 7.5], "texture": "#texture"}, - "up": {"uv": [0.5, 8, 7.5, 8.5], "texture": "#1"} - } - }, - { - "name": "body", - "from": [3, 1, 3], - "to": [13, 2, 13], - "faces": { - "north": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, - "east": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, - "south": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, - "west": {"uv": [10.5, 13, 16, 13.5], "texture": "#texture"}, - "up": {"uv": [10.5, 8, 16, 13.5], "texture": "#texture"} - } - }, - { - "from": [-2, 10, 7.1], - "to": [0, 14, 8.9], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]}, - "faces": { - "north": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "south": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "west": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "up": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#texture"}, - "down": {"uv": [8.5, 11.5, 9.5, 12.5], "texture": "#texture"} - } - }, - { - "name": "pipestuff", - "from": [-2, 10, 12.1], - "to": [0, 14, 13.9], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 13]}, - "faces": { - "north": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "south": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "west": {"uv": [8.5, 9.5, 9.5, 11.5], "texture": "#texture"}, - "up": {"uv": [8.5, 8.5, 9.5, 9.5], "texture": "#texture"}, - "down": {"uv": [8.5, 11.5, 9.5, 12.5], "texture": "#texture"} - } - }, - { - "name": "pipestuff", - "from": [-2, 10, 12.1], - "to": [0, 14, 13.9], - "rotation": {"angle": 22.5, "axis": "z", "origin": [0, 14, 8]}, - "faces": { - "north": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, - "south": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, - "west": {"uv": [8.5, 13.75, 9.5, 14.75], "texture": "#texture"}, - "up": {"uv": [8.5, 13.25, 9.5, 13.75], "texture": "#texture"}, - "down": {"uv": [8.5, 14.75, 9.5, 15.25], "texture": "#texture"} - } - } - ] + } } \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_replicator.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_replicator.json deleted file mode 100644 index ea799161f..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_replicator.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "overdrive_that_matters:block/matter_replicator_working" -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/models/item/matter_scanner.json b/src/main/resources/assets/overdrive_that_matters/models/item/matter_scanner.json deleted file mode 100644 index 82efee943..000000000 --- a/src/main/resources/assets/overdrive_that_matters/models/item/matter_scanner.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "overdrive_that_matters:block/matter_scanner_working" -} \ No newline at end of file diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_base_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_base_mask.png new file mode 100644 index 000000000..8eed2559c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/android_station_base_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/black.png new file mode 100644 index 000000000..ff50b0e0b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/blue.png new file mode 100644 index 000000000..abf5835e7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/brown.png new file mode 100644 index 000000000..a10eaf44a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/cyan.png new file mode 100644 index 000000000..34de073d7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/gray.png new file mode 100644 index 000000000..279fbd663 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/green.png new file mode 100644 index 000000000..e29b5652a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_blue.png new file mode 100644 index 000000000..17a29e59e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_gray.png new file mode 100644 index 000000000..0de11693e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/lime.png new file mode 100644 index 000000000..91cd0100f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/magenta.png new file mode 100644 index 000000000..4c5cdafed Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/orange.png new file mode 100644 index 000000000..1a6b7d0d3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/pink.png new file mode 100644 index 000000000..681ec375f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/purple.png new file mode 100644 index 000000000..d43023269 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/red.png new file mode 100644 index 000000000..f06fa4fc8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/white.png new file mode 100644 index 000000000..43a8ff97f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/yellow.png new file mode 100644 index 000000000..e085d837f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame_mask.png new file mode 100644 index 000000000..fea965e23 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/batterybank_frame_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/black.png new file mode 100644 index 000000000..a43dd7d92 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/blue.png new file mode 100644 index 000000000..c0046cb50 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/brown.png new file mode 100644 index 000000000..a88e41fa3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/cyan.png new file mode 100644 index 000000000..fe247efcc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/gray.png new file mode 100644 index 000000000..4c89b2e33 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/green.png new file mode 100644 index 000000000..9b92965b5 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_blue.png new file mode 100644 index 000000000..5d0eddf84 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_gray.png new file mode 100644 index 000000000..d9f07c0bc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/lime.png new file mode 100644 index 000000000..0ddc8f23b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/magenta.png new file mode 100644 index 000000000..921bc1938 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/orange.png new file mode 100644 index 000000000..40eb3fd83 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/pink.png new file mode 100644 index 000000000..23da7f9ff Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/purple.png new file mode 100644 index 000000000..48b69e966 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/red.png new file mode 100644 index 000000000..2b2972bd6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/white.png new file mode 100644 index 000000000..5c18d9805 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/yellow.png new file mode 100644 index 000000000..4c42c8fee Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_mask.png new file mode 100644 index 000000000..0bf1c567f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/item_monitor_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/black.png new file mode 100644 index 000000000..a590c2be5 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/blue.png new file mode 100644 index 000000000..0eb79a965 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/brown.png new file mode 100644 index 000000000..fd57404a0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/cyan.png new file mode 100644 index 000000000..99755e503 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/gray.png new file mode 100644 index 000000000..8400ea21a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/green.png new file mode 100644 index 000000000..3f9f49dcd Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_blue.png new file mode 100644 index 000000000..ecf6dc625 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_gray.png new file mode 100644 index 000000000..251aec9fb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/lime.png new file mode 100644 index 000000000..ff8508b67 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/magenta.png new file mode 100644 index 000000000..ebfebcf17 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/orange.png new file mode 100644 index 000000000..545872e04 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/pink.png new file mode 100644 index 000000000..d66c0eb50 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/purple.png new file mode 100644 index 000000000..f71135eac Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/red.png new file mode 100644 index 000000000..1d6c07486 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/white.png new file mode 100644 index 000000000..dcde675d4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/yellow.png new file mode 100644 index 000000000..e17647ebf Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_mask.png new file mode 100644 index 000000000..c62d76d25 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_bottler_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/black.png new file mode 100644 index 000000000..a0af0739d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/blue.png new file mode 100644 index 000000000..c2fff0276 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/brown.png new file mode 100644 index 000000000..805667fcb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/cyan.png new file mode 100644 index 000000000..a0c9d9c66 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/gray.png new file mode 100644 index 000000000..beeef7432 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/green.png new file mode 100644 index 000000000..fa0743c0b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_blue.png new file mode 100644 index 000000000..32c0c3634 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_gray.png new file mode 100644 index 000000000..dd6a20767 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/lime.png new file mode 100644 index 000000000..e35f3e8cf Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/magenta.png new file mode 100644 index 000000000..402a62071 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/orange.png new file mode 100644 index 000000000..21fd87ae6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/pink.png new file mode 100644 index 000000000..27f68247b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/purple.png new file mode 100644 index 000000000..f339efd7c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/red.png new file mode 100644 index 000000000..a896934f1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/white.png new file mode 100644 index 000000000..1244d5e84 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/yellow.png new file mode 100644 index 000000000..5cb8664cc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_mask.png new file mode 100644 index 000000000..0827be2c6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_decomposer_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/black.png new file mode 100644 index 000000000..6b96845a4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/blue.png new file mode 100644 index 000000000..9cf671284 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/brown.png new file mode 100644 index 000000000..8c88eea87 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/cyan.png new file mode 100644 index 000000000..0c70d44a4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/gray.png new file mode 100644 index 000000000..ec3c54bfd Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/green.png new file mode 100644 index 000000000..9a4e9e8fa Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_blue.png new file mode 100644 index 000000000..9e5fd7ec8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_gray.png new file mode 100644 index 000000000..5bac999dc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/lime.png new file mode 100644 index 000000000..74fe917ef Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/magenta.png new file mode 100644 index 000000000..294e74ec9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/orange.png new file mode 100644 index 000000000..37cbeb5d3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/pink.png new file mode 100644 index 000000000..88d6248e1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/purple.png new file mode 100644 index 000000000..280c22cc8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/red.png new file mode 100644 index 000000000..ea6e76462 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/white.png new file mode 100644 index 000000000..b3558bc01 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/yellow.png new file mode 100644 index 000000000..40857a41d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor_mask.png new file mode 100644 index 000000000..2c82e0073 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_reconstructor_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/black.png new file mode 100644 index 000000000..b3d9c481f Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/blue.png new file mode 100644 index 000000000..ee8d6363e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/brown.png new file mode 100644 index 000000000..fd8921b15 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/cyan.png new file mode 100644 index 000000000..c1e436ecb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/gray.png new file mode 100644 index 000000000..d2315cea9 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/green.png new file mode 100644 index 000000000..f54c4e2ad Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_blue.png new file mode 100644 index 000000000..e2182f82d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_gray.png new file mode 100644 index 000000000..0243b8bf3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/lime.png new file mode 100644 index 000000000..e44577df0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/magenta.png new file mode 100644 index 000000000..d9c9cf062 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/orange.png new file mode 100644 index 000000000..2e3a829ad Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/pink.png new file mode 100644 index 000000000..df95d30f8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/purple.png new file mode 100644 index 000000000..d5536cab8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/red.png new file mode 100644 index 000000000..c00d69b8e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/white.png new file mode 100644 index 000000000..d2a874daf Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/yellow.png new file mode 100644 index 000000000..ee3c2f740 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_mask.png new file mode 100644 index 000000000..35519c71e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_recycler_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/black.png new file mode 100644 index 000000000..35f5fc830 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/blue.png new file mode 100644 index 000000000..a03db2be1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/brown.png new file mode 100644 index 000000000..738ba727b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/cyan.png new file mode 100644 index 000000000..017760657 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/gray.png new file mode 100644 index 000000000..81176af74 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/green.png new file mode 100644 index 000000000..00f13214e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_blue.png new file mode 100644 index 000000000..c2d4eda17 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_gray.png new file mode 100644 index 000000000..8b9fd6d12 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/lime.png new file mode 100644 index 000000000..a44b57db8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/magenta.png new file mode 100644 index 000000000..aa8801784 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/orange.png new file mode 100644 index 000000000..a7fc70d08 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/pink.png new file mode 100644 index 000000000..886e51ba8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/purple.png new file mode 100644 index 000000000..c3fd8854a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/red.png new file mode 100644 index 000000000..090a51be2 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/white.png new file mode 100644 index 000000000..df1973601 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/yellow.png new file mode 100644 index 000000000..535e9cb14 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/black.png new file mode 100644 index 000000000..2fd7d2663 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/blue.png new file mode 100644 index 000000000..28d2f8fce Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/brown.png new file mode 100644 index 000000000..263a2f34d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/cyan.png new file mode 100644 index 000000000..5aa3208ac Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/gray.png new file mode 100644 index 000000000..141d136c1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/green.png new file mode 100644 index 000000000..315af6be8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_blue.png new file mode 100644 index 000000000..359e37a6c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_gray.png new file mode 100644 index 000000000..1837845b6 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/lime.png new file mode 100644 index 000000000..5cf32bbc1 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/magenta.png new file mode 100644 index 000000000..503049339 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/orange.png new file mode 100644 index 000000000..d423c0565 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/pink.png new file mode 100644 index 000000000..d2c33c0a4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/purple.png new file mode 100644 index 000000000..75902915e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/red.png new file mode 100644 index 000000000..e0823b700 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/white.png new file mode 100644 index 000000000..5522d9c36 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/yellow.png new file mode 100644 index 000000000..728741b24 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base_mask.png new file mode 100644 index 000000000..ea760acea Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_base_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/black.png new file mode 100644 index 000000000..78a20d337 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/blue.png new file mode 100644 index 000000000..8718eae22 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/brown.png new file mode 100644 index 000000000..f2b0d747b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/cyan.png new file mode 100644 index 000000000..2b9c3d1c0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/gray.png new file mode 100644 index 000000000..90435a1ce Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/green.png new file mode 100644 index 000000000..c9635e31d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_blue.png new file mode 100644 index 000000000..583c7891c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_gray.png new file mode 100644 index 000000000..09a5b03ac Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/lime.png new file mode 100644 index 000000000..d7f0d6ba0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/magenta.png new file mode 100644 index 000000000..16a811870 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/orange.png new file mode 100644 index 000000000..6d6161995 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/pink.png new file mode 100644 index 000000000..d25205290 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/purple.png new file mode 100644 index 000000000..5520342a2 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/red.png new file mode 100644 index 000000000..504d2c441 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/white.png new file mode 100644 index 000000000..52e59884d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/yellow.png new file mode 100644 index 000000000..806a49690 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_mask.png new file mode 100644 index 000000000..4d7e75d57 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_halted_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_mask.png new file mode 100644 index 000000000..4d7e75d57 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/black.png new file mode 100644 index 000000000..d7e4c04bb Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/blue.png new file mode 100644 index 000000000..04f9197aa Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/brown.png new file mode 100644 index 000000000..e00d6e677 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/cyan.png new file mode 100644 index 000000000..5bc3324ca Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/gray.png new file mode 100644 index 000000000..8ffc9c824 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/green.png new file mode 100644 index 000000000..3baacb4b8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_blue.png new file mode 100644 index 000000000..503fabdc3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_gray.png new file mode 100644 index 000000000..ddd4f395b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/lime.png new file mode 100644 index 000000000..5825dce8c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/magenta.png new file mode 100644 index 000000000..813bbcbd4 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/orange.png new file mode 100644 index 000000000..288521e05 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/pink.png new file mode 100644 index 000000000..59be11aa7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/purple.png new file mode 100644 index 000000000..5373ec72c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/red.png new file mode 100644 index 000000000..aaa274491 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/white.png new file mode 100644 index 000000000..3fac40572 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/yellow.png new file mode 100644 index 000000000..710d754db Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_mask.png new file mode 100644 index 000000000..4d7e75d57 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_replicator_offline_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/black.png new file mode 100644 index 000000000..5d6e46b60 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/blue.png new file mode 100644 index 000000000..cee8075bc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/brown.png new file mode 100644 index 000000000..f2bbe05d3 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/cyan.png new file mode 100644 index 000000000..294ec4915 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/gray.png new file mode 100644 index 000000000..d73971e07 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/green.png new file mode 100644 index 000000000..6c1d91ee8 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_blue.png new file mode 100644 index 000000000..041e93126 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_gray.png new file mode 100644 index 000000000..c8b0068c7 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/lime.png new file mode 100644 index 000000000..bfe8e1835 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/magenta.png new file mode 100644 index 000000000..66d7c7f76 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/orange.png new file mode 100644 index 000000000..0532b209b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/pink.png new file mode 100644 index 000000000..e21b6d9bd Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/purple.png new file mode 100644 index 000000000..1494026af Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/red.png new file mode 100644 index 000000000..50ea1416b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/white.png new file mode 100644 index 000000000..4c2d00221 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/yellow.png new file mode 100644 index 000000000..e68b47dcc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_mask.png new file mode 100644 index 000000000..d238a4649 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/matter_scanner_mask.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/black.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/black.png new file mode 100644 index 000000000..d85913037 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/black.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/blue.png new file mode 100644 index 000000000..ed4c8ec83 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/brown.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/brown.png new file mode 100644 index 000000000..8a801ae35 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/brown.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/cyan.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/cyan.png new file mode 100644 index 000000000..a2d0ba15c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/cyan.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/gray.png new file mode 100644 index 000000000..d98ad485b Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/green.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/green.png new file mode 100644 index 000000000..9413a72ec Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/green.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_blue.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_blue.png new file mode 100644 index 000000000..ada241389 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_blue.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_gray.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_gray.png new file mode 100644 index 000000000..cff27a29c Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/light_gray.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/lime.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/lime.png new file mode 100644 index 000000000..cba2b8d85 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/lime.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/magenta.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/magenta.png new file mode 100644 index 000000000..0898fe9f0 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/magenta.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/orange.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/orange.png new file mode 100644 index 000000000..d37b45a4e Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/orange.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/pink.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/pink.png new file mode 100644 index 000000000..296523788 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/pink.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/purple.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/purple.png new file mode 100644 index 000000000..355bd4d19 Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/purple.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/red.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/red.png new file mode 100644 index 000000000..585d173ba Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/red.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/white.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/white.png new file mode 100644 index 000000000..72788586a Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/white.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/yellow.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/yellow.png new file mode 100644 index 000000000..b34e5a1ef Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame/yellow.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame_mask.png b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame_mask.png new file mode 100644 index 000000000..2c6e5e7fc Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/mattercapacitorbank_frame_mask.png differ