Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof BrowseHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof BrowseHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public static void openExisting(@NotNull HeadDBPlugin plugin, @NotNull Player pl
}

public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player player, @NotNull InventoryClickEvent event) {
if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

InventoryHolder holder = event.getView().getTopInventory().getHolder();
InventoryHolder holder = event.getView().getTopInventory().getHolder(false);
if (!(holder instanceof CreateHeadHolder) && !(holder instanceof CreateHeadSelectorHolder)) {
return false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public static void open(@NotNull HeadDBPlugin plugin, @NotNull Player player, @N
}

public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player player, @NotNull InventoryClickEvent event, @NotNull Consumer<HeadId> edit, @NotNull Consumer<ItemStack> give) {
if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public static void open(@NotNull HeadDBPlugin plugin, @NotNull Player player, @N
}

public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player player, @NotNull InventoryClickEvent event) {
if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private static void openEditor(@NotNull HeadDBPlugin plugin, @NotNull Player pla
}

public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player player, @NotNull InventoryClickEvent event) {
if (event.getView().getTopInventory().getHolder() instanceof CategoryEditorHolder editor) {
if (event.getView().getTopInventory().getHolder(false) instanceof CategoryEditorHolder editor) {
event.setCancelled(true);
if (event.getClickedInventory() == null || !event.getClickedInventory().equals(event.getView().getTopInventory())) {
return true;
Expand All @@ -137,7 +137,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
return true;
}

if (!(event.getView().getTopInventory().getHolder() instanceof MoreCategoriesHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof MoreCategoriesHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof GuiButtonEditorHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof GuiButtonEditorHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private static void open(@NotNull HeadDBPlugin plugin, @NotNull Player player, @
}

public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player player, @NotNull InventoryClickEvent event) {
if (!(event.getView().getTopInventory().getHolder() instanceof GuiButtonLoreHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof GuiButtonLoreHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof ConfirmHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof ConfirmHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void onInventoryClose(@NotNull InventoryCloseEvent event) {
return;
}

InventoryHolder holder = event.getInventory().getHolder();
InventoryHolder holder = event.getInventory().getHolder(false);
if (holder == null) {
return;
}
Expand Down Expand Up @@ -217,7 +217,7 @@ public void onInventoryClick(@NotNull InventoryClickEvent event) {
return;
}

if (event.getView().getTopInventory().getHolder() instanceof HeadEditMenu.EditHolder) {
if (event.getView().getTopInventory().getHolder(false) instanceof HeadEditMenu.EditHolder) {
deny(event);
}
}
Expand Down Expand Up @@ -323,7 +323,7 @@ private void openEdit(@NotNull Player player, @NotNull HeadId id) {
private void handleAction(@NotNull Player player, @NotNull InventoryClickEvent event, @NotNull HeadEditMenu.ActionTarget target) {
String action = target.action();
HeadId id = target.id();
HeadEditMenu.EditHolder holder = event.getView().getTopInventory().getHolder() instanceof HeadEditMenu.EditHolder editHolder ? editHolder : null;
HeadEditMenu.EditHolder holder = event.getView().getTopInventory().getHolder(false) instanceof HeadEditMenu.EditHolder editHolder ? editHolder : null;

if (action.equals(HeadEditMenu.ACTION_PREVIEW)) {
return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof FavoritesHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof FavoritesHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof HiddenHeadsHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof HiddenHeadsHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(edit, "edit");
Objects.requireNonNull(give, "give");

if (!(event.getView().getTopInventory().getHolder() instanceof LocalHeadListHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof LocalHeadListHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof MaterialSelectionHolder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof MaterialSelectionHolder holder)) {
return false;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static boolean handleClick(@NotNull HeadDBPlugin plugin, @NotNull Player
Objects.requireNonNull(player, "player");
Objects.requireNonNull(event, "event");

if (!(event.getView().getTopInventory().getHolder() instanceof Holder holder)) {
if (!(event.getView().getTopInventory().getHolder(false) instanceof Holder holder)) {
return false;
}

Expand Down
Loading