initial start on 1.21.9

This commit is contained in:
granny
2025-09-17 15:53:39 -07:00
parent 59fb18d3c0
commit 49ad045768
3 changed files with 15 additions and 15 deletions

View File

@@ -1,8 +1,8 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.21.8-R0.1-SNAPSHOT version = 1.21.9-R0.1-SNAPSHOT
mcVersion = 1.21.8 mcVersion = 1.21.9-pre1
paperCommit = 29c8822d90899c89d2689338e81a98f690bcba12 paperCommit = 8bb12cbd3570dc8cfc6b0318cc2ace0a70a50784
org.gradle.configuration-cache = true org.gradle.configuration-cache = true
org.gradle.caching = true org.gradle.caching = true

View File

@@ -1,6 +1,6 @@
--- a/paper-api/build.gradle.kts --- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts +++ b/paper-api/build.gradle.kts
@@ -90,7 +_,7 @@ @@ -98,7 +_,7 @@
testRuntimeOnly("org.junit.platform:junit-platform-launcher") testRuntimeOnly("org.junit.platform:junit-platform-launcher")
} }
@@ -9,7 +9,7 @@
idea { idea {
module { module {
generatedSourceDirs.add(generatedDir.toFile()) generatedSourceDirs.add(generatedDir.toFile())
@@ -100,6 +_,18 @@ @@ -108,6 +_,18 @@
main { main {
java { java {
srcDir(generatedDir) srcDir(generatedDir)
@@ -28,7 +28,7 @@
} }
} }
} }
@@ -165,8 +_,10 @@ @@ -173,8 +_,10 @@
val services = objects.newInstance<Services>() val services = objects.newInstance<Services>()
tasks.withType<Javadoc>().configureEach { tasks.withType<Javadoc>().configureEach {
@@ -40,7 +40,7 @@
options.use() options.use()
options.isDocFilesSubDirs = true options.isDocFilesSubDirs = true
options.links( options.links(
@@ -199,11 +_,11 @@ @@ -207,11 +_,11 @@
} }
// workaround for https://github.com/gradle/gradle/issues/4046 // workaround for https://github.com/gradle/gradle/issues/4046

View File

@@ -25,9 +25,9 @@
+ // Purpur end - Rebrand + // Purpur end - Rebrand
+ +
spigot { spigot {
enabled = true enabled = false
buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44" buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
@@ -107,7 +_,21 @@ @@ -111,7 +_,21 @@
} }
} }
@@ -50,16 +50,16 @@
configurations.named(log4jPlugins.compileClasspathConfigurationName) { configurations.named(log4jPlugins.compileClasspathConfigurationName) {
extendsFrom(configurations.compileClasspath.get()) extendsFrom(configurations.compileClasspath.get())
} }
@@ -129,7 +_,7 @@ @@ -133,7 +_,7 @@
} }
dependencies { dependencies {
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
+ implementation(project(":purpur-api")) // Purpur + implementation(project(":purpur-api")) // Purpur
implementation("ca.spottedleaf:concurrentutil:0.0.3") implementation("ca.spottedleaf:concurrentutil:0.0.4-SNAPSHOT")
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+ implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21 implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
@@ -156,6 +_,10 @@ @@ -161,6 +_,10 @@
implementation("org.ow2.asm:asm-commons:9.8") implementation("org.ow2.asm:asm-commons:9.8")
implementation("org.spongepowered:configurate-yaml:4.2.0") implementation("org.spongepowered:configurate-yaml:4.2.0")
@@ -70,7 +70,7 @@
// Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed // Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
runtimeOnly("commons-lang:commons-lang:2.6") runtimeOnly("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
@@ -200,14 +_,14 @@ @@ -205,14 +_,14 @@
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim() val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
attributes( attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main", "Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -90,7 +90,7 @@
"Build-Number" to (build ?: ""), "Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(), "Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch, "Git-Branch" to gitBranch,
@@ -266,7 +_,7 @@ @@ -271,7 +_,7 @@
jvmArgumentProviders.add(provider) jvmArgumentProviders.add(provider)
} }
@@ -99,7 +99,7 @@
idea { idea {
module { module {
generatedSourceDirs.add(generatedDir.toFile()) generatedSourceDirs.add(generatedDir.toFile())
@@ -369,6 +_,46 @@ @@ -374,6 +_,46 @@
classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip }) classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
mainClass.set(null as String?) mainClass.set(null as String?)
} }