Revert "drop 1.17.x to 1.18.x nms"

This reverts commit 3ab6dbc155.

README.md

@@ -2,6 +2,7 @@
 
 **Custom Anvil** is a plugin that allows server administrators to customize every aspect of the anvil's mechanics. 
 It is expected to work on 1.18 to 1.21.7 minecraft servers running spigot or paper.
+(the plugin support of 1.16.5 to 1.17.1 is experimental and may encounter issues)
 
 **Custom Anvil** was previously named **Unsafe Enchants+**.
 It was renamed because it now affects every anvil aspect and not only unsafe enchants\
@@ -86,7 +87,7 @@ as low priority as I work for the plugin on my free time for free.
 
 One of the configurations allow displaying price about 40 and removing Too Expensive. \
 By how the minecraft client work: price above 40 can only be displayed green, even if the player does not own enough experience level. 
-Minecraft version 1.19 to 1.21.7 do not need any dependency. Other version need ProtocoLib enabled on your server for this feature. \
+Minecraft version 1.17 to 1.21.7 do not need any dependency. Other version need ProtocoLib enabled on your server for this feature. \
 You can also wait for an update of the plugin to support a newer version.
 
 Please note that 1.16.5 to 1.17.1 are not officially supported. Run at your own risk.

build.gradle.kts

@@ -69,6 +69,9 @@ dependencies {
 
     // Include nms
     implementation(project(":nms:nms-common"))
+    implementation(project(":nms:v1_17R1", configuration = "reobf"))
+    implementation(project(":nms:v1_18R1", configuration = "reobf"))
+    implementation(project(":nms:v1_18R2", configuration = "reobf"))
     implementation(project(":nms:v1_19R1", configuration = "reobf"))
     implementation(project(":nms:v1_19R2", configuration = "reobf"))
     implementation(project(":nms:v1_19R3", configuration = "reobf"))

nms/v1_17R1/.gitignore

@@ -0,0 +1 @@
+.lastDeploymentsId

nms/v1_17R1/build.gradle.kts

@@ -0,0 +1,35 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+group = rootProject.group
+version = rootProject.version
+
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+dependencies {
+    implementation(project(":nms:nms-common"))
+
+    // Used for nms
+    paperweight.paperDevBundle("1.17.1-R0.1-SNAPSHOT")
+}
+
+repositories {
+    maven("https://repo.papermc.io/repository/maven-public/")
+
+}
+
+// Set target version
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = "16"
+    targetCompatibility = "16"
+
+    options.encoding = "UTF-8"
+}
+
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        jvmTarget.set(JvmTarget.JVM_16)
+    }
+}

nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt

@@ -0,0 +1,16 @@
+package xyz.alexcrea.cuanvil.dependency.gui.version
+
+import org.bukkit.craftbukkit.v1_17_R1.inventory.CraftInventoryView
+import org.bukkit.inventory.InventoryView
+import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
+
+class v1_17R1_ExternGuiTester: ExternGuiTester {
+    override val wesjdAnvilGuiName = "Wrapper1_17_R1"
+
+    override fun getContainerClass(view: InventoryView): Class<Any>? {
+        if (view !is CraftInventoryView) return null
+        val container = view.handle
+
+        return container.javaClass
+    }
+}

nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_17R1_PacketManager.kt

@@ -0,0 +1,33 @@
+package xyz.alexcrea.cuanvil.dependency.packet.versions
+
+import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
+import net.minecraft.world.entity.player.Abilities
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer
+import org.bukkit.entity.Player
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
+
+class V1_17R1_PacketManager : PacketManagerBase(), PacketManager {
+    override val canSetInstantBuild: Boolean
+        get() = true
+
+    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
+        val nmsPlayer = (player as CraftPlayer).handle
+        val playerAbilities = nmsPlayer.abilities
+        val sendedAbilities: Abilities
+        if (playerAbilities.instabuild == instantBuild) {
+            sendedAbilities = playerAbilities
+        } else {
+            sendedAbilities = Abilities()
+            sendedAbilities.invulnerable = playerAbilities.invulnerable
+            sendedAbilities.flying = playerAbilities.flying
+            sendedAbilities.mayfly = playerAbilities.mayfly
+            sendedAbilities.instabuild = instantBuild
+            sendedAbilities.mayBuild = playerAbilities.mayBuild
+            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
+            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
+        }
+        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
+        nmsPlayer.connection.send(packet)
+    }
+}

