From 892371f7026e3057161d0e495b9472215a0ce3ff Mon Sep 17 00:00:00 2001
From: LSeng <MociGames958921@>
Date: Sun, 22 May 2022 22:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8GUI=E4=B8=AD?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E5=8F=A6=E4=B8=80=E4=B8=AAGUI=E6=97=B6?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cc/carm/lib/easyplugin/gui/GUI.java   | 18 +++++-------------
 .../carm/lib/easyplugin/gui/GUIListener.java   | 17 ++++++++---------
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java b/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java
index 8ef7773..25fe470 100644
--- a/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java
+++ b/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUI.java
@@ -132,31 +132,23 @@ public class GUI {
 	}
 
 	public void addFlag(String flag, Object obj) {
-		if (this.flags == null) {
-			this.flags = new HashMap<>();
-		}
+		if (this.flags == null) this.flags = new HashMap<>();
 		this.flags.put(flag, obj);
 	}
 
 	public Object getFlag(String flag) {
-		if (this.flags == null) {
-			return null;
-		} else {
+		if (this.flags == null) return null;
+		else
 			return this.flags.get(flag);
-		}
 	}
 
 	public void setFlag(String flag, Object obj) {
-		if (this.flags == null) {
-			this.flags = new HashMap<>();
-		}
+		if (this.flags == null) this.flags = new HashMap<>();
 		this.flags.replace(flag, obj);
 	}
 
 	public void removeFlag(String flag) {
-		if (this.flags == null) {
-			this.flags = new HashMap<>();
-		}
+		if (this.flags == null) this.flags = new HashMap<>();
 		this.flags.remove(flag);
 	}
 
diff --git a/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java b/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java
index 97ee229..2a0cb33 100644
--- a/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java
+++ b/easyplugin-gui/src/main/java/cc/carm/lib/easyplugin/gui/GUIListener.java
@@ -1,6 +1,5 @@
 package cc.carm.lib.easyplugin.gui;
 
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.HandlerList;
@@ -24,10 +23,10 @@ public class GUIListener implements Listener {
 
 	@EventHandler
 	public void onInventoryClickEvent(InventoryClickEvent event) {
-		if (!(event.getWhoClicked() instanceof Player)) { return; }
+		if (!(event.getWhoClicked() instanceof Player)) return;
 		Player player = (Player) event.getWhoClicked();
-		if (!GUI.hasOpenedGUI(player)) { return;}
-		if (GUI.getOpenedGUI(player) != getCurrentGUI()) { return; }
+		if (!GUI.hasOpenedGUI(player)) return;
+		if (GUI.getOpenedGUI(player) != getCurrentGUI()) return;
 
 		getCurrentGUI().rawClickListener(event);
 
@@ -36,11 +35,11 @@ public class GUIListener implements Listener {
 			return;
 		}
 
-		if (event.getClickedInventory() == null) { return; }
+		if (event.getClickedInventory() == null) return;
 
 		if (event.getClickedInventory().equals(getCurrentGUI().inv)) {
 
-			if (getCurrentGUI().cancelOnTarget) { event.setCancelled(true); }
+			if (getCurrentGUI().cancelOnTarget) event.setCancelled(true);
 
 			if (event.getSlot() != -999) {
 				GUIItem clickedItem = getCurrentGUI().getItem(event.getSlot());
@@ -62,7 +61,7 @@ public class GUIListener implements Listener {
 
 	@EventHandler
 	public void onDrag(InventoryDragEvent e) {
-		if (!(e.getWhoClicked() instanceof Player)) { return; }
+		if (!(e.getWhoClicked() instanceof Player)) return;
 		if (e.getInventory().equals(getCurrentGUI().inv)
 				|| e.getInventory().equals(e.getWhoClicked().getInventory())) {
 			getCurrentGUI().onDrag(e);
@@ -71,8 +70,8 @@ public class GUIListener implements Listener {
 
 	@EventHandler
 	public void onInventoryCloseEvent(InventoryCloseEvent event) {
-		if (!(event.getPlayer() instanceof Player)) { return; }
-		if (!event.getInventory().equals(getCurrentGUI().inv)) { return; }
+		if (!(event.getPlayer() instanceof Player)) return;
+		if (!event.getInventory().equals(getCurrentGUI().inv)) return;
 
 		close((Player) event.getPlayer());