Code cleanup

This commit is contained in:
2022-01-30 15:03:47 -06:00
parent d4761d4386
commit 4a05d90c17
25 changed files with 191 additions and 97 deletions

View File

@ -25,7 +25,8 @@ public class PunishedPlayerMenu extends AbstractMenu
private final List<Inventory> inventories = Lists.newArrayList();
public PunishedPlayerMenu(PunishedPlayer player) {
public PunishedPlayerMenu(PunishedPlayer player)
{
super("§c§lPunishments");
this.punishedPlayer = player;
for (int i = 0; i <= punishedPlayer.getPunishments().size() / 53; i++)
@ -35,7 +36,7 @@ public class PunishedPlayerMenu extends AbstractMenu
ItemMeta meta = nextPage.getItemMeta();
meta.setDisplayName(ChatColor.LIGHT_PURPLE + "Next Page");
nextPage.setItemMeta(meta);
ItemStack previousPage = new ItemStack(Material.FEATHER);
ItemMeta meta2 = previousPage.getItemMeta();
meta2.setDisplayName(ChatColor.LIGHT_PURPLE + "Previous Page");
@ -45,7 +46,7 @@ public class PunishedPlayerMenu extends AbstractMenu
ItemMeta meta3 = back.getItemMeta();
meta3.setDisplayName(ChatColor.RED + "Return");
back.setItemMeta(meta3);
inventory.setItem(50, nextPage);
inventory.setItem(49, back);
inventory.setItem(48, previousPage);
@ -53,11 +54,13 @@ public class PunishedPlayerMenu extends AbstractMenu
}
}
public List<Inventory> getInventory() {
public List<Inventory> getInventory()
{
return inventories;
}
public void openInv(Player player, int index) {
public void openInv(Player player, int index)
{
int currentItemIndex = 0;
int currentInvIndex = 0;
for (Punishment punishment : punishedPlayer.getPunishments())
@ -68,7 +71,8 @@ public class PunishedPlayerMenu extends AbstractMenu
break;
}
if (currentItemIndex == inv.getSize() - 1) {
if (currentItemIndex == inv.getSize() - 1)
{
currentInvIndex++;
currentItemIndex = 0;
inv = inventories.get(currentInvIndex);
@ -91,34 +95,61 @@ public class PunishedPlayerMenu extends AbstractMenu
@EventHandler
public void onClick(InventoryClickEvent event)
{
if (event.getClickedInventory() == null) return;
if (event.getClickedInventory() == null)
{
return;
}
Inventory inv = event.getClickedInventory();
if (!isValidInventory(inv)) return;
if (event.getCurrentItem() == null) return;
if (!isValidInventory(inv))
{
return;
}
if (event.getCurrentItem() == null)
{
return;
}
ItemStack item = event.getCurrentItem();
event.setCancelled(true);
if (item.getType() == Material.FEATHER)
{
if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Next Page"))
{
if (getCurrentInventoryIndex(inv) + 1 > inventories.size() - 1) return;
if (inventories.get(getCurrentInventoryIndex(inv) + 1).getContents().length == 0) return;
openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1);
} else if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Previous Page"))
if (getCurrentInventoryIndex(inv) + 1 > inventories.size() - 1)
{
return;
}
if (inventories.get(getCurrentInventoryIndex(inv) + 1).getContents().length == 0)
{
return;
}
openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1);
}
else if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Previous Page"))
{
if (getCurrentInventoryIndex(inv) - 1 < 0) return;
if (getCurrentInventoryIndex(inv) - 1 > inventories.size() - 1) return;
if (inventories.get(getCurrentInventoryIndex(inv) - 1).getContents().length == 0) return;
openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
if (getCurrentInventoryIndex(inv) - 1 < 0)
{
return;
}
if (getCurrentInventoryIndex(inv) - 1 > inventories.size() - 1)
{
return;
}
if (inventories.get(getCurrentInventoryIndex(inv) - 1).getContents().length == 0)
{
return;
}
openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
}
} else if (item.getType() == Material.BARRIER)
}
else if (item.getType() == Material.BARRIER)
{
new PunishmentMenu().openInv((Player) event.getWhoClicked(), 0);
} else if (item.getType() == Material.PLAYER_HEAD)
new PunishmentMenu().openInv((Player)event.getWhoClicked(), 0);
}
else if (item.getType() == Material.PLAYER_HEAD)
{
SkullMeta meta = (SkullMeta) item.getItemMeta();
SkullMeta meta = (SkullMeta)item.getItemMeta();
OfflinePlayer player = meta.getOwningPlayer();
assert player != null;
PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId()) == null ? null : PlayerCache.getPunishedPlayer(player.getUniqueId());

View File

