Swap some nullable annotations (#10960)

patches/api/Add-more-Witch-API.patch

@@ -48,7 +48,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     *
 +     * @return The potion the witch is drinking
 +     */
-+    @Nullable ItemStack getDrinkingPotion();
++    @org.jetbrains.annotations.NotNull
++    ItemStack getDrinkingPotion();
 +
 +    /**
 +     * Set the potion the Witch should drink

patches/api/Add-villager-reputation-API.patch

@@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     * @param uniqueId The {@link UUID} of the player to get the reputation of.
 +     * @return The player's copied reputation with this villager.
 +     */
-+    @Nullable
++    @NotNull
 +    public com.destroystokyo.paper.entity.villager.Reputation getReputation(@NotNull UUID uniqueId);
 +
 +    /**

patches/api/EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -24,7 +24,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        return this.shouldConsumeItem();
 +    }
 +
-+    @NotNull @Deprecated
++    @Nullable @Deprecated
 +    public ItemStack getArrowItem() {
 +        return this.getConsumable();
 +    }

patches/api/Fix-Spigot-annotation-mistakes.patch

@@ -795,6 +795,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Contract("null -> null")
      @Nullable
      public static EntityType fromName(@Nullable String name) {
+diff --git a/src/main/java/org/bukkit/entity/ItemDisplay.java b/src/main/java/org/bukkit/entity/ItemDisplay.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/ItemDisplay.java
++++ b/src/main/java/org/bukkit/entity/ItemDisplay.java
+@@ -0,0 +0,0 @@ public interface ItemDisplay extends Display {
+      *
+      * @return the displayed item stack
+      */
+-    @Nullable
++    @NotNull // Paper
+     ItemStack getItemStack();
+ 
+     /**
 diff --git a/src/main/java/org/bukkit/entity/LightningStrike.java b/src/main/java/org/bukkit/entity/LightningStrike.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/LightningStrike.java
@@ -885,6 +898,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @Deprecated // Paper
      public MaterialData getDisplayBlock();
  
+     /**
+diff --git a/src/main/java/org/bukkit/entity/OminousItemSpawner.java b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/OminousItemSpawner.java
++++ b/src/main/java/org/bukkit/entity/OminousItemSpawner.java
+@@ -0,0 +0,0 @@ public interface OminousItemSpawner extends Entity {
+      *
+      * @return the item
+      */
+-    @Nullable
++    @org.jetbrains.annotations.NotNull // Paper
+     ItemStack getItem();
+ 
      /**
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
@@ -939,6 +965,29 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -@Deprecated
 +@Deprecated(forRemoval = true) // Paper
  public interface SplashPotion extends ThrownPotion { }
+diff --git a/src/main/java/org/bukkit/entity/ZombieVillager.java b/src/main/java/org/bukkit/entity/ZombieVillager.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/entity/ZombieVillager.java
++++ b/src/main/java/org/bukkit/entity/ZombieVillager.java
+@@ -0,0 +0,0 @@ public interface ZombieVillager extends Zombie {
+      * Sets the villager profession of this zombie.
+      */
+     @Override
+-    void setVillagerProfession(@Nullable Villager.Profession profession);
++    void setVillagerProfession(@NotNull Villager.Profession profession); // Paper
+ 
+     /**
+      * Returns the villager profession of this zombie.
+      *
+-     * @return the profession or null
++     * @return the profession
+      */
+     @Override
+-    @Nullable
++    @NotNull // Paper
+     Villager.Profession getVillagerProfession();
+ 
+     /**
 diff --git a/src/main/java/org/bukkit/entity/memory/MemoryKey.java b/src/main/java/org/bukkit/entity/memory/MemoryKey.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/entity/memory/MemoryKey.java