From 1505f216d693805e04b13f73fa2022a37127f46b Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Sat, 14 Jun 2025 16:58:12 +0200 Subject: [PATCH] remove legacy plugin and server versions from gradlew --- build.gradle.kts | 13 ------- libs/ExcellentEnchants-4.1.0-striped.jar | Bin 33928 -> 0 bytes nms/v1_17R1/.gitignore | 1 - nms/v1_17R1/build.gradle.kts | 35 ------------------ .../gui/version/v1_17R1_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_17R1_PacketManager.kt | 33 ----------------- nms/v1_18R1/.gitignore | 1 - nms/v1_18R1/build.gradle.kts | 35 ------------------ .../gui/version/v1_18R1_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_18R1_PacketManager.kt | 33 ----------------- nms/v1_18R2/.gitignore | 1 - nms/v1_18R2/build.gradle.kts | 35 ------------------ .../gui/version/v1_18R2_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_18R2_PacketManager.kt | 33 ----------------- nms/v1_19R1/.gitignore | 1 - nms/v1_19R1/build.gradle.kts | 35 ------------------ .../gui/version/v1_19R1_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_19R1_PacketManager.kt | 33 ----------------- nms/v1_19R2/.gitignore | 1 - nms/v1_19R2/build.gradle.kts | 35 ------------------ .../gui/version/v1_19R2_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_19R2_PacketManager.kt | 33 ----------------- nms/v1_19R3/.gitignore | 1 - nms/v1_19R3/build.gradle.kts | 35 ------------------ .../gui/version/v1_19R3_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_19R3_PacketManager.kt | 33 ----------------- nms/v1_20R1/.gitignore | 1 - nms/v1_20R1/build.gradle.kts | 35 ------------------ .../gui/version/v1_20R1_ExternGuiTester.kt | 16 -------- .../packet/versions/V1_20R1_PacketManager.kt | 33 ----------------- nms/v1_20R2/.gitignore | 1 - nms/v1_20R2/build.gradle.kts | 35 ------------------ .../gui/version/v1_20R2_ExternGuiTester.kt | 17 --------- .../packet/versions/V1_20R2_PacketManager.kt | 33 ----------------- nms/v1_20R3/.gitignore | 1 - nms/v1_20R3/build.gradle.kts | 35 ------------------ .../gui/version/v1_20R3_ExternGuiTester.kt | 17 --------- .../packet/versions/V1_20R3_PacketManager.kt | 33 ----------------- nms/v1_20R4/.gitignore | 1 - nms/v1_20R4/build.gradle.kts | 35 ------------------ .../gui/version/v1_20R4_ExternGuiTester.kt | 17 --------- .../packet/versions/V1_20R4_PacketManager.kt | 33 ----------------- .../dependency/datapack/DataPackTester.kt | 0 .../dependency/scheduler/FoliaScheduler.kt | 0 settings.gradle.kts | 22 ----------- 45 files changed, 888 deletions(-) delete mode 100644 libs/ExcellentEnchants-4.1.0-striped.jar delete mode 100644 nms/v1_17R1/.gitignore delete mode 100644 nms/v1_17R1/build.gradle.kts delete mode 100644 nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt delete mode 100644 nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_17R1_PacketManager.kt delete mode 100644 nms/v1_18R1/.gitignore delete mode 100644 nms/v1_18R1/build.gradle.kts delete mode 100644 nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt delete mode 100644 nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R1_PacketManager.kt delete mode 100644 nms/v1_18R2/.gitignore delete mode 100644 nms/v1_18R2/build.gradle.kts delete mode 100644 nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt delete mode 100644 nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R2_PacketManager.kt delete mode 100644 nms/v1_19R1/.gitignore delete mode 100644 nms/v1_19R1/build.gradle.kts delete mode 100644 nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R1_ExternGuiTester.kt delete mode 100644 nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R1_PacketManager.kt delete mode 100644 nms/v1_19R2/.gitignore delete mode 100644 nms/v1_19R2/build.gradle.kts delete mode 100644 nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R2_ExternGuiTester.kt delete mode 100644 nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R2_PacketManager.kt delete mode 100644 nms/v1_19R3/.gitignore delete mode 100644 nms/v1_19R3/build.gradle.kts delete mode 100644 nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R3_ExternGuiTester.kt delete mode 100644 nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R3_PacketManager.kt delete mode 100644 nms/v1_20R1/.gitignore delete mode 100644 nms/v1_20R1/build.gradle.kts delete mode 100644 nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R1_ExternGuiTester.kt delete mode 100644 nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R1_PacketManager.kt delete mode 100644 nms/v1_20R2/.gitignore delete mode 100644 nms/v1_20R2/build.gradle.kts delete mode 100644 nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R2_ExternGuiTester.kt delete mode 100644 nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R2_PacketManager.kt delete mode 100644 nms/v1_20R3/.gitignore delete mode 100644 nms/v1_20R3/build.gradle.kts delete mode 100644 nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R3_ExternGuiTester.kt delete mode 100644 nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R3_PacketManager.kt delete mode 100644 nms/v1_20R4/.gitignore delete mode 100644 nms/v1_20R4/build.gradle.kts delete mode 100644 nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R4_ExternGuiTester.kt delete mode 100644 nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R4_PacketManager.kt rename nms/{v1_20R1 => v1_21R1}/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt (100%) rename nms/{v1_20R3 => v1_21R1}/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 98238fc..ef58817 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,14 +46,11 @@ dependencies { // EcoEnchants compileOnly("com.willfp:EcoEnchants:12.11.1") compileOnly("com.willfp:eco:6.74.5") - compileOnly(project(":impl:LegacyEcoEnchant")) // ExcellentEnchants compileOnly("su.nightexpress.excellentenchants:Core:5.1.0") { exclude("org.spigotmc") } - compileOnly(files("libs/ExcellentEnchants-4.3.3-striped.jar")) // For pre v5 excellent enchants - compileOnly(files("libs/ExcellentEnchants-4.1.0-striped.jar")) // For legacy excellent enchants // Disenchantment compileOnly(files("libs/Disenchantment-6.1.5.jar")) @@ -69,16 +66,6 @@ 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")) - implementation(project(":nms:v1_20R1", configuration = "reobf")) - implementation(project(":nms:v1_20R2", configuration = "reobf")) - implementation(project(":nms:v1_20R3", configuration = "reobf")) - implementation(project(":nms:v1_20R4", configuration = "reobf")) implementation(project(":nms:v1_21R1", configuration = "reobf")) implementation(project(":nms:v1_21R2", configuration = "reobf")) implementation(project(":nms:v1_21R3", configuration = "reobf")) diff --git a/libs/ExcellentEnchants-4.1.0-striped.jar b/libs/ExcellentEnchants-4.1.0-striped.jar deleted file mode 100644 index a3500aa7e91478cd5589c76a07e0c3179aa8ece6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33928 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 pw& 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.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) - } -} diff --git a/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt b/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt deleted file mode 100644 index 8e352e0..0000000 --- a/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_17R1_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -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? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_17R1_PacketManager.kt b/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_17R1_PacketManager.kt deleted file mode 100644 index c820eab..0000000 --- a/nms/v1_17R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_17R1_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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) - } -} diff --git a/nms/v1_18R1/.gitignore b/nms/v1_18R1/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_18R1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_18R1/build.gradle.kts b/nms/v1_18R1/build.gradle.kts deleted file mode 100644 index 0ed9674..0000000 --- a/nms/v1_18R1/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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().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) - } -} diff --git a/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt b/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt deleted file mode 100644 index 659a0f6..0000000 --- a/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R1_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -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? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R1_PacketManager.kt b/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R1_PacketManager.kt deleted file mode 100644 index 71df5c7..0000000 --- a/nms/v1_18R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R1_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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) - } -} diff --git a/nms/v1_18R2/.gitignore b/nms/v1_18R2/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_18R2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_18R2/build.gradle.kts b/nms/v1_18R2/build.gradle.kts deleted file mode 100644 index 2cc9659..0000000 --- a/nms/v1_18R2/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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().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) - } -} diff --git a/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt b/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt deleted file mode 100644 index 1447716..0000000 --- a/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_18R2_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -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? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R2_PacketManager.kt b/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R2_PacketManager.kt deleted file mode 100644 index ee442f5..0000000 --- a/nms/v1_18R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_18R2_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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) - } -} diff --git a/nms/v1_19R1/.gitignore b/nms/v1_19R1/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_19R1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_19R1/build.gradle.kts b/nms/v1_19R1/build.gradle.kts deleted file mode 100644 index ad7724c..0000000 --- a/nms/v1_19R1/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.19.2-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().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) - } -} diff --git a/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R1_ExternGuiTester.kt b/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R1_ExternGuiTester.kt deleted file mode 100644 index c151924..0000000 --- a/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R1_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_19_R1.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_19R1_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_19_R1" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R1_PacketManager.kt b/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R1_PacketManager.kt deleted file mode 100644 index 7a057fc..0000000 --- a/nms/v1_19R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R1_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_19_R1.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_19R1_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) - } -} diff --git a/nms/v1_19R2/.gitignore b/nms/v1_19R2/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_19R2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_19R2/build.gradle.kts b/nms/v1_19R2/build.gradle.kts deleted file mode 100644 index 6eff943..0000000 --- a/nms/v1_19R2/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.19.3-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().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) - } -} diff --git a/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R2_ExternGuiTester.kt b/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R2_ExternGuiTester.kt deleted file mode 100644 index ac46674..0000000 --- a/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R2_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_19_R2.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_19R2_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_19_R2" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R2_PacketManager.kt b/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R2_PacketManager.kt deleted file mode 100644 index 0d04cd1..0000000 --- a/nms/v1_19R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R2_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_19_R2.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_19R2_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) - } -} diff --git a/nms/v1_19R3/.gitignore b/nms/v1_19R3/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_19R3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_19R3/build.gradle.kts b/nms/v1_19R3/build.gradle.kts deleted file mode 100644 index 23b6952..0000000 --- a/nms/v1_19R3/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.19.4-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().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) - } -} diff --git a/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R3_ExternGuiTester.kt b/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R3_ExternGuiTester.kt deleted file mode 100644 index 7ce5abd..0000000 --- a/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_19R3_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_19_R3.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_19R3_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_19_R3" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} \ No newline at end of file diff --git a/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R3_PacketManager.kt b/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R3_PacketManager.kt deleted file mode 100644 index 7c72791..0000000 --- a/nms/v1_19R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_19R3_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_19_R3.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_19R3_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) - } -} diff --git a/nms/v1_20R1/.gitignore b/nms/v1_20R1/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_20R1/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_20R1/build.gradle.kts b/nms/v1_20R1/build.gradle.kts deleted file mode 100644 index 5426ff6..0000000 --- a/nms/v1_20R1/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.20.1-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "18" - targetCompatibility = "18" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_18) - } -} diff --git a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R1_ExternGuiTester.kt b/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R1_ExternGuiTester.kt deleted file mode 100644 index dae3b98..0000000 --- a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R1_ExternGuiTester.kt +++ /dev/null @@ -1,16 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_20_R1.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester - -class v1_20R1_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_20_R1" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} diff --git a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R1_PacketManager.kt b/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R1_PacketManager.kt deleted file mode 100644 index 1fbac83..0000000 --- a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R1_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_20_R1.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_20R1_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) - } -} diff --git a/nms/v1_20R2/.gitignore b/nms/v1_20R2/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_20R2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_20R2/build.gradle.kts b/nms/v1_20R2/build.gradle.kts deleted file mode 100644 index 40aa188..0000000 --- a/nms/v1_20R2/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.20.2-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "18" - targetCompatibility = "18" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_18) - } -} diff --git a/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R2_ExternGuiTester.kt b/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R2_ExternGuiTester.kt deleted file mode 100644 index 6a8358a..0000000 --- a/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R2_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_20_R2.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester -import kotlin.jvm.javaClass - -class v1_20R2_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_20_R2" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} diff --git a/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R2_PacketManager.kt b/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R2_PacketManager.kt deleted file mode 100644 index a2db371..0000000 --- a/nms/v1_20R2/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R2_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_20_R2.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_20R2_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) - } -} diff --git a/nms/v1_20R3/.gitignore b/nms/v1_20R3/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_20R3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_20R3/build.gradle.kts b/nms/v1_20R3/build.gradle.kts deleted file mode 100644 index 58aba26..0000000 --- a/nms/v1_20R3/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.20.4-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "18" - targetCompatibility = "18" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_18) - } -} diff --git a/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R3_ExternGuiTester.kt b/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R3_ExternGuiTester.kt deleted file mode 100644 index 80362e2..0000000 --- a/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R3_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester -import kotlin.jvm.javaClass - -class v1_20R3_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_20_R3" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} diff --git a/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R3_PacketManager.kt b/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R3_PacketManager.kt deleted file mode 100644 index 51c2ecb..0000000 --- a/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R3_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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_20_R3.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_20R3_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) - } -} diff --git a/nms/v1_20R4/.gitignore b/nms/v1_20R4/.gitignore deleted file mode 100644 index 47374f1..0000000 --- a/nms/v1_20R4/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.lastDeploymentsId \ No newline at end of file diff --git a/nms/v1_20R4/build.gradle.kts b/nms/v1_20R4/build.gradle.kts deleted file mode 100644 index 3b98361..0000000 --- a/nms/v1_20R4/build.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ -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.20.6-R0.1-SNAPSHOT") -} - -repositories { - maven("https://repo.papermc.io/repository/maven-public/") - -} - -// Set target version -tasks.withType().configureEach { - sourceCompatibility = "18" - targetCompatibility = "18" - - options.encoding = "UTF-8" -} - -kotlin { - compilerOptions { - apiVersion.set(org.jetbrains.kotlin.gradle.dsl.KotlinVersion.KOTLIN_2_0) - jvmTarget.set(JvmTarget.JVM_18) - } -} diff --git a/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R4_ExternGuiTester.kt b/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R4_ExternGuiTester.kt deleted file mode 100644 index 16e867c..0000000 --- a/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/version/v1_20R4_ExternGuiTester.kt +++ /dev/null @@ -1,17 +0,0 @@ -package xyz.alexcrea.cuanvil.dependency.gui.version - -import org.bukkit.craftbukkit.inventory.CraftInventoryView -import org.bukkit.inventory.InventoryView -import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester -import kotlin.jvm.javaClass - -class v1_20R4_ExternGuiTester: ExternGuiTester { - override val wesjdAnvilGuiName = "Wrapper1_20_R4" - - override fun getContainerClass(view: InventoryView): Class? { - if (view !is CraftInventoryView) return null - val container = view.handle - - return container.javaClass - } -} diff --git a/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R4_PacketManager.kt b/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R4_PacketManager.kt deleted file mode 100644 index ac1e504..0000000 --- a/nms/v1_20R4/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_20R4_PacketManager.kt +++ /dev/null @@ -1,33 +0,0 @@ -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.entity.CraftPlayer -import org.bukkit.entity.Player -import xyz.alexcrea.cuanvil.dependency.packet.PacketManager -import xyz.alexcrea.cuanvil.dependency.packet.PacketManagerBase - -class V1_20R4_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) - } -} diff --git a/nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt b/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt similarity index 100% rename from nms/v1_20R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt rename to nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt diff --git a/nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt b/nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt similarity index 100% rename from nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt rename to nms/v1_21R1/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 2861550..bbda37b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,26 +3,6 @@ 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") -findProject(":nms:v1_19R2")?.name = "v1_19R2" -include("nms:v1_19R3") -findProject(":nms:v1_19R3")?.name = "v1_19R3" -include("nms:v1_20R1") -findProject(":nms:v1_20R1")?.name = "v1_20R1" -include("nms:v1_20R2") -findProject(":nms:v1_20R2")?.name = "v1_20R2" -include("nms:v1_20R3") -findProject(":nms:v1_20R3")?.name = "v1_20R3" -include("nms:v1_20R4") -findProject(":nms:v1_20R4")?.name = "v1_20R4" include("nms:v1_21R1") findProject(":nms:v1_21R1")?.name = "v1_21R1" include("nms:v1_21R2") @@ -34,5 +14,3 @@ findProject(":nms:v1_21R4")?.name = "v1_21R4" include("nms:v1_21R5") findProject(":nms:v1_21R5")?.name = "v1_21R5" -include(":impl:LegacyEcoEnchant") -findProject(":impl:LegacyEcoEnchant")?.name = "LegacyEcoEnchant" \ No newline at end of file