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

Patch updates

Browse Source
This commit is contained in:
Cryptite
2023-06-23 09:34:58 -05:00
parent 37de50054d
commit fdadeb897f
23 changed files with 141 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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 e7a03ea1dab56e7725f718da0b44c736018ac995..9387d8fdb70e882104155abb284cba129d20585e 100644
index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..6e5a7cd4028d38126632390e129c005dae158877 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,8 +7,12 @@ plugins {
@@ -23,7 +23,7 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..9387d8fdb70e882104155abb284cba12
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -62,7 +66,7 @@ tasks.jar {
@@ -64,7 +68,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..9387d8fdb70e882104155abb284cba12
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask(
@@ -136,7 +140,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -42,10 +42,10 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..9387d8fdb70e882104155abb284cba12
standardInput = System.`in`
workingDir = rootProject.layout.projectDirectory
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..53188d488936c0ab97ed5dea558831c8ced4cd0d 100644
index 912affb0ab1c4c40f7a655194e95ec6f0ebf1fcd..d15b822d7b12691608a3890d87b09c7562f91958 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1691,7 +1691,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -55,10 +55,10 @@ index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..53188d488936c0ab97ed5dea558831c8
public SystemReport fillSystemReport(SystemReport details) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ffa27c9c02dc4d12411fc089de3af8e8e12ba06e..0c69891686e643d2e6897fee3ff8a6fdc3c97de8 100644
index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..83c0591f044099c02763b04e2f2c8155bfcdfc13 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -262,7 +262,7 @@ import javax.annotation.Nullable; // Paper
@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {