Skip to content

Commit 84a22af

Browse files
committed
✨ feat(nms): enhance NMS support with new internal bridge and refactor packet handling
- add InternalNmsBridge interface for improved packet handling - update NmsProvider to use getPacketBridgeHandler method - apply NmsUseWithCaution annotation to relevant classes - suppress ClassName warnings for consistency in naming conventions
1 parent 36baa59 commit 84a22af

87 files changed

Lines changed: 105 additions & 1668 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ interface NmsProvider {
5454
/**
5555
* Creates the packet bridge handler for wrapping/unwrapping NMS packets.
5656
*/
57-
fun createPacketBridgeHandler(): NmsPacketBridgeHandler
57+
fun getPacketBridgeHandler(): NmsPacketBridgeHandler
5858

5959
/**
6060
* Creates the packet lore registry for managing version-specific lore handlers.

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_11NmsPacketBridgeHandler.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import dev.slne.surf.api.paper.server.nms.v1_21_11.listener.packets.V1_21_11Pack
1010
import net.minecraft.network.protocol.Packet
1111

1212
@NmsUseWithCaution
13-
class V1_21_11NmsPacketBridgeHandler : NmsPacketBridgeHandler {
13+
object V1_21_11NmsPacketBridgeHandler : NmsPacketBridgeHandler {
1414

1515
@Suppress("UNCHECKED_CAST")
1616
override fun wrapServerboundPacket(nmsPacket: Any): NmsServerboundPacket? {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,7 @@ class V1_21_11NmsProvider : NmsProvider {
7373
V1_21_11SurfPaperNmsPlayerToastPacketsImpl()
7474

7575
override fun createTickThreadGuard(): TickThreadGuard = V1_21_11TickThreadGuard()
76-
override fun createPacketBridgeHandler(): NmsPacketBridgeHandler =
77-
V1_21_11NmsPacketBridgeHandler()
76+
override fun getPacketBridgeHandler(): NmsPacketBridgeHandler = V1_21_11NmsPacketBridgeHandler
7877

7978
override fun createPacketLoreRegistry(): PacketLoreRegistry = V1_21_11PacketLoreRegistry()
8079
override fun createGlowingLifecycleHandler(): GlowingLifecycleHandler =

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_1NmsPacketBridgeHandler.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import dev.slne.surf.api.paper.server.nms.v26_1.listener.packets.V26_1PacketRegi
1010
import net.minecraft.network.protocol.Packet
1111

1212
@NmsUseWithCaution
13-
class V26_1NmsPacketBridgeHandler : NmsPacketBridgeHandler {
13+
@Suppress("ClassName")
14+
object V26_1NmsPacketBridgeHandler : NmsPacketBridgeHandler {
1415

1516
@Suppress("UNCHECKED_CAST")
1617
override fun wrapServerboundPacket(nmsPacket: Any): NmsServerboundPacket? {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import dev.slne.surf.api.paper.server.nms.v26_1.packet.lore.V26_1PacketLoreRegis
2929
import dev.slne.surf.api.paper.server.nms.v26_1.reflection.V26_1Reflection
3030
import dev.slne.surf.api.paper.server.nms.v26_1.region.V26_1TickThreadGuard
3131

32+
@Suppress("ClassName")
3233
@OptIn(NmsUseWithCaution::class)
3334
@AutoService(NmsProvider::class)
3435
class V26_1NmsProvider : NmsProvider {
@@ -73,8 +74,7 @@ class V26_1NmsProvider : NmsProvider {
7374
V26_1SurfPaperNmsPlayerToastPacketsImpl()
7475

7576
override fun createTickThreadGuard(): TickThreadGuard = V26_1TickThreadGuard()
76-
override fun createPacketBridgeHandler(): NmsPacketBridgeHandler =
77-
V26_1NmsPacketBridgeHandler()
77+
override fun getPacketBridgeHandler(): NmsPacketBridgeHandler = V26_1NmsPacketBridgeHandler
7878

7979
override fun createPacketLoreRegistry(): PacketLoreRegistry = V26_1PacketLoreRegistry()
8080
override fun createGlowingLifecycleHandler(): GlowingLifecycleHandler =

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import java.util.concurrent.ConcurrentHashMap
1414
import java.util.concurrent.CopyOnWriteArraySet
1515

1616
@NmsUseWithCaution
17+
@Suppress("ClassName")
1718
class V26_1SurfPaperNmsBridgeImpl : SurfPaperNmsBridge {
1819
private typealias PacketListenerMap<T> = ConcurrentHashMap<Class<*>, CopyOnWriteArraySet<T>>
1920

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_1SurfPaperNmsCommandArgumentTypesBridgeImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import java.lang.reflect.InvocationHandler
1919
import java.util.concurrent.ConcurrentHashMap
2020

2121
@NmsUseWithCaution
22+
@Suppress("ClassName")
2223
class V26_1SurfPaperNmsCommandArgumentTypesBridgeImpl : SurfPaperNmsCommandArgumentTypesBridge {
2324

2425
override fun compoundTag(): ArgumentType<*> {

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_1SurfPaperNmsCommonBridgeImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import org.bukkit.entity.Player
2020
import java.net.InetSocketAddress
2121

2222
@NmsUseWithCaution
23+
@Suppress("ClassName")
2324
class V26_1SurfPaperNmsCommonBridgeImpl : SurfPaperNmsCommonBridge {
2425

2526
@Suppress("DEPRECATION")

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_1SurfPaperNmsEntityBridgeImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import org.bukkit.World
1818
import org.bukkit.entity.EntityType
1919

2020
@NmsUseWithCaution
21+
@Suppress("ClassName")
2122
class V26_1SurfPaperNmsEntityBridgeImpl : SurfPaperNmsEntityBridge {
2223

2324
@Suppress("UnstableApiUsage")

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_1SurfPaperNmsGlowingBridgeImpl.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import net.minecraft.network.syncher.SynchedEntityData.DataValue
1414
import org.bukkit.entity.Entity
1515

1616
@NmsUseWithCaution
17+
@Suppress("ClassName")
1718
object V26_1SurfPaperNmsGlowingBridgeImpl : SurfPaperNmsGlowingBridge {
1819
fun createTeam(data: V26_1TeamData): PacketOperation =
1920
V26_1PacketOperationImpl.simple {

0 commit comments

Comments
 (0)