part 2

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsArchitecturyEvents.kt

@@ -57,7 +57,7 @@ object GenerationsArchitecturyEvents {
 
             if (player is ServerPlayer) {
                 if (hand == InteractionHand.MAIN_HAND && player.level().getBlockState(pos)
-                        .`is`(GenerationsShrines.TAPU_SHRINE.get()) && player.getItemInHand(hand)
+                        .`is`(GenerationsShrines.TAPU_SHRINE) && player.getItemInHand(hand)
                         .`is`(GenerationsItems.SPARKLING_STONE)
                 ) {
                     val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("tapu_spawn")]
@@ -71,7 +71,7 @@ object GenerationsArchitecturyEvents {
                     event.result = TriState.TRUE
                     return@subscribe
                 } else if (hand == InteractionHand.MAIN_HAND && player.level().getBlockState(pos)
-                        .`is`(GenerationsShrines.ABUNDANT_SHRINE.get()) && player.getItemInHand(hand)
+                        .`is`(GenerationsShrines.ABUNDANT_SHRINE) && player.getItemInHand(hand)
                         .`is`(GenerationsItems.REVEAL_GLASS)
                 ) {
                     val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("therian_spawn")]

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsCore.kt

@@ -11,6 +11,7 @@ import com.cobblemon.mod.common.api.data.DataProvider
 import com.cobblemon.mod.common.api.spawning.detail.SpawnDetail.Companion.registerSpawnType
 import com.cobblemon.mod.common.api.storage.player.PlayerDataExtensionRegistry.register
 import com.mojang.logging.LogUtils
+import com.mojang.serialization.MapCodec
 import dev.architectury.event.events.common.LootEvent
 import generations.gg.generations.core.generationscore.common.api.GenerationsMolangFunctions
 import generations.gg.generations.core.generationscore.common.api.data.GenerationsCoreEntityDataSerializers
@@ -38,13 +39,14 @@ import generations.gg.generations.core.generationscore.common.world.level.block.
 import generations.gg.generations.core.generationscore.common.world.level.block.entities.GenerationsBlockEntities
 import generations.gg.generations.core.generationscore.common.world.loot.LootItemConditionTypes
 import generations.gg.generations.core.generationscore.common.world.loot.LootPoolEntryTypes
-import generations.gg.generations.core.generationscore.common.world.recipe.GenerationsCoreRecipeSerializers
-import generations.gg.generations.core.generationscore.common.world.recipe.GenerationsCoreRecipeTypes
-import generations.gg.generations.core.generationscore.common.world.recipe.RksResultType
+import generations.gg.generations.core.generationscore.common.world.recipe.*
 import generations.gg.generations.core.generationscore.common.world.sound.GenerationsSounds
 import generations.gg.generations.core.generationscore.common.world.spawning.ZygardeCellDetail
 import net.minecraft.core.registries.Registries
+import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.chat.MutableComponent
+import net.minecraft.network.codec.ByteBufCodecs
+import net.minecraft.network.codec.StreamCodec
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.level.ServerPlayer
@@ -65,6 +67,7 @@ import java.util.function.IntConsumer
  * @author Joseph T. McQuigg, WaterPicker
  */
 object GenerationsCore {
+
     /** The mod id of the Generations-Core mod.  */
     const val MOD_ID: String = "generations_core"
 
@@ -80,6 +83,8 @@ object GenerationsCore {
     @JvmField
 	var dataProvider: DataProvider = GenerationsDataProvider.INSTANCE
 
+    lateinit var RKS_RESULT_TYPE: RegistryContainer<RksResultType<*>, RksResult<*>>
+
     /**
      * Initializes the Generations-Core mod.
      */
@@ -90,6 +95,7 @@ object GenerationsCore {
         )
         GenerationsCore.implementation = implementation
 
+        RKS_RESULT_TYPE = RegistryContainer( "rks_result", RksResult<*>::type, RksResultType<*>::codec, RksResultType<*>::streamCodec)
 
         //		GenerationsDataProvider.INSTANCE.register(ShopPresets.instance());
 //		GenerationsDataProvider.INSTANCE.register(Shops.instance());
@@ -123,32 +129,10 @@ object GenerationsCore {
 
         GenerationsCoreEntityDataSerializers.init()
         GenerationsStorage.init()
-        GenerationsDataComponents.init()
-        GenerationsSounds.init()
-        GenerationsBlocks.init()
-        GenerationsPokeDolls.init()
-        GenerationsWood.init()
-        GenerationsOres.init()
-        GenerationsDecorationBlocks.init()
-        LootPoolEntryTypes.init()
-        LootItemConditionTypes.init()
-        GenerationsUtilityBlocks.init()
-        GenerationsShrines.init()
-        GenerationsBlocks.initItems()
-        GenerationsItems.init()
-        GenerationsBlockEntities.init()
-        GenerationsEntities.init()
-        GenerationsArmorMaterials.init()
-        GenerationsArmor.init()
-        GenerationsTools.init()
-        GenerationsCreativeTabs.init()
-        GenerationsContainers.init()
         GenerationsResources.init()
-        RksResultType.init()
         GenerationsIngredidents.init()
-        GenerationsCoreRecipeTypes.init()
-        GenerationsCoreRecipeSerializers.init()
-        GenerationsCoreStats.init()
+
+        registerRegistires()
 
         GenerationsDataProvider.INSTANCE.registerDefaults()
 
@@ -175,7 +159,6 @@ object GenerationsCore {
         registerDefaultCustomInteractions()
 
 
-        //		BuiltInRegistries.BLOCK.stream().map(a -> a.arch$registryName() + ": " + a.getLootTable()).forEach(a -> System.out.println(a));
     }
 
     fun initBuiltinPacks(consumer: TriConsumer<PackType?, ResourceLocation?, MutableComponent?>?) {
@@ -206,6 +189,40 @@ object GenerationsCore {
 	fun id(path: String): ResourceLocation {
         return ResourceLocation.fromNamespaceAndPath(MOD_ID, path)
     }
+
+    fun registerRegistires() {
+        implementation.register(GenerationsDataComponents)
+        implementation.register(GenerationsSounds)
+        GenerationsBlocks.init(implementation::register)
+        implementation.register(GenerationsPokeDolls)
+        GenerationsWood.init(implementation::register)
+        implementation.register(GenerationsOres)
+        implementation.register(GenerationsDecorationBlocks)
+        implementation.register(LootPoolEntryTypes)
+        implementation.register(LootItemConditionTypes)
+        implementation.register(GenerationsUtilityBlocks)
+        implementation.register(GenerationsShrines)
+        GenerationsItems.init(implementation::register)
+        GenerationsBlocks.initItems(implementation::register)
+        implementation.register(GenerationsBlockEntities)
+        implementation.register(GenerationsEntities)
+        implementation.register(GenerationsArmorMaterials)
+        implementation.register(GenerationsArmor)
+        implementation.register(GenerationsTools)
+        implementation.register(GenerationsCreativeTabs)
+        implementation.register(GenerationsContainers)
+        implementation.register(GenerationsCoreRecipeTypes)
+        implementation.register(GenerationsCoreRecipeSerializers)
+        implementation.register(GenerationsCoreStats)
+        implementation.register(GenerationsRksTypes)
+    }
+}
+
+class RegistryContainer<T: Any, V: Any>(name: String, from: (V) -> T, mapCodec: (T) -> MapCodec<out V>, streamCodec: (T) -> StreamCodec<RegistryFriendlyByteBuf, out V>) {
+    val key = ResourceKey.createRegistryKey<T>(name.generationsResource())
+    val registry = GenerationsCore.implementation.createRegistry(key, true)
+    val codec = registry.byNameCodec().dispatch(from::invoke, mapCodec::invoke)
+    val streamCodec = ByteBufCodecs.registry(key).dispatch(from::invoke, streamCodec::invoke)
 }
 
 fun <T> T?.orFalse(predicate: (T) -> Boolean): Boolean = this?.let(predicate) ?: false

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsImplementation.kt

@@ -1,17 +1,30 @@
 package generations.gg.generations.core.generationscore.common
 
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
+import generations.gg.generations.core.generationscore.common.world.container.ExtendedMenuProvider
+import net.minecraft.core.Registry
+import net.minecraft.network.FriendlyByteBuf
+import net.minecraft.network.RegistryFriendlyByteBuf
 import net.minecraft.network.syncher.EntityDataSerializer
+import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
+import net.minecraft.world.MenuProvider
+import net.minecraft.world.entity.player.Inventory
+import net.minecraft.world.inventory.AbstractContainerMenu
+import net.minecraft.world.inventory.MenuType
 import net.minecraft.world.item.CreativeModeTab
 import net.minecraft.world.item.ItemStack
 import net.minecraft.world.level.ItemLike
 import net.minecraft.world.level.block.Block
+import java.util.*
+import java.util.function.Consumer
 import java.util.function.Supplier
 
 interface GenerationsImplementation {
+
     fun registerResourceReloader(
         identifier: ResourceLocation?,
         reloader: PreparableReloadListener?,
@@ -48,6 +61,11 @@ interface GenerationsImplementation {
     ): CreativeModeTab
 
     fun <T: Any> registerEntityDataSerializer(name: String, dataSerializer: EntityDataSerializer<T>)
+    fun <T : AbstractContainerMenu> createExtendedMenu(constructor: (Int, Inventory, FriendlyByteBuf) -> T): MenuType<T>
+    fun <T: Any> register(register: PlatformRegistry<T>)
+    fun openExtendedMenu(serverPlayer: ServerPlayer, menuProvider: ExtendedMenuProvider)
+
+    fun <T: Any> createRegistry(key: ResourceKey<Registry<T>>, sync: Boolean): Registry<T>
 
     enum class ModAPI {
         FABRIC,

common/src/main/java/generations/gg/generations/core/generationscore/common/api/data/GenerationsCoreEntityDataSerializers.kt

@@ -1,24 +1,23 @@
 package generations.gg.generations.core.generationscore.common.api.data
 
 //import generations.gg.generations.core.generationscore.common.world.entity.StatueEntity.StatueInfo
-import dev.architectury.injectables.annotations.ExpectPlatform
 import generations.gg.generations.core.generationscore.common.GenerationsCore
+import generations.gg.generations.core.generationscore.common.util.StreamCodecs.asRegistryFriendly
+import generations.gg.generations.core.generationscore.common.util.StreamCodecs.optional
 import generations.gg.generations.core.generationscore.common.util.readNullableString
 import generations.gg.generations.core.generationscore.common.util.readPokemonProperties
 import generations.gg.generations.core.generationscore.common.util.writeNullableString
 import generations.gg.generations.core.generationscore.common.util.writePokemonProperties
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.RegistryFriendlyByteBuf
+import net.minecraft.network.codec.ByteBufCodecs
 import net.minecraft.network.codec.StreamCodec
 import net.minecraft.network.syncher.EntityDataSerializer
 import net.minecraft.network.syncher.EntityDataSerializers
 
 object GenerationsCoreEntityDataSerializers {
-    val NULLABLE_STRING = simple(FriendlyByteBuf::writeNullableString, FriendlyByteBuf::readNullableString)
-    val PROPERTIES = simple(FriendlyByteBuf::writePokemonProperties, FriendlyByteBuf::readPokemonProperties)
-
-    @ExpectPlatform
-    fun <T> simple(encoder: (RegistryFriendlyByteBuf, T) -> Unit, decoder: (RegistryFriendlyByteBuf) -> T): EntityDataSerializer<T> = EntityDataSerializer.forValueType(StreamCodec.of(encoder, decoder))
+    val NULLABLE_STRING = EntityDataSerializer.forValueType(ByteBufCodecs.STRING_UTF8.optional().asRegistryFriendly())
+    val PROPERTIES = EntityDataSerializer.forValueType(StreamCodec.of(FriendlyByteBuf::writePokemonProperties, FriendlyByteBuf::readPokemonProperties))
 
     @JvmStatic fun init() {
         GenerationsCore.implementation.registerEntityDataSerializer("properties", PROPERTIES)

common/src/main/java/generations/gg/generations/core/generationscore/common/api/events/general/InteractionEvents.kt

@@ -2,7 +2,6 @@ package generations.gg.generations.core.generationscore.common.api.events.genera
 
 import com.cobblemon.mod.common.api.events.Cancelable
 import com.cobblemon.mod.common.api.reactive.CancelableObservable
-import dev.architectury.event.EventResult
 import generations.gg.generations.core.generationscore.common.api.events.TriState
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction