From 5deb14f62fb8be111bd60819a9313a9050e4fc95 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 26 Aug 2022 23:27:24 +0700
Subject: [PATCH] Fix Cargo Crate being in wrong creative tabs

---
 .../ru/dbotthepony/mc/otm/registry/MRegistry.kt     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 756f90d61..d0bea9b82 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -91,6 +91,9 @@ class WriteOnce<V> : ReadWriteProperty<Any, V> {
 	}
 }
 
+/**
+ * Colored only
+ */
 @Suppress("PropertyName", "unused")
 open class ColoredDecorativeBlock(
 	val baseName: String,
@@ -330,10 +333,14 @@ open class ColoredDecorativeBlock(
 	}
 }
 
+/**
+ * Base + Colored
+ */
 class DecorativeBlock(
 	baseName: String,
 	private val provider: (DyeColor?) -> Block,
-	itemGroup: CreativeModeTab = OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE
+	itemGroup: CreativeModeTab = OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE,
+	val baseItemGroup: CreativeModeTab = OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE,
 ) : ColoredDecorativeBlock(baseName, provider, itemGroup) {
 	private var _block: RegistryObject<Block> by WriteOnce()
 	private var _item: RegistryObject<Item> by WriteOnce()
@@ -394,7 +401,7 @@ class DecorativeBlock(
 	}
 
 	override fun registerItems(registry: DeferredRegister<Item>) {
-		_item = registry.register(baseName) { BlockItem(_block.get(), Item.Properties().tab(OverdriveThatMatters.INSTANCE.CREATIVE_TAB_DECORATIVE).stacksTo(64)) }
+		_item = registry.register(baseName) { BlockItem(_block.get(), Item.Properties().tab(baseItemGroup).stacksTo(64)) }
 
 		super.registerItems(registry)
 	}
@@ -426,7 +433,7 @@ object MRegistry {
 		research.build(event)
 	}
 
-	val CARGO_CRATES = DecorativeBlock(MNames.CARGO_CRATE, ::CargoCrateBlock, OverdriveThatMatters.INSTANCE.CREATIVE_TAB)
+	val CARGO_CRATES = DecorativeBlock(MNames.CARGO_CRATE, ::CargoCrateBlock, baseItemGroup = OverdriveThatMatters.INSTANCE.CREATIVE_TAB)
 
 	val TRITANIUM_BLOCK = DecorativeBlock.simple(MNames.TRITANIUM_BLOCK, {
 		BlockBehaviour.Properties.of(Material.METAL, it?.materialColor ?: MaterialColor.COLOR_LIGHT_BLUE)