nms/v1_18R1/.gitignore

@@ -0,0 +1 @@
+.lastDeploymentsId

nms/v1_18R1/build.gradle.kts

@@ -0,0 +1,35 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+group = rootProject.group
+version = rootProject.version
+
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+dependencies {
+    implementation(project(":nms:nms-common"))
+
+    // Used for nms
+    paperweight.paperDevBundle("1.18.1-R0.1-SNAPSHOT")
+}
+
+repositories {
+    maven("https://repo.papermc.io/repository/maven-public/")
+
+}
+
+// Set target version
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+
+    options.encoding = "UTF-8"
+}
+
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}

nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt

@@ -0,0 +1,16 @@
+package xyz.alexcrea.cuanvil.dependency.gui.version
+
+import org.bukkit.craftbukkit.v1_18_R1.inventory.CraftInventoryView
+import org.bukkit.inventory.InventoryView
+import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
+
+class v1_18R1_ExternGuiTester: ExternGuiTester {
+    override val wesjdAnvilGuiName = "Wrapper1_18_R1"
+
+    override fun getContainerClass(view: InventoryView): Class<Any>? {
+        if (view !is CraftInventoryView) return null
+        val container = view.handle
+
+        return container.javaClass
+    }
+}

nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R1_PacketManager.kt

@@ -0,0 +1,33 @@
+package xyz.alexcrea.cuanvil.dependency.packet.versions
+
+import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
+import net.minecraft.world.entity.player.Abilities
+import org.bukkit.craftbukkit.v1_18_R1.entity.CraftPlayer
+import org.bukkit.entity.Player
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
+
+class V1_18R1_PacketManager : PacketManagerBase(), PacketManager {
+    override val canSetInstantBuild: Boolean
+        get() = true
+
+    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
+        val nmsPlayer = (player as CraftPlayer).handle
+        val playerAbilities = nmsPlayer.abilities
+        val sendedAbilities: Abilities
+        if (playerAbilities.instabuild == instantBuild) {
+            sendedAbilities = playerAbilities
+        } else {
+            sendedAbilities = Abilities()
+            sendedAbilities.invulnerable = playerAbilities.invulnerable
+            sendedAbilities.flying = playerAbilities.flying
+            sendedAbilities.mayfly = playerAbilities.mayfly
+            sendedAbilities.instabuild = instantBuild
+            sendedAbilities.mayBuild = playerAbilities.mayBuild
+            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
+            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
+        }
+        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
+        nmsPlayer.connection.send(packet)
+    }
+}

nms/v1_18R2/.gitignore

@@ -0,0 +1 @@
+.lastDeploymentsId

nms/v1_18R2/build.gradle.kts

@@ -0,0 +1,35 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+group = rootProject.group
+version = rootProject.version
+
+plugins {
+    id("io.papermc.paperweight.userdev")
+}
+
+dependencies {
+    implementation(project(":nms:nms-common"))
+
+    // Used for nms
+    paperweight.paperDevBundle("1.18.2-R0.1-SNAPSHOT")
+}
+
+repositories {
+    maven("https://repo.papermc.io/repository/maven-public/")
+
+}
+
+// Set target version
+tasks.withType<JavaCompile>().configureEach {
+    sourceCompatibility = "17"
+    targetCompatibility = "17"
+
+    options.encoding = "UTF-8"
+}
+
+kotlin {
+    compilerOptions {
+        apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0)
+        jvmTarget.set(JvmTarget.JVM_17)
+    }
+}

nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt

@@ -0,0 +1,16 @@
+package xyz.alexcrea.cuanvil.dependency.gui.version
+
+import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryView
+import org.bukkit.inventory.InventoryView
+import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
+
+class v1_18R2_ExternGuiTester: ExternGuiTester {
+    override val wesjdAnvilGuiName = "Wrapper1_18_R2"
+
+    override fun getContainerClass(view: InventoryView): Class<Any>? {
+        if (view !is CraftInventoryView) return null
+        val container = view.handle
+
+        return container.javaClass
+    }
+}

nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R2_PacketManager.kt

@@ -0,0 +1,33 @@
+package xyz.alexcrea.cuanvil.dependency.packet.versions
+
+import net.minecraft.network.protocol.game.ClientboundPlayerAbilitiesPacket
+import net.minecraft.world.entity.player.Abilities
+import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer
+import org.bukkit.entity.Player
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManager
+import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase
+
+class V1_18R2_PacketManager : PacketManagerBase(), PacketManager {
+    override val canSetInstantBuild: Boolean
+        get() = true
+
+    override fun setInstantBuild(player: Player, instantBuild: Boolean) {
+        val nmsPlayer = (player as CraftPlayer).handle
+        val playerAbilities = nmsPlayer.abilities
+        val sendedAbilities: Abilities
+        if (playerAbilities.instabuild == instantBuild) {
+            sendedAbilities = playerAbilities
+        } else {
+            sendedAbilities = Abilities()
+            sendedAbilities.invulnerable = playerAbilities.invulnerable
+            sendedAbilities.flying = playerAbilities.flying
+            sendedAbilities.mayfly = playerAbilities.mayfly
+            sendedAbilities.instabuild = instantBuild
+            sendedAbilities.mayBuild = playerAbilities.mayBuild
+            sendedAbilities.flyingSpeed = playerAbilities.flyingSpeed
+            sendedAbilities.walkingSpeed = playerAbilities.walkingSpeed
+        }
+        val packet = ClientboundPlayerAbilitiesPacket(sendedAbilities)
+        nmsPlayer.connection.send(packet)
+    }
+}

settings.gradle.kts

@@ -3,6 +3,12 @@ rootProject.name = "CustomAnvil"
 // NMS subproject
 include("nms:nms-common")
 findProject(":nms:nms-common")?.name = "nms-common"
+include("nms:v1_17R1")
+findProject(":nms:v1_17R1")?.name = "v1_17R1"
+include("nms:v1_18R1")
+findProject(":nms:v1_18R1")?.name = "v1_18R1"
+include("nms:v1_18R2")
+findProject(":nms:v1_18R2")?.name = "v1_18R2"
 include("nms:v1_19R1")
 findProject(":nms:v1_19R1")?.name = "v1_19R1"
 include("nms:v1_19R2")

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt

@@ -11,7 +11,18 @@ object GuiTesterSelector {
             if (versionParts[0] != 1) return null
 
             return when (versionParts[1]) {
-                // Can't support 1.16.5-1.18.x paper userdev do not exist or broken
+                // Can't support 1.16.5 bc 1.16.5 paper userdev do not exist
+
+                17 -> when (versionParts[2]) {
+                    0, 1 -> v1_17R1_ExternGuiTester()
+                    else -> null
+                }
+
+                18 -> when (versionParts[2]) {
+                    0, 1 -> v1_18R1_ExternGuiTester()
+                    2 -> v1_18R2_ExternGuiTester()
+                    else -> null
+                }
 
                 19 -> when (versionParts[2]) {
                     0, 1, 2 -> v1_19R1_ExternGuiTester()

src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt

@@ -19,14 +19,24 @@ object PacketManagerSelector {
                 ProtocoLibWrapper()
             else
                 NoPacketManager()
-
     private val versionSpecificManager: PacketManagerBase?
         get() {
             val versionParts = UpdateUtils.currentMinecraftVersionArray()
             if (versionParts[0] != 1) return null
 
             return when (versionParts[1]) {
-                // Can't support 1.16.5 to 1.18.x bc paper userdev do not exist or broken
+                // Can't support 1.16.5 bc 1.16.5 paper userdev do not exist
+
+                17 -> when (versionParts[2]) {
+                    0, 1 -> V1_17R1_PacketManager()
+                    else -> null
+                }
+
+                18 -> when (versionParts[2]) {
+                    0, 1 -> V1_18R1_PacketManager()
+                    2 -> V1_18R2_PacketManager()
+                    else -> null
+                }
 
                 19 -> when (versionParts[2]) {
                     0, 1, 2 -> V1_19R1_PacketManager()