From 5f07aff44c0840ca92acbe3b7d48cda76c7f617b Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 21 May 2022 03:26:59 -0700 Subject: [PATCH] Updated Upstream (Paper & Pufferfish) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@7045f18 Change link to screamingsandals PaperMC/Paper@ca62386 Hide ores with deepslate at Y=4 and below (#7792) PaperMC/Paper@9b492cf Deprecate set/doesBounce from Projectile (#7800) PaperMC/Paper@ed4e916 [ci-skip] Update repository and API urls (#7835) PaperMC/Paper@fc1752f Fix more upstream javadocs (#7837) Pufferfish Changes: pufferfish-gg/Pufferfish@629b5b3 Updated Upstream (Paper) --- gradle.properties | 2 +- patches/api/0004-Purpur-config-files.patch | 4 ++-- patches/api/0011-Bring-back-server-name.patch | 4 ++-- patches/api/0014-Lagging-threshold.patch | 4 ++-- ...lict-on-change-for-adventure-deprecations.patch | 14 +++++++------- ...dded-the-ability-to-add-combustible-items.patch | 4 ++-- patches/server/0002-Rebrand.patch | 8 ++++---- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 2c01fcea3..7addb44b9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.18.2-R0.1-SNAPSHOT -paperCommit = 73bd35d07624fde87498e6e5151b2a13baae25b1 +paperCommit = fc1752ff15f442eb4488ac78e4728b91223d3e2d org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0004-Purpur-config-files.patch b/patches/api/0004-Purpur-config-files.patch index ee9c932b5..7da5a1b3e 100644 --- a/patches/api/0004-Purpur-config-files.patch +++ b/patches/api/0004-Purpur-config-files.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 743a4091e06015b303d1eebc3b6bd393f98e4b9f..541da7064f5bd563cde8475be6bc47c82d9cd22b 100644 +index 79b26045a68ebb9b01e5bd06abbccaaef5489777..30a1ba5ec7752a1771046072d00ed1718e6d0b84 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1900,6 +1900,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1897,6 +1897,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi } // Paper end diff --git a/patches/api/0011-Bring-back-server-name.patch b/patches/api/0011-Bring-back-server-name.patch index 646a45bdf..bef4594d7 100644 --- a/patches/api/0011-Bring-back-server-name.patch +++ b/patches/api/0011-Bring-back-server-name.patch @@ -25,10 +25,10 @@ index d8666481f9a407403d0114ff02024fd3c50c27c4..a1374b608c20d47fde15135089bf8ace + // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 541da7064f5bd563cde8475be6bc47c82d9cd22b..027e0141995ce8edc11ae0ab3c589ad6ac00b43c 100644 +index 30a1ba5ec7752a1771046072d00ed1718e6d0b84..0eb5c94458e7a87e6cf9d6332a0889286f96826e 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2070,4 +2070,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2067,4 +2067,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer(); // Paper end diff --git a/patches/api/0014-Lagging-threshold.patch b/patches/api/0014-Lagging-threshold.patch index 4eadef179..43338ea34 100644 --- a/patches/api/0014-Lagging-threshold.patch +++ b/patches/api/0014-Lagging-threshold.patch @@ -24,10 +24,10 @@ index a1374b608c20d47fde15135089bf8aceb98d6129..e7bca7fc74a6a2914c966183c9f83340 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 027e0141995ce8edc11ae0ab3c589ad6ac00b43c..d723e5503ddface53f670ac4e2dac2aa250f68b5 100644 +index 0eb5c94458e7a87e6cf9d6332a0889286f96826e..cc026cbb487244851f8f58b763655a583c7b32e5 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2078,5 +2078,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2075,5 +2075,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull String getServerName(); diff --git a/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch index 506a6e041..eb40143a9 100644 --- a/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch +++ b/patches/api/0032-Conflict-on-change-for-adventure-deprecations.patch @@ -72,7 +72,7 @@ index e7bca7fc74a6a2914c966183c9f83340dd510bf0..9189ada0644a226038eeb7967d45c72d return server.getShutdownMessage(); } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8b8b1f8bc 100644 +index cc026cbb487244851f8f58b763655a583c7b32e5..226dd08c1001c664d60f45a6d9370077f4b8c574 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java @@ -327,7 +327,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @@ -84,7 +84,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 public int broadcastMessage(@NotNull String message); // Paper start -@@ -976,7 +976,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -973,7 +973,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return number of message recipients * @deprecated in favour of {@link #broadcast(net.kyori.adventure.text.Component, String)} */ @@ -93,7 +93,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 public int broadcast(@NotNull String message, @NotNull String permission); // Paper start /** -@@ -1289,7 +1289,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1286,7 +1286,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * * @see InventoryType#isCreatable() */ @@ -102,7 +102,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 @NotNull Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title); -@@ -1333,7 +1333,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1330,7 +1330,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @throws IllegalArgumentException if the size is not a multiple of 9 * @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)} */ @@ -111,7 +111,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 @NotNull Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException; -@@ -1356,7 +1356,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1353,7 +1353,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)} */ @NotNull @@ -120,7 +120,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 Merchant createMerchant(@Nullable String title); /** -@@ -1459,7 +1459,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1456,7 +1456,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #motd()} */ @NotNull @@ -129,7 +129,7 @@ index d723e5503ddface53f670ac4e2dac2aa250f68b5..41fdb8e58fdf9a9153fc671d1aab45e8 String getMotd(); // Paper start -@@ -1477,7 +1477,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -1474,7 +1474,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @deprecated in favour of {@link #shutdownMessage()} */ @Nullable diff --git a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch b/patches/api/0042-Added-the-ability-to-add-combustible-items.patch index e7cd45fa3..e0225ab90 100644 --- a/patches/api/0042-Added-the-ability-to-add-combustible-items.patch +++ b/patches/api/0042-Added-the-ability-to-add-combustible-items.patch @@ -34,10 +34,10 @@ index 9189ada0644a226038eeb7967d45c72ddfc89085..8c37680ca16adbf030cfd3098330d259 // Purpur end } diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 41fdb8e58fdf9a9153fc671d1aab45e8b8b1f8bc..ccb8909d3da0bb6ccc6d35e8497c3b4b993b9044 100644 +index 226dd08c1001c664d60f45a6d9370077f4b8c574..5d1668c6f368843ec071df7d65dbd0a29be545d0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2085,5 +2085,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2082,5 +2082,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi * @return True if lagging */ boolean isLagging(); diff --git a/patches/server/0002-Rebrand.patch b/patches/server/0002-Rebrand.patch index fb2a6f257..d3578a444 100644 --- a/patches/server/0002-Rebrand.patch +++ b/patches/server/0002-Rebrand.patch @@ -45,7 +45,7 @@ index 9521971e9e597834e785b36d1657064dc1621b9b..655f4d84a9522b7af5f3fd234d879775 standardInput = System.`in` workingDir = rootProject.layout.projectDirectory diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java -index ece77f5ea4b14bbed7c070131b3251ea86764538..fba5dbdb7bcbb55400ef18342c9b54612972a718 100644 +index bf42969859545a8a520923ef1836ffa4a5cc24a0..fba5dbdb7bcbb55400ef18342c9b54612972a718 100644 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java @@ -19,8 +19,10 @@ import java.util.stream.StreamSupport; @@ -116,7 +116,7 @@ index ece77f5ea4b14bbed7c070131b3251ea86764538..fba5dbdb7bcbb55400ef18342c9b5461 if (siteApiVersion == null) { return -1; } try { try (BufferedReader reader = Resources.asCharSource( -- new URL("https://papermc.io/api/v2/projects/paper/versions/" + siteApiVersion), +- new URL("https://api.papermc.io/v2/projects/paper/versions/" + siteApiVersion), + new URL("https://api.purpurmc.org/v2/purpur/" + siteApiVersion), // Purpur Charsets.UTF_8 ).openBufferedStream()) { @@ -189,7 +189,7 @@ index 371b0f95b23d67c9913875a3dd7888e722551f18..a6f29c00d6716b501d0f52db8670d81e 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 27e90ca03275a42271bbe97ee1a63a355b098ede..1ea4178976e1583b6b0f71b26d00c024bc2ef49c 100644 +index 6afd7c8b3a0db90dbab14b4405ae4c750e5b0ef1..db2c73390d846f6428546fe18b961147ac092ba2 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java @@ -295,11 +295,12 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface @@ -221,7 +221,7 @@ index 303b70f0433ff49a3bee2a0d92c41f01aec38bee..5e9fc979daced5dad9977ab12ea019f4 private static final int DEFAULT_SIZE_THRESHOLD = 1024 * 8; diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index cca4ae47f80c45e64b4e0915d938e6e394a39b8e..de1f35271ca1ab711d2d9301c4c695219c7e170d 100644 +index f4a82b1f2dc26f938d3dcb23ec32f135a1bfd163..a2af4e9b32f9ebfb97255437a7028df8613d0d95 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -249,7 +249,7 @@ import javax.annotation.Nullable; // Paper