Merge branch 'v1.x.x' into v2.x.x-merging

# Conflicts:
#	build.gradle.kts
#	nms/nms-common/build.gradle.kts
#	nms/nms-common/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/ExternGuiTester.kt
#	nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/datapack/DataPackTester.kt
#	nms/nms-paper/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt
#	nms/v1_20R3/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt
#	nms/v1_21R6/src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/versions/V1_21R6_PacketManager.kt
#	settings.gradle.kts
#	src/main/kotlin/xyz/alexcrea/cuanvil/dependency/gui/GuiTesterSelector.kt
#	src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManager.kt
#	src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PacketManagerSelector.kt
#	src/main/kotlin/xyz/alexcrea/cuanvil/dependency/packet/PaperPacketManager.kt
#	src/main/kotlin/xyz/alexcrea/cuanvil/dependency/scheduler/FoliaScheduler.kt
This commit is contained in:
alexcrea 2025-12-30 01:18:00 +01:00
commit ff4be622f8
Signed by: alexcrea
GPG key ID: E346CD16413450E3
19 changed files with 1523 additions and 33 deletions

View file

@ -8,7 +8,7 @@ plugins {
kotlin("jvm") version "2.1.0"
java
id("org.jetbrains.dokka").version("1.9.20")
id("com.gradleup.shadow").version("9.0.0-beta16")
id("com.gradleup.shadow").version("9.3.0")
// Maven publish
`maven-publish`
signing
@ -31,6 +31,9 @@ repositories {
maven(url = "https://repo.nightexpressdev.com/releases")
}
val reobfNMS = providers.gradleProperty("subprojects.reobfnms")
.get().split(",")
dependencies {
// Paper
paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT")
@ -154,7 +157,8 @@ tasks {
filesMatching("plugin.yml") {
expand(
"version" to effectiveVersion,
"libraries" to " \"org.jetbrains.kotlin:kotlin-stdlib:2.1.0\" "
"libraries" to " \"org.jetbrains.kotlin:kotlin-stdlib:2.1.0\" " +
", \"net.kyori:adventure-platform-bukkit:4.4.1\""
)
}
@ -254,13 +258,9 @@ object Meta {
const val snapshot = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
}
val disalowedDependency = setOf(
"nms-common", "kotlin-stdlib",
"v1_17R1",
"v1_18R1", "v1_18R2", "v1_19R1", "v1_19R2", "v1_19R3",
"v1_20R1", "v1_20R2", "v1_20R3", "v1_20R4",
"v1_21R1", "v1_21R2", "v1_21R3", "v1_21R4", "v1_21R5"
)
val disallowedDependency = HashSet<String>()
disallowedDependency.addAll(reobfNMS)
disallowedDependency.addAll(listOf("nms-common", "nms-paper", "kotlin-stdlib"))
publishing {
repositories {
@ -328,7 +328,7 @@ publishing {
val artifactNode = ((child as Node).get("artifactId") as NodeList)[0] as Node
val artifactID = artifactNode.value() as String
if(disalowedDependency.contains(artifactID)) {
if(disallowedDependency.contains(artifactID)) {
toRemove.add(child)
}
}