From c0364736f469855b1be8779022248f8056b32c45 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sat, 8 Oct 2022 17:10:46 +0700
Subject: [PATCH] =?UTF-8?q?GearShocky=20=E2=80=94=20=D0=A1=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=BD=D1=8F,=20=D0=B2=2016:52=20=D0=94=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=20=D0=B0=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20=D0=BB=D1=83?=
 =?UTF-8?q?=D1=87=D1=88=D0=B5=20=D1=81=D1=82=D1=83=D0=BF=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=D0=B7=20=D0=BF=D0=BB=D0=B8=D1=82=D0=BA?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mc/otm/datagen/DecorativeData.kt          | 26 +++++++++++++++++++
 .../mc/otm/datagen/lang/English.kt            |  2 ++
 .../mc/otm/datagen/loot/LootTablesData.kt     |  3 +++
 .../otm/datagen/recipes/DecorativesRecipes.kt |  5 ++++
 .../dbotthepony/mc/otm/datagen/tags/Tags.kt   | 10 +++++++
 .../ru/dbotthepony/mc/otm/registry/MBlocks.kt |  2 ++
 .../ru/dbotthepony/mc/otm/registry/MItems.kt  |  2 ++
 .../ru/dbotthepony/mc/otm/registry/MNames.kt  |  2 ++
 .../dbotthepony/mc/otm/registry/MRegistry.kt  | 11 ++++++++
 9 files changed, 63 insertions(+)

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<Fi
 	slabWithCut(MItems.TRITANIUM_STRIPED_BLOCK, MItems.TRITANIUM_STRIPED_SLAB, consumer)
 	wallWithCut(MItems.TRITANIUM_STRIPED_BLOCK, MItems.TRITANIUM_STRIPED_WALL, consumer)
 
+	for ((color, item) in MRegistry.FLOOR_TILES.items) {
+		stairsWithCut(item, MRegistry.FLOOR_TILES_STAIRS.items[color]!!, consumer)
+		slabWithCut(item, MRegistry.FLOOR_TILES_SLAB.items[color]!!, consumer)
+	}
+
 	for ((item, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.itemsWithColor) {
 		val (base, stripe) = colors
 
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 4056bba01..41e1060a8 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
@@ -77,9 +77,16 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.items.appender(MItemTags.MACHINES).add(MItems.MACHINES)
 	tagsProvider.blocks.appender(MBlockTags.MACHINES).add(MItems.MACHINES.stream().map { it as? BlockItem }.filter { it != null }.map { it!!.block })
 
+	tagsProvider.blocks.appender(BlockTags.STAIRS)
+		.add(MRegistry.FLOOR_TILES_STAIRS.blocks.values)
+		.add(MRegistry.TRITANIUM_STAIRS.allBlocks.values)
+		.add(MRegistry.TRITANIUM_STRIPED_STAIRS.flatBlocks)
+		.add(MBlocks.TRITANIUM_STRIPED_STAIRS)
+
 	tagsProvider.blocks.appender(BlockTags.SLABS)
 		.add(MRegistry.TRITANIUM_SLAB.allBlocks.values)
 		.add(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks)
+		.add(MRegistry.FLOOR_TILES_SLAB.blocks.values)
 		.add(MBlocks.TRITANIUM_STRIPED_SLAB)
 
 	tagsProvider.blocks.appender(BlockTags.WALLS)
@@ -90,6 +97,7 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.items.appender(ItemTags.SLABS)
 		.add(MRegistry.TRITANIUM_SLAB.allItems.values)
 		.add(MRegistry.TRITANIUM_STRIPED_SLAB.flatItems)
+		.add(MRegistry.FLOOR_TILES_SLAB.items.values)
 		.add(MItems.TRITANIUM_STRIPED_SLAB)
 
 	tagsProvider.items.appender(ItemTags.WALLS)
@@ -154,6 +162,8 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.requiresPickaxe(MRegistry.TRITANIUM_STRIPED_SLAB.flatBlocks, Tiers.IRON)
 
 	tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES.blocks.values)
+	tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_STAIRS.blocks.values)
+	tagsProvider.requiresPickaxe(MRegistry.FLOOR_TILES_SLAB.blocks.values)
 	tagsProvider.requiresShovel(MRegistry.UNREFINED_FLOOR_TILES.blocks.values)
 
 	tagsProvider.requiresPickaxe(MRegistry.INDUSTRIAL_GLASS.allBlocks.values, Tiers.STONE)
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 f80597e91..edf4bfe25 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MBlocks.kt
@@ -200,6 +200,8 @@ object MBlocks {
 		MRegistry.INDUSTRIAL_GLASS_PANE.registerBlocks(registry)
 		MRegistry.UNREFINED_FLOOR_TILES.registerBlocks(registry)
 		MRegistry.FLOOR_TILES.registerBlocks(registry)
+		MRegistry.FLOOR_TILES_STAIRS.registerBlocks(registry)
+		MRegistry.FLOOR_TILES_SLAB.registerBlocks(registry)
 		MRegistry.VENT.registerBlocks(registry)
 		MRegistry.VENT_ALTERNATIVE.registerBlocks(registry)
 		MRegistry.DECORATIVE_CRATE.registerBlocks(registry)
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 76adc6f16..5a2f20b8c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MItems.kt
@@ -351,6 +351,8 @@ object MItems {
 		MRegistry.INDUSTRIAL_GLASS_PANE.registerItems(registry)
 		MRegistry.UNREFINED_FLOOR_TILES.registerItems(registry)
 		MRegistry.FLOOR_TILES.registerItems(registry)
+		MRegistry.FLOOR_TILES_STAIRS.registerItems(registry)
+		MRegistry.FLOOR_TILES_SLAB.registerItems(registry)
 		MRegistry.VENT.registerItems(registry)
 		MRegistry.VENT_ALTERNATIVE.registerItems(registry)
 		MRegistry.DECORATIVE_CRATE.registerItems(registry)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt
index 44e88196d..6190a3bc3 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt
@@ -65,6 +65,8 @@ object MNames {
 	const val CARBON_FIBRE_BLOCK = "carbon_fibre_block"
 
 	const val FLOOR_TILES = "floor_tiles"
+	const val FLOOR_TILES_STAIRS = "floor_tiles_stairs"
+	const val FLOOR_TILES_SLAB = "floor_tiles_slab"
 	const val UNREFINED_FLOOR_TILES = "unrefined_floor_tiles"
 	const val VENT = "vent"
 	const val VENT_ALTERNATIVE = "vent_alternative"
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
index d9864f88c..54eae7a2b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -176,6 +176,17 @@ object MRegistry {
 			.strength(1.5f, 6f)
 	})
 
+	val FLOOR_TILES_STAIRS = ColoredDecorativeBlock(MNames.FLOOR_TILES_STAIRS, {
+		StairBlock(
+			{ FLOOR_TILES.blocks[it]!!.defaultBlockState() },
+			BlockBehaviour.Properties.copy(FLOOR_TILES.blocks[it]!!)
+		)
+	})
+
+	val FLOOR_TILES_SLAB = ColoredDecorativeBlock(MNames.FLOOR_TILES_SLAB, {
+		SlabBlock(BlockBehaviour.Properties.copy(FLOOR_TILES.blocks[it]!!))
+	})
+
 	val UNREFINED_FLOOR_TILES = ColoredDecorativeBlock.simple(MNames.UNREFINED_FLOOR_TILES, {
 		BlockBehaviour.Properties.of(Material.CLAY, it.materialColor)
 			.sound(SoundType.GRAVEL)