diff --git a/gradle.properties b/gradle.properties index 15c4d09..fafab14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = gg.projecteden.parchment version = 1.19-R0.1-SNAPSHOT mcVersion = 1.19 -paperRef = 1bd678c494009f2707b3cdf48ed10cd95b7e3fd5 +paperRef = b327e17634db1798ad854300dac85107e7fb7b73 org.gradle.caching=true org.gradle.parallel=true diff --git a/patches/api/0008-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch index 88e642f..fbed74d 100644 --- a/patches/api/0008-Expose-MCUtil-Executors.patch +++ b/patches/api/0008-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index e756edf56995f4552387c2e1082307eb3dd48bb3..e4cefd01d6400bfd3192f7b27f3fa7e9984fb7df 100644 +index 56e261efa654e4a6872ccea28f0461df13845d13..be4471e5ac6645cb208cb68de2a7f278c9fa198c 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2090,4 +2090,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2105,4 +2105,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi */ @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer(); // Paper end diff --git a/patches/api/0010-Add-Furnace-Recipe-API.patch b/patches/api/0010-Add-Furnace-Recipe-API.patch index c5a23d8..25d3ade 100644 --- a/patches/api/0010-Add-Furnace-Recipe-API.patch +++ b/patches/api/0010-Add-Furnace-Recipe-API.patch @@ -64,10 +64,10 @@ index 0000000000000000000000000000000000000000..28c01caa9d6379046f6af6612719b404 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 7ad1cabe05277c1f3238da6e121c35d8a9f0d952..2fd4f6a97a5964e187ee06a66d48e7e6021155d4 100644 +index e8c0c853eb52d1473c20231660355f77b1f7e016..60172dd594e51351c8253446f6d8c1347920b2a0 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -3909,6 +3909,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -3985,6 +3985,36 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/patches/api/0012-Add-Player-getHiddenEntities-API.patch b/patches/api/0012-Add-Player-getHiddenEntities-API.patch index 261ed97..1d2c3f8 100644 --- a/patches/api/0012-Add-Player-getHiddenEntities-API.patch +++ b/patches/api/0012-Add-Player-getHiddenEntities-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index e185b33daf7054e226944d30cfa8f08c97b4ce5f..07b95d18aec6813e1ca1b8dc15a5329ea9b37ed8 100644 +index 53957259b284a7cfbfcbb6d64c5a981999d161d6..1c42b484882a5e6f2c8276c428824b2cbf6a39e3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1426,6 +1426,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1433,6 +1433,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @org.jetbrains.annotations.ApiStatus.Experimental // Paper public boolean canSee(@NotNull Entity entity); diff --git a/patches/api/0013-Add-Timings-Events.patch b/patches/api/0013-Add-Timings-Events.patch index f9e0755..c4a4d3e 100644 --- a/patches/api/0013-Add-Timings-Events.patch +++ b/patches/api/0013-Add-Timings-Events.patch @@ -4,8 +4,46 @@ Date: Mon, 18 Jul 2022 20:15:42 -0400 Subject: [PATCH] Add Timings Events +diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java +index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..90f8f7a0996cf1a6f6b3e9eef0243b2d629a1214 100644 +--- a/src/main/java/co/aikar/timings/Timings.java ++++ b/src/main/java/co/aikar/timings/Timings.java +@@ -23,6 +23,8 @@ + */ + package co.aikar.timings; + ++import co.aikar.timings.event.TimingsModifyEvent; ++import co.aikar.timings.event.TimingsModifyEvent.Action; + import com.google.common.base.Preconditions; + import com.google.common.collect.EvictingQueue; + import com.google.common.collect.Lists; +@@ -135,7 +137,24 @@ public final class Timings { + * @param enabled Should timings be reported + */ + public static void setTimingsEnabled(boolean enabled) { ++ setTimingsEnabled(enabled, null); ++ } ++ ++ /** ++ *

Sets whether or not the Spigot Timings system should be enabled

