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 02e15fc2b..d26e76d66 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 @@ -10,6 +10,10 @@ fun addBlockModels(provider: MatteryBlockModelProvider) { resourceCubeAll(MBlocks.DEEPSLATE_TRITANIUM_ORE) resourceCubeAll(MBlocks.TRITANIUM_INGOT_BLOCK) + resourceCubeAll(MBlocks.DILITHIUM_ORE) + resourceCubeAll(MBlocks.DEEPSLATE_DILITHIUM_ORE) + resourceCubeAll(MBlocks.DILITHIUM_CRYSTAL_BLOCK) + cable("crude_energy_cable", "block/power_cable_0", powered = true) cable("regular_energy_cable", "block/power_cable_1", powered = true) cable("advanced_energy_cable", "block/power_cable_2", powered = true) 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 365dd358c..ea7f3a860 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 @@ -31,6 +31,10 @@ fun addBlockStates(provider: MatteryBlockStateProvider) { provider.block(MBlocks.TRITANIUM_INGOT_BLOCK) provider.block(MBlocks.METAL_MESH) + provider.ore(MBlocks.DILITHIUM_ORE) + provider.ore(MBlocks.DEEPSLATE_DILITHIUM_ORE) + provider.block(MBlocks.DILITHIUM_CRYSTAL_BLOCK) + provider.block(MBlocks.CHEMICAL_GENERATOR.values) provider.block(MBlocks.MATTER_SCANNER.values) provider.block(MBlocks.ITEM_MONITOR.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 297c75ff0..27b244d8b 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 @@ -24,15 +24,20 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.block(MItems.METAL_MESH) provider.generatedTranslucent(MItems.TRITANIUM_BARS, modLocation("block/decorative/tritanium_bars")) provider.generatedTranslucent(MItems.METAL_RAILING, modLocation("block/decorative/metal_railing")) - provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) - provider.block(MItems.TRITANIUM_ORE) provider.blocks(MItems.TRITANIUM_STRIPED_BLOCK.values) - provider.block(MItems.TRITANIUM_RAW_BLOCK) - provider.block(MItems.TRITANIUM_INGOT_BLOCK) provider.coloredWithBaseBlock(MItems.ITEM_MONITOR, "item_monitor") provider.block(MItems.PHANTOM_ATTRACTOR) provider.block(MItems.HOLO_SIGN) + provider.block(MItems.TRITANIUM_ORE) + provider.block(MItems.DEEPSLATE_TRITANIUM_ORE) + provider.block(MItems.TRITANIUM_RAW_BLOCK) + provider.block(MItems.TRITANIUM_INGOT_BLOCK) + + provider.block(MItems.DILITHIUM_ORE) + provider.block(MItems.DEEPSLATE_DILITHIUM_ORE) + provider.block(MItems.DILITHIUM_CRYSTAL_BLOCK) + MRegistry.VENT.allItems.values.forEach(provider::block) MRegistry.VENT_ALTERNATIVE.allItems.values.forEach(provider::block) MRegistry.TRITANIUM_BLOCK.allItems.values.forEach(provider::block) @@ -87,6 +92,8 @@ fun addItemModels(provider: MatteryItemModelProvider) { provider.component(MItems.TRITANIUM_NUGGET) provider.resource(MItems.TRITANIUM_ORE_CLUMP) + provider.resource(MItems.DILITHIUM_CRYSTAL) + provider.generated(MItems.EXOPACK_PROBE) provider.handheld(MItems.TRITANIUM_TOOLS) diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/deepslate_dilithium_ore.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_crystal_block.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/block/resource/dilithium_ore.png differ diff --git a/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png new file mode 100644 index 000000000..d36635b4d Binary files /dev/null and b/src/main/resources/assets/overdrive_that_matters/textures/item/resources/dilithium_crystal.png differ