Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 18:07:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

rebase

Browse Source
This commit is contained in:
Ben Kerllenevich
2021-11-29 08:28:20 -05:00
parent 9afd573ce5
commit f0e15c4d2a
29 changed files with 84 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/server/0002-Rebrand.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
diff --git a/build.gradle.kts b/build.gradle.kts
index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067d2672257 100644
index cd74406039704e5a880f00b9b60bb7b1dedc5398..034d1058c7a7c1ed1a4a2c7ac23ec00f72ac63dd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -18,8 +18,8 @@ repositories {
@@ -19,7 +19,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
// Paper start
implementation("org.jline:jline-terminal-jansi:3.21.0")
implementation("net.minecrell:terminalconsoleappender:1.3.0")
@@ -53,6 +53,8 @@ dependencies {
@@ -49,6 +49,8 @@ dependencies {
isTransitive = false
}
// Paper end
@@ -28,7 +28,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test
testImplementation("junit:junit:4.13.1")
@@ -71,7 +73,7 @@ tasks.jar {
@@ -67,7 +69,7 @@ tasks.jar {
attributes(
"Main-Class" to "org.bukkit.craftbukkit.Main",
"Implementation-Title" to "CraftBukkit",
@@ -37,7 +37,7 @@ index 72e4828940396b7b326ed64c3c06b785f949b08d..c103a602c9369f959da4a99edcf9f067
"Implementation-Vendor" to date, // Paper
"Specification-Title" to "Bukkit",
"Specification-Version" to project.version,
@@ -162,7 +164,7 @@ fun TaskContainer.registerRunTask(
@@ -158,7 +160,7 @@ fun TaskContainer.registerRunTask(
name: String,
block: JavaExec.() -> Unit
): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -113,10 +113,10 @@ index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e30
.completer(new ConsoleCommandCompleter(this.server))
.option(LineReader.Option.COMPLETE_IN_WORD, true);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 519806cee3a45eaaedefa83b7237b073c9bbc332..1f3f93485f8ceab2f8d2601a952414b993ace6a3 100644
index 893badbe321fa974cb82f5f11ab590bb3827f8b8..f1fbd740706fd0679643be466bf5fa4905dbe453 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1707,7 +1707,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1708,7 +1708,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@DontObfuscate
public String getServerModName() {
@@ -145,7 +145,7 @@ index 38a0fb9a7c4ade9cacfd30dffabfea7e6b773981..fd3d3e22613511a42f7fc343079b081c
// Spigot end
DedicatedServer.LOGGER.warn("To change this, set \"online-mode\" to \"true\" in the server.properties file.");
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6b53310b37a502a677459bf2b777a2c450fb6482..14cbc2a71b5587cd8f6df897a017afeb4e4ec017 100644
index 1d7d3dbf7f6857d9853112844b70692e92e9c89d..77984134e53755caf45b8217a912ef0df645de59 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -255,7 +255,7 @@ import javax.annotation.Nullable; // Paper