Completed networking

Author: Waterpicker

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

@@ -1,13 +1,13 @@
 package generations.gg.generations.core.generationscore.common
 
+import com.cobblemon.mod.common.NetworkManager
 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.syncher.EntityDataSerializer
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
@@ -64,15 +64,5 @@ interface GenerationsImplementation {
 
     fun <T: Any> createRegistry(key: ResourceKey<Registry<T>>, sync: Boolean): Registry<T>
 
-    enum class ModAPI {
-        FABRIC,
-        FORGE
-    }
-
-    val server: MinecraftServer?
-
-    enum class Environment {
-        CLIENT,
-        SERVER
-    }
+    val networkManager: NetworkManager
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/network/GenerationsNetwork.kt

@@ -1,18 +1,28 @@
 package generations.gg.generations.core.generationscore.common.network
 
+import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.common.client.net.spawn.SpawnExtraDataEntityHandler
 import com.cobblemon.mod.common.net.PacketRegisterInfo
+import com.cobblemon.mod.common.util.server
+import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.network.packets.*
 import generations.gg.generations.core.generationscore.common.network.packets.shop.*
 import generations.gg.generations.core.generationscore.common.network.packets.statue.S2COpenStatueEditorScreenHandler
 import generations.gg.generations.core.generationscore.common.network.packets.statue.S2COpenStatueEditorScreenPacket
 import generations.gg.generations.core.generationscore.common.network.packets.statue.UpdateStatueHandler
 import generations.gg.generations.core.generationscore.common.network.packets.statue.UpdateStatuePacket
 import generations.gg.generations.core.generationscore.common.network.spawn.SpawnStatuePacket
-import generations.gg.generations.core.generationscore.common.world.shop.ShopPresetRegistrySyncPacket
-import generations.gg.generations.core.generationscore.common.world.shop.ShopRegistrySyncPacket
+import net.minecraft.server.level.ServerPlayer
 
 object GenerationsNetwork {
+    fun ServerPlayer.sendPacket(packet: NetworkPacket<*>) {
+        sendPacketToPlayer(this, packet)
+    }
+    fun sendToServer(packet: NetworkPacket<*>) {
+        GenerationsCore.implementation.networkManager.sendToServer(packet)
+    }
+    fun sendToAllPlayers(packet: NetworkPacket<*>) = sendPacketToPlayers(server()!!.playerList.players, packet)
+    fun sendPacketToPlayers(players: Iterable<ServerPlayer>, packet: NetworkPacket<*>) = players.forEach { sendPacketToPlayer(it, packet) }
 
     val s2cPayloads = generateS2CPacketInfoList()
     val c2sPayloads = generateC2SPacketInfoList()
@@ -55,4 +65,9 @@ object GenerationsNetwork {
         list.add(PacketRegisterInfo(UpdateStatuePacket.ORIENTATION_ID, UpdateStatuePacket.Companion::orientationDecode, UpdateStatueHandler.Orientation))
         return list
     }
+
+
+    fun sendPacketToPlayer(player: ServerPlayer, packet: NetworkPacket<*>) {
+        GenerationsCore.implementation.networkManager.sendPacketToPlayer(player, packet)
+    }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/S2COpenMailPacketHandler.kt

@@ -1,30 +1,25 @@
 package generations.gg.generations.core.generationscore.common.network.packets
 
 import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler
-import dev.architectury.utils.Env
-import dev.architectury.utils.EnvExecutor
+
 import generations.gg.generations.core.generationscore.common.client.screen.mails.MailEditScreen
 import generations.gg.generations.core.generationscore.common.client.screen.mails.MailViewScreen
 import generations.gg.generations.core.generationscore.common.tags.GenerationsItemTags
 import net.minecraft.client.Minecraft
 
 object S2COpenMailPacketHandler : ClientNetworkPacketHandler<S2COpenMailPacket> {
     override fun handle(packet: S2COpenMailPacket, minecraft: Minecraft) {
-        EnvExecutor.runInEnv(Env.CLIENT) {
-            Runnable {
-                val itemStack = Minecraft.getInstance().player!!.getItemInHand(packet.hand)
-                if (itemStack.`is`(GenerationsItemTags.CLOSED_POKEMAIL)) Minecraft.getInstance().setScreen(
-                    MailViewScreen(
-                        MailViewScreen.WrittenMailAccess(itemStack)
-                    )
-                ) else if (itemStack.`is`(GenerationsItemTags.POKEMAIL)) Minecraft.getInstance().setScreen(
-                    MailEditScreen(
-                        Minecraft.getInstance().player!!,
-                        itemStack,
-                        packet.hand
-                    )
-                )
-            }
-        }
+        val itemStack = minecraft.player!!.getItemInHand(packet.hand)
+        if (itemStack.`is`(GenerationsItemTags.CLOSED_POKEMAIL)) minecraft.setScreen(
+            MailViewScreen(
+                MailViewScreen.WrittenMailAccess(itemStack)
+            )
+        ) else if (itemStack.`is`(GenerationsItemTags.POKEMAIL)) minecraft.setScreen(
+            MailEditScreen(
+                minecraft.player!!,
+                itemStack,
+                packet.hand
+            )
+        )
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/schedule/ScheduledTask.kt

@@ -1,6 +1,6 @@
 package generations.gg.generations.core.generationscore.common.world.level.schedule
 
-import generations.gg.generations.core.generationscore.common.GenerationsCore
+import com.cobblemon.mod.common.util.server
 import net.minecraft.server.MinecraftServer
 import net.minecraft.world.level.timers.TimerCallback
 import net.minecraft.world.level.timers.TimerQueue
@@ -11,7 +11,7 @@ class ScheduledTask private constructor() : TimerCallback<MinecraftServer> {
 
     companion object {
         fun schedule(run: Runnable, triggerTime: Int) {
-            val server = GenerationsCore.implementation.server ?: return
+            val server = server() ?: return
             server.worldData.overworldData().scheduledEvents.schedule(
                 "misc", server.overworld().gameTime + triggerTime
             ) { _, _, _ -> run.run() }

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/GenerationsCoreFabric.kt

@@ -76,11 +76,15 @@ import java.util.function.Supplier
  *
  * @author Joseph T. McQuigg, WaterPicker
  */
-class GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLaunchEntrypoint {
+object GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLaunchEntrypoint {
     private var serverBacking: MinecraftServer? = null
 
     override fun onInitialize() {
         init(this)
+
+        networkManager.registerMessages()
+        networkManager.registerServerHandlers()
+
         VanillaCompat.setup()
 
         if (FabricLoader.getInstance().isModLoaded("impactor")) ImpactorCompat.init()
@@ -106,9 +110,6 @@ class GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLaun
             return@register InteractionEvents.fireRightClick(player, hand, hitResult.blockPos, hitResult.direction);
         })
 
-        GenerationsFabricNetwork.registerMessages()
-        GenerationsFabricNetwork.registerServerHandlers()
-
         AnvilEvents.ANVIL_CHANGE.register(AnvilChange { result, left, right, name, baseCost, player ->
             onAnvilChange(
                 left, right, player,
@@ -201,6 +202,7 @@ class GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLaun
     }
 
     override fun <T : Any> createRegistry(key: ResourceKey<Registry<T>>, sync: Boolean): Registry<T> = FabricRegistryBuilder.createSimple(key).attribute(RegistryAttribute.SYNCED).buildAndRegister()
+    override val networkManager: GenerationsFabricNetwork = GenerationsFabricNetwork
 
     override fun registerResourceReloader(
         identifier: ResourceLocation,
@@ -223,9 +225,6 @@ class GenerationsCoreFabric : ModInitializer, GenerationsImplementation, PreLaun
         override fun getFabricDependencies(): MutableCollection<ResourceLocation> = this.dependencies.toMutableList()
     }
 
-    override val server: MinecraftServer?
-        get() = serverBacking
-
     override fun onPreLaunch() {
         setConfigDirectory(FabricLoader.getInstance().configDir)
     }

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/client/GenerationsCoreClientFabric.kt

@@ -16,7 +16,7 @@ import generations.gg.generations.core.generationscore.common.client.render.Rend
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsMushroomBlock
 import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsWood
-import generations.gg.generations.core.generationscore.fabric.networking.GenerationsFabricNetwork
+import generations.gg.generations.core.generationscore.fabric.GenerationsCoreFabric
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
@@ -33,13 +33,11 @@ import net.minecraft.client.renderer.blockentity.BlockEntityRenderers
 import net.minecraft.client.renderer.entity.EntityRendererProvider
 import net.minecraft.world.entity.Entity
 import net.minecraft.world.entity.EntityType
-import net.minecraft.world.level.block.Block
 import net.minecraft.world.level.block.DoorBlock
 import net.minecraft.world.level.block.TransparentBlock
 import net.minecraft.world.level.block.TrapDoorBlock
 import net.minecraft.world.level.block.entity.BlockEntity
 import net.minecraft.world.level.block.entity.BlockEntityType
-import java.util.function.Consumer
 
 /**
  * The client initializer for the fabric client portion of the mod.
@@ -82,7 +80,7 @@ class GenerationsCoreClientFabric : ClientModInitializer {
             RenderStateRecord.pop()
         }
 
-        GenerationsFabricNetwork.registerClientHandlers()
+        GenerationsCoreFabric.networkManager.registerClientHandlers()
 
         onInitialize(Minecraft.getInstance())
         registerRenderTypes()

fabric/src/main/java/generations/gg/generations/core/generationscore/fabric/networking/GenerationsFabricNetwork.kt

@@ -1,9 +1,14 @@
 package generations.gg.generations.core.generationscore.fabric.networking
 
+import com.cobblemon.mod.common.NetworkManager
+import com.cobblemon.mod.common.api.net.NetworkPacket
 import com.cobblemon.mod.fabric.net.FabricPacketInfo
 import generations.gg.generations.core.generationscore.common.network.GenerationsNetwork
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking
+import net.minecraft.server.level.ServerPlayer
 
-object GenerationsFabricNetwork {
+object GenerationsFabricNetwork: NetworkManager {
     fun registerMessages() {
         GenerationsNetwork.s2cPayloads.map { FabricPacketInfo(it) }.forEach { it.registerPacket(true) }
         GenerationsNetwork.c2sPayloads.map { FabricPacketInfo(it) }.forEach { it.registerPacket(false) }
@@ -16,4 +21,13 @@ object GenerationsFabricNetwork {
     fun registerServerHandlers() {
         GenerationsNetwork.c2sPayloads.map { FabricPacketInfo(it) }.forEach { it.registerServerHandler() }
     }
+
+    override fun sendPacketToPlayer(player: ServerPlayer, packet: NetworkPacket<*>) {
+        ServerPlayNetworking.send(player, packet)
+    }
+
+    override fun sendToServer(packet: NetworkPacket<*>) {
+        ClientPlayNetworking.send(packet)
+    }
+
 }

neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.kt

@@ -1,5 +1,6 @@
 package generations.gg.generations.core.generationscore.forge
 
+import com.cobblemon.mod.common.NetworkManager
 import com.google.common.collect.ImmutableMap
 import com.mojang.datafixers.util.Pair
 import generations.gg.generations.core.generationscore.common.GenerationsCore
@@ -15,15 +16,14 @@ import generations.gg.generations.core.generationscore.common.config.ConfigLoade
 import generations.gg.generations.core.generationscore.common.util.PlatformRegistry
 import generations.gg.generations.core.generationscore.common.util.extensions.supplier
 import generations.gg.generations.core.generationscore.common.world.container.ExtendedMenuProvider
+import generations.gg.generations.core.generationscore.forge.networking.GenerationsNeoForgeNetworkManager
 import net.minecraft.client.Minecraft
-import net.minecraft.client.renderer.item.ClampedItemPropertyFunction
 import net.minecraft.core.Registry
 import net.minecraft.network.FriendlyByteBuf
 import net.minecraft.network.chat.Component
 import net.minecraft.network.syncher.EntityDataSerializer
 import net.minecraft.resources.ResourceKey
 import net.minecraft.resources.ResourceLocation
-import net.minecraft.server.MinecraftServer
 import net.minecraft.server.level.ServerPlayer
 import net.minecraft.server.packs.PackType
 import net.minecraft.server.packs.resources.PreparableReloadListener
@@ -57,7 +57,6 @@ import net.neoforged.neoforge.registries.NeoForgeRegistries
 import net.neoforged.neoforge.registries.NewRegistryEvent
 import net.neoforged.neoforge.registries.RegisterEvent
 import net.neoforged.neoforge.registries.RegistryBuilder
-import net.neoforged.neoforge.server.ServerLifecycleHooks
 import thedarkcolour.kotlinforforge.neoforge.forge.MOD_BUS
 import java.util.*
 import java.util.function.Consumer
@@ -96,6 +95,8 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
             addListener(::onInitialize)
             addListener(::postInit)
 
+            addListener(GenerationsNeoForgeNetworkManager::registerMessages)
+
             addListener<NewRegistryEvent> { event ->
                 registries.forEach { event.register(it) }
             }
@@ -302,6 +303,5 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
         else Minecraft.getInstance().resourceManager.instanceOrNull<ReloadableResourceManager>()?.registerReloadListener(reloader)
     }
 
-    override val server: MinecraftServer?
-        get() = ServerLifecycleHooks.getCurrentServer()
+    override val networkManager: NetworkManager = GenerationsNeoForgeNetworkManager
 }

neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/networking/GenerationsNeoForgeNetworkManager.kt

@@ -0,0 +1,49 @@
+package generations.gg.generations.core.generationscore.forge.networking;
+
+import com.cobblemon.mod.common.NetworkManager
+import com.cobblemon.mod.common.api.net.NetworkPacket
+import com.cobblemon.mod.neoforge.net.NeoForgePacketInfo
+import generations.gg.generations.core.generationscore.common.GenerationsCore
+import generations.gg.generations.core.generationscore.common.network.GenerationsNetwork
+import generations.gg.generations.core.generationscore.common.network.packets.DataRegistrySyncPacketHandler
+import net.minecraft.client.Minecraft
+import net.minecraft.resources.ResourceLocation
+import net.minecraft.server.level.ServerPlayer
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent
+import net.neoforged.neoforge.network.registration.HandlerThread
+
+
+object GenerationsNeoForgeNetworkManager : NetworkManager {
+    const val PROTOCOL_VERSION = "1.0.0"
+
+    fun registerMessages(event: RegisterPayloadHandlersEvent) {
+        val registrar = event
+            .registrar(GenerationsCore.MOD_ID)
+            .versioned(PROTOCOL_VERSION)
+
+        val netRegistrar = event
+            .registrar(GenerationsCore.MOD_ID)
+            .versioned(PROTOCOL_VERSION)
+            .executesOn(HandlerThread.NETWORK)
+
+        val syncPackets = HashSet<ResourceLocation>()
+        val asyncPackets = HashSet<ResourceLocation>()
+
+        GenerationsNetwork.s2cPayloads.map { NeoForgePacketInfo(it) }.forEach {
+            val handleAsync = it.info.handler is DataRegistrySyncPacketHandler<*, *>
+            if (handleAsync) asyncPackets += it.info.id
+            else syncPackets += it.info.id
+
+            it.registerToClient(if (handleAsync) netRegistrar else registrar)
+        }
+        GenerationsNetwork.c2sPayloads.map { NeoForgePacketInfo(it) }.forEach { it.registerToServer(registrar) }
+    }
+
+    override fun sendPacketToPlayer(player: ServerPlayer, packet: NetworkPacket<*>) {
+        player.connection.send(packet)
+    }
+
+    override fun sendToServer(packet: NetworkPacket<*>) {
+        Minecraft.getInstance().connection?.send(packet)
+    }
+}