@ -22,7 +22,8 @@ public class PunishmentMenu extends AbstractMenu
private List<Inventory> inventories = Lists.newArrayList();
public PunishmentMenu() {
public PunishmentMenu()
{
super("§c§lPunishments");
for (int i = 0; i <= Bukkit.getOnlinePlayers().size() / 53; i++)
{
@ -31,23 +32,25 @@ public class PunishmentMenu extends AbstractMenu
ItemMeta meta = nextPage.getItemMeta();
meta.setDisplayName(ChatColor.LIGHT_PURPLE + "Next Page");
nextPage.setItemMeta(meta);
ItemStack previousPage = new ItemStack(Material.FEATHER);
ItemMeta meta2 = previousPage.getItemMeta();
meta2.setDisplayName(ChatColor.LIGHT_PURPLE + "Previous Page");
previousPage.setItemMeta(meta2);
inventory.setItem(50, nextPage);
inventory.setItem(48, previousPage);
inventories.add(inventory);
}
}
public List<Inventory> getInventory() {
public List<Inventory> getInventory()
{
return inventories;
}
public void openInv(Player player, int index) {
public void openInv(Player player, int index)
{
int currentItemIndex = 0;
int currentInvIndex = 0;
for (Player players : Bukkit.getOnlinePlayers())
@ -58,7 +61,8 @@ public class PunishmentMenu extends AbstractMenu
break;
}
if (currentItemIndex == inv.getSize() - 1) {
if (currentItemIndex == inv.getSize() - 1)
{
currentInvIndex++;
currentItemIndex = 0;
inv = inventories.get(currentInvIndex);
@ -66,7 +70,7 @@ public class PunishmentMenu extends AbstractMenu
ItemStack item = new ItemStack(Material.PLAYER_HEAD);
SkullMeta meta = (SkullMeta) item.getItemMeta();
SkullMeta meta = (SkullMeta)item.getItemMeta();
meta.setOwningPlayer(players);
meta.setDisplayName(ChatColor.YELLOW + players.getName());
item.setItemMeta(meta);
@ -81,31 +85,57 @@ public class PunishmentMenu extends AbstractMenu
@EventHandler
public void onClick(InventoryClickEvent event)
{
if (event.getClickedInventory() == null) return;
if (event.getClickedInventory() == null)
{
return;
}
Inventory inv = event.getClickedInventory();
if (!isValidInventory(inv)) return;
if (event.getCurrentItem() == null) return;
if (!isValidInventory(inv))
{
return;
}
if (event.getCurrentItem() == null)
{
return;
}
ItemStack item = event.getCurrentItem();
event.setCancelled(true);
if (item.getType() == Material.FEATHER)
{
if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Next Page"))
{
if (getCurrentInventoryIndex(inv) + 1 > inventories.size() - 1) return;
if (inventories.get(getCurrentInventoryIndex(inv) + 1).getContents().length == 0) return;
openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1);
} else if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Previous Page"))
if (getCurrentInventoryIndex(inv) + 1 > inventories.size() - 1)
{
return;
}
if (inventories.get(getCurrentInventoryIndex(inv) + 1).getContents().length == 0)
{
return;
}
openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) + 1);
}
else if (item.getItemMeta().getDisplayName().equalsIgnoreCase(ChatColor.LIGHT_PURPLE + "Previous Page"))
{
if (getCurrentInventoryIndex(inv) - 1 < 0) return;
if (getCurrentInventoryIndex(inv) - 1 > inventories.size() - 1) return;
if (inventories.get(getCurrentInventoryIndex(inv) - 1).getContents().length == 0) return;
openInv((Player) event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
if (getCurrentInventoryIndex(inv) - 1 < 0)
{
return;
}
if (getCurrentInventoryIndex(inv) - 1 > inventories.size() - 1)
{
return;
}
if (inventories.get(getCurrentInventoryIndex(inv) - 1).getContents().length == 0)
{
return;
}
openInv((Player)event.getWhoClicked(), getCurrentInventoryIndex(inv) - 1);
}
} else if (item.getType() == Material.PLAYER_HEAD)
}
else if (item.getType() == Material.PLAYER_HEAD)
{
SkullMeta meta = (SkullMeta) item.getItemMeta();
SkullMeta meta = (SkullMeta)item.getItemMeta();
OfflinePlayer player = meta.getOwningPlayer();
assert player != null;
PunishedPlayer punishedPlayer = PlayerCache.getPunishedPlayer(player.getUniqueId()) == null ? null : PlayerCache.getPunishedPlayer(player.getUniqueId());
@ -115,11 +145,10 @@ public class PunishmentMenu extends AbstractMenu
event.getWhoClicked().closeInventory();
return;
}
new PunishedPlayerMenu(punishedPlayer).openInv((Player) event.getWhoClicked(), 0);
new PunishedPlayerMenu(punishedPlayer).openInv((Player)event.getWhoClicked(), 0);
}
}
public int getCurrentInventoryIndex(Inventory inventory)