carm/UserPrefix
carm/UserPrefix
1
Fork 0
mirror of https://github.com/CarmJos/UserPrefix.git synced 2024-09-20 04:25:46 +00:00
Code Issues Releases Activity

优化代码

Browse Source
This commit is contained in:
carm 2021-09-08 19:08:20 +08:00
parent a95d4d8cbb
commit bd303f24b7
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java
View File

@ -1,9 +1,9 @@
package cc.carm.plugin.userprefix.hooker; package cc.carm.plugin.userprefix.hooker;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import cc.carm.plugin.userprefix.manager.PrefixManager; import cc.carm.plugin.userprefix.manager.PrefixManager;
import cc.carm.plugin.userprefix.manager.UserManager; import cc.carm.plugin.userprefix.manager.UserManager;
import cc.carm.plugin.userprefix.model.ConfiguredPrefix; import cc.carm.plugin.userprefix.model.ConfiguredPrefix;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
@ -36,17 +36,17 @@ public class UserPrefixExpansion extends PlaceholderExpansion {
} }
@Override @Override
public String getAuthor() { public @NotNull String getAuthor() {
return plugin.getDescription().getAuthors().toString(); return plugin.getDescription().getAuthors().toString();
} }
@Override @Override
public String getIdentifier() { public @NotNull String getIdentifier() {
return "UserPrefix"; return "UserPrefix";
} }
@Override @Override
public String getVersion() { public @NotNull String getVersion() {
return plugin.getDescription().getVersion(); return plugin.getDescription().getVersion();
} }
@ -82,8 +82,10 @@ public class UserPrefixExpansion extends PlaceholderExpansion {
case "version": { case "version": {
return getVersion().replace("-SNAPSHOT", ""); return getVersion().replace("-SNAPSHOT", "");
} }
default: {
return "参数错误";
}
} }
return null;
} }
} }

27
src/main/java/cc/carm/plugin/userprefix/util/gui/GUI.java
View File

@ -194,24 +194,28 @@ public class GUI {
Bukkit.getPluginManager().registerEvents(listener = new Listener() { Bukkit.getPluginManager().registerEvents(listener = new Listener() {
@EventHandler @EventHandler
public void onInventoryClickEvent(InventoryClickEvent event) { public void onInventoryClickEvent(InventoryClickEvent event) {
rawClickListener(event); if (!(event.getWhoClicked() instanceof Player)) return;
if (!(event.getWhoClicked() instanceof Player)) {
return;
}
Player p = (Player) event.getWhoClicked(); Player p = (Player) event.getWhoClicked();
rawClickListener(event);
if (event.getSlot() != -999) { if (event.getSlot() != -999) {
try { try {
if (getOpenedGUI(p) == GUI.this && event.getClickedInventory() != null && event.getClickedInventory().equals(GUI.this.inv) && GUI.this.items[event.getSlot()] != null) if (getOpenedGUI(p) == GUI.this
&& event.getClickedInventory() != null
&& event.getClickedInventory().equals(GUI.this.inv)
&& GUI.this.items[event.getSlot()] != null) {
GUI.this.items[event.getSlot()].realRawClickAction(event); GUI.this.items[event.getSlot()].realRawClickAction(event);
}
} catch (ArrayIndexOutOfBoundsException e) { } catch (ArrayIndexOutOfBoundsException e) {
System.err.print("err cause by GUI(" + GUI.this + "), name=" + name);
e.printStackTrace(); e.printStackTrace();
System.err.print("err cause by GUI(" + GUI.this.toString() + "), name=" + name);
return; return;
} }
} else { } else if (setCancelledIfClickOnOuter) {
if (setCancelledIfClickOnOuter) event.setCancelled(true); event.setCancelled(true);
} }
if (hasOpenedGUI(p) && /*player.openedGUI.inv.equals(event.getClickedInventory())*/ getOpenedGUI(p) == GUI.this && event.getClickedInventory() != null) { if (hasOpenedGUI(p)
&& getOpenedGUI(p) == GUI.this
&& event.getClickedInventory() != null) {
if (event.getClickedInventory().equals(GUI.this.inv)) { if (event.getClickedInventory().equals(GUI.this.inv)) {
if (setCancelledIfClickOnTarget) event.setCancelled(true); if (setCancelledIfClickOnTarget) event.setCancelled(true);
@ -231,8 +235,8 @@ public class GUI {
} }
} }
} }
} else if (event.getClickedInventory().equals(p.getInventory())) { } else if (event.getClickedInventory().equals(p.getInventory()) && setCancelledIfClickOnSelf) {
if (setCancelledIfClickOnSelf) event.setCancelled(true); event.setCancelled(true);
} }
} }
} }
@ -254,6 +258,7 @@ public class GUI {
if (event.getInventory().equals(inv)) { if (event.getInventory().equals(inv)) {
HandlerList.unregisterAll(this); HandlerList.unregisterAll(this);
listener = null; listener = null;
removeOpenedGUI(p);
onClose(); onClose();
} }
} }

8
src/main/java/cc/carm/plugin/userprefix/util/gui/GUIItem.java
View File

@ -53,10 +53,6 @@ public class GUIItem {
actionsIgnoreActive.add(action); actionsIgnoreActive.add(action);
} }
public void customAction() {
}
public void rawClickAction(InventoryClickEvent event) { public void rawClickAction(InventoryClickEvent event) {
} }
@ -65,10 +61,6 @@ public class GUIItem {
} }
public void customAction(Object obj) {
}
/** /**
* 玩家点击GUI后执行的代码 * 玩家点击GUI后执行的代码
* *