Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2026-01-04 15:41:31 +00:00
Code Issues Releases Activity

Update Paper

Browse Source
This commit is contained in:
violetc
2024-07-22 21:12:35 +08:00
parent 658cb0e580
commit d2a4562ebe
19 changed files with 162 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd6996fa0181c 100644
index 421f6b3dc8890d63d2e7aa774d0bf8f7e15890ab..cf8a410dedf26e48617ccad7e899edc26cf5f7c9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -17,7 +17,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -67,6 +67,15 @@ paperweight {
@@ -71,6 +71,15 @@ paperweight {
craftBukkitPackageVersion.set("v1_21_R1") // also needs to be updated in MappingEnvironment
}
@@ -33,7 +33,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699
tasks.jar {
archiveClassifier.set("dev")
@@ -80,14 +89,14 @@ tasks.jar {
@@ -84,14 +93,14 @@ tasks.jar {
val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
@@ -53,7 +53,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699
"Build-Number" to (build ?: ""),
"Build-Time" to Instant.now().toString(),
"Git-Branch" to gitBranch, // Paper
@@ -144,7 +153,7 @@ fun TaskContainer.registerRunTask(
@@ -148,7 +157,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -62,7 +62,7 @@ index 1a734293c9416f13324bb0edf8f950c9029f8bc4..d0caefc335e85afede34ad3b804bd699
mainClass.set("org.bukkit.craftbukkit.Main")
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
@@ -213,13 +222,13 @@ tasks.registerRunTask("runReobfBundler") {
@@ -217,13 +226,13 @@ tasks.registerRunTask("runReobfBundler") {
classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreateBundlerJar>("createReobfBundlerJar").flatMap { it.outputZip })
mainClass.set(null as String?)
}
@@ -184,10 +184,10 @@ index 790bad0494454ca12ee152e3de6da3da634d9b20..c060857cb0551fff8f5033553b887f3a
private static final String BUILD_DEV = "DEV";
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 57e84cf2219d28c37e4c042371afddf585334954..56b030a8dc0a335a88179e49d9165e0e9310420f 100644
index 9325d6f95165a7cee00d7de736af723681cc16b4..b5a216dbf3f73c32ac4e930a694527dc13df0b5d 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1241,7 +1241,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1243,7 +1243,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
LOGGER.info("*************************************************************************************");
LOGGER.info("This is the first time you're starting this server.");
LOGGER.info("It's recommended you read our 'Getting Started' documentation for guidance.");
@@ -196,7 +196,7 @@ index 57e84cf2219d28c37e4c042371afddf585334954..56b030a8dc0a335a88179e49d9165e0e
LOGGER.info("*************************************************************************************");
}
// Paper end - Add onboarding message for initial server start
@@ -1937,7 +1937,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1941,7 +1941,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -206,13 +206,13 @@ index 57e84cf2219d28c37e4c042371afddf585334954..56b030a8dc0a335a88179e49d9165e0e
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 7d82cc6b847124cf4225428ba310309544928148..4214ed228125c6ba36ef2c763f842a54f33446fc 100644
index dd56c8e041116ef3602a9f89c998c8208ab89b51..0b4a70ebd312038d5b128c9e1f990666d1642a1a 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -235,9 +235,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
org.spigotmc.WatchdogThread.doStart(org.spigotmc.SpigotConfig.timeoutTime, org.spigotmc.SpigotConfig.restartOnCrash); // Paper - start watchdog thread
@@ -237,9 +237,10 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
thread.start(); // Paper - Enhance console tab completions for brigadier commands; start console thread after MinecraftServer.console & PaperConfig are initialized
io.papermc.paper.command.PaperCommands.registerCommands(this); // Paper - setup /paper command
this.server.spark.registerCommandBeforePlugins(this.server); // Paper - spark
- com.destroystokyo.paper.Metrics.PaperMetrics.startMetrics(); // Paper - start metrics
com.destroystokyo.paper.VersionHistoryManager.INSTANCE.getClass(); // Paper - load version history now
@@ -235,7 +235,7 @@ index 759062d219ff490a3cb19e710c4d18e3e08288e0..3952428c02fe87477f4139f4fa983815
javax.swing.JLabel jLabel = new javax.swing.JLabel("If you need help setting up your server you can visit:");
diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
index 38083fc6dc60673562f2d05aa354c365571baff8..c2e2e0ea5f2bb8204cb698db7904b0f863d2506f 100644
index 618f4b2e1d012b647b3e7bf359c8ecdd7f159e63..c2c421b1caf76b40542fdc436801accbe97a38cb 100644
--- a/src/main/java/org/bukkit/craftbukkit/Main.java
+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -273,7 +273,7 @@ public class Main {