From a23b3648d64908dbee41a1465da18a655872fe68 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Mon, 30 Aug 2021 19:11:54 -0500 Subject: [PATCH] Updated Upstream (Paper & Airplane) Upstream has released updates that appear to apply and compile correctly --- gradle.properties | 2 +- .../server/0001-Airplane-Server-Changes.patch | 98 ++++++++++++++----- patches/server/0003-Rebrand.patch | 76 +++++++++++--- patches/server/0004-Purpur-config-files.patch | 8 +- patches/server/0009-Timings-stuff.patch | 10 +- ...6-Apply-paper-s-reobf-mappings-patch.patch | 46 --------- 6 files changed, 148 insertions(+), 92 deletions(-) delete mode 100644 patches/server/0256-Apply-paper-s-reobf-mappings-patch.patch diff --git a/gradle.properties b/gradle.properties index 6f5a77fb3..72f003dbb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = 651f96afcc6bc7c2b180a22fe822a5cdcc93cdea +paperCommit = e8fe7fe00e4d0df7702d535b237740ebc303c5f6 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch index 6eb73a3cc..04d0a8808 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -19,21 +19,34 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/build.gradle.kts b/build.gradle.kts -index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..8a56862f59b7b7d64580b46c561643a1d99348c7 100644 +index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..8a4c00b978b289d162321a043efb0a5ca4c9ef4a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -29,8 +29,8 @@ repositories { +@@ -2,9 +2,12 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCach + import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer + import io.papermc.paperweight.tasks.BaseTask + import io.papermc.paperweight.util.Git ++import io.papermc.paperweight.util.cache + import io.papermc.paperweight.util.defaultOutput + import io.papermc.paperweight.util.openZip + import io.papermc.paperweight.util.path ++import io.papermc.paperweight.util.registering ++import io.papermc.paperweight.util.set + import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE + import java.nio.file.Files + import java.util.Locale +@@ -29,8 +32,8 @@ repositories { } dependencies { - implementation(project(":Paper-API")) - implementation(project(":Paper-MojangAPI")) -+ implementation(project(":Airplane-API")) // Airplane // Tuinity ++ implementation(project(":Airplane-API")) // Airplane // Paper + implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -65,6 +65,10 @@ dependencies { +@@ -65,6 +68,10 @@ dependencies { implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper @@ -44,17 +57,39 @@ index b3687f632bbf06c933a6ef04dc2236ccf3c030b8..8a56862f59b7b7d64580b46c561643a1 testImplementation("io.github.classgraph:classgraph:4.8.47") // Paper - mob goal test testImplementation("junit:junit:4.13.1") testImplementation("org.hamcrest:hamcrest-library:1.3") -@@ -82,7 +86,7 @@ tasks.jar { - attributes( +@@ -83,6 +90,7 @@ tasks.jar { "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Paper-$implementationVersion", -+ "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane + "Implementation-Version" to "git-Paper-$implementationVersion", ++ "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane // Tuinity "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, +@@ -140,6 +148,22 @@ relocation { + } + } + ++val generateReobfMappings = rootProject.tasks.named("generateReobfMappings") ++ ++val patchReobfMappings by tasks.registering { ++ inputMappings.set(generateReobfMappings.flatMap { it.reobfMappings }) ++ patch.set(rootProject.layout.cache.resolve("paperweight/upstreams/paper/build-data/reobf-mappings-patch.tiny")) ++ ++ fromNamespace.set(io.papermc.paperweight.util.constants.DEOBF_NAMESPACE) ++ toNamespace.set(io.papermc.paperweight.util.constants.SPIGOT_NAMESPACE) ++ ++ outputMappings.set(layout.cache.resolve("paperweight/mappings/reobf-patched.tiny")) ++} ++ ++tasks.reobfJar { ++ mappingsFile.set(patchReobfMappings.flatMap { it.outputMappings }) ++} ++ + val generatePom = tasks.named("generatePomFileForMavenPublication") + + tasks.shadowJar { diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 7d44abcb4fff9717a1af55879deb7eb9c2d9e7e9..5fc65b0224b5c56039d60baf30f2de35f8bfb1c6 100644 +index 7d44abcb4fff9717a1af55879deb7eb9c2d9e7e9..da6a5b1b2f5203a0fab8e4fccd727951df7c9c9a 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -228,7 +228,8 @@ public class TimingsExport extends Thread { @@ -62,13 +97,13 @@ index 7d44abcb4fff9717a1af55879deb7eb9c2d9e7e9..5fc65b0224b5c56039d60baf30f2de35 pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), - pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)) -+ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), -+ pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)) ++ pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Airplane ++ pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)) // Airplane )); new TimingsExport(listeners, parent, history).start(); diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740db74709d9 100644 +index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..f5d01bce4d5547b4aeca96b7962b2090f47ea541 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,7 +593,7 @@ public class Metrics { @@ -76,7 +111,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740d // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { - Metrics metrics = new Metrics("Paper", serverUUID, logFailedRequests, Bukkit.getLogger()); -+ Metrics metrics = new Metrics("Airplane", serverUUID, logFailedRequests, Bukkit.getLogger()); // Airplane ++ Metrics metrics = new Metrics("Airplane", serverUUID, logFailedRequests, Bukkit.getLogger()); // Tuinity - we have our own bstats page // Airplane metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { String minecraftVersion = Bukkit.getVersion(); @@ -85,12 +120,12 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740d metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); - metrics.addCustomChart(new Metrics.SimplePie("paper_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); -+ metrics.addCustomChart(new Metrics.SimplePie("airplane_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Airplane ++ metrics.addCustomChart(new Metrics.SimplePie("airplane_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Tuinity - we have our own bstats page // Airplane metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 076b0218ccb064ee36f46f9d76fe61eacda931b3..6ba32b6efd32e6861f2c6bc8296b12c5c9cee593 100644 +index 86d73c98ff04384f3d6c9d967ae7ad85c7c29bf1..25f9103041ebc065502bb32066cd8db79518034d 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -202,16 +202,26 @@ public class PaperConfig { @@ -122,7 +157,7 @@ index 076b0218ccb064ee36f46f9d76fe61eacda931b3..6ba32b6efd32e6861f2c6bc8296b12c5 int timingHistoryLength = getInt("timings.history-length", 3600); timingsServerName = getString("timings.server-name", "Unknown Server"); diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 580bae0d414d371a07a6bfeefc41fdd989dc0083..030731923811f7748e8f9086f88e913031f1ec21 100644 +index 580bae0d414d371a07a6bfeefc41fdd989dc0083..51d89d6bcbcc24a6be6a836263ebb1ed23e91cba 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 { @@ -131,11 +166,30 @@ index 580bae0d414d371a07a6bfeefc41fdd989dc0083..030731923811f7748e8f9086f88e9130 public Component getVersionMessage(@Nonnull String serverVersion) { - String[] parts = serverVersion.substring("git-Paper-".length()).split("[-\\s]"); - final Component updateMessage = getUpdateStatusMessage("PaperMC/Paper", GITHUB_BRANCH_NAME, parts[0]); -+ String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Airplane -+ final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Airplane ++ String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Tuinity ++ final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Tuinity final Component history = getHistory(); return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; +@@ -54,13 +54,13 @@ public class PaperVersionFetcher implements VersionFetcher { + + private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { + int distance; +- try { +- int jenkinsBuild = Integer.parseInt(versionInfo); +- distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); +- } catch (NumberFormatException ignored) { ++ //try { ++ // int jenkinsBuild = Integer.parseInt(versionInfo); ++ // distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); ++ //} catch (NumberFormatException ignored) { + versionInfo = versionInfo.replace("\"", ""); + distance = fetchDistanceFromGitHub(repo, branch, versionInfo); +- } ++ //} + + switch (distance) { + case -1: diff --git a/src/main/java/gg/airplane/AirplaneCommand.java b/src/main/java/gg/airplane/AirplaneCommand.java new file mode 100644 index 0000000000000000000000000000000000000000..89c89e633f14b5820147e734b1b7ad8cadfdce80 @@ -1606,7 +1660,7 @@ index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df92 public static CompletableFuture> sequenceFailFast(List> futures) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index edd2333e0fb24a50bc388249224e9311aa90a10f..1490753c9f47769177212051924306493efdc5d5 100644 +index edd2333e0fb24a50bc388249224e9311aa90a10f..61b0e52ec692b8bfc7629ee6e84952a6704362aa 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1730,7 +1730,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Spigot - Spigot > // CraftBukkit - cb > vanilla! -+ return "Airplane"; // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! ++ return "Airplane"; // Airplane - Airplane > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } public SystemReport fillSystemReport(SystemReport details) { @@ -3437,7 +3491,7 @@ index d752720f2f234b9dbd2117333fee1bfad663ec02..9868b3a9a35cea9689c76ea9b62f2732 // Paper start - try to shutdown on main server.safeShutdown(false, false); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 774556a62eb240da42e84db4502e2ed43495be17..7217088fda330c97c6edd007159aa6b2dee41bfb 100644 +index 774556a62eb240da42e84db4502e2ed43495be17..1788d79ea489e446d3d9f541693d4ba3dfc26015 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { @@ -3445,7 +3499,7 @@ index 774556a62eb240da42e84db4502e2ed43495be17..7217088fda330c97c6edd007159aa6b2 String result = "Unknown-Version"; - InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/io.papermc.paper/paper-api/pom.properties"); -+ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.airplane/airplane-api/pom.properties"); // Airplane ++ InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.airplane/airplane-api/pom.properties"); // Tuinity // Airplane Properties properties = new Properties(); if (stream != null) { diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch index 7de0c1711..9d0eecc86 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -5,19 +5,19 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 8a56862f59b7b7d64580b46c561643a1d99348c7..628ac56388882a1bcbeae37769a99e9ccb071f66 100644 +index 8a4c00b978b289d162321a043efb0a5ca4c9ef4a..399641413d38f1a27165a0cf60b6c7c781cf1488 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -29,7 +29,7 @@ repositories { +@@ -32,7 +32,7 @@ repositories { } dependencies { -- implementation(project(":Airplane-API")) // Airplane // Tuinity +- implementation(project(":Airplane-API")) // Airplane // Paper + implementation(project(":Purpur-API")) // Airplane // Purpur implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") -@@ -61,6 +61,7 @@ dependencies { +@@ -64,6 +64,7 @@ dependencies { implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper @@ -25,17 +25,18 @@ index 8a56862f59b7b7d64580b46c561643a1d99348c7..628ac56388882a1bcbeae37769a99e9c implementation("org.quiltmc:tiny-mappings-parser:0.3.0") // Paper - needed to read mappings for stacktrace deobfuscation implementation("com.velocitypowered:velocity-native:1.1.0-SNAPSHOT") // Paper -@@ -86,7 +87,7 @@ tasks.jar { +@@ -89,8 +90,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", -- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane +- "Implementation-Version" to "git-Paper-$implementationVersion", +- "Implementation-Version" to "git-Airplane-$implementationVersion", // Airplane // Tuinity + "Implementation-Version" to "git-Purpur-$implementationVersion", // Airplane // Purpur "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index 030731923811f7748e8f9086f88e913031f1ec21..e2c0717066ac16a9274daff1a192bf70f0c119a0 100644 +index 51d89d6bcbcc24a6be6a836263ebb1ed23e91cba..b6c1e50df4e0a69ac1e81613539bcc0731c67063 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -18,7 +18,7 @@ import java.util.stream.StreamSupport; @@ -51,8 +52,8 @@ index 030731923811f7748e8f9086f88e913031f1ec21..e2c0717066ac16a9274daff1a192bf70 @Nonnull @Override public Component getVersionMessage(@Nonnull String serverVersion) { -- String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Airplane -- final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Airplane +- String[] parts = serverVersion.substring("git-Airplane-".length()).split("[-\\s]"); // Tuinity +- final Component updateMessage = getUpdateStatusMessage("TECHNOVE/Airplane", GITHUB_BRANCH_NAME, parts[0]); // Tuinity + String[] parts = serverVersion.substring("git-Purpur-".length()).split("[-\\s]"); // Airplane // Purpur + final Component updateMessage = getUpdateStatusMessage("pl3xgaming/Purpur", "ver/" + getMinecraftVersion(), parts[0]); // Airplane // Purpur final Component history = getHistory(); @@ -67,7 +68,31 @@ index 030731923811f7748e8f9086f88e913031f1ec21..e2c0717066ac16a9274daff1a192bf70 org.bukkit.Bukkit.getLogger().warning("Pattern: " + VER_PATTERN.toString()); org.bukkit.Bukkit.getLogger().warning("Version: " + org.bukkit.Bukkit.getBukkitVersion()); } -@@ -78,15 +78,11 @@ public class PaperVersionFetcher implements VersionFetcher { +@@ -54,13 +54,18 @@ public class PaperVersionFetcher implements VersionFetcher { + + private static Component getUpdateStatusMessage(@Nonnull String repo, @Nonnull String branch, @Nonnull String versionInfo) { + int distance; +- //try { +- // int jenkinsBuild = Integer.parseInt(versionInfo); +- // distance = fetchDistanceFromSiteApi(jenkinsBuild, getMinecraftVersion()); +- //} catch (NumberFormatException ignored) { ++ // Purpur start - put all this back, yet again ++ try { ++ int buildNumber = Integer.parseInt(versionInfo); ++ distance = fetchDistanceFromSiteApi(buildNumber, getMinecraftVersion()); ++ if (distance < 0) { ++ distance = fetchDistanceFromJenkins(buildNumber); ++ } ++ } catch (NumberFormatException ignored) { + versionInfo = versionInfo.replace("\"", ""); + distance = fetchDistanceFromGitHub(repo, branch, versionInfo); +- //} ++ } ++ // Purpur end + + switch (distance) { + case -1: +@@ -78,15 +83,11 @@ public class PaperVersionFetcher implements VersionFetcher { if (siteApiVersion == null) { return -1; } try { try (BufferedReader reader = Resources.asCharSource( @@ -85,6 +110,29 @@ index 030731923811f7748e8f9086f88e913031f1ec21..e2c0717066ac16a9274daff1a192bf70 return latest - jenkinsBuild; } catch (JsonSyntaxException ex) { ex.printStackTrace(); +@@ -98,6 +99,22 @@ public class PaperVersionFetcher implements VersionFetcher { + } + } + ++ // Purpur start ++ private static int fetchDistanceFromJenkins(int jenkinsBuild) { ++ try { ++ try (BufferedReader reader = Resources.asCharSource(new URL(JENKINS_URL), Charsets.UTF_8).openBufferedStream()) { ++ return Integer.decode(reader.readLine()) - jenkinsBuild; ++ } catch (NumberFormatException ex) { ++ ex.printStackTrace(); ++ return -2; ++ } ++ } catch (IOException e) { ++ e.printStackTrace(); ++ return -1; ++ } ++ } ++ // Purpur end ++ + // Contributed by Techcable in GH-65 + private static int fetchDistanceFromGitHub(@Nonnull String repo, @Nonnull String branch, @Nonnull String hash) { + try { diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java index e0b1f0671d16ddddcb6725acd25a1d1d69e42701..8c3c68465197fafc14849dc38a572e309931e2a2 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -99,14 +147,14 @@ 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 1490753c9f47769177212051924306493efdc5d5..080ccf4092de52292175c9333b530b82bf3aa5c8 100644 +index 61b0e52ec692b8bfc7629ee6e84952a6704362aa..080ccf4092de52292175c9333b530b82bf3aa5c8 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1730,7 +1730,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! +- return "Airplane"; // Airplane - Airplane > //Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! + return "Purpur"; // Purpur - Purpur > // Airplane - Airplane > // Paper - Paper > // Spigot - Spigot > // CraftBukkit - cb > vanilla! } @@ -144,14 +192,14 @@ index fe1b046f707ee145327475b7f923928f4dfcad05..c757e4fe3e511f699512dccbcb11137f private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java -index 7217088fda330c97c6edd007159aa6b2dee41bfb..e7d740e191c5ac408ba1fa493e9367dd52900a02 100644 +index 1788d79ea489e446d3d9f541693d4ba3dfc26015..e7d740e191c5ac408ba1fa493e9367dd52900a02 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java @@ -11,7 +11,7 @@ public final class Versioning { public static String getBukkitVersion() { String result = "Unknown-Version"; -- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.airplane/airplane-api/pom.properties"); // Airplane +- InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/gg.airplane/airplane-api/pom.properties"); // Tuinity // Airplane + InputStream stream = Bukkit.class.getClassLoader().getResourceAsStream("META-INF/maven/net.pl3x.purpur/purpur-api/pom.properties"); // Airplane // Purpur Properties properties = new Properties(); diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index 0c3b7cfcf..52f315241 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -5,14 +5,14 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/com/destroystokyo/paper/Metrics.java b/src/main/java/com/destroystokyo/paper/Metrics.java -index 9d70f944af2c81ab5ab23b06857d740db74709d9..05f1b6d103ec20f196b60944f5bc007384c449f1 100644 +index f5d01bce4d5547b4aeca96b7962b2090f47ea541..05f1b6d103ec20f196b60944f5bc007384c449f1 100644 --- a/src/main/java/com/destroystokyo/paper/Metrics.java +++ b/src/main/java/com/destroystokyo/paper/Metrics.java @@ -593,8 +593,7 @@ public class Metrics { boolean logFailedRequests = config.getBoolean("logFailedRequests", false); // Only start Metrics, if it's enabled in the config if (config.getBoolean("enabled", true)) { -- Metrics metrics = new Metrics("Airplane", serverUUID, logFailedRequests, Bukkit.getLogger()); // Airplane +- Metrics metrics = new Metrics("Airplane", serverUUID, logFailedRequests, Bukkit.getLogger()); // Tuinity - we have our own bstats page // Airplane - + Metrics metrics = new Metrics("Purpur", serverUUID, logFailedRequests, Bukkit.getLogger()); // Airplane // Purpur metrics.addCustomChart(new Metrics.SimplePie("minecraft_version", () -> { @@ -23,14 +23,14 @@ index 9d70f944af2c81ab5ab23b06857d740db74709d9..05f1b6d103ec20f196b60944f5bc0073 metrics.addCustomChart(new Metrics.SingleLineChart("players", () -> Bukkit.getOnlinePlayers().size())); - metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : "offline")); -- metrics.addCustomChart(new Metrics.SimplePie("airplane_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Airplane +- metrics.addCustomChart(new Metrics.SimplePie("airplane_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Tuinity - we have our own bstats page // Airplane + metrics.addCustomChart(new Metrics.SimplePie("online_mode", () -> Bukkit.getOnlineMode() ? "online" : (PaperConfig.isProxyOnlineMode() ? "bungee" : "offline"))); // Purpur + metrics.addCustomChart(new Metrics.SimplePie("purpur_version", () -> (Metrics.class.getPackage().getImplementationVersion() != null) ? Metrics.class.getPackage().getImplementationVersion() : "unknown")); // Airplane // Purpur metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index c6dd2567ac88c7bfff0a23201752fa6561f2565b..7c1852f3ffce977506689f86d6b875fe1c8e11b7 100644 +index da67fb1d6c6719e757ad600fe5ea36e9e18b1325..3781e7c23347a5860c448a94bd01cb90979d9d4a 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -118,6 +118,11 @@ public class PaperConfig { diff --git a/patches/server/0009-Timings-stuff.patch b/patches/server/0009-Timings-stuff.patch index 3b5ae8de1..6c1b56a8c 100644 --- a/patches/server/0009-Timings-stuff.patch +++ b/patches/server/0009-Timings-stuff.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Timings stuff diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index 5fc65b0224b5c56039d60baf30f2de35f8bfb1c6..6d4f049cd77599d9cc0ed79e70902eb1ddc03f02 100644 +index da6a5b1b2f5203a0fab8e4fccd727951df7c9c9a..bca3bc0b8687940dff181bab6a5a2a3c11423358 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -226,10 +226,14 @@ public class TimingsExport extends Thread { @@ -17,9 +17,9 @@ index 5fc65b0224b5c56039d60baf30f2de35f8bfb1c6..6d4f049cd77599d9cc0ed79e70902eb1 + pair("server.properties", mapAsJSON(Bukkit.spigot().getServerProperties())), pair("bukkit", mapAsJSON(Bukkit.spigot().getBukkitConfig(), null)), + pair("spigot", mapAsJSON(Bukkit.spigot().getSpigotConfig(), null)), - pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), -- pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)) -+ pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)), + pair("paper", mapAsJSON(Bukkit.spigot().getPaperConfig(), null)), // Airplane +- pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)) // Airplane ++ pair("airplane", mapAsJSON(gg.airplane.AirplaneConfig.getConfigCopy(), null)), // Airplane + pair("purpur", mapAsJSON(Bukkit.spigot().getPurpurConfig(), null)) + // Purpur end )); @@ -46,7 +46,7 @@ index 5fc65b0224b5c56039d60baf30f2de35f8bfb1c6..6d4f049cd77599d9cc0ed79e70902eb1 JSONObject object = new JSONObject(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 7c1852f3ffce977506689f86d6b875fe1c8e11b7..0c1c88a79d055566c0e19f9372a74f6da8c1ecda 100644 +index 3781e7c23347a5860c448a94bd01cb90979d9d4a..977363508e090ede5191f7dbc4c258bfb0a9c911 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -217,7 +217,7 @@ public class PaperConfig { diff --git a/patches/server/0256-Apply-paper-s-reobf-mappings-patch.patch b/patches/server/0256-Apply-paper-s-reobf-mappings-patch.patch deleted file mode 100644 index dc0d68063..000000000 --- a/patches/server/0256-Apply-paper-s-reobf-mappings-patch.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> -Date: Wed, 30 Jun 2021 02:33:18 -0700 -Subject: [PATCH] Apply paper's reobf mappings patch - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 628ac56388882a1bcbeae37769a99e9ccb071f66..399641413d38f1a27165a0cf60b6c7c781cf1488 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -2,9 +2,12 @@ import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCach - import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer - import io.papermc.paperweight.tasks.BaseTask - import io.papermc.paperweight.util.Git -+import io.papermc.paperweight.util.cache - import io.papermc.paperweight.util.defaultOutput - import io.papermc.paperweight.util.openZip - import io.papermc.paperweight.util.path -+import io.papermc.paperweight.util.registering -+import io.papermc.paperweight.util.set - import shadow.org.apache.logging.log4j.core.config.plugins.processor.PluginProcessor.PLUGIN_CACHE_FILE - import java.nio.file.Files - import java.util.Locale -@@ -145,6 +148,22 @@ relocation { - } - } - -+val generateReobfMappings = rootProject.tasks.named("generateReobfMappings") -+ -+val patchReobfMappings by tasks.registering { -+ inputMappings.set(generateReobfMappings.flatMap { it.reobfMappings }) -+ patch.set(rootProject.layout.cache.resolve("paperweight/upstreams/paper/build-data/reobf-mappings-patch.tiny")) -+ -+ fromNamespace.set(io.papermc.paperweight.util.constants.DEOBF_NAMESPACE) -+ toNamespace.set(io.papermc.paperweight.util.constants.SPIGOT_NAMESPACE) -+ -+ outputMappings.set(layout.cache.resolve("paperweight/mappings/reobf-patched.tiny")) -+} -+ -+tasks.reobfJar { -+ mappingsFile.set(patchReobfMappings.flatMap { it.outputMappings }) -+} -+ - val generatePom = tasks.named("generatePomFileForMavenPublication") - - tasks.shadowJar {