Skip to content

Commit ac8f05f

Browse files
committed
Update Paper
1 parent 3e2f25a commit ac8f05f

File tree

6 files changed

+93
-93
lines changed

6 files changed

+93
-93
lines changed

folia-server/build.gradle.kts.patch

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
--- a/paper-server/build.gradle.kts
22
+++ b/paper-server/build.gradle.kts
3-
@@ -24,6 +_,17 @@
3+
@@ -25,6 +_,18 @@
4+
paperweight {
45
minecraftVersion = providers.gradleProperty("mcVersion")
56
gitFilePatches = false
6-
7+
+
78
+ val fork = forks.register("folia") {
89
+ upstream.patchDir("paperServer") {
910
+ upstreamPath = "paper-server"
@@ -15,10 +16,10 @@
1516
+
1617
+ activeFork = fork
1718
+
19+
1820
spigot {
1921
enabled = true
20-
buildDataRef = "281ac0de7a76d808753ede97d11b034bc801b63d"
21-
@@ -105,7 +_,19 @@
22+
@@ -107,7 +_,19 @@
2223
}
2324
}
2425

@@ -39,7 +40,7 @@
3940
configurations.named(log4jPlugins.compileClasspathConfigurationName) {
4041
extendsFrom(configurations.compileClasspath.get())
4142
}
42-
@@ -127,7 +_,7 @@
43+
@@ -129,7 +_,7 @@
4344
}
4445

4546
dependencies {
@@ -48,7 +49,7 @@
4849
implementation("ca.spottedleaf:concurrentutil:0.0.3")
4950
implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
5051
implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
51-
@@ -203,14 +_,14 @@
52+
@@ -205,14 +_,14 @@
5253
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
5354
attributes(
5455
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -67,3 +68,12 @@
6768
"Build-Number" to (build ?: ""),
6869
"Build-Time" to buildTime.toString(),
6970
"Git-Branch" to gitBranch,
71+
@@ -376,7 +_,7 @@
72+
}
73+
74+
fill {
75+
- project("paper")
76+
+ project("folia")
77+
versionFamily(paperweight.minecraftVersion.map { it.split(".", "-").takeWhile { part -> part.toIntOrNull() != null }.take(2).joinToString(".") })
78+
version(paperweight.minecraftVersion)
79+

0 commit comments

Comments
 (0)