feat: update upstream

gradle.properties

@@ -2,7 +2,7 @@ group = gg.projecteden.parchment
 version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
-paperRef = 225c95025bdd6bab445cf109cc7d63637e1bf2e5
+paperRef = fead63e2eac3e11c900e68d468d51eb5ef091059
 
 org.gradle.caching=true
 org.gradle.parallel=true

patches/api/0002-Add-SoundEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add SoundEvent
 
 diff --git a/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..0bb783a6a86681fa54a738a3851e9079d4befa87
+index 0000000000000000000000000000000000000000..14fa1d766f49eed2907214fc536222bae9167a85
 --- /dev/null
 +++ b/src/main/java/gg/projecteden/parchment/event/sound/SoundEvent.java
 @@ -0,0 +1,359 @@
@@ -305,7 +305,7 @@ index 0000000000000000000000000000000000000000..0bb783a6a86681fa54a738a3851e9079
 +
 +    private record WrappedRecipientsFunction(@NotNull Function<SoundEvent, List<Player>> wrapped) implements Function<SoundEvent, List<Player>> {
 +        @Override
-+        public List<Player> apply(SoundEvent event) {
++        public @NotNull List<Player> apply(@NotNull SoundEvent event) {
 +            List<Player> recipients = wrapped.apply(event);
 +            HumanEntity except = event.getException();
 +            if (except != null) {

patches/api/0012-Add-Timings-Events.patch

@@ -95,10 +95,10 @@ index 3af5b8ea795311582044c712de50d29412024b77..806a1e528aae9a26413b483855130bef
  
 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..df78c90859999ec18c7b8758e0f1c71281e1abe4
+index 0000000000000000000000000000000000000000..9ad67d72e6173d1629f862ca9fd13475950709f0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/event/TimingsEvent.java
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,36 @@
 +package co.aikar.timings.event;
 +
 +import org.bukkit.Bukkit;
@@ -107,19 +107,21 @@ index 0000000000000000000000000000000000000000..df78c90859999ec18c7b8758e0f1c712
 +import org.bukkit.event.HandlerList;
 +import org.jetbrains.annotations.NotNull;
 +
++import java.util.Collection;
++import java.util.HashSet;
 +import java.util.Set;
 +
 +public abstract class TimingsEvent extends Event {
 +
-+    private final Set<CommandSender> audience;
++    private final @NotNull Set<CommandSender> audience;
 +    private static final HandlerList handlers = new HandlerList();
 +
-+    public TimingsEvent(Set<CommandSender> audience) {
++    public TimingsEvent(@NotNull Collection<CommandSender> audience) {
 +        super(!Bukkit.isPrimaryThread());
-+        this.audience = audience;
++        this.audience = new HashSet<>(audience);
 +    }
 +
-+    public Set<CommandSender> getAudience() {
++    public @NotNull Set<CommandSender> getAudience() {
 +        return this.audience;
 +    }
 +
@@ -128,62 +130,65 @@ index 0000000000000000000000000000000000000000..df78c90859999ec18c7b8758e0f1c712
 +        return handlers;
 +    }
 +
-+    public static HandlerList getHandlerList() {
++    public static @NotNull HandlerList getHandlerList() {
 +        return handlers;
 +    }
 +
 +}
 diff --git a/src/main/java/co/aikar/timings/event/TimingsGenerateReportEvent.java b/src/main/java/co/aikar/timings/event/TimingsGenerateReportEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..5ed7d1d4972842e93e2a9c2ffa799e6fc9136e63
+index 0000000000000000000000000000000000000000..33152129508c526031eee68f2ae797563d97be0c
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/event/TimingsGenerateReportEvent.java
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,20 @@
 +package co.aikar.timings.event;
 +
 +import org.bukkit.command.CommandSender;
++import org.jetbrains.annotations.NotNull;
 +
 +import java.util.Collections;
 +
 +public class TimingsGenerateReportEvent extends TimingsEvent {
 +
-+    private final String paste;
++    private final @NotNull String paste;
 +
-+    public TimingsGenerateReportEvent(CommandSender sender, String paste) {
++    public TimingsGenerateReportEvent(@NotNull CommandSender sender, @NotNull String paste) {
 +        super(Collections.singleton(sender));
 +        this.paste = paste;
 +    }
 +
-+    public String getPaste() {
++    public @NotNull String getPaste() {
 +        return this.paste;
 +    }
 +}
 diff --git a/src/main/java/co/aikar/timings/event/TimingsMessageEvent.java b/src/main/java/co/aikar/timings/event/TimingsMessageEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..04ec925cfa9e385e8ad4763b18570b7bf07c4007
+index 0000000000000000000000000000000000000000..626f25e164c6b23481c5a976a6e184e739104305
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/event/TimingsMessageEvent.java
-@@ -0,0 +1,33 @@
+@@ -0,0 +1,35 @@
 +package co.aikar.timings.event;
 +
 +import net.kyori.adventure.text.Component;
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.event.Cancellable;
++import org.jetbrains.annotations.NotNull;
 +
++import java.util.Collection;
 +import java.util.HashSet;
 +import java.util.List;
 +
 +public class TimingsMessageEvent extends TimingsEvent implements Cancellable {
 +
-+    public Component message;
++    public @NotNull Component message;
 +    private boolean cancelled;
 +
-+    public TimingsMessageEvent(List<CommandSender> senders, Component message) {
++    public TimingsMessageEvent(@NotNull Collection<CommandSender> senders, @NotNull Component message) {
 +        super(new HashSet<>(senders));
 +        this.message = message;
 +    }
 +
-+    public Component getMessage() {
++    public @NotNull Component getMessage() {
 +        return this.message;
 +    }
 +
@@ -199,28 +204,29 @@ index 0000000000000000000000000000000000000000..04ec925cfa9e385e8ad4763b18570b7b
 +}
 diff --git a/src/main/java/co/aikar/timings/event/TimingsModifyEvent.java b/src/main/java/co/aikar/timings/event/TimingsModifyEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1fe9bbedf23fdf7b02de02f5d184d8d956c7056b
+index 0000000000000000000000000000000000000000..3faf845716d5d3adf360949f28a5e12aa7e20aa6
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/event/TimingsModifyEvent.java
-@@ -0,0 +1,40 @@
+@@ -0,0 +1,41 @@
 +package co.aikar.timings.event;
 +
 +import org.bukkit.command.CommandSender;
 +import org.bukkit.event.Cancellable;
++import org.jetbrains.annotations.NotNull;
 +
 +import java.util.Collections;
 +
 +public class TimingsModifyEvent extends TimingsEvent implements Cancellable {
 +
-+    private final Action action;
++    private final @NotNull Action action;
 +    private boolean cancelled = false;
 +
-+    public TimingsModifyEvent(CommandSender sender, Action action) {
++    public TimingsModifyEvent(@NotNull CommandSender sender, @NotNull Action action) {
 +        super(Collections.singleton(sender));
 +        this.action = action;
 +    }
 +
-+    public Action getAction() {
++    public @NotNull Action getAction() {
 +        return this.action;
 +    }
 +

patches/api/0016-Add-PreEntityShootBowEvent.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Add PreEntityShootBowEvent
 
 diff --git a/src/main/java/gg/projecteden/parchment/event/entity/PreEntityShootBowEvent.java b/src/main/java/gg/projecteden/parchment/event/entity/PreEntityShootBowEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7368e7b039882dd629d187502c5c90d74471590e
+index 0000000000000000000000000000000000000000..cd156e2d71728f8d30a12df87398875b1ec8915e
 --- /dev/null
 +++ b/src/main/java/gg/projecteden/parchment/event/entity/PreEntityShootBowEvent.java
 @@ -0,0 +1,61 @@
@@ -23,22 +23,22 @@ index 0000000000000000000000000000000000000000..7368e7b039882dd629d187502c5c90d7
 +public class PreEntityShootBowEvent extends EntityEvent implements Cancellable {
 +    private static final HandlerList handlers = new HandlerList();
 +
-+    private final ItemStack bow;
++    private final @NotNull ItemStack bow;
-+    private final ItemStack arrow;
++    private final @NotNull ItemStack arrow;
 +    boolean relative = true;
 +    boolean cancelled = false;
 +
-+    public PreEntityShootBowEvent(Entity entity, ItemStack bow, ItemStack arrow) {
++    public PreEntityShootBowEvent(@NotNull Entity entity, @NotNull ItemStack bow, @NotNull ItemStack arrow) {
 +        super(entity);
 +        this.bow = bow;
 +        this.arrow = arrow;
 +    }
 +
-+    public ItemStack getBow() {
++    public @NotNull ItemStack getBow() {
 +        return this.bow;
 +    }
 +
-+    public ItemStack getArrow() {
++    public @NotNull ItemStack getArrow() {
 +        return this.arrow;
 +    }
 +