mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Finish converting all events to jspecify annotations

Browse source
This commit is contained in:
Jake Potrebic 2024-09-29 16:48:34 -07:00
parent fa97c59a4e
commit 29a25df60e
78 changed files with 757 additions and 883 deletions
Download patch file Download diff file Expand all files Collapse all files

11
patches/api/Add-PlayerInventorySlotChangeEvent.patch
View file

@ -17,11 +17,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import org.bukkit.event.player.PlayerEvent;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NullMarked;
+
+/**
+ * Called when a slot contents change in a player's inventory.
+ */
+@NullMarked
+public class PlayerInventorySlotChangeEvent extends PlayerEvent {
+
+ private static final HandlerList HANDLER_LIST = new HandlerList();
@ -32,7 +33,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private final ItemStack newItemStack;
+ private boolean triggerAdvancements = true;
+
+ public PlayerInventorySlotChangeEvent(@NotNull Player player, int rawSlot, @NotNull ItemStack oldItemStack, @NotNull ItemStack newItemStack) {
+ public PlayerInventorySlotChangeEvent(final Player player, final int rawSlot, final ItemStack oldItemStack, final ItemStack newItemStack) {
+ super(player);
+ this.rawSlot = rawSlot;
+ this.slot = player.getOpenInventory().convertSlot(rawSlot);
@ -67,7 +68,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @return The old ItemStack in the slot.
+ */
+ @NotNull
+ public ItemStack getOldItemStack() {
+ return this.oldItemStack;
+ }
@ -77,7 +77,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @return The new ItemStack in the slot.
+ */
+ @NotNull
+ public ItemStack getNewItemStack() {
+ return this.newItemStack;
+ }
@ -96,17 +95,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ *
+ * @param triggerAdvancements Whether the slot change advancements will be triggered.
+ */
+ public void setShouldTriggerAdvancements(boolean triggerAdvancements) {
+ public void setShouldTriggerAdvancements(final boolean triggerAdvancements) {
+ this.triggerAdvancements = triggerAdvancements;
+ }
+
+ @NotNull
+ @Override
+ public HandlerList getHandlers() {
+ return HANDLER_LIST;
+ }
+
+ @NotNull
+ public static HandlerList getHandlerList() {
+ return HANDLER_LIST;
+ }