From 32fc651f97864733201aac7347921fa26fec5dc9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Wed, 13 Oct 2021 07:51:34 -0500 Subject: [PATCH] Updated Upstream (Paper & Airplane) Upstream has released updates that appear to apply and compile correctly Paper Changes: https://github.com/PaperMC/Paper/commit/b470400d5c7029fb6f608c11dfb927cc9bb5823d Add methods to find targets for lightning strikes (#6712) https://github.com/PaperMC/Paper/commit/381a1462b33eb22c2c37b1ae0d2e5f4379243c74 Fix unplaced block states after new chunk gen API (#6747) https://github.com/PaperMC/Paper/commit/523a55c609e0b939b8fb15793f851503cea8da28 Fix loading cmds in datapacks (#6641) https://github.com/PaperMC/Paper/commit/a61827df9109522f4e84cbe312f6185ba9d7a254 VanillaCommandWrapper didnt account for entity senders (#6586) https://github.com/PaperMC/Paper/commit/cd610df101fe36efe946b841f5e1f04446db1661 Re-readd root/admin user detection (#6703) https://github.com/PaperMC/Paper/commit/4a0d935cd090b455be0d1c3d4b6f6d924a08faa5 Always allow item changing in EntityFireball (#5493) https://github.com/PaperMC/Paper/commit/54813dbb212bd5860db50098a5a7713d8f95cf98 [ci skip] Misc gradle updates (#6763) https://github.com/PaperMC/Paper/commit/56e65fd3a7b64f3baccd3d4b5364133cc50a07d1 Null check isApplicable for CraftBlockEntityState#update https://github.com/PaperMC/Paper/commit/857524864847552e74029c1351e8791206aeb919 Use ChatRenderer.defaultRenderer() when legacy events have not modified the format (#6104) Airplane Changes: https://github.com/TECHNOVE/Airplane/commit/f96ca1ce5db894dab34b86350ccf35848cf241a9 Upstream https://github.com/TECHNOVE/Airplane/commit/89cdb2c72a3dd9765415403837b50b4840ad03dc Update Paperweight deps https://github.com/TECHNOVE/Airplane/commit/317e61bb4854c7617b33b0ae6d7b87757d9eac76 We love CI testing --- gradle.properties | 2 +- .../server/0001-Airplane-Server-Changes.patch | 29 +++++-------------- patches/server/0003-Rebrand.patch | 14 ++++----- patches/server/0004-Purpur-config-files.patch | 4 +-- ...x-vanilla-command-permission-handler.patch | 6 ++-- patches/server/0141-Implement-TPSBar.patch | 10 +++---- ...omizable-sleeping-actionbar-messages.patch | 6 ++-- ...ain-and-thunder-should-stop-on-sleep.patch | 8 ++--- .../server/0260-UPnP-Port-Forwarding.patch | 6 ++-- 9 files changed, 36 insertions(+), 49 deletions(-) diff --git a/gradle.properties b/gradle.properties index ca70a9143..cb6802816 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 = 975f2e5104b961f491ed2dde97de12d1cbb50d1f +paperCommit = 857524864847552e74029c1351e8791206aeb919 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 47e7344b5..d359785b2 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -19,23 +19,10 @@ 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 cb1a931417073908be5c7aa1af710477775b3dbd..fdc3f2390d8d0124102cbff386e8a981c6f92c22 100644 +index 13f89bdaf1ada33060b1ee4d6f2860ec194b68a4..0bd09bd56968660437a94ec078a13ee78339fa0e 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 -@@ -28,8 +31,8 @@ repositories { +@@ -25,8 +25,8 @@ repositories { } dependencies { @@ -46,7 +33,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..fdc3f2390d8d0124102cbff386e8a981 // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") implementation("net.minecrell:terminalconsoleappender:1.2.0") -@@ -64,6 +67,13 @@ dependencies { +@@ -61,6 +61,13 @@ 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 @@ -60,7 +47,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..fdc3f2390d8d0124102cbff386e8a981 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,6 +92,7 @@ tasks.jar { +@@ -79,6 +86,7 @@ tasks.jar { "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", "Implementation-Version" to "git-Paper-$implementationVersion", @@ -68,7 +55,7 @@ index cb1a931417073908be5c7aa1af710477775b3dbd..fdc3f2390d8d0124102cbff386e8a981 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -139,6 +150,22 @@ relocation { +@@ -136,6 +144,22 @@ relocation { } } @@ -2229,10 +2216,10 @@ index c8876b000a03f18e7a140167ed4505a9843a8d14..c80a600b72972c2e8b7d472e2e11c312 } diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index 7ce1ce59eeba8b57cd76b1c9c561733b476e7ebf..291e96aac85e86e1f5d2c295adb1b9e05b2f2528 100644 +index b6ee0e709b0f0529b99567bc9b8fb6bfd99bcd8e..e2901132b78126c0a4eb04363dfe6a0dccd1313f 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -224,6 +224,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -234,6 +234,8 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface io.papermc.paper.util.ObfHelper.INSTANCE.getClass(); // load mappings for stacktrace deobf and etc. io.papermc.paper.brigadier.PaperBrigadierProviderImpl.INSTANCE.getClass(); // init PaperBrigadierProvider // Paper end @@ -2317,7 +2304,7 @@ index b7c9294fdd3d799d410afba4a1118aa371c98533..c71bc00973899feec0ec5530bf3d2379 this.wasOnGround = this.entity.isOnGround(); this.teleportDelay = 0; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 9e4ad810dd6348ad95c9a7e6d1bd63f6ec37c986..416f579560115caddadf6a400b80a4d1d6ebe04c 100644 +index 96ccf894519fc892e35fbd13ab97fe289236caca..86b6d4b4984c7dc41026bffb695fe9e573c48891 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -772,7 +772,20 @@ public class ServerLevel extends Level implements WorldGenLevel { diff --git a/patches/server/0003-Rebrand.patch b/patches/server/0003-Rebrand.patch index 19b82cf97..87030451a 100644 --- a/patches/server/0003-Rebrand.patch +++ b/patches/server/0003-Rebrand.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index fdc3f2390d8d0124102cbff386e8a981c6f92c22..f304212a962911fe9bf6a5dd2336ee9850f58f0a 100644 +index 0bd09bd56968660437a94ec078a13ee78339fa0e..dc6c416bb2145bb684e1dedda626263d423cba67 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -31,7 +31,7 @@ repositories { +@@ -25,7 +25,7 @@ repositories { } dependencies { @@ -17,7 +17,7 @@ index fdc3f2390d8d0124102cbff386e8a981c6f92c22..f304212a962911fe9bf6a5dd2336ee98 implementation("io.papermc.paper:paper-mojangapi:1.17.1-R0.1-SNAPSHOT") // Airplane // Paper start implementation("org.jline:jline-terminal-jansi:3.12.1") -@@ -63,6 +63,8 @@ dependencies { +@@ -57,6 +57,8 @@ dependencies { implementation("co.aikar:cleaner:1.0-SNAPSHOT") // Paper implementation("io.netty:netty-all:4.1.65.Final") // Paper @@ -26,7 +26,7 @@ index fdc3f2390d8d0124102cbff386e8a981c6f92c22..f304212a962911fe9bf6a5dd2336ee98 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 -@@ -91,8 +93,7 @@ tasks.jar { +@@ -85,8 +87,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -36,7 +36,7 @@ index fdc3f2390d8d0124102cbff386e8a981c6f92c22..f304212a962911fe9bf6a5dd2336ee98 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -233,7 +234,7 @@ tasks.test { +@@ -228,7 +229,7 @@ tasks.test { fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -125,10 +125,10 @@ index c80a600b72972c2e8b7d472e2e11c312adaa06e1..0f7189ee1b16717ca2011e69e645a596 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 291e96aac85e86e1f5d2c295adb1b9e05b2f2528..d9bee4649ce376e8ef44720161bbeb4139e1132a 100644 +index e2901132b78126c0a4eb04363dfe6a0dccd1313f..69dae20c0ff581359042899d615ebcdd7140c02a 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -284,11 +284,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -294,11 +294,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!"); DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware."); // Spigot start diff --git a/patches/server/0004-Purpur-config-files.patch b/patches/server/0004-Purpur-config-files.patch index 89e433508..5e7d7cebe 100644 --- a/patches/server/0004-Purpur-config-files.patch +++ b/patches/server/0004-Purpur-config-files.patch @@ -81,10 +81,10 @@ index 71e29d29ed5c2d61832e2f124967bb223708406f..224669ecaad37ac2f16900700eea40ef if (this.source.acceptsSuccess() && !this.silent) { this.source.sendMessage(message, Util.NIL_UUID); diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -index d9bee4649ce376e8ef44720161bbeb4139e1132a..25cd8b550a81cf144fed62f32320cd2e0ab11f94 100644 +index 69dae20c0ff581359042899d615ebcdd7140c02a..235e16740ad0419b8ea8793af2f6013fda24d503 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java -@@ -220,6 +220,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface +@@ -230,6 +230,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface } thread.start(); // Paper - start console thread after MinecraftServer.console & PaperConfig are initialized com.destroystokyo.paper.PaperConfig.registerCommands(); diff --git a/patches/server/0027-Fix-vanilla-command-permission-handler.patch b/patches/server/0027-Fix-vanilla-command-permission-handler.patch index c9a502e9a..212cfb9a0 100644 --- a/patches/server/0027-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0027-Fix-vanilla-command-permission-handler.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Fix vanilla command permission handler diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -index 30274979d8dafc7c0a374c3e6b1d1b5dbd6cfe4c..a3bc8192c10f888c0d395709108019670f0bad62 100644 +index f64aa22ed6fcb4af67317b99f459ee5296392548..36c91793e0aa4895193623cf8cba7820d31f4eca 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java @@ -34,6 +34,7 @@ public abstract class CommandNode implements Comparable> { @@ -17,10 +17,10 @@ index 30274979d8dafc7c0a374c3e6b1d1b5dbd6cfe4c..a3bc8192c10f888c0d39570910801967 public void removeCommand(String name) { this.children.remove(name); diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -index e9d1fb479855194da5a05e86861848158736cbb4..b06f070a8030e5a6d965a2705749874895db58b6 100644 +index 4aa1dc543950b5de64345b3403a6d0bc41c521df..1c19a64da230268ceb9124bb7e1a141d78ac3393 100644 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java -@@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { +@@ -89,6 +89,7 @@ public final class VanillaCommandWrapper extends BukkitCommand { } public static String getPermission(CommandNode vanillaCommand) { diff --git a/patches/server/0141-Implement-TPSBar.patch b/patches/server/0141-Implement-TPSBar.patch index 8a4c1f76c..d1111be55 100644 --- a/patches/server/0141-Implement-TPSBar.patch +++ b/patches/server/0141-Implement-TPSBar.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Implement TPSBar diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java -index 42deff516bd363d0882b441fa6928ac7eecbfccc..386e9ad013369633e2be543b9281e5a5fdce9c74 100644 +index 4308cf798c7f97532ee56369a11afe4dbf7a898f..d734addd622f6d429a79df08310bce562db3425e 100644 --- a/src/main/java/net/minecraft/commands/Commands.java +++ b/src/main/java/net/minecraft/commands/Commands.java @@ -201,6 +201,7 @@ public class Commands { @@ -17,7 +17,7 @@ index 42deff516bd363d0882b441fa6928ac7eecbfccc..386e9ad013369633e2be543b9281e5a5 if (environment.includeIntegrated) { diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 41b58dae909445c677ce4b66a3f2020b9153d359..9c5c4db0638591f030008322003c6cb0d097034c 100644 +index c4d33daf24df7c5955f282da312a2c9384de1ff4..d87f8d7414d630890c33e41e602936068d48abd3 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1134,6 +1134,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop