502647092/TabooLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #36 from Bkm016/patch/java11

Browse Source 
Fix MenuBuilder
This commit is contained in:
坏黑
2020-02-15 10:55:58 +08:00
committed by GitHub
parent 0fb4f73ac6 5400b18c69
commit 7967c1dbe2
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/scala/io/izzel/taboolib/util/item/inventory/ClickListener.java
View File

@@ -19,8 +19,6 @@ import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.event.server.PluginDisableEvent;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import java.util.Optional;
/** /**
* @Author 坏黑 * @Author 坏黑
* @Since 2019-05-21 18:16 * @Since 2019-05-21 18:16
@@ -37,8 +35,20 @@ class ClickListener implements Listener {
public void e(InventoryOpenEvent e) { public void e(InventoryOpenEvent e) {
MenuBuilder builder = MenuHolder.get(e.getInventory()); MenuBuilder builder = MenuHolder.get(e.getInventory());
if (builder != null) { if (builder != null) {
Bukkit.getScheduler().runTaskLater(TabooLib.getPlugin(), () -> builder.getBuildTask().run(e.getInventory()), 1); Bukkit.getScheduler().runTaskLater(TabooLib.getPlugin(), () -> {
Bukkit.getScheduler().runTaskLaterAsynchronously(TabooLib.getPlugin(), () -> builder.getBuildTaskAsync().run(e.getInventory()), 1); try {
builder.getBuildTask().run(e.getInventory());
} catch (Throwable t) {
t.printStackTrace();
}
}, 1);
Bukkit.getScheduler().runTaskLaterAsynchronously(TabooLib.getPlugin(), () -> {
try {
builder.getBuildTaskAsync().run(e.getInventory());
} catch (Throwable t) {
t.printStackTrace();
}
}, 1);
} }
} }
@@ -50,7 +60,11 @@ class ClickListener implements Listener {
if (builder.isLockHand() && (e.getRawSlot() - e.getInventory().getSize() - 27 == e.getWhoClicked().getInventory().getHeldItemSlot() || (e.getClick() == org.bukkit.event.inventory.ClickType.NUMBER_KEY && e.getHotbarButton() == e.getWhoClicked().getInventory().getHeldItemSlot()))) { if (builder.isLockHand() && (e.getRawSlot() - e.getInventory().getSize() - 27 == e.getWhoClicked().getInventory().getHeldItemSlot() || (e.getClick() == org.bukkit.event.inventory.ClickType.NUMBER_KEY && e.getHotbarButton() == e.getWhoClicked().getInventory().getHeldItemSlot()))) {
e.setCancelled(true); e.setCancelled(true);
} }
Optional.ofNullable(builder.getClickTask()).ifPresent(t -> t.run(new ClickEvent(ClickType.CLICK, e, builder.getSlot(e.getRawSlot())))); try {
builder.getClickTask().run(new ClickEvent(ClickType.CLICK, e, builder.getSlot(e.getRawSlot())));
} catch (Throwable t) {
t.printStackTrace();
}
// drop on empty area // drop on empty area
if (!e.isCancelled() && Items.nonNull(e.getCurrentItem()) && e.getClick() == org.bukkit.event.inventory.ClickType.DROP) { if (!e.isCancelled() && Items.nonNull(e.getCurrentItem()) && e.getClick() == org.bukkit.event.inventory.ClickType.DROP) {
Item item = Vectors.itemDrop((Player) e.getWhoClicked(), e.getCurrentItem()); Item item = Vectors.itemDrop((Player) e.getWhoClicked(), e.getCurrentItem());
@@ -82,7 +96,11 @@ class ClickListener implements Listener {
public void e(InventoryDragEvent e) { public void e(InventoryDragEvent e) {
MenuBuilder builder = MenuHolder.get(e.getInventory()); MenuBuilder builder = MenuHolder.get(e.getInventory());
if (builder != null) { if (builder != null) {
try {
builder.getClickTask().run(new ClickEvent(ClickType.DRAG, e, ' ')); builder.getClickTask().run(new ClickEvent(ClickType.DRAG, e, ' '));
} catch (Throwable t) {
t.printStackTrace();
}
} }
} }
@@ -90,7 +108,11 @@ class ClickListener implements Listener {
public void e(InventoryCloseEvent e) { public void e(InventoryCloseEvent e) {
MenuBuilder builder = MenuHolder.get(e.getInventory()); MenuBuilder builder = MenuHolder.get(e.getInventory());
if (builder != null) { if (builder != null) {
try {
builder.getCloseTask().run(e); builder.getCloseTask().run(e);
} catch (Throwable t) {
t.printStackTrace();
}
} }
} }