From 196d06aa91dddc78d938c2854e0cde95e4b4ba2c Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sun, 6 Oct 2024 18:45:07 +1100 Subject: [PATCH] #1064: Add specific getTopInventory methods for InventoryView derivatives By: Miles Holder --- .../src/main/java/org/bukkit/inventory/view/AnvilView.java | 6 ++++++ .../src/main/java/org/bukkit/inventory/view/BeaconView.java | 6 ++++++ .../java/org/bukkit/inventory/view/BrewingStandView.java | 6 ++++++ .../main/java/org/bukkit/inventory/view/CrafterView.java | 6 ++++++ .../java/org/bukkit/inventory/view/EnchantmentView.java | 5 +++++ .../main/java/org/bukkit/inventory/view/FurnaceView.java | 6 ++++++ .../main/java/org/bukkit/inventory/view/LecternView.java | 6 ++++++ .../src/main/java/org/bukkit/inventory/view/LoomView.java | 5 +++++ .../main/java/org/bukkit/inventory/view/MerchantView.java | 5 +++++ .../java/org/bukkit/inventory/view/StonecutterView.java | 5 +++++ 10 files changed, 56 insertions(+) diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/AnvilView.java b/paper-api/src/main/java/org/bukkit/inventory/view/AnvilView.java index 0344b3db78..8963fefac4 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/AnvilView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/AnvilView.java @@ -1,6 +1,8 @@ package org.bukkit.inventory.view; +import org.bukkit.inventory.AnvilInventory; import org.bukkit.inventory.InventoryView; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -9,6 +11,10 @@ import org.jetbrains.annotations.Nullable; */ public interface AnvilView extends InventoryView { + @NotNull + @Override + AnvilInventory getTopInventory(); + /** * Gets the rename text specified within the anvil's text field. * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/BeaconView.java b/paper-api/src/main/java/org/bukkit/inventory/view/BeaconView.java index 46b2606174..7abbd83b39 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/BeaconView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/BeaconView.java @@ -1,7 +1,9 @@ package org.bukkit.inventory.view; +import org.bukkit.inventory.BeaconInventory; import org.bukkit.inventory.InventoryView; import org.bukkit.potion.PotionEffectType; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** @@ -10,6 +12,10 @@ import org.jetbrains.annotations.Nullable; */ public interface BeaconView extends InventoryView { + @NotNull + @Override + BeaconInventory getTopInventory(); + /** * Gets the tier of the beacon *

diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java b/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java index 206e9befae..f76db2757f 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/BrewingStandView.java @@ -1,6 +1,8 @@ package org.bukkit.inventory.view; +import org.bukkit.inventory.BrewerInventory; import org.bukkit.inventory.InventoryView; +import org.jetbrains.annotations.NotNull; /** * An instance of {@link InventoryView} which provides extra methods related to @@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView; */ public interface BrewingStandView extends InventoryView { + @NotNull + @Override + BrewerInventory getTopInventory(); + /** * Gets the fuel level of this brewing stand. *

diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/CrafterView.java b/paper-api/src/main/java/org/bukkit/inventory/view/CrafterView.java index 2345644482..12fe27466d 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/CrafterView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/CrafterView.java @@ -1,6 +1,8 @@ package org.bukkit.inventory.view; +import org.bukkit.inventory.CrafterInventory; import org.bukkit.inventory.InventoryView; +import org.jetbrains.annotations.NotNull; /** * An instance of {@link InventoryView} which provides extra methods related to @@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView; */ public interface CrafterView extends InventoryView { + @NotNull + @Override + CrafterInventory getTopInventory(); + /** * Checks if the given crafter slot is disabled. * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/EnchantmentView.java b/paper-api/src/main/java/org/bukkit/inventory/view/EnchantmentView.java index e3471d5067..18014f3aa0 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/EnchantmentView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/EnchantmentView.java @@ -1,6 +1,7 @@ package org.bukkit.inventory.view; import org.bukkit.enchantments.EnchantmentOffer; +import org.bukkit.inventory.EnchantingInventory; import org.bukkit.inventory.InventoryView; import org.jetbrains.annotations.NotNull; @@ -10,6 +11,10 @@ import org.jetbrains.annotations.NotNull; */ public interface EnchantmentView extends InventoryView { + @NotNull + @Override + EnchantingInventory getTopInventory(); + /** * Gets the random enchantment seed used in this view * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/FurnaceView.java b/paper-api/src/main/java/org/bukkit/inventory/view/FurnaceView.java index 3970484819..ac5acee319 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/FurnaceView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/FurnaceView.java @@ -1,7 +1,9 @@ package org.bukkit.inventory.view; import org.bukkit.block.Furnace; +import org.bukkit.inventory.FurnaceInventory; import org.bukkit.inventory.InventoryView; +import org.jetbrains.annotations.NotNull; /** * An instance of {@link InventoryView} which provides extra methods related to @@ -9,6 +11,10 @@ import org.bukkit.inventory.InventoryView; */ public interface FurnaceView extends InventoryView { + @NotNull + @Override + FurnaceInventory getTopInventory(); + /** * The cook time for this view. *

diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/LecternView.java b/paper-api/src/main/java/org/bukkit/inventory/view/LecternView.java index 216c4ed177..f48c68843a 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/LecternView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/LecternView.java @@ -1,6 +1,8 @@ package org.bukkit.inventory.view; import org.bukkit.inventory.InventoryView; +import org.bukkit.inventory.LecternInventory; +import org.jetbrains.annotations.NotNull; /** * An instance of {@link InventoryView} which provides extra methods related to @@ -8,6 +10,10 @@ import org.bukkit.inventory.InventoryView; */ public interface LecternView extends InventoryView { + @NotNull + @Override + LecternInventory getTopInventory(); + /** * Gets the page that the LecternView is on. * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/LoomView.java b/paper-api/src/main/java/org/bukkit/inventory/view/LoomView.java index b37091f8a4..b5bf0d2a01 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/LoomView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/LoomView.java @@ -3,6 +3,7 @@ package org.bukkit.inventory.view; import java.util.List; import org.bukkit.block.banner.PatternType; import org.bukkit.inventory.InventoryView; +import org.bukkit.inventory.LoomInventory; import org.jetbrains.annotations.NotNull; /** @@ -11,6 +12,10 @@ import org.jetbrains.annotations.NotNull; */ public interface LoomView extends InventoryView { + @NotNull + @Override + LoomInventory getTopInventory(); + /** * Gets a list of all selectable to the player. * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/MerchantView.java b/paper-api/src/main/java/org/bukkit/inventory/view/MerchantView.java index f7000f6c0e..8d45a7e5a2 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/MerchantView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/MerchantView.java @@ -2,6 +2,7 @@ package org.bukkit.inventory.view; import org.bukkit.inventory.InventoryView; import org.bukkit.inventory.Merchant; +import org.bukkit.inventory.MerchantInventory; import org.jetbrains.annotations.NotNull; /** @@ -10,6 +11,10 @@ import org.jetbrains.annotations.NotNull; */ public interface MerchantView extends InventoryView { + @NotNull + @Override + MerchantInventory getTopInventory(); + /** * Gets the merchant that this view is for. * diff --git a/paper-api/src/main/java/org/bukkit/inventory/view/StonecutterView.java b/paper-api/src/main/java/org/bukkit/inventory/view/StonecutterView.java index 4ff11fe782..9805ea5b2f 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/view/StonecutterView.java +++ b/paper-api/src/main/java/org/bukkit/inventory/view/StonecutterView.java @@ -2,6 +2,7 @@ package org.bukkit.inventory.view; import java.util.List; import org.bukkit.inventory.InventoryView; +import org.bukkit.inventory.StonecutterInventory; import org.bukkit.inventory.StonecuttingRecipe; import org.jetbrains.annotations.NotNull; @@ -11,6 +12,10 @@ import org.jetbrains.annotations.NotNull; */ public interface StonecutterView extends InventoryView { + @NotNull + @Override + StonecutterInventory getTopInventory(); + /** * Gets the current index of the selected recipe. *