++ * ++ * Calls a {@link TimingsModifyEvent}, if cancelled the timings will not be reset ++ * ++ * @param enabled Should timings be reported ++ * @param sender The sender asking to reset ++ */ ++ public static void setTimingsEnabled(boolean enabled, CommandSender sender) { + timingsEnabled = enabled; ++ if (sender != null) { ++ if (!new co.aikar.timings.event.TimingsModifyEvent(sender, Action.RESET).callEvent()) { ++ return; ++ } ++ } + reset(); + } + diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java -index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b9b41e54a70f8f81e600fc435fc6c184e310bf09 100644 +index 3132dc98d26c54c5e46162e53aaed195d7335c8d..f44ec5789bc98d5558eee6cff39770b4192c3e3c 100644 --- a/src/main/java/co/aikar/timings/TimingsCommand.java +++ b/src/main/java/co/aikar/timings/TimingsCommand.java @@ -59,12 +59,14 @@ public class TimingsCommand extends BukkitCommand { @@ -58,10 +96,10 @@ index 3132dc98d26c54c5e46162e53aaed195d7335c8d..b9b41e54a70f8f81e600fc435fc6c184 } else if ( "paste".equalsIgnoreCase(arg) || diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java -index 34f4c02c3bdbe571a7efb1f8c61d8924b0c81268..e00b5149b10310b3b2bf7c9fcab1bce3d0b5c50e 100644 +index 34f4c02c3bdbe571a7efb1f8c61d8924b0c81268..093c1bc755061dc6f54e5dce1ef68fd027fc43a6 100644 --- a/src/main/java/co/aikar/timings/TimingsReportListener.java +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java -@@ -58,7 +62,9 @@ public class TimingsReportListener implements net.kyori.adventure.audience.Forwa +@@ -58,7 +58,9 @@ public class TimingsReportListener implements net.kyori.adventure.audience.Forwa @Override public void sendMessage(final @NotNull net.kyori.adventure.identity.Identity source, final @NotNull net.kyori.adventure.text.Component message, final @NotNull net.kyori.adventure.audience.MessageType type) { @@ -72,7 +110,7 @@ index 34f4c02c3bdbe571a7efb1f8c61d8924b0c81268..e00b5149b10310b3b2bf7c9fcab1bce3 } @NotNull -@@ -69,7 +75,9 @@ public class TimingsReportListener implements net.kyori.adventure.audience.Forwa +@@ -69,7 +71,9 @@ public class TimingsReportListener implements net.kyori.adventure.audience.Forwa @Override public void sendMessage(@NotNull String message) { @@ -85,7 +123,7 @@ index 34f4c02c3bdbe571a7efb1f8c61d8924b0c81268..e00b5149b10310b3b2bf7c9fcab1bce3 public void addConsoleIfNeeded() { diff --git a/src/main/java/co/aikar/timings/event/TimingsEvent.java b/src/main/java/co/aikar/timings/event/TimingsEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..2abce3d7a89b2dd1657870d86772ef5bc4623235 +index 0000000000000000000000000000000000000000..df78c90859999ec18c7b8758e0f1c71281e1abe4 --- /dev/null +++ b/src/main/java/co/aikar/timings/event/TimingsEvent.java @@ -0,0 +1,34 @@ @@ -233,41 +271,3 @@ index 0000000000000000000000000000000000000000..1fe9bbedf23fdf7b02de02f5d184d8d9 + } + +} -diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java -index dd72a34eaa4bedd9ea0b92eaa79091b00eb4dd09..90f8f7a0996cf1a6f6b3e9eef0243b2d629a1214 100644 ---- a/src/main/java/co/aikar/timings/Timings.java -+++ b/src/main/java/co/aikar/timings/Timings.java -@@ -23,6 +23,8 @@ - */ - package co.aikar.timings; - -+import co.aikar.timings.event.TimingsModifyEvent; -+import co.aikar.timings.event.TimingsModifyEvent.Action; - import com.google.common.base.Preconditions; - import com.google.common.collect.EvictingQueue; - import com.google.common.collect.Lists; -@@ -135,7 +137,24 @@ public final class Timings { - * @param enabled Should timings be reported - */ - public static void setTimingsEnabled(boolean enabled) { -+ setTimingsEnabled(enabled, null); -+ } -+ -+ /** -+ *

Sets whether or not the Spigot Timings system should be enabled

-+ * -+ * Calls a {@link TimingsModifyEvent}, if cancelled the timings will not be reset -+ * -+ * @param enabled Should timings be reported -+ * @param sender The sender asking to reset -+ */ -+ public static void setTimingsEnabled(boolean enabled, CommandSender sender) { - timingsEnabled = enabled; -+ if (sender != null) { -+ if (!new co.aikar.timings.event.TimingsModifyEvent(sender, Action.RESET).callEvent()) { -+ return; -+ } -+ } - reset(); - } - diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 4169e0a..ebb0fdd 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -104,10 +104,10 @@ index bf42969859545a8a520923ef1836ffa4a5cc24a0..2532e265c5dade55f71c34fcab6d1e74 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 77cd45f616e2ff38ad6a648b8b865a99e544f3ec..518b6dfd4dd083e23ae519061664e74cd31d4e5f 100644 +index 35a5cc8ed861401d3dd28b08ebc5d40aad82b0df..101109e0ddf51231ab40e77a7d5a2013f826accd 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1654,7 +1654,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop