mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-04-19 17:58:15 +02:00
let's get this started
This commit is contained in:
@@ -3,7 +3,7 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
java // TODO java launcher tasks
|
java // TODO java launcher tasks
|
||||||
id("io.papermc.paperweight.patcher") version "2.0.0-beta.19"
|
id("io.papermc.paperweight.patcher") version "2.0.0-SNAPSHOT"
|
||||||
}
|
}
|
||||||
|
|
||||||
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
|
||||||
@@ -37,13 +37,13 @@ subprojects {
|
|||||||
|
|
||||||
extensions.configure<JavaPluginExtension> {
|
extensions.configure<JavaPluginExtension> {
|
||||||
toolchain {
|
toolchain {
|
||||||
languageVersion = JavaLanguageVersion.of(21)
|
languageVersion = JavaLanguageVersion.of(25)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks.withType<JavaCompile> {
|
tasks.withType<JavaCompile> {
|
||||||
options.encoding = Charsets.UTF_8.name()
|
options.encoding = Charsets.UTF_8.name()
|
||||||
options.release = 21
|
options.release = 25
|
||||||
options.isFork = true
|
options.isFork = true
|
||||||
options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
|
options.compilerArgs.addAll(listOf("-Xlint:-deprecation", "-Xlint:-removal"))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
group = org.purpurmc.purpur
|
group = org.purpurmc.purpur
|
||||||
version = 1.21.11-R0.1-SNAPSHOT
|
version=26.1-snapshot-11-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.11
|
mcVersion=26.1-snapshot-11
|
||||||
apiVersion = 1.21.11
|
apiVersion = 26.1
|
||||||
paperCommit = 3f5728e24942a470a428c60839eda5340f85f9f8
|
paperCommit = 22c0219b3f42ad0d6a06e41321e020eeacb7b02f
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
--- a/paper-api/build.gradle.kts
|
--- a/paper-api/build.gradle.kts
|
||||||
+++ b/paper-api/build.gradle.kts
|
+++ b/paper-api/build.gradle.kts
|
||||||
@@ -91,7 +_,7 @@
|
@@ -91,7 +_,7 @@
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher:6.0.3")
|
||||||
}
|
}
|
||||||
|
|
||||||
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
|
-val generatedDir: java.nio.file.Path = layout.projectDirectory.dir("src/generated/java").asFile.toPath()
|
||||||
|
|||||||
@@ -9,10 +9,11 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
`java-library`
|
`java-library`
|
||||||
@@ -22,6 +_,18 @@
|
@@ -22,9 +_,21 @@
|
||||||
minecraftVersion = providers.gradleProperty("mcVersion")
|
minecraftVersion = providers.gradleProperty("mcVersion")
|
||||||
gitFilePatches = false
|
gitFilePatches = false
|
||||||
|
|
||||||
|
- updatingMinecraft {
|
||||||
+ // Purpur start - Rebrand
|
+ // Purpur start - Rebrand
|
||||||
+ val purpur = forks.register("purpur") {
|
+ val purpur = forks.register("purpur") {
|
||||||
+ upstream.patchDir("paperServer") {
|
+ upstream.patchDir("paperServer") {
|
||||||
@@ -25,10 +26,14 @@
|
|||||||
+ activeFork = purpur
|
+ activeFork = purpur
|
||||||
+ // Purpur end - Rebrand
|
+ // Purpur end - Rebrand
|
||||||
+
|
+
|
||||||
spigot {
|
+ /*updatingMinecraft { // Purpur start - TODO - snapshot - we don't need this
|
||||||
enabled = true
|
oldPaperCommit = "7e80cef5198561d0db53406127e5b8bc7af51577"
|
||||||
buildDataRef = "17f77cee7117ab9d6175f088ae8962bfd04e61a9"
|
- }
|
||||||
@@ -104,7 +_,21 @@
|
+ }*/ // Purpur end - TODO - snapshot - we don't need this
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.generateDevelopmentBundle {
|
||||||
|
@@ -86,7 +_,21 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +56,7 @@
|
|||||||
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
|
||||||
extendsFrom(configurations.compileClasspath.get())
|
extendsFrom(configurations.compileClasspath.get())
|
||||||
}
|
}
|
||||||
@@ -127,7 +_,7 @@
|
@@ -109,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -60,8 +65,8 @@
|
|||||||
implementation("ca.spottedleaf:concurrentutil:0.0.8")
|
implementation("ca.spottedleaf:concurrentutil:0.0.8")
|
||||||
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
|
||||||
@@ -153,6 +_,10 @@
|
@@ -135,6 +_,10 @@
|
||||||
implementation("org.ow2.asm:asm-commons:9.8")
|
implementation("org.ow2.asm:asm-commons:9.9.1")
|
||||||
implementation("org.spongepowered:configurate-yaml:4.2.0")
|
implementation("org.spongepowered:configurate-yaml:4.2.0")
|
||||||
|
|
||||||
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
|
+ implementation("org.mozilla:rhino-runtime:1.7.14") // Purpur
|
||||||
@@ -71,7 +76,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")
|
||||||
@@ -191,21 +_,21 @@
|
@@ -164,21 +_,21 @@
|
||||||
val git = Git(rootProject.layout.projectDirectory.path)
|
val git = Git(rootProject.layout.projectDirectory.path)
|
||||||
val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
|
val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
|
||||||
val build = System.getenv("BUILD_NUMBER") ?: null
|
val build = System.getenv("BUILD_NUMBER") ?: null
|
||||||
@@ -99,7 +104,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,
|
||||||
@@ -264,7 +_,7 @@
|
@@ -237,7 +_,7 @@
|
||||||
jvmArgumentProviders.add(provider)
|
jvmArgumentProviders.add(provider)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -108,7 +113,7 @@
|
|||||||
idea {
|
idea {
|
||||||
module {
|
module {
|
||||||
generatedSourceDirs.add(generatedDir.toFile())
|
generatedSourceDirs.add(generatedDir.toFile())
|
||||||
@@ -356,7 +_,7 @@
|
@@ -314,7 +_,7 @@
|
||||||
mainClass.set(null as String?)
|
mainClass.set(null as String?)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -117,7 +122,7 @@
|
|||||||
project("paper")
|
project("paper")
|
||||||
versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
|
versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
|
||||||
version(paperweight.minecraftVersion)
|
version(paperweight.minecraftVersion)
|
||||||
@@ -371,4 +_,47 @@
|
@@ -329,4 +_,47 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user