From 5fa901202ec56f3aef0309a41db4f09e91cd36e3 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Tue, 6 Sep 2022 22:39:07 +0700
Subject: [PATCH] Remove colored blocks recipe variants to reduce clutter

---
 .../datagen/recipes/CraftingTableRecipes.kt   | 71 ++-----------------
 1 file changed, 6 insertions(+), 65 deletions(-)

diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
index 33279f205..18faa0cc1 100644
--- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
+++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/recipes/CraftingTableRecipes.kt
@@ -48,7 +48,7 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
 
 	for ((color, item) in MRegistry.TRITANIUM_BLOCK.mappedColoredItemsAll) {
 		MatteryRecipe(item, 24)
-			.rowAB(color?.tag, MItemTags.PLATE_TRITANIUM)
+			.rowBC(MItemTags.PLATE_TRITANIUM, color?.tag)
 			.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
 			.rowB(MItemTags.PLATE_TRITANIUM)
 			.unlockedBy(MItemTags.PLATE_TRITANIUM)
@@ -80,57 +80,22 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
 		.unlockedBy(Tags.Items.DYES_YELLOW)
 		.build(consumer)
 
-	MatteryRecipe(MBlocks.TRITANIUM_STRIPED_BLOCK, 24)
-		.rowB(MItemTags.PLATE_TRITANIUM)
-		.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
-		.rowBC(MItemTags.PLATE_TRITANIUM, Tags.Items.DYES_YELLOW)
-		.unlockedBy(MItemTags.PLATE_TRITANIUM)
-		.unlockedBy(Tags.Items.DYES_YELLOW)
-		.build(consumer, "alt")
-
 	for ((item, colors) in MRegistry.TRITANIUM_STRIPED_BLOCK.itemsWithColor) {
 		val (base, stripe) = colors
 
 		MatteryRecipe(item, 24)
-			.rowAB(a = base.tag, b = MItemTags.PLATE_TRITANIUM)
+			.rowBC(MItemTags.PLATE_TRITANIUM, base.tag)
 			.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
-			.rowAB(a = stripe.tag, b = MItemTags.PLATE_TRITANIUM)
+			.rowAB(stripe.tag, MItemTags.PLATE_TRITANIUM)
 			.unlockedBy(MItemTags.PLATE_TRITANIUM)
 			.unlockedBy(base.tag)
 			.unlockedBy(stripe.tag)
-			.build(consumer, "1")
-
-		MatteryRecipe(item, 24)
-			.rowBC(c = base.tag, b = MItemTags.PLATE_TRITANIUM)
-			.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
-			.rowBC(c = stripe.tag, b = MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(base.tag)
-			.unlockedBy(stripe.tag)
-			.build(consumer, "2")
-
-		MatteryRecipe(item, 24)
-			.rowAB(a = base.tag, b = MItemTags.PLATE_TRITANIUM)
-			.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
-			.rowBC(c = stripe.tag, b = MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(base.tag)
-			.unlockedBy(stripe.tag)
-			.build(consumer, "3")
-
-		MatteryRecipe(item, 24)
-			.rowBC(c = base.tag, b = MItemTags.PLATE_TRITANIUM)
-			.row(MItemTags.PLATE_TRITANIUM, COBBLESTONE, MItemTags.PLATE_TRITANIUM)
-			.rowAB(a = stripe.tag, b = MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(MItemTags.PLATE_TRITANIUM)
-			.unlockedBy(base.tag)
-			.unlockedBy(stripe.tag)
-			.build(consumer, "4")
+			.build(consumer)
 	}
 
 	for ((color, item) in MRegistry.VENT.mappedColoredItemsAll) {
 		MatteryRecipe(item, 24)
-			.rowAB(color?.tag, MItemTags.PLATE_TRITANIUM)
+			.rowBC(MItemTags.PLATE_TRITANIUM, color?.tag)
 			.row(MItemTags.PLATE_TRITANIUM, Items.IRON_BARS, MItemTags.PLATE_TRITANIUM)
 			.rowB(MItemTags.PLATE_TRITANIUM)
 			.unlockedBy(MItemTags.PLATE_TRITANIUM)
@@ -153,37 +118,13 @@ fun addCraftingTableRecipes(consumer: Consumer<FinishedRecipe>) {
 		MItems.CRATE_PINK to Tags.Items.DYES_PINK,
 		MItems.CRATE_PURPLE to Tags.Items.DYES_PURPLE,
 	)) {
-		MatteryRecipe(crate, 24)
-			.rowAB(color, MItemTags.PLATE_IRON)
-			.row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON)
-			.rowB(MItemTags.PLATE_IRON)
-			.unlockedBy(MItemTags.PLATE_IRON)
-			.unlockedBy(color)
-			.build(consumer, "1")
-
 		MatteryRecipe(crate, 24)
 			.rowBC(MItemTags.PLATE_IRON, color)
 			.row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON)
 			.rowB(MItemTags.PLATE_IRON)
 			.unlockedBy(MItemTags.PLATE_IRON)
 			.unlockedBy(color)
-			.build(consumer, "2")
-
-		MatteryRecipe(crate, 24)
-			.rowB(MItemTags.PLATE_IRON)
-			.row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON)
-			.rowAB(color, MItemTags.PLATE_IRON)
-			.unlockedBy(MItemTags.PLATE_IRON)
-			.unlockedBy(color)
-			.build(consumer, "3")
-
-		MatteryRecipe(crate, 24)
-			.rowB(MItemTags.PLATE_IRON)
-			.row(MItemTags.PLATE_IRON, COBBLESTONE, MItemTags.PLATE_IRON)
-			.rowBC(MItemTags.PLATE_IRON, color)
-			.unlockedBy(MItemTags.PLATE_IRON)
-			.unlockedBy(color)
-			.build(consumer, "4")
+			.build(consumer)
 	}
 
 	// Машины