OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-27 06:50:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move paperweight use to -server

Browse source
This commit is contained in:
Jason Penilla 2024-12-06 14:02:39 -07:00 committed by Nassim Jahnke
parent c6233d8bcd
commit fe6dbf0377
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
3 changed files with 51 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
build.gradle.kts
View file

@ -9,16 +9,14 @@ import java.util.regex.Pattern
import kotlin.io.path.*
plugins {
java
`maven-publish`
id("io.papermc.paperweight.core") version "2.0.0-SNAPSHOT"
id("io.papermc.paperweight.core") version "2.0.0-SNAPSHOT" apply false
}
allprojects {
apply(plugin = "java")
subprojects {
apply(plugin = "java-library")
apply(plugin = "maven-publish")
java {
extensions.configure<JavaPluginExtension> {
toolchain {
languageVersion = JavaLanguageVersion.of(21)
}
@ -51,45 +49,8 @@ subprojects {
mavenCentral()
maven(paperMavenPublicUrl)
}
}
dependencies {
mache("io.papermc:mache:1.21.4+build.3")
}
paperweight {
softSpoon = true
minecraftVersion = "1.21.4"
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
// gitFilePatches = true
paper {
paperServerDir = file("paper-server")
}
serverProject = project(":paper-server")
}
tasks.generateDevelopmentBundle {
apiCoordinates = "io.papermc.paper:paper-api"
libraryRepositories.addAll(
"https://repo.maven.apache.org/maven2/",
paperMavenPublicUrl,
)
}
publishing {
if (project.providers.gradleProperty("publishDevBundle").isPresent) {
publications.create<MavenPublication>("devBundle") {
artifact(tasks.generateDevelopmentBundle) {
artifactId = "dev-bundle"
}
}
}
}
allprojects {
publishing {
extensions.configure<PublishingExtension> {
repositories {
maven("https://repo.papermc.io/repository/maven-snapshots/") {
name = "paperSnapshots"
@ -112,6 +73,7 @@ tasks.register("printPaperVersion") {
}
// see gradle.properties
/*
if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
tasks.collectAtsFromPatches {
val dir = layout.projectDirectory.dir("patches/unapplied/server")
@ -256,3 +218,4 @@ abstract class RebasePatches : BaseTask() {
git("add", unappliedPatches.path.toString() + "/*").runSilently()
}
}
*/

3
gradle.properties
View file

@ -8,3 +8,6 @@ updatingMinecraft=false
org.gradle.caching=true
org.gradle.parallel=true
org.gradle.vfs.watch=false
# TODO: this should be removed when we move things to forked JVMs
org.gradle.jvmargs=-Xmx2G

44
paper-server/build.gradle.kts
View file

@ -2,8 +2,46 @@ import io.papermc.paperweight.util.*
import java.time.Instant
plugins {
java
`java-library`
`maven-publish`
id("io.papermc.paperweight.core")
}
val paperMavenPublicUrl = "https://repo.papermc.io/repository/maven-public/"
dependencies {
mache("io.papermc:mache:1.21.4+build.5")
}
paperweight {
softSpoon = true
minecraftVersion = "1.21.4"
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
// gitFilePatches = true
paper {
paperServerDir = file("./")
}
serverProject = project(":paper-server")
}
tasks.generateDevelopmentBundle {
apiCoordinates = "io.papermc.paper:paper-api"
libraryRepositories.addAll(
"https://repo.maven.apache.org/maven2/",
paperMavenPublicUrl,
)
}
publishing {
if (project.providers.gradleProperty("publishDevBundle").isPresent) {
publications.create<MavenPublication>("devBundle") {
artifact(tasks.generateDevelopmentBundle) {
artifactId = "dev-bundle"
}
}
}
}
val log4jPlugins = sourceSets.create("log4jPlugins")
@ -225,7 +263,7 @@ tasks.registerRunTask("runDevServer") {
tasks.registerRunTask("runBundler") {
description = "Spin up a test server from the Mojang mapped bundler jar"
classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip })
classpath(tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createMojmapBundlerJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}
// tasks.registerRunTask("runReobfBundler") {
@ -235,7 +273,7 @@ tasks.registerRunTask("runBundler") {
// }
tasks.registerRunTask("runPaperclip") {
description = "Spin up a test server from the Mojang mapped Paperclip jar"
classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createMojmapPaperclipJar").flatMap { it.outputZip })
classpath(tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createMojmapPaperclipJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}
// tasks.registerRunTask("runReobfPaperclip") {