diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt index 70c2e0687..83e31826e 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/DecorativeData.kt @@ -73,6 +73,24 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr } } + for ((color, block) in MRegistry.FLOOR_TILES_SLAB.blocks) { + blockStateProvider.exec { + blockStateProvider.slabBlock( + block as SlabBlock, + MRegistry.FLOOR_TILES.blocks[color]!!.registryName!!, + modLocation("${DataGen.DECORATIVE_BLOCK_LOCATION}/${MRegistry.FLOOR_TILES.blocks[color]!!.registryName!!.path}") + ) + } + } + + for ((color, block) in MRegistry.FLOOR_TILES_STAIRS.blocks) { + DataGen.decorativeStairs( + block as StairBlock, + MRegistry.FLOOR_TILES.blocks[color]!!.registryName!!.path, + MRegistry.FLOOR_TILES.blocks[color]!!.registryName!!.path + ) + } + for ((color, block) in MRegistry.TRITANIUM_WALL.allBlocks) { DataGen.decorativeWall( block as WallBlock, @@ -89,6 +107,14 @@ fun addDecorativeData(blockStateProvider: MatteryBlockStateProvider, itemModelPr itemModelProvider.block(item) } + for (item in MRegistry.FLOOR_TILES_SLAB.items.values) { + itemModelProvider.block(item) + } + + for (item in MRegistry.FLOOR_TILES_STAIRS.items.values) { + itemModelProvider.block(item) + } + for ((color, item) in MRegistry.TRITANIUM_WALL.allItems) { itemModelProvider.exec { itemModelProvider.wallInventory(item.registryName!!.path, modLocation(DataGen.DECORATIVE_BLOCK_LOCATION + "/" + MRegistry.TRITANIUM_BLOCK.allBlocks[color]!!.registryName!!.path)) 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 dc7fcf5df..98474103b 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 @@ -11,6 +11,8 @@ private fun decoratives(provider: MatteryLanguageProvider) { provider.englishColors.add(MRegistry.TRITANIUM_SLAB, "%s Tritanium Slab") provider.englishColors.add(MRegistry.TRITANIUM_WALL, "%s Tritanium Wall") provider.englishColors.add(MRegistry.FLOOR_TILES, "%s Floor Tiles") + provider.englishColors.add(MRegistry.FLOOR_TILES_STAIRS, "%s Floor Tiles Stairs") + provider.englishColors.add(MRegistry.FLOOR_TILES_SLAB, "%s Floor Tiles Slab") provider.englishColors.add(MRegistry.UNREFINED_FLOOR_TILES, "Unrefined %s Floor Tiles") provider.englishColors.add(MRegistry.INDUSTRIAL_GLASS, "%s Stained Industrial Glass") 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 7049d59e8..9ca7bed78 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 @@ -45,6 +45,9 @@ fun addLootTables(lootTables: LootTables) { lootTables.dropsSelf(MRegistry.TRITANIUM_STRIPED_WALL.flatBlocks) lootTables.createSlabItemTable(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks) + lootTables.dropsSelf(MRegistry.FLOOR_TILES_STAIRS.blocks.values) + lootTables.createSlabItemTable(MRegistry.FLOOR_TILES_SLAB.blocks.values) + lootTables.dropsSelf(MBlocks.CARBON_FIBRE_BLOCK) lootTables.dropsSelf(MBlocks.TRITANIUM_RAW_BLOCK) lootTables.dropsSelf(MBlocks.TRITANIUM_STRIPED_BLOCK) diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt index e9c9abd27..fb612eefb 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/DecorativesRecipes.kt @@ -98,6 +98,11 @@ fun addDecorativesRecipes(provider: MatteryRecipeProvider, consumer: Consumer