From cc9f87b352203a90cf9dfe2ba4e32ffe8f07358b Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 9 Jun 2023 14:39:11 +0700
Subject: [PATCH] Register creative tab registrar

---
 .../dbotthepony/mc/otm/registry/MCreativeTabs.kt   | 14 +++++++++-----
 .../ru/dbotthepony/mc/otm/registry/MRegistry.kt    |  2 ++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
index c701193b9..fd2df678e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MCreativeTabs.kt
@@ -8,6 +8,7 @@ import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.material.Fluids
 import net.minecraftforge.common.capabilities.ForgeCapabilities
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent
+import net.minecraftforge.eventbus.api.IEventBus
 import net.minecraftforge.fluids.FluidStack
 import net.minecraftforge.fluids.capability.IFluidHandler
 import net.minecraftforge.registries.DeferredRegister
@@ -262,6 +263,7 @@ object MCreativeTabs {
 			.icon { ItemStack(BATTERY_CREATIVE, 1) }
 			.build()
 	}
+
 	val DECORATIVE: CreativeModeTab by registry.register("decorative") {
 		CreativeModeTab.builder()
 			.title(TranslatableComponent("itemGroup.otm_decorative"))
@@ -269,14 +271,16 @@ object MCreativeTabs {
 			.build()
 	}
 
+	internal fun initialize(bus: IEventBus) {
+		registry.register(bus)
+	}
+
 	fun register(event: BuildCreativeModeTabContentsEvent) {
 		CreativeMenuComparator.invalidate()
 
-		if (event.tab == MAIN) {
-			addMainCreativeTabItems(event)
-		}
-		if (event.tab == DECORATIVE) {
-			addDecorativeTabItems(event)
+		when (event.tab) {
+			MAIN -> addMainCreativeTabItems(event)
+			DECORATIVE -> addDecorativeTabItems(event)
 		}
 	}
 }
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 14eb680cf..1acaf7a3b 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt
@@ -205,6 +205,8 @@ object MRegistry {
 		bus.addListener(this::initializeCommon)
 		bus.addListener(MStats::registerVanilla)
 
+		MCreativeTabs.initialize(bus)
+
 		DecimalProvider.register(bus)
 
 		MBlocks.register(bus)