From e8d76a4a8ea1e73877dd915930ca320e7b48216d Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Fri, 10 Mar 2023 21:12:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B6=D1=91=D1=81=D1=82=D0=BA=D0=BE=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=BD=D1=83=D0=BB=20=D1=82=D0=B5=D0=B3=D0=B0=D0=BC?=
 =?UTF-8?q?=D0=B8=20+=20=D1=80=D1=83=D0=B4=D1=8B=20=D0=B2=20=D0=BA=D1=80?=
 =?UTF-8?q?=D0=B5=D0=B0=D1=82=D0=B8=D0=B2=20=D1=82=D0=B0=D0=B1=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dbotthepony/mc/otm/datagen/tags/Tags.kt   |  9 +++-
 .../mc/otm/datagen/tags/TagsProvider.kt       | 41 +++++++++++++++++++
 .../mc/otm/registry/CreativeTabs.kt           |  2 +
 3 files changed, 50 insertions(+), 2 deletions(-)

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 a2d6469f3..873faa61f 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
@@ -29,8 +29,13 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.storageBlocksAsItem.add("tritanium", MItems.TRITANIUM_INGOT_BLOCK)
 	tagsProvider.storageBlocksAsBlock.add("tritanium", MBlocks.TRITANIUM_INGOT_BLOCK)
 
-	tagsProvider.ore("tritanium", MBlocks.TRITANIUM_ORE)
-	tagsProvider.ore("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE)
+	tagsProvider.stoneOre("tritanium", MBlocks.TRITANIUM_ORE)
+	tagsProvider.deepslateOre("tritanium", MBlocks.DEEPSLATE_TRITANIUM_ORE)
+	tagsProvider.singleDropOre(
+		MBlocks.TRITANIUM_ORE,
+		MBlocks.DEEPSLATE_TRITANIUM_ORE
+	)
+
 	tagsProvider.clump("tritanium", MItems.TRITANIUM_ORE_CLUMP, MBlocks.TRITANIUM_RAW_BLOCK)
 
 	tagsProvider.wires.add("copper", MItems.COPPER_WIRING)
diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt
index bc575e784..67bbdcb67 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/tags/TagsProvider.kt
@@ -201,6 +201,33 @@ class TagsProvider(
 	val witherImmune = blocks.appender(BlockTags.WITHER_IMMUNE)
 	val dragonImmune = blocks.appender(BlockTags.DRAGON_IMMUNE)
 
+	fun stoneOre(key: String, block: Block): TagsProvider {
+		ore(key, block)
+
+		itemGroundOresStone.add(block.asItem())
+		blockGroundOresStone.add(block)
+
+		return this
+	}
+
+	fun deepslateOre(key: String, block: Block): TagsProvider {
+		ore(key, block)
+
+		itemGroundOresDeepslate.add(block.asItem())
+		blockGroundOresDeepslate.add(block)
+
+		return this
+	}
+
+	fun singleDropOre(vararg blocks: Block): TagsProvider {
+		for (block in blocks) {
+			itemOreRatesSingular.add(block.asItem())
+			blockOreRatesSingular.add(block)
+		}
+
+		return this
+	}
+
 	fun ore(key: String, block: Block): TagsProvider {
 		val forgeKey = ResourceLocation("forge", "ores/$key")
 		val b = TagKey.create(Registries.BLOCK, forgeKey)
@@ -244,6 +271,20 @@ class TagsProvider(
 	val rawMaterials = items.forge("raw_materials")
 	val wires = items.forge("wires")
 
+	val blockGroundOresStone = blocks.forge("ores_in_ground/stone")
+	val blockGroundOresDeepslate = blocks.forge("ores_in_ground/deepslate")
+//	val blockGroundOresNetherrack = blocks.forge("ores_in_ground/netherrack")
+	val itemGroundOresStone = items.forge("ores_in_ground/stone")
+	val itemGroundOresDeepslate = items.forge("ores_in_ground/deepslate")
+//	val itemGroundOresNetherrack = items.forge("ores_in_ground/netherrack")
+
+//	val blockOreRatesSparse = blocks.forge("ore_rates/sparse")
+	val blockOreRatesSingular = blocks.forge("ore_rates/singular")
+//	val blockOreRatesDense = blocks.forge("ore_rates/dense")
+//	val itemOreRatesSparse = items.forge("ore_rates/sparse")
+	val itemOreRatesSingular = items.forge("ore_rates/singular")
+//	val itemOreRatesDense = items.forge("ore_rates/dense")
+
 	val gameEvents = Delegate(Registries.GAME_EVENT)
 	val vibrations = gameEvents.appender(GameEventTags.VIBRATIONS)
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/CreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/CreativeTabs.kt
index f0a269713..45689ba1b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/CreativeTabs.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/CreativeTabs.kt
@@ -111,6 +111,8 @@ internal fun addMainCreativeTabItems(consumer: CreativeModeTab.Output) {
 
 		// accept(MItems.MATTER_DUST)
 
+		accept(MItems.TRITANIUM_ORE)
+		accept(MItems.DEEPSLATE_TRITANIUM_ORE)
 		accept(MItems.TRITANIUM_ORE_CLUMP)
 		accept(MItems.TRITANIUM_DUST)
 		accept(MItems.TRITANIUM_NUGGET)