refactor: update reflection proxies and improve JSON serialization for player stats (#291)

Author: ammodev

gradle.properties

@@ -7,6 +7,6 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 javaVersion=25
 mcVersion=26.1.1
 group=dev.slne.surf
-version=26.1.1-3.0.2
+version=26.1.1-3.0.3
 relocationPrefix=dev.slne.surf.api.libs
 snapshot=false

surf-api-paper/surf-api-paper-server/src/main/kotlin/dev/slne/surf/api/paper/server/impl/nms/bridges/SurfPaperNmsItemBridgeImpl.kt

@@ -5,7 +5,6 @@ import dev.slne.surf.api.core.util.checkInstantiationByServiceLoader
 import dev.slne.surf.api.paper.nms.NmsUseWithCaution
 import dev.slne.surf.api.paper.nms.bridges.SurfPaperNmsItemBridge
 import dev.slne.surf.api.paper.server.nms.nms
-import dev.slne.surf.api.paper.server.reflection.Reflection
 import net.minecraft.core.component.DataComponentMap
 import net.minecraft.core.component.DataComponents
 import org.bukkit.inventory.ItemType
@@ -25,6 +24,7 @@ class SurfPaperNmsItemBridgeImpl : SurfPaperNmsItemBridge {
             .addAll(nmsItem.components())
             .set(DataComponents.MAX_STACK_SIZE, maxStackSize)
             .build()
-        Reflection.ITEM_PROXY.setComponents(nmsItem, updatedComponents)
+
+        nmsItem.builtInRegistryHolder().bindComponents(updatedComponents)
     }
 }

surf-api-paper/surf-api-paper-server/src/main/kotlin/dev/slne/surf/api/paper/server/impl/nms/bridges/SurfPaperNmsStatsBridgeImpl.kt

@@ -16,7 +16,9 @@ class SurfPaperNmsStatsBridgeImpl : SurfPaperNmsStatsBridge {
     }
 
     override fun getPlayerStatsAsJson(player: Player): String {
-        return Reflection.SERVER_STATS_COUNTER_PROXY.toJson(player.toNms().stats)
+        val gson = Reflection.SERVER_STATS_COUNTER_PROXY.getGson()
+        val jsonElement = Reflection.SERVER_STATS_COUNTER_PROXY.toJson(player.toNms().stats)
+        return gson.toJson(jsonElement)
     }
 
     override fun savePlayerStatsToFile(player: Player) {

surf-api-paper/surf-api-paper-server/src/main/kotlin/dev/slne/surf/api/paper/server/reflection/ItemProxy.kt

@@ -8,7 +8,6 @@ import xyz.jpenilla.reflectionremapper.proxy.ReflectionProxyFactory
 
 object Reflection {
     val SERVER_STATS_COUNTER_PROXY: ServerStatsCounterProxy
-    val ITEM_PROXY: ItemProxy
     val ENTITY_PROXY: EntityProxy
     val SERVER_CONNECTION_LISTENER_PROXY: ServerConnectionListenerProxy
     val JAVA_PLUGIN_PROXY: JavaPluginProxy
@@ -21,7 +20,6 @@ object Reflection {
             ReflectionProxyFactory.create(remapper, Reflection::class.java.classLoader)
 
         SERVER_STATS_COUNTER_PROXY = proxyFactory.reflectionProxy<ServerStatsCounterProxy>()
-        ITEM_PROXY = SurfReflection.createProxy<ItemProxy>()
         ENTITY_PROXY = proxyFactory.reflectionProxy<EntityProxy>()
         SERVER_CONNECTION_LISTENER_PROXY =
             proxyFactory.reflectionProxy<ServerConnectionListenerProxy>()

surf-api-paper/surf-api-paper-server/src/main/kotlin/dev/slne/surf/api/paper/server/reflection/Reflection.kt

@@ -1,12 +1,20 @@
 package dev.slne.surf.api.paper.server.reflection
 
+import com.google.gson.Gson
+import com.google.gson.JsonElement
 import net.minecraft.stats.ServerStatsCounter
+import xyz.jpenilla.reflectionremapper.proxy.annotation.FieldGetter
 import xyz.jpenilla.reflectionremapper.proxy.annotation.MethodName
 import xyz.jpenilla.reflectionremapper.proxy.annotation.Proxies
+import xyz.jpenilla.reflectionremapper.proxy.annotation.Static
 
 @Proxies(ServerStatsCounter::class)
 interface ServerStatsCounterProxy {
 
     @MethodName("toJson")
-    fun toJson(statsCounter: ServerStatsCounter): String
+    fun toJson(statsCounter: ServerStatsCounter): JsonElement
+
+    @FieldGetter("GSON")
+    @Static
+    fun getGson(): Gson
 }