Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-27 02:49:10 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2023-12-28 13:11:10 +08:00
parent 434ea125d2
commit cb31cda2f4
38 changed files with 96 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0001-Build-changes.patch
View File

@@ -5,19 +5,17 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..257520120913ab39d57ac0e79ae6381fbda0011b 100644
index 58da26ad2f128ba0b66f86820f60853f4be352f0..914c6520398045ad30537d7493a79a55ad4ddee2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -26,9 +26,13 @@ repositories {
}
@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
val alsoShade: Configuration by configurations.creating
dependencies {
- extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
- implementation(project(":paper-api"))
- implementation(project(":paper-mojangapi"))
+ extraRuntime(platform("net.kyori:adventure-bom:4.15.0-SNAPSHOT"))
+ implementation(project(":leaves-api")) // Leaves
+ // Leaves start
+ // Leaves start
+ implementation(project(":leaves-api"))
+ implementation("io.papermc.paper:paper-mojangapi:1.20.4-R0.1-SNAPSHOT") {
+ exclude("io.papermc.paper", "paper-api")
+ }
@@ -25,7 +23,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..257520120913ab39d57ac0e79ae6381f
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -72,19 +76,29 @@ dependencies {
@@ -58,19 +62,29 @@ dependencies {
}
val craftbukkitPackageVersion = "1_20_R3" // Paper
@@ -57,7 +55,7 @@ index b12b5a1e82a5ebf47135a3863a390a45a9d8d8ec..257520120913ab39d57ac0e79ae6381f
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -168,7 +182,7 @@ fun TaskContainer.registerRunTask(
@@ -154,7 +168,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -186,7 +184,7 @@ index 58536aabf607015939a1326f80207c0a06eed8ff..5a07dad83602425b35f480cf8a31ed32
this.setFlightAllowed(dedicatedserverproperties.allowFlight);
this.setMotd(dedicatedserverproperties.motd);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index e011cfcdda2e0a609d4158b0454bdf046b04c9d9..a8b92ff8975730fb8ac752aa21aa28f9cae26dd9 100644
index 142d2c48239d4ebe3896218536656d116cd24d7c..9e4002e82dba3a09a3a8346aebba34f30f902dff 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper