From 3530c60e15ac51321057aea80cf104e3233dbee0 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Sat, 25 Feb 2023 20:23:15 +0300
Subject: [PATCH] tags for armors/tools + forge tag appender fix

---
 .../ru/dbotthepony/mc/otm/datagen/tags/Tags.kt     | 14 ++++++++++++++
 .../mc/otm/datagen/tags/TagsProvider.kt            | 12 ++++++------
 2 files changed, 20 insertions(+), 6 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 639958f6b..a2d6469f3 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
@@ -88,6 +88,20 @@ fun addTags(tagsProvider: TagsProvider) {
 	tagsProvider.items.appender(MItemTags.TRITANIUM_NUGGETS).add(MItems.TRITANIUM_NUGGET)
 	tagsProvider.items.appender(MItemTags.NUGGETS).add(MItems.TRITANIUM_NUGGET)
 
+	tagsProvider.items.forge("armors")
+		.add("helmets", MItems.TRITANIUM_HELMET)
+		.add("chestplates", MItems.TRITANIUM_CHESTPLATE)
+		.add("leggings", MItems.TRITANIUM_PANTS)
+		.add("boots", MItems.TRITANIUM_BOOTS)
+	tagsProvider.items.forge("tools")
+		.add("swords", MItems.TRITANIUM_SWORD)
+		.add("axes", MItems.TRITANIUM_AXE)
+		.add("pickaxes", MItems.TRITANIUM_PICKAXE)
+		.add("shovels", MItems.TRITANIUM_SHOVEL)
+		.add("hoes", MItems.TRITANIUM_HOE)
+		.add("shields", MItems.TRITANIUM_SHIELD)
+	tagsProvider.items.forge("shears").add(MItems.TRITANIUM_SHEARS)
+
 	tagsProvider.blocks.appender(BlockTags.STAIRS)
 		.add(MRegistry.FLOOR_TILES_STAIRS.blocks.values)
 		.add(MRegistry.TRITANIUM_STAIRS.allBlocks.values)
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 3f6c10c52..bc575e784 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
@@ -43,16 +43,16 @@ interface MTagAppender<T> {
 }
 
 interface ForgeTagAppender<T> : MTagAppender<T> {
-	fun add(key: String, value: T): MTagAppender<T>
+	fun add(key: String, value: T): ForgeTagAppender<T>
 	fun addSafe(key: String, value: T): Boolean
-	fun add(key: String, vararg values: T): MTagAppender<T>
+	fun add(key: String, vararg values: T): ForgeTagAppender<T>
 	fun addSafe(key: String, vararg values: T): Boolean {
 		var any = false
 		for (value in values) any = addSafe(key, value)
 		return any
 	}
 
-	fun add(key: String, values: Collection<T>): MTagAppender<T>
+	fun add(key: String, values: Collection<T>): ForgeTagAppender<T>
 
 	fun addSafe(key: String, values: Collection<T>): Boolean {
 		var any = false
@@ -131,7 +131,7 @@ class TagsProvider(
 			val parent by lazy { appender(ResourceLocation("forge", path)) }
 
 			return object : ForgeTagAppender<T> {
-				override fun add(key: String, value: T): MTagAppender<T> {
+				override fun add(key: String, value: T): ForgeTagAppender<T> {
 					val tag = TagKey.create(registryKey, ResourceLocation("forge", "$path/$key"))
 
 					if (!getSet(tag).add(value)) {
@@ -146,12 +146,12 @@ class TagsProvider(
 					return getSet(tag).add(value)
 				}
 
-				override fun add(key: String, vararg values: T): MTagAppender<T> {
+				override fun add(key: String, vararg values: T): ForgeTagAppender<T> {
 					for (value in values) add(key, value)
 					return this
 				}
 
-				override fun add(key: String, values: Collection<T>): MTagAppender<T> {
+				override fun add(key: String, values: Collection<T>): ForgeTagAppender<T> {
 					for (value in values) add(key, value)
 					return this
 				}