Netherite-Public/InvUI
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rearrange close and open methods in AbstractWindow

Browse Source
This commit is contained in:
NichtStudioCode 2023-06-11 14:33:53 +02:00
parent 210527b742
commit 7b0767b9f4
1 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
invui-core/src/main/java/xyz/xenondevs/invui/window/AbstractWindow.java
View File

@ -26,13 +26,13 @@ import xyz.xenondevs.invui.gui.AbstractGui;
import xyz.xenondevs.invui.gui.Gui; import xyz.xenondevs.invui.gui.Gui;
import xyz.xenondevs.invui.gui.GuiParent; import xyz.xenondevs.invui.gui.GuiParent;
import xyz.xenondevs.invui.gui.SlotElement; import xyz.xenondevs.invui.gui.SlotElement;
import xyz.xenondevs.invui.inventory.Inventory;
import xyz.xenondevs.invui.inventory.event.PlayerUpdateReason;
import xyz.xenondevs.invui.inventory.event.UpdateReason;
import xyz.xenondevs.invui.item.Item; import xyz.xenondevs.invui.item.Item;
import xyz.xenondevs.invui.item.ItemProvider; import xyz.xenondevs.invui.item.ItemProvider;
import xyz.xenondevs.invui.util.ArrayUtils; import xyz.xenondevs.invui.util.ArrayUtils;
import xyz.xenondevs.invui.util.Pair; import xyz.xenondevs.invui.util.Pair;
import xyz.xenondevs.invui.inventory.Inventory;
import xyz.xenondevs.invui.inventory.event.PlayerUpdateReason;
import xyz.xenondevs.invui.inventory.event.UpdateReason;
import java.util.*; import java.util.*;
import java.util.function.Consumer; import java.util.function.Consumer;
@ -169,42 +169,6 @@ public abstract class AbstractWindow implements Window, GuiParent {
event.setCursor(cursorStack); event.setCursor(cursorStack);
} }
public void handleOpenEvent(InventoryOpenEvent event) {
if (!event.getPlayer().equals(getViewer())) {
event.setCancelled(true);
} else {
handleOpened();
if (openHandlers != null) {
openHandlers.forEach(Runnable::run);
}
}
}
public void handleCloseEvent(Player player, boolean forceClose) {
if (closeable || forceClose) {
if (!currentlyOpen)
throw new IllegalStateException("Window is already closed!");
closeable = true;
currentlyOpen = false;
remove();
// handleClosed() might have already been called by open() if the window was replaced by another one
if (!hasHandledClose) {
handleClosed();
hasHandledClose = true;
}
if (closeHandlers != null) {
closeHandlers.forEach(Runnable::run);
}
} else if (player.equals(getViewer())) {
Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), () -> openInventory(player), 0);
}
}
public void handleClickEvent(InventoryClickEvent event) { public void handleClickEvent(InventoryClickEvent event) {
if (Arrays.asList(getInventories()).contains(event.getClickedInventory())) { if (Arrays.asList(getInventories()).contains(event.getClickedInventory())) {
// The inventory that was clicked is part of the open window // The inventory that was clicked is part of the open window
@ -251,34 +215,6 @@ public abstract class AbstractWindow implements Window, GuiParent {
&& ((SlotElement.InventorySlotElement) element).getInventory() == inventory); && ((SlotElement.InventorySlotElement) element).getInventory() == inventory);
} }
private void remove() {
WindowManager.getInstance().removeWindow(this);
Arrays.stream(elementsDisplayed)
.filter(Objects::nonNull)
.map(SlotElement::getHoldingElement)
.forEach(slotElement -> {
if (slotElement instanceof SlotElement.ItemSlotElement) {
((SlotElement.ItemSlotElement) slotElement).getItem().removeWindow(this);
} else if (slotElement instanceof SlotElement.InventorySlotElement) {
((SlotElement.InventorySlotElement) slotElement).getInventory().removeWindow(this);
}
});
Arrays.stream(getGuis())
.forEach(gui -> gui.removeParent(this));
}
@Override
public void close() {
closeable = true;
Player viewer = getCurrentViewer();
if (viewer != null) {
viewer.closeInventory();
}
}
@Override @Override
public void open() { public void open() {
Player viewer = getViewer(); Player viewer = getViewer();
@ -309,6 +245,70 @@ public abstract class AbstractWindow implements Window, GuiParent {
); );
} }
public void handleOpenEvent(InventoryOpenEvent event) {
if (!event.getPlayer().equals(getViewer())) {
event.setCancelled(true);
} else {
handleOpened();
if (openHandlers != null) {
openHandlers.forEach(Runnable::run);
}
}
}
@Override
public void close() {
closeable = true;
Player viewer = getCurrentViewer();
if (viewer != null) {
viewer.closeInventory();
}
}
public void handleCloseEvent(Player player, boolean forceClose) {
if (closeable || forceClose) {
if (!currentlyOpen)
throw new IllegalStateException("Window is already closed!");
closeable = true;
currentlyOpen = false;
remove();
// handleClosed() might have already been called by open() if the window was replaced by another one
if (!hasHandledClose) {
handleClosed();
hasHandledClose = true;
}
if (closeHandlers != null) {
closeHandlers.forEach(Runnable::run);
}
} else if (player.equals(getViewer())) {
Bukkit.getScheduler().runTaskLater(InvUI.getInstance().getPlugin(), () -> openInventory(player), 0);
}
}
private void remove() {
WindowManager.getInstance().removeWindow(this);
Arrays.stream(elementsDisplayed)
.filter(Objects::nonNull)
.map(SlotElement::getHoldingElement)
.forEach(slotElement -> {
if (slotElement instanceof SlotElement.ItemSlotElement) {
((SlotElement.ItemSlotElement) slotElement).getItem().removeWindow(this);
} else if (slotElement instanceof SlotElement.InventorySlotElement) {
((SlotElement.InventorySlotElement) slotElement).getInventory().removeWindow(this);
}
});
Arrays.stream(getGuis())
.forEach(gui -> gui.removeParent(this));
}
@Override @Override
public void changeTitle(@NotNull ComponentWrapper title) { public void changeTitle(@NotNull ComponentWrapper title) {
this.title = title; this.title = title;