✨ feat(nms): update NmsBridge implementation for multiversion support

- rename SurfPaperNmsBridge to InternalNmsBridge for clarity
- adjust createNmsBridge method to return appropriate bridge implementations

Author: twisti-dev

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-common/src/main/kotlin/dev/slne/surf/api/paper/nms/common/NmsProvider.kt

@@ -3,7 +3,6 @@ package dev.slne.surf.api.paper.nms.common
 import dev.slne.surf.api.core.util.logger
 import dev.slne.surf.api.paper.glow.SurfGlowingApi
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
-import dev.slne.surf.api.paper.nms.SurfPaperNmsBridge
 import dev.slne.surf.api.paper.nms.bridges.*
 import dev.slne.surf.api.paper.nms.bridges.packets.SurfPaperNmsPacketBridges
 import dev.slne.surf.api.paper.nms.bridges.packets.block.SurfPaperNmsBlockPackets
@@ -38,7 +37,7 @@ interface NmsProvider {
 
     // ==================== Bridge Factories ==================== //
 
-    fun createNmsBridge(): SurfPaperNmsBridge
+    fun createNmsBridge(): InternalNmsBridge
     fun createCommonBridge(): SurfPaperNmsCommonBridge
     fun createEntityBridge(): SurfPaperNmsEntityBridge
     fun createItemBridge(): SurfPaperNmsItemBridge

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v1-21-11/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v1_21_11/V1_21_11NmsProvider.kt

@@ -2,7 +2,6 @@ package dev.slne.surf.api.paper.server.nms.v1_21_11
 
 import dev.slne.surf.api.paper.glow.SurfGlowingApi
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
-import dev.slne.surf.api.paper.nms.SurfPaperNmsBridge
 import dev.slne.surf.api.paper.nms.bridges.*
 import dev.slne.surf.api.paper.nms.bridges.packets.SurfPaperNmsPacketBridges
 import dev.slne.surf.api.paper.nms.bridges.packets.block.SurfPaperNmsBlockPackets
@@ -39,7 +38,7 @@ import org.bukkit.plugin.java.JavaPlugin
 class V1_21_11NmsProvider(override val plugin: JavaPlugin) : NmsProvider {
     override val version: NmsVersion = NmsVersion.V1_21_11
 
-    override fun createNmsBridge(): SurfPaperNmsBridge = V1_21_11SurfPaperNmsBridgeImpl()
+    override fun createNmsBridge() = V1_21_11SurfPaperNmsBridgeImpl()
     override fun createCommonBridge(): SurfPaperNmsCommonBridge =
         V1_21_11SurfPaperNmsCommonBridgeImpl()
 

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v1-21-11/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v1_21_11/bridges/V1_21_11SurfPaperNmsBridgeImpl.kt

@@ -5,7 +5,7 @@ import dev.slne.surf.api.core.util.logger
 import dev.slne.surf.api.paper.api.nms.listener.NmsClientboundPacketListener
 import dev.slne.surf.api.paper.api.nms.listener.NmsServerboundPacketListener
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
-import dev.slne.surf.api.paper.nms.SurfPaperNmsBridge
+import dev.slne.surf.api.paper.nms.common.InternalNmsBridge
 import dev.slne.surf.api.paper.nms.listener.packets.clientbound.NmsClientboundPacket
 import dev.slne.surf.api.paper.nms.listener.packets.serverbound.NmsServerboundPacket
 import dev.slne.surf.api.paper.packet.listener.listener.PacketListenerResult
@@ -14,7 +14,7 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArraySet
 
 @NmsUseWithCaution
-class V1_21_11SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
+class V1_21_11SurfPaperNmsBridgeImpl : InternalNmsBridge {
     private typealias PacketListenerMap<T> = ConcurrentHashMap<Class<*>, CopyOnWriteArraySet<T>>
 
     private val log = logger()
@@ -69,7 +69,7 @@ class V1_21_11SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
     }
 
     @Suppress("UNCHECKED_CAST")
-    fun <Packet : NmsServerboundPacket> handleServerboundPacket(
+    override fun <Packet : NmsServerboundPacket> handleServerboundPacket(
         packet: Packet,
         player: Player?,
     ): Packet? {
@@ -97,7 +97,7 @@ class V1_21_11SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
     }
 
     @Suppress("UNCHECKED_CAST")
-    fun <Packet : NmsClientboundPacket> handleClientboundPacket(
+    override fun <Packet : NmsClientboundPacket> handleClientboundPacket(
         packet: Packet,
         player: Player?,
     ): Packet? {

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/V26_1NmsProvider.kt

@@ -2,7 +2,6 @@ package dev.slne.surf.api.paper.server.nms.v26_1
 
 import dev.slne.surf.api.paper.glow.SurfGlowingApi
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
-import dev.slne.surf.api.paper.nms.SurfPaperNmsBridge
 import dev.slne.surf.api.paper.nms.bridges.*
 import dev.slne.surf.api.paper.nms.bridges.packets.SurfPaperNmsPacketBridges
 import dev.slne.surf.api.paper.nms.bridges.packets.block.SurfPaperNmsBlockPackets
@@ -39,7 +38,7 @@ import org.bukkit.plugin.java.JavaPlugin
 class V26_1NmsProvider(override val plugin: JavaPlugin) : NmsProvider {
     override val version: NmsVersion = NmsVersion.V26_1
 
-    override fun createNmsBridge(): SurfPaperNmsBridge = V26_1SurfPaperNmsBridgeImpl()
+    override fun createNmsBridge() = V26_1SurfPaperNmsBridgeImpl()
     override fun createCommonBridge(): SurfPaperNmsCommonBridge =
         V26_1SurfPaperNmsCommonBridgeImpl()
 

surf-api-paper/surf-api-paper-nms/surf-api-paper-nms-v26-1/src/main/kotlin/dev/slne/surf/api/paper/server/nms/v26_1/bridges/V26_1SurfPaperNmsBridgeImpl.kt

@@ -5,7 +5,7 @@ import dev.slne.surf.api.core.util.logger
 import dev.slne.surf.api.paper.api.nms.listener.NmsClientboundPacketListener
 import dev.slne.surf.api.paper.api.nms.listener.NmsServerboundPacketListener
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
-import dev.slne.surf.api.paper.nms.SurfPaperNmsBridge
+import dev.slne.surf.api.paper.nms.common.InternalNmsBridge
 import dev.slne.surf.api.paper.nms.listener.packets.clientbound.NmsClientboundPacket
 import dev.slne.surf.api.paper.nms.listener.packets.serverbound.NmsServerboundPacket
 import dev.slne.surf.api.paper.packet.listener.listener.PacketListenerResult
@@ -15,7 +15,7 @@ import java.util.concurrent.CopyOnWriteArraySet
 
 @NmsUseWithCaution
 @Suppress("ClassName")
-class V26_1SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
+class V26_1SurfPaperNmsBridgeImpl : InternalNmsBridge {
     private typealias PacketListenerMap<T> = ConcurrentHashMap<Class<*>, CopyOnWriteArraySet<T>>
 
     private val log = logger()
@@ -70,7 +70,7 @@ class V26_1SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
     }
 
     @Suppress("UNCHECKED_CAST")
-    fun <Packet : NmsServerboundPacket> handleServerboundPacket(
+    override fun <Packet : NmsServerboundPacket> handleServerboundPacket(
         packet: Packet,
         player: Player?,
     ): Packet? {
@@ -98,7 +98,7 @@ class V26_1SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
     }
 
     @Suppress("UNCHECKED_CAST")
-    fun <Packet : NmsClientboundPacket> handleClientboundPacket(
+    override fun <Packet : NmsClientboundPacket> handleClientboundPacket(
         packet: Packet,
         player: Player?,
     ): Packet? {