1.21.5 support (#16)

booky10 · web-flow · commit a7ce407d7391 · 2025-03-27T23:38:25.000+01:00
* Update gradle wrapper to v8.13

* Bump gradle plugins

* Mark 1.21.5 as supported

* Replace deprecated gradle exec feature

* Refactor reobfuscated jar handling
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,8 +2,8 @@ plugins {
     id("java-library")
     id("maven-publish")
 
-    id("io.papermc.paperweight.userdev") version "1.7.2" apply false
-    id("com.gradleup.shadow") version "8.3.0"
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.16" apply false
+    id("com.gradleup.shadow") version "8.3.6"
 }
 
 tasks["jar"].enabled = false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/platform-paper-1.19.3/build.gradle.kts b/platform-paper-1.19.3/build.gradle.kts
@@ -7,22 +7,6 @@ dependencies {
     paperweight.paperDevBundle("1.19.3-R0.1-SNAPSHOT")
 }
 
-tasks {
-    reobfJar {
-        inputJar.set(jar.get().outputs.files.singleFile)
-        outputJar.set(File.createTempFile("reobfOut", ".jar"))
-
-        doLast {
-            val inputFile = inputJar.get().asFile
-            inputFile.delete()
-
-            val outputFile = outputJar.get().asFile
-            outputFile.copyTo(inputFile)
-            outputFile.delete()
-        }
-    }
-
-    assemble {
-        dependsOn(reobfJar)
-    }
-}
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
diff --git a/platform-paper-1.19.4/build.gradle.kts b/platform-paper-1.19.4/build.gradle.kts
@@ -7,22 +7,6 @@ dependencies {
     paperweight.paperDevBundle("1.19.4-R0.1-SNAPSHOT")
 }
 
-tasks {
-    reobfJar {
-        inputJar.set(jar.get().outputs.files.singleFile)
-        outputJar.set(File.createTempFile("reobfOut", ".jar"))
-
-        doLast {
-            val inputFile = inputJar.get().asFile
-            inputFile.delete()
-
-            val outputFile = outputJar.get().asFile
-            outputFile.copyTo(inputFile)
-            outputFile.delete()
-        }
-    }
-
-    assemble {
-        dependsOn(reobfJar)
-    }
-}
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
diff --git a/platform-paper-1.20.2/build.gradle.kts b/platform-paper-1.20.2/build.gradle.kts
@@ -7,22 +7,6 @@ dependencies {
     paperweight.paperDevBundle("1.20.2-R0.1-SNAPSHOT")
 }
 
-tasks {
-    reobfJar {
-        inputJar.set(jar.get().outputs.files.singleFile)
-        outputJar.set(File.createTempFile("reobfOut", ".jar"))
-
-        doLast {
-            val inputFile = inputJar.get().asFile
-            inputFile.delete()
-
-            val outputFile = outputJar.get().asFile
-            outputFile.copyTo(inputFile)
-            outputFile.delete()
-        }
-    }
-
-    assemble {
-        dependsOn(reobfJar)
-    }
-}
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
diff --git a/platform-paper-1.20.3/build.gradle.kts b/platform-paper-1.20.3/build.gradle.kts
@@ -7,22 +7,6 @@ dependencies {
     paperweight.paperDevBundle("1.20.3-R0.1-SNAPSHOT")
 }
 
-tasks {
-    reobfJar {
-        inputJar.set(jar.get().outputs.files.singleFile)
-        outputJar.set(File.createTempFile("reobfOut", ".jar"))
-
-        doLast {
-            val inputFile = inputJar.get().asFile
-            inputFile.delete()
-
-            val outputFile = outputJar.get().asFile
-            outputFile.copyTo(inputFile)
-            outputFile.delete()
-        }
-    }
-
-    assemble {
-        dependsOn(reobfJar)
-    }
-}
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
diff --git a/platform-paper-1.20.5/build.gradle.kts b/platform-paper-1.20.5/build.gradle.kts
@@ -14,6 +14,11 @@ java {
     targetCompatibility = JavaVersion.VERSION_21
 }
 
+// hack to allow depending on this platform in java 17 projects
+configurations.runtimeElements.configure {
+    attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+}
+
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION
 }
diff --git a/platform-paper-1.20/build.gradle.kts b/platform-paper-1.20/build.gradle.kts
@@ -7,22 +7,6 @@ dependencies {
     paperweight.paperDevBundle("1.20-R0.1-SNAPSHOT")
 }
 
-tasks {
-    reobfJar {
-        inputJar.set(jar.get().outputs.files.singleFile)
-        outputJar.set(File.createTempFile("reobfOut", ".jar"))
-
-        doLast {
-            val inputFile = inputJar.get().asFile
-            inputFile.delete()
-
-            val outputFile = outputJar.get().asFile
-            outputFile.copyTo(inputFile)
-            outputFile.delete()
-        }
-    }
-
-    assemble {
-        dependsOn(reobfJar)
-    }
-}
+tasks.assemble {
+    dependsOn(tasks.reobfJar)
+}
diff --git a/platform-paper-1.21.2/build.gradle.kts b/platform-paper-1.21.2/build.gradle.kts
@@ -14,6 +14,11 @@ java {
     targetCompatibility = JavaVersion.VERSION_21
 }
 
