Re-struct nms packages, fix mappings

Author: Rothes

bukkit/nms/common/generic_v1_19/build.gradle.kts

@@ -10,7 +10,9 @@ import net.minecraft.server.MinecraftServer
 
 class PacketReader: IPacketReader {
 
-    private val chatTypes = with(MinecraftServer.getServer().registryAccess().registryOrThrow(Registries.CHAT_TYPE) as MappedRegistry) {
+    private val chatTypes = with(
+        MinecraftServer.getServer().registryAccess().registryOrThrow(Registries.CHAT_TYPE) as MappedRegistry)
+    {
         registryKeySet()
             .sortedBy {
                 getId(this.get(it))

bukkit/nms/common/generic_v1_19_3/src/main/kotlin/io/github/rothes/protocolstringreplacer/nms/generic/packetreader/PacketReader.kt

@@ -1,4 +1,4 @@
-val serverVer = "1.20.5"
+val serverVer = "1.20.6"
 
 dependencies {
     paperweight.paperDevBundle("$serverVer-R0.1-SNAPSHOT")

bukkit/nms/common/generic_v1_20_5/build.gradle.kts

@@ -9,25 +9,47 @@ object NmsManager {
 
     private const val PACKAGE_PREFIX = "io.github.rothes.protocolstringreplacer.nms"
 
-    lateinit var minecraftVersion: String
+    private lateinit var minecraftVersion: String
 
-    val packetReader by lazy { IPacketReader::class.java.instance }
-    val disguisedPacketHandler by lazy { IDisguisedPacketHandler::class.java.instance }
-    val menuTypeGetter by lazy { IMenuTypeGetter::class.java.instance }
-    val blockEntityTypeGetter by lazy { IBlockEntityTypeGetter::class.java.instance }
+    fun setVersion(major: Int, minor: Int) {
+        var m = minor
+        while (m < 10) {
+            setVersionProp(major, m)
+            try {
+                create<IPacketReader>()
+                return
+            } catch (ignored: ClassNotFoundException) {
+                m++
+            }
+        }
+        setVersionProp(major, minor)
+    }
+
+    private fun setVersionProp(major: Int, minor: Int) {
+        minecraftVersion = if (minor == 0) "v1_$major" else "v1_${major}_$minor"
+    }
+
+    val packetReader by lazy { create<IPacketReader>() }
+    val disguisedPacketHandler by lazy { create<IDisguisedPacketHandler>() }
+    val menuTypeGetter by lazy { create<IMenuTypeGetter>() }
+    val blockEntityTypeGetter by lazy { create<IBlockEntityTypeGetter>() }
+
+    private inline fun <reified T> create(): T {
+        return T::class.java.instance
+    }
 
     @Suppress("UNCHECKED_CAST")
     private val <T> Class<T>.versioned: Class<out T>
         get() = Class.forName(buildString {
             append(PACKAGE_PREFIX)
-            append(".v")
-            append(minecraftVersion.replace('.', '_'))
+            append(".")
+            append(minecraftVersion)
             append(this@versioned.`package`.name.substring(PACKAGE_PREFIX.length))
             append('.')
             append(this@versioned.simpleName.substring(1))
         }) as Class<out T>
 
-    @Suppress("UNCHECKED_CAST")
     private val <T> Class<T>.instance: T
         get() = this.versioned.getConstructor().newInstance() as T
+
 }

bukkit/nms/src/main/kotlin/io/github/rothes/protocolstringreplacer/nms/NmsManager.kt

@@ -1,9 +1,8 @@
-val serverVer = "1.19"
+val serverVer = "1.19" // 1.19.1 bundle is broken, so we're using 1.19
 
 dependencies {
     paperweight.paperDevBundle("$serverVer-R0.1-SNAPSHOT")
     pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat")
-    implementation(project(":bukkit:nms:common:generic_v1_19"))
 }
 
 java {

bukkit/nms/v1_18_2/build.gradle.kts

@@ -1,4 +1,4 @@
-package io.github.rothes.protocolstringreplacer.nms.generic.packetreader
+package io.github.rothes.protocolstringreplacer.nms.v1_19_1.packetreader
 
 import io.github.rothes.protocolstringreplacer.nms.packetreader.ChatType
 import io.github.rothes.protocolstringreplacer.nms.packetreader.IPacketReader

bukkit/nms/v1_19/build.gradle.kts

@@ -1,9 +1,8 @@
-val serverVer = "1.19.1"
+val serverVer = "1.19.2"
 
 dependencies {
     paperweight.paperDevBundle("$serverVer-R0.1-SNAPSHOT")
     pluginRemapper("net.fabricmc:tiny-remapper:0.10.3:fat")
-    implementation(project(":bukkit:nms:common:generic_v1_19"))
 }
 
 java {

bukkit/nms/v1_19_1/build.gradle.kts

@@ -0,0 +1,28 @@
+package io.github.rothes.protocolstringreplacer.nms.v1_19_2.packetreader
+
+import io.github.rothes.protocolstringreplacer.nms.packetreader.ChatType
+import io.github.rothes.protocolstringreplacer.nms.packetreader.IPacketReader
+import net.minecraft.core.MappedRegistry
+import net.minecraft.core.Registry
+import net.minecraft.network.protocol.game.ClientboundPlayerChatPacket
+import net.minecraft.server.MinecraftServer
+
+class PacketReader: IPacketReader {
+
+    private val chatTypes = with(
+        MinecraftServer.getServer().registryAccess().registryOrThrow(Registry.CHAT_TYPE_REGISTRY) as MappedRegistry
+    ) {
+        registryKeySet()
+            .sortedBy {
+                getId(this.get(it))
+            }
+            .map { it.location().path }
+            .map { ChatType.entries.find { type -> type.keys.contains(it) }!! }
+            .toTypedArray()
+    }
+
+    override fun readChatType(packet: ClientboundPlayerChatPacket): ChatType {
+        return chatTypes[packet.chatType.chatType]
+    }
+
+}