Repo-Mirror/ParchmentMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Update

Browse Source
This commit is contained in:
Jason Penilla
2025-01-03 11:06:15 -08:00
parent 07763ce642
commit d4c2a2945c
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle.kts
View File

@@ -3,12 +3,12 @@ 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.8" id("io.papermc.paperweight.patcher") version "2.0.0-beta.11"
} }
paperweight { paperweight {
upstreams.paper { upstreams.paper {
ref = "54debf494f467a71c561cf8765c4f21725c99dd8" ref = providers.gradleProperty("paperRef")
patchFile { patchFile {
path = "paper-server/build.gradle.kts" path = "paper-server/build.gradle.kts"

6
fork-api/build.gradle.kts.patch
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
@@ -105,6 +_,18 @@ @@ -103,6 +_,18 @@
main { main {
java { java {
srcDir(generatedApiPath) srcDir(generatedApiPath)
@@ -19,7 +19,7 @@
} }
} }
} }
@@ -174,7 +_,7 @@ @@ -169,7 +_,7 @@
tasks.withType<Javadoc> { tasks.withType<Javadoc> {
val options = options as StandardJavadocDocletOptions val options = options as StandardJavadocDocletOptions
@@ -28,7 +28,7 @@
options.use() options.use()
options.isDocFilesSubDirs = true options.isDocFilesSubDirs = true
options.links( options.links(
@@ -212,11 +_,11 @@ @@ -202,11 +_,11 @@
} }
// workaround for https://github.com/gradle/gradle/issues/4046 // workaround for https://github.com/gradle/gradle/issues/4046

10
fork-server/build.gradle.kts.patch
View File

@@ -1,6 +1,6 @@
--- a/paper-server/build.gradle.kts --- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts +++ b/paper-server/build.gradle.kts
@@ -20,8 +_,19 @@ @@ -21,8 +_,19 @@
// macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java") // macheOldPath = file("F:\\Projects\\PaperTooling\\mache\\versions\\1.21.4\\src\\main\\java")
// gitFilePatches = true // gitFilePatches = true
@@ -21,7 +21,7 @@
} }
spigot { spigot {
@@ -104,7 +_,20 @@ @@ -105,7 +_,20 @@
} }
} }
@@ -44,11 +44,11 @@
extendsFrom(configurations.compileClasspath.get()) extendsFrom(configurations.compileClasspath.get())
} }
@@ -123,7 +_,7 @@ @@ -123,7 +_,7 @@
// Paper end - configure mockito agent that is needed in newer java versions }
dependencies { dependencies {
- implementation(project(":paper-api")) - implementation(project(":paper-api"))
+ implementation(project(":fork-api")) + implementation(project(":fork-api"))
implementation("ca.spottedleaf:concurrentutil:0.0.2") // Paper - Add ConcurrentUtil dependency implementation("ca.spottedleaf:concurrentutil:0.0.2")
// Paper start
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

1
gradle.properties
View File

@@ -1,6 +1,7 @@
group=fork.test group=fork.test
version=1.21.4-R0.1-SNAPSHOT version=1.21.4-R0.1-SNAPSHOT
mcVersion=1.21.4 mcVersion=1.21.4
paperRef=daddcf67420e92ce1eba27949f3c847a92ffab14
org.gradle.configuration-cache=true org.gradle.configuration-cache=true
#org.gradle.caching=true #org.gradle.caching=true