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

Update upstream

Browse Source
This commit is contained in:
lexikiq
2021-10-20 22:22:50 -04:00
parent 36add0b91e
commit 6a210ce41d
15 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Build changes
diff --git a/build.gradle.kts b/build.gradle.kts
index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653be53a62d 100644
index 13f89bdaf1ada33060b1ee4d6f2860ec194b68a4..c9518700b93ca5e01fe2c8335fd8852e4cf89702 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -29,8 +29,8 @@ repositories {
@@ -25,8 +25,8 @@ repositories {
}
dependencies {
@@ -19,7 +19,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653
// Paper start
implementation("org.jline:jline-terminal-jansi:3.12.1")
implementation("net.minecrell:terminalconsoleappender:1.2.0")
@@ -82,7 +82,7 @@ tasks.jar {
@@ -78,7 +78,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -28,7 +28,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -104,6 +104,26 @@ publishing {
@@ -100,6 +100,26 @@ publishing {
classifier = null
}
artifact(tasks.shadowJar)
@@ -55,7 +55,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653
}
}
@@ -147,7 +167,7 @@ tasks.shadowJar {
@@ -143,7 +163,7 @@ tasks.shadowJar {
// Needed for Paperclip's install to maven local feature
from(generatePom) {
@@ -64,7 +64,7 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..6e14fe7fed362d470555445b053a2653
rename { "pom.xml" }
}
@@ -207,7 +227,7 @@ tasks.test {
@@ -204,7 +224,7 @@ tasks.test {
fun TaskContainer.registerRunTask(
name: String, block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -87,10 +87,10 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..52126870f1fc15a9ddce4452673b236e
/**
diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93c496364a 100644
index ece77f5ea4b14bbed7c070131b3251ea86764538..71bf426f7fb58fff6739bb1332d1286db810d434 100644
--- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
+++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
@@ -29,8 +29,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -31,8 +31,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@Nonnull
@Override
public Component getVersionMessage(@Nonnull String serverVersion) {
@@ -101,7 +101,7 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93
final Component history = getHistory();
return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage;
@@ -43,7 +43,7 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -45,7 +45,7 @@ public class PaperVersionFetcher implements VersionFetcher {
String result = matcher.group();
mcVer = result.substring(0, result.length() - 2); // strip 'R' anchor and trailing '-'
} else {
@@ -111,10 +111,10 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..e744a4c6de5beae4161d855da6dcab93
org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion());
}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 1d7c26354eee1dff5e66b6234d408ed8f800415c..7d8137afcf453540aaa3cb44e9619ee28eb523e8 100644
index 7636b0ae9031e06fd8b4a0c359a45a17e6e075de..2afa6acaa1bd34acac6fc81260d6e0570bc3bf7f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1721,7 +1721,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1726,7 +1726,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -124,10 +124,10 @@ index 1d7c26354eee1dff5e66b6234d408ed8f800415c..7d8137afcf453540aaa3cb44e9619ee2
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 c1fc309411c277f7b7450686543a6a7a7fe2fdb1..2ac1a98c7d7c1d3ac09788bfe87d94c4f17dd67a 100644
index cfbde4c1220b0d6081a3e4ad2375e0d7bfb2ef40..9f5bbb9e684ec11bc979ca2ece4eb73da0e3d1e8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -246,7 +246,7 @@ import javax.annotation.Nullable; // Paper
@@ -251,7 +251,7 @@ import javax.annotation.Nullable; // Paper
import javax.annotation.Nonnull; // Paper
public final class CraftServer implements Server {