Hopefully fixes initalization issues.

Waterpicker · Waterpicker · commit f3ced8094619 · 2025-06-17T21:47:06.000-05:00
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsImplementation.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsImplementation.kt
@@ -68,5 +68,5 @@ interface GenerationsImplementation {
 
     val networkManager: NetworkManager
 
-    fun <T: Any> entryRegister(resourceKey: Registry<T>): EntryRegister<T>
+    fun <T: Any> entryRegister(registry: Registry<T>, resourceKey: ResourceKey<Registry<T>>): EntryRegister<T>
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/util/ItemPlatformRegistry.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/util/ItemPlatformRegistry.kt
@@ -1,12 +1,7 @@
 package generations.gg.generations.core.generationscore.common.util
 
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.Item
 
-open class ItemPlatformRegistry: PlatformRegistry<Item>() {
-    override val registry: Registry<Item> = BuiltInRegistries.ITEM
-    override val resourceKey: ResourceKey<Registry<Item>> = Registries.ITEM
-}
+open class ItemPlatformRegistry: PlatformRegistry<Item>(Registries.ITEM, BuiltInRegistries.ITEM)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PlatformRegistry.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PlatformRegistry.kt
@@ -6,19 +6,8 @@ import net.minecraft.core.Registry
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 
-abstract class PlatformRegistry<T: Any> {
-
-        /**
-         * The vanilla [Registry].
-         */
-        abstract val registry: Registry<T>
-
-        /**
-         * The vanilla [ResourceKey].
-         */
-        abstract val resourceKey: ResourceKey<Registry<T>>
-
-        val register: EntryRegister<T> = GenerationsCore.implementation.entryRegister(registry)
+abstract class PlatformRegistry<T: Any>(registryKey: ResourceKey<Registry<T>>, registry: Registry<T>) {
+    val register: EntryRegister<T> = GenerationsCore.implementation.entryRegister(registry, registryKey)
 
         protected val queue = hashMapOf<ResourceLocation, Holder<T>>()
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/GenerationsContainers.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/container/GenerationsContainers.kt
@@ -3,20 +3,16 @@ package generations.gg.generations.core.generationscore.common.world.container
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.FriendlyByteBuf
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.entity.player.Player
 import net.minecraft.world.flag.FeatureFlags
 import net.minecraft.world.inventory.AbstractContainerMenu
 import net.minecraft.world.inventory.MenuType
 
-object GenerationsContainers: PlatformRegistry<MenuType<*>>() {
-    override val registry: Registry<MenuType<*>> = BuiltInRegistries.MENU
-    override val resourceKey: ResourceKey<Registry<MenuType<*>>> = Registries.MENU
+object GenerationsContainers: PlatformRegistry<MenuType<*>>(Registries.MENU, BuiltInRegistries.MENU) {
 
     @JvmField
     val COOKING_POT = register("cooking_pot", ::CookingPotContainer)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/GenerationsEntities.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/GenerationsEntities.kt
@@ -6,17 +6,13 @@ import generations.gg.generations.core.generationscore.common.world.entity.block
 import generations.gg.generations.core.generationscore.common.world.entity.block.SittableEntity
 import generations.gg.generations.core.generationscore.common.world.entity.statue.StatueEntity
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.EntityType
 import net.minecraft.world.entity.MobCategory
 
-object GenerationsEntities: PlatformRegistry<EntityType<*>>() {
-    override val registry: Registry<EntityType<*>> = BuiltInRegistries.ENTITY_TYPE
-    override val resourceKey: ResourceKey<Registry<EntityType<*>>> = Registries.ENTITY_TYPE
+object GenerationsEntities: PlatformRegistry<EntityType<*>>(Registries.ENTITY_TYPE, BuiltInRegistries.ENTITY_TYPE) {
 
     val SEAT = createEntityType("seat", MobCategory.MISC, 0.0f, 0.0f, ::SittableEntity)
     val TIERED_FISHING_BOBBER = register("tiered_fishing_bobber") { EntityType.Builder.of(::TieredFishingHookEntity, MobCategory.MISC).noSave().sized(0.25f, 0.25f).clientTrackingRange(4).updateInterval(5).build("tiered_fishing_bobber") }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/GenerationsArmorMaterials.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/armor/GenerationsArmorMaterials.kt
@@ -7,10 +7,8 @@ import generations.gg.generations.core.generationscore.common.util.PlatformRegis
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import net.minecraft.Util
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.sounds.SoundEvents
 import net.minecraft.world.item.ArmorItem
 import net.minecraft.world.item.ArmorMaterial
@@ -19,9 +17,7 @@ import net.minecraft.world.item.Items
 import net.minecraft.world.item.crafting.Ingredient
 import java.util.*
 
-object GenerationsArmorMaterials: PlatformRegistry<ArmorMaterial>() {
-    override val registry: Registry<ArmorMaterial> = BuiltInRegistries.ARMOR_MATERIAL
-    override val resourceKey: ResourceKey<Registry<ArmorMaterial>> = Registries.ARMOR_MATERIAL
+object GenerationsArmorMaterials: PlatformRegistry<ArmorMaterial>(Registries.ARMOR_MATERIAL, BuiltInRegistries.ARMOR_MATERIAL) {
 
     val AETHER = register("aether", 15, intArrayOf(2, 5, 6, 2), 9, GenerationsItems.SILICON::value)
     val AQUA = register("saphire", 15, intArrayOf(2, 5, 6, 2), 9, GenerationsItems.SAPPHIRE::value)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/components/GenerationsDataComponents.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/components/GenerationsDataComponents.kt
@@ -8,18 +8,14 @@ import generations.gg.generations.core.generationscore.common.world.item.Walkmon
 import generations.gg.generations.core.generationscore.common.world.item.curry.CurryData
 import generations.gg.generations.core.generationscore.common.world.item.legends.RubyRodItem
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.component.DataComponentType
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.network.codec.StreamCodec
-import net.minecraft.resources.ResourceKey
 
-object GenerationsDataComponents: PlatformRegistry<DataComponentType<*>>() {
-    override val registry: Registry<DataComponentType<*>> = BuiltInRegistries.DATA_COMPONENT_TYPE
-    override val resourceKey: ResourceKey<Registry<DataComponentType<*>>> = Registries.DATA_COMPONENT_TYPE
+object GenerationsDataComponents: PlatformRegistry<DataComponentType<*>>(Registries.DATA_COMPONENT_TYPE, BuiltInRegistries.DATA_COMPONENT_TYPE) {
 
     var DISTANCE = register<Double>(
         DataKeys.DISTANCE,
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/creativetab/GenerationsCreativeTabs.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/creativetab/GenerationsCreativeTabs.kt
@@ -5,10 +5,8 @@ import generations.gg.generations.core.generationscore.common.util.PlatformRegis
 import generations.gg.generations.core.generationscore.common.world.item.GenerationsItems
 import generations.gg.generations.core.generationscore.common.world.level.block.*
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.CreativeModeTab
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.ItemLike
@@ -19,9 +17,7 @@ import net.minecraft.world.level.ItemLike
  * @author WaterPicker
  * @see CreativeModeTab
  */
-object GenerationsCreativeTabs: PlatformRegistry<CreativeModeTab>() {
-    override val registry: Registry<CreativeModeTab> = BuiltInRegistries.CREATIVE_MODE_TAB
-    override val resourceKey: ResourceKey<Registry<CreativeModeTab>> = Registries.CREATIVE_MODE_TAB
+object GenerationsCreativeTabs: PlatformRegistry<CreativeModeTab>(Registries.CREATIVE_MODE_TAB, BuiltInRegistries.CREATIVE_MODE_TAB) {
 
     val BUILDING_BLOCKS = createTab("building_blocks", { GenerationsBlocks.LIGHT_BLUE_POKE_BRICK_SET.baseBlock.asItem().defaultInstance }, GenerationsWood.WOOD_BLOCKS, GenerationsItems.BLOCK_ITEMS, GenerationsOres, GenerationsItems.BUILDING_BLOCKS)
     val RESTORATION = createTab("restoration", { GenerationsItems.LEMONADE.value().defaultInstance }, GenerationsItems.RESTORATION)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsCoreStats.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsCoreStats.kt
@@ -3,15 +3,11 @@ package generations.gg.generations.core.generationscore.common.world.level.block
 import generations.gg.generations.core.generationscore.common.generationsResource
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 
-object GenerationsCoreStats: PlatformRegistry<ResourceLocation>() {
-    override val registry: Registry<ResourceLocation> = BuiltInRegistries.CUSTOM_STAT
-    override val resourceKey: ResourceKey<Registry<ResourceLocation>> = Registries.CUSTOM_STAT
+object GenerationsCoreStats: PlatformRegistry<ResourceLocation>(Registries.CUSTOM_STAT, BuiltInRegistries.CUSTOM_STAT) {
 
     val HIDDEN_LOOT_FOUND = register("hidden_loot_found")
     val NORMAL_LOOT_FOUND = register("normal_loot_found")
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/GenerationsBlockEntities.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/entities/GenerationsBlockEntities.kt
@@ -12,19 +12,15 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.altar.CelestialAltarBlockEntity
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.shrines.altar.TimeSpaceAltarBlockEntity
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
 import net.minecraft.world.level.block.entity.HangingSignBlockEntity
 import net.minecraft.world.level.block.entity.SignBlockEntity
 
-object GenerationsBlockEntities: PlatformRegistry<BlockEntityType<*>>() {
-    override val registry: Registry<BlockEntityType<*>> = BuiltInRegistries.BLOCK_ENTITY_TYPE
-    override val resourceKey: ResourceKey<Registry<BlockEntityType<*>>> = Registries.BLOCK_ENTITY_TYPE
+object GenerationsBlockEntities: PlatformRegistry<BlockEntityType<*>>(Registries.BLOCK_ENTITY_TYPE, BuiltInRegistries.BLOCK_ENTITY_TYPE) {
 
     val POKE_DOLL = registerRegular("pokedoll", ::PokeDollBlockEntity,
         GenerationsPokeDolls.ARCEUS_POKEDOLL, GenerationsPokeDolls.ARTICUNO_POKEDOLL, GenerationsPokeDolls.AZELF_POKEDOLL, GenerationsPokeDolls.AZURILL_POKEDOLL,
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/loot/LootItemConditionTypes.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/loot/LootItemConditionTypes.kt
@@ -10,10 +10,7 @@ import net.minecraft.resources.ResourceKey
 import net.minecraft.world.level.storage.loot.predicates.LootItemCondition
 import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType
 
-object LootItemConditionTypes: PlatformRegistry<LootItemConditionType>() {
-    override val registry: Registry<LootItemConditionType> = BuiltInRegistries.LOOT_CONDITION_TYPE
-    override val resourceKey: ResourceKey<Registry<LootItemConditionType>> = Registries.LOOT_CONDITION_TYPE
-
+object LootItemConditionTypes: PlatformRegistry<LootItemConditionType>(Registries.LOOT_CONDITION_TYPE, BuiltInRegistries.LOOT_CONDITION_TYPE) {
     val SPECIES_KEY = register("species_key", SpeciesKeyCondition.CODEC)
 
     fun <T : LootItemCondition> register(name: String, supplier: MapCodec<T>): Holder<LootItemConditionType> = create(name, { LootItemConditionType(supplier) })
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/loot/LootPoolEntryTypes.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/loot/LootPoolEntryTypes.kt
@@ -3,17 +3,12 @@ package generations.gg.generations.core.generationscore.common.world.loot
 import com.mojang.serialization.MapCodec
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer
 import net.minecraft.world.level.storage.loot.entries.LootPoolEntryType
 
-object LootPoolEntryTypes: PlatformRegistry<LootPoolEntryType>() {
-    override val registry: Registry<LootPoolEntryType> = BuiltInRegistries.LOOT_POOL_ENTRY_TYPE
-    override val resourceKey: ResourceKey<Registry<LootPoolEntryType>> = Registries.LOOT_POOL_ENTRY_TYPE
-
+object LootPoolEntryTypes: PlatformRegistry<LootPoolEntryType>(Registries.LOOT_POOL_ENTRY_TYPE, BuiltInRegistries.LOOT_POOL_ENTRY_TYPE) {
     val RESOURCE_KEY = register("resource_key", ResouceKeyEntry.CODEC)
 
     fun <T : LootPoolEntryContainer> register(name: String, codec: MapCodec<T>): Holder<LootPoolEntryType> {
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsCoreRecipeSerializers.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsCoreRecipeSerializers.kt
@@ -3,18 +3,14 @@ package generations.gg.generations.core.generationscore.common.world.recipe
 import com.mojang.serialization.MapCodec
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.codec.StreamCodec
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.crafting.Recipe
 import net.minecraft.world.item.crafting.RecipeSerializer
 
-object GenerationsCoreRecipeSerializers: PlatformRegistry<RecipeSerializer<*>>() {
-    override val registry: Registry<RecipeSerializer<*>> = BuiltInRegistries.RECIPE_SERIALIZER
-    override val resourceKey: ResourceKey<Registry<RecipeSerializer<*>>> = Registries.RECIPE_SERIALIZER
+object GenerationsCoreRecipeSerializers: PlatformRegistry<RecipeSerializer<*>>(Registries.RECIPE_SERIALIZER, BuiltInRegistries.RECIPE_SERIALIZER) {
 
     var SHAPED_RKS = register("shaped_rks", ShapedRksRecipe.CODEC, ShapedRksRecipe.STREAM_CODEC)
     var SHAPELESS_RKS = register("shapeless_rks", ShapelessRksRecipe.CODEC, ShapelessRksRecipe.STREAM_CODEC)
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsCoreRecipeTypes.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsCoreRecipeTypes.kt
@@ -3,17 +3,12 @@ package generations.gg.generations.core.generationscore.common.world.recipe
 import generations.gg.generations.core.generationscore.common.generationsResource
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.core.registries.BuiltInRegistries
 import net.minecraft.core.registries.Registries
-import net.minecraft.resources.ResourceKey
 import net.minecraft.world.item.crafting.Recipe
 import net.minecraft.world.item.crafting.RecipeType
 
-object GenerationsCoreRecipeTypes: PlatformRegistry<RecipeType<*>>() {
-    override val registry: Registry<RecipeType<*>> = BuiltInRegistries.RECIPE_TYPE
-    override val resourceKey: ResourceKey<Registry<RecipeType<*>>> = Registries.RECIPE_TYPE
-
+object GenerationsCoreRecipeTypes: PlatformRegistry<RecipeType<*>>(Registries.RECIPE_TYPE, BuiltInRegistries.RECIPE_TYPE) {
 
     @JvmField
 	var RKS = register<RksRecipe>("rks")
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsRksTypes.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/recipe/GenerationsRksTypes.kt
@@ -4,16 +4,10 @@ import com.mojang.serialization.MapCodec
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import net.minecraft.core.Holder
-import net.minecraft.core.Registry
 import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.codec.StreamCodec
-import net.minecraft.resources.ResourceKey
 
-object GenerationsRksTypes: PlatformRegistry<RksResultType<*>>() {
-    override val registry: Registry<RksResultType<*>>
-        get() = GenerationsCore.RKS_RESULT_TYPE.registry
-    override val resourceKey: ResourceKey<Registry<RksResultType<*>>>
-        get() = GenerationsCore.RKS_RESULT_TYPE.key
+object GenerationsRksTypes: PlatformRegistry<RksResultType<*>>(GenerationsCore.RKS_RESULT_TYPE.key, GenerationsCore.RKS_RESULT_TYPE.registry) {
 
     val POKEMON = register("pokemon", PokemonResult.CODEC, PokemonResult.STREAM_CODEC)
     val ITEM = register("item", ItemResult.CODEC, ItemResult.STREAM_CODEC)
diff --git a/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.kt b/fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.kt
@@ -239,7 +239,7 @@ object GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLau
         setConfigDirectory(FabricLoader.getInstance().configDir)
     }
 
-    override fun <T: Any> entryRegister(registry: Registry<T>): EntryRegister<T> {
+    override fun <T: Any> entryRegister(registry: Registry<T>, resourceKey: ResourceKey<Registry<T>>): EntryRegister<T> {
         return FabricEntryRegister(registry)
     }
 
diff --git a/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.kt b/neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.kt
@@ -52,7 +52,10 @@ import net.neoforged.neoforge.event.*
 import net.neoforged.neoforge.event.entity.living.LivingEvent.LivingJumpEvent
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent.EntityInteract
-import net.neoforged.neoforge.registries.*
+import net.neoforged.neoforge.registries.DeferredRegister
+import net.neoforged.neoforge.registries.NeoForgeRegistries
+import net.neoforged.neoforge.registries.NewRegistryEvent
+import net.neoforged.neoforge.registries.RegistryBuilder
 import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS
 import java.util.*
 import java.util.function.Consumer
@@ -73,7 +76,7 @@ fun generations.gg.generations.core.generationscore.common.api.events.TriState.a
  * @author Joseph T. McQuigg, WaterPicker
  */
 @Mod(GenerationsCore.MOD_ID)
-class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
+class GenerationsCoreForge(bus: IEventBus) : GenerationsImplementation {
     private val registries = mutableListOf<Registry<*>>()
     private val reloadableResources: MutableList<PreparableReloadListener> = ArrayList()
     private val packs: Map<PackType, List<Pair<ResourceLocation, Component>>> = EnumMap(net.minecraft.server.packs.PackType::class.java)
@@ -86,8 +89,8 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
     init {
         setConfigDirectory(FMLPaths.CONFIGDIR.get())
 
-        with(MOD_BUS) {
-            ENTITY_DATA_SERIALIZER_REGISTER.register(MOD_BUS)
+        with(bus) {
+            ENTITY_DATA_SERIALIZER_REGISTER.register(bus)
             addListener(::onInitialize)
             addListener(::postInit)
             addListener<BuildCreativeModeTabContentsEvent> {
@@ -145,17 +148,17 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
     }
 
     override fun <T: Any> register(register: () -> PlatformRegistry<T>) {
-        with(MOD_BUS) {
-            this.addListener<RegisterEvent> { event ->
-                val platform = register.invoke()
-
-                if(event.registryKey.equals(platform.resourceKey)) {
-                    event.register(platform.resourceKey) { helper ->
-                        platform.init()
-                    }
-                }
-            }
-        }
+//        with(MOD_BUS) {
+//            this.addListener<RegisterEvent> { event ->
+//                val platform = register.invoke()
+//
+//                if(event.registryKey.equals(platform.resourceKey)) {
+//                    event.register(platform.resourceKey) { helper ->
+//                        platform.init()
+//                    }
+//                }
+//            }
+//        }
     }
 
     override fun registerStrippable(log: Holder<Block>, stripped: Holder<Block>) {
@@ -300,8 +303,8 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
 
     override val networkManager: NetworkManager = GenerationsNeoForgeNetworkManager
 
-    override fun <T:Any> entryRegister(resourceKey: Registry<T>): EntryRegister<T> {
-        return NeoForgeEntryRegister(resourceKey, MOD_BUS)
+    override fun <T:Any> entryRegister(registry: Registry<T>, resourceKey: ResourceKey<Registry<T>>): EntryRegister<T> {
+        return NeoForgeEntryRegister(registry, MOD_BUS)
     }
 
     class NeoForgeEntryRegister<T:Any>(resourceKey: Registry<T>, bus: IEventBus): EntryRegister<T>() {

Original file line number	Diff line number	Diff line change
`@@ -68,5 +68,5 @@ interface GenerationsImplementation {`
`68`	`68`
`69`	`69`	`val networkManager: NetworkManager`
`70`	`70`
`71`		`- fun <T: Any> entryRegister(resourceKey: Registry<T>): EntryRegister<T>`
	`71`	`+ fun <T: Any> entryRegister(registry: Registry<T>, resourceKey: ResourceKey<Registry<T>>): EntryRegister<T>`
`72`	`72`	`}`