+// hack to allow depending on this platform in java 17 projects
+configurations.runtimeElements.configure {
+    attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)
+}
+
 paperweight {
     reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION
 }
diff --git a/platform-paper-1.21.2/src/main/java/de/pianoman911/mapengine/common/Paper1212Provider.java b/platform-paper-1.21.2/src/main/java/de/pianoman911/mapengine/common/Paper1212Provider.java
@@ -13,7 +13,8 @@ public final class Paper1212Provider implements IPlatformProvider {
 
     private static final IntSet SUPPORTED_PROTOCOLS = IntSet.of(
             768, // 1.21.2
-            769  // 1.21.4
+            769, // 1.21.4
+            770  // 1.21.5
     );
 
     @SuppressWarnings("deprecation") // bukkit unsafe
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -1,4 +1,3 @@
-import java.io.ByteArrayOutputStream
 import java.time.ZoneOffset
 import java.time.ZonedDateTime
 import java.time.format.DateTimeFormatter
@@ -11,11 +10,14 @@ plugins {
     id("xyz.jpenilla.run-paper") version "2.3.1"
 }
 
-val platforms = listOf("1.19.3", "1.19.4", "1.20", "1.20.2", "1.20.3", "1.20.5", "1.21.2")
+val reobfPlatforms = listOf("1.19.3", "1.19.4", "1.20", "1.20.2", "1.20.3")
+val mojangPlatforms = listOf("1.20.5", "1.21.2")
+val allPlatforms: List<String> = reobfPlatforms + mojangPlatforms
 
 dependencies {
-    platforms.forEach {
-        runtimeOnly(project(":platform-paper-$it"))
+    allPlatforms.forEach {
+        val configuration = if (reobfPlatforms.contains(it)) "reobf" else "runtimeElements"
+        runtimeOnly(project(":platform-paper-$it", configuration))
     }
 
     api(project(":platform-common"))
@@ -28,13 +30,10 @@ val gitHash = git("rev-parse --short HEAD")
 val gitBranch = git("rev-parse --abbrev-ref HEAD")
 val gitTag = git("describe --tags --abbrev=0")
 
-fun git(git: String): String {
-    val out = ByteArrayOutputStream()
-    rootProject.exec {
+fun git(git: String): Provider<String> {
+    return providers.exec {
         commandLine(Stream.concat(Stream.of("git"), git.split(" ").stream()).toList())
-        standardOutput = out
-    }
-    return out.toString().trim()
+    }.standardOutput.asText.map { it.trim() }
 }
 
 val compileTime: Temporal = ZonedDateTime.now(ZoneOffset.UTC)
@@ -61,11 +60,11 @@ tasks {
 
             "Build-Date" to compileDate,
             "Build-Timestamp" to compileTime.toString(),
-            "Platforms" to platforms.joinToString(", "),
+            "Platforms" to allPlatforms.joinToString(", "),
 
-            "Git-Commit" to gitHash,
-            "Git-Branch" to gitBranch,
-            "Git-Tag" to gitTag,
+            "Git-Commit" to gitHash.get(),
+            "Git-Branch" to gitBranch.get(),
+            "Git-Tag" to gitTag.get(),
 
             // starting with 1.20.5, paper runtime jars are only provided with mojang mappings
             // mapengine uses mojang mappings and disables reobfuscation for 1.20.5+
@@ -85,5 +84,5 @@ bukkit {
     authors = listOf("pianoman911")
 
     name = rootProject.name
-    description = "$gitHash/$gitBranch ($gitTag), $compileDate"
+    description = "${gitHash.get()}/${gitBranch.get()} (${gitTag.get()}), $compileDate"
 }

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@ plugins {`
`2`	`2`	`id("java-library")`
`3`	`3`	`id("maven-publish")`
`4`	`4`
`5`		`- id("io.papermc.paperweight.userdev") version "1.7.2" apply false`
`6`		`- id("com.gradleup.shadow") version "8.3.0"`
	`5`	`+ id("io.papermc.paperweight.userdev") version "2.0.0-beta.16" apply false`
	`6`	`+ id("com.gradleup.shadow") version "8.3.6"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`tasks["jar"].enabled = false`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@ java {`
`14`	`14`	`targetCompatibility = JavaVersion.VERSION_21`
`15`	`15`	`}`
`16`	`16`
	`17`	`+// hack to allow depending on this platform in java 17 projects`
	`18`	`+configurations.runtimeElements.configure {`
	`19`	`+ attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 17)`
	`20`	`+}`
	`21`	`+`
`17`	`22`	`paperweight {`
`18`	`23`	`reobfArtifactConfiguration = ReobfArtifactConfiguration.MOJANG_PRODUCTION`
`19`	`24`	`}`