Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/dev/noah/perplayerkit/PerPlayerKit.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import dev.noah.perplayerkit.storage.exceptions.StorageOperationException;
import dev.noah.perplayerkit.util.BackupManager;
import dev.noah.perplayerkit.util.BroadcastManager;
import dev.noah.perplayerkit.util.StyleManager;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.Material;
Expand Down Expand Up @@ -62,6 +63,8 @@ public void onEnable() {
ConfigManager configManager = new ConfigManager(this);
configManager.loadConfig();

new StyleManager(this);

new ItemFilter(this);
new BroadcastManager(this);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@

import dev.noah.perplayerkit.gui.ItemUtil;
import dev.noah.perplayerkit.util.DisabledCommand;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import dev.noah.perplayerkit.util.StyleManager;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
Expand Down Expand Up @@ -51,9 +50,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command

public void viewOnlyEC(Player p) {

ItemStack fill = ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE,1,"");
ItemStack fill = ItemUtil.createGlassPane();

Menu menu = ChestMenu.builder(5).title(ChatColor.BLUE + "View Only Enderchest").build();
Menu menu = ChestMenu.builder(5).title(StyleManager.get().getPrimaryColor() + "View Only Enderchest").build();


for (int i = 0; i < 9; i++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import dev.noah.perplayerkit.util.BroadcastManager;
import dev.noah.perplayerkit.util.CooldownManager;
import dev.noah.perplayerkit.util.DisabledCommand;
import dev.noah.perplayerkit.util.StyleManager;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
Expand All @@ -26,8 +26,9 @@

public class RegearCommand implements CommandExecutor, Listener {

public static final ItemStack REGEAR_SHULKER_ITEM = ItemUtil.createItem(Material.WHITE_SHULKER_BOX, 1, ChatColor.BLUE + "Regear Shulker", "&7● Restocks Your Kit", "&7● Use &9/rg &7to get another regear shulker");
public static final ItemStack REGEAR_SHELL_ITEM = ItemUtil.createItem(Material.SHULKER_SHELL, 1, ChatColor.BLUE + "Regear Shell", "&7● Restocks Your Kit", "&7● Click to use!");
public static final ItemStack REGEAR_SHULKER_ITEM = ItemUtil.createItem(Material.WHITE_SHULKER_BOX, 1, StyleManager.get().getPrimaryColor() + "Regear Shulker", "&7● Restocks Your Kit", "&7● Use " + StyleManager.get().getPrimaryColor() + "/rg &7to get another regear shulker");
public static final ItemStack REGEAR_SHELL_ITEM = ItemUtil.createItem(Material.SHULKER_SHELL, 1, StyleManager.get().getPrimaryColor() + "Regear Shell", "&7● Restocks Your Kit", "&7● Click to use!");

private final Plugin plugin;
private final CooldownManager commandCooldownManager;
private final CooldownManager damageCooldownManager;
Expand Down Expand Up @@ -192,7 +193,7 @@ public record RegearInventoryHolder(

@Override
public @NotNull Inventory getInventory() {
Inventory inventory = Bukkit.createInventory(this, 27, ChatColor.BLUE + "Regear Shulker");
Inventory inventory = Bukkit.createInventory(this, 27, StyleManager.get().getPrimaryColor() + "Regear Shulker");
inventory.setItem(13, REGEAR_SHELL_ITEM);
return inventory;
}
Expand Down
49 changes: 23 additions & 26 deletions src/main/java/dev/noah/perplayerkit/gui/GUI.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,11 @@
import dev.noah.perplayerkit.KitManager;
import dev.noah.perplayerkit.KitRoomDataManager;
import dev.noah.perplayerkit.PublicKit;
import dev.noah.perplayerkit.util.BroadcastManager;
import dev.noah.perplayerkit.util.IDUtil;
import dev.noah.perplayerkit.util.PlayerUtil;
import dev.noah.perplayerkit.util.*;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
Expand All @@ -46,7 +43,7 @@

import static dev.noah.perplayerkit.gui.ItemUtil.addHideFlags;
import static dev.noah.perplayerkit.gui.ItemUtil.createItem;
import dev.noah.perplayerkit.util.SoundManager;
import static dev.noah.perplayerkit.gui.ItemUtil.createGlassPane;

public class GUI {
private final Plugin plugin;
Expand All @@ -67,7 +64,7 @@ public static void addLoadPublicKit(Slot slot, String id) {
}

public static Menu createPublicKitMenu() {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Public Kit Room").redraw(true).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Public Kit Room").redraw(true).build();
}

public static boolean removeKitDeletionFlag(Player player) {
Expand All @@ -87,7 +84,7 @@ public void OpenKitMenu(Player p, int slot) {
allowModification(menu.getSlot(i));
}
for (int i = 41; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}
menu.getSlot(45).setItem(createItem(Material.CHAINMAIL_BOOTS, 1, "&7&lBOOTS"));
menu.getSlot(46).setItem(createItem(Material.CHAINMAIL_LEGGINGS, 1, "&7&lLEGGINGS"));
Expand Down Expand Up @@ -120,7 +117,7 @@ public void OpenPublicKitEditor(Player p, String kitId) {
allowModification(menu.getSlot(i));
}
for (int i = 41; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}
menu.getSlot(45).setItem(createItem(Material.CHAINMAIL_BOOTS, 1, "&7&lBOOTS"));
menu.getSlot(46).setItem(createItem(Material.CHAINMAIL_LEGGINGS, 1, "&7&lLEGGINGS"));
Expand All @@ -144,11 +141,11 @@ public void OpenECKitKenu(Player p, int slot) {
Menu menu = createECMenu(slot);

for (int i = 0; i < 9; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());

}
for (int i = 36; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());

}
if (KitManager.get().getItemStackArrayById(p.getUniqueId() + "ec" + slot) != null) {
Expand Down Expand Up @@ -183,7 +180,7 @@ public void InspectKit(Player p, UUID target, int slot) {
}
}
for (int i = 41; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}
menu.getSlot(45).setItem(createItem(Material.CHAINMAIL_BOOTS, 1, "&7&lBOOTS"));
menu.getSlot(46).setItem(createItem(Material.CHAINMAIL_LEGGINGS, 1, "&7&lLEGGINGS"));
Expand Down Expand Up @@ -216,11 +213,11 @@ public void InspectEc(Player p, UUID target, int slot) {
Menu menu = createInspectEcMenu(slot, playerName);

for (int i = 0; i < 9; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());

}
for (int i = 36; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());

}
if (KitManager.get().getItemStackArrayById(p.getUniqueId() + "ec" + slot) != null) {
Expand Down Expand Up @@ -254,7 +251,7 @@ public void InspectEc(Player p, UUID target, int slot) {
public void OpenMainMenu(Player p) {
Menu menu = createMainMenu(p);
for (int i = 0; i < 54; i++) {
menu.getSlot(i).setItem(createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(createGlassPane());
}
for (int i = 9; i < 18; i++) {
menu.getSlot(i).setItem(createItem(Material.CHEST, 1, "&3&lKit " + (i - 8), "&7● Left click to load kit", "&7● Right click to edit kit"));
Expand All @@ -279,7 +276,7 @@ public void OpenMainMenu(Player p) {
}

for (int i = 37; i < 44; i++) {
menu.getSlot(i).setItem(createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(createGlassPane());
}

menu.getSlot(37).setItem(createItem(Material.NETHER_STAR, 1, "&a&lKIT ROOM"));
Expand Down Expand Up @@ -308,7 +305,7 @@ public void OpenKitRoom(Player p, int page) {
allowModification(menu.getSlot(i));
}
for (int i = 45; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}
if (KitRoomDataManager.get().getKitRoomPage(page) != null) {
for (int i = 0; i < 45; i++) {
Expand Down Expand Up @@ -352,10 +349,10 @@ public Menu ViewPublicKitMenu(Player p, String id) {
}
return null;
}
Menu menu = ChestMenu.builder(6).title(ChatColor.BLUE + "Viewing Public Kit: " + id).redraw(true).build();
Menu menu = ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Viewing Public Kit: " + id).redraw(true).build();

for (int i = 0; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}

for (int i = 9; i < 36; i++) {
Expand All @@ -382,7 +379,7 @@ public Menu ViewPublicKitMenu(Player p, String id) {
public void OpenPublicKitMenu(Player player) {
Menu menu = createPublicKitMenu();
for (int i = 0; i < 54; i++) {
menu.getSlot(i).setItem(ItemUtil.createItem(Material.BLUE_STAINED_GLASS_PANE, 1, " "));
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
}

for (int i = 18; i < 36; i++) {
Expand Down Expand Up @@ -653,31 +650,31 @@ public void addEditLoadEC(Slot slot, int i) {
}

public Menu createKitMenu(int slot) {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Kit: " + slot).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Kit: " + slot).build();
}

public Menu createPublicKitMenu(String id) {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Public Kit: " + id).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Public Kit: " + id).build();
}

public Menu createECMenu(int slot) {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Enderchest: " + slot).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Enderchest: " + slot).build();
}

public Menu createInspectMenu(int slot, String playerName) {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Inspecting " + playerName + "'s kit " + slot).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Inspecting " + playerName + "'s kit " + slot).build();
}

public Menu createInspectEcMenu(int slot, String playerName) {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Inspecting " + playerName + "'s enderchest " + slot).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Inspecting " + playerName + "'s enderchest " + slot).build();
}

public Menu createMainMenu(Player p) {
return ChestMenu.builder(6).title(ChatColor.BLUE + p.getName() + "'s Kits").build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + p.getName() + "'s Kits").build();
}

public Menu createKitRoom() {
return ChestMenu.builder(6).title(ChatColor.BLUE + "Kit Room").redraw(true).build();
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Kit Room").redraw(true).build();
}

public void allowModification(Slot slot) {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/dev/noah/perplayerkit/gui/ItemUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package dev.noah.perplayerkit.gui;

import dev.noah.perplayerkit.util.StyleManager;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
Expand Down Expand Up @@ -54,6 +55,10 @@ public static ItemStack createItem(Material material, int quantity, String name,
return item;
}

public static ItemStack createGlassPane() {
return createItem(StyleManager.get().getGlassMaterial(), 1, " ");
}

public static ItemStack createItem(Material material, String name) {
return createItem(material, 1, name);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import dev.noah.perplayerkit.KitManager;
import dev.noah.perplayerkit.gui.GUI;
import dev.noah.perplayerkit.util.StyleManager;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
Expand All @@ -41,10 +42,10 @@ public void onKitEditorClose(InventoryCloseEvent e) {
if (inv.getSize() == 54) {
if (inv.getLocation() == null) {
InventoryView view = e.getView();
if (view.getTitle().contains(ChatColor.BLUE + "Kit: ")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Kit: ")) {
Player p = (Player) e.getPlayer();
UUID uuid = p.getUniqueId();
int slot = Integer.parseInt(view.getTitle().replace(ChatColor.BLUE + "Kit: ", ""));
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Kit: ", ""));
ItemStack[] kit = new ItemStack[41];
ItemStack[] chestitems = e.getInventory().getContents();

Expand All @@ -67,9 +68,9 @@ public void onPublicKitEditorClose(InventoryCloseEvent e) {
if (inv.getSize() == 54) {
if (inv.getLocation() == null) {
InventoryView view = e.getView();
if (view.getTitle().contains(ChatColor.BLUE + "Public Kit: ")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Public Kit: ")) {
Player player = (Player) e.getPlayer();
String publickit = view.getTitle().replace(ChatColor.BLUE + "Public Kit: ", "");
String publickit = view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Public Kit: ", "");
ItemStack[] kit = new ItemStack[41];
ItemStack[] chestitems = e.getInventory().getContents();

Expand All @@ -92,10 +93,10 @@ public void onEnderchestEditorClose(InventoryCloseEvent e) {
if (inv.getSize() == 54) {
if (inv.getLocation() == null) {
InventoryView view = e.getView();
if (view.getTitle().contains(ChatColor.BLUE + "Enderchest: ")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Enderchest: ")) {
Player p = (Player) e.getPlayer();
UUID uuid = p.getUniqueId();
int slot = Integer.parseInt(view.getTitle().replace(ChatColor.BLUE + "Enderchest: ", ""));
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Enderchest: ", ""));
ItemStack[] kit = new ItemStack[27];
ItemStack[] chestitems = e.getInventory().getContents();

Expand All @@ -118,13 +119,13 @@ public void onInspectKitEditorClose(InventoryCloseEvent e) {
if (inv.getSize() == 54) {
if (inv.getLocation() == null) {
InventoryView view = e.getView();
if (view.getTitle().contains(ChatColor.BLUE + "Inspecting ") && view.getTitle().contains("'s kit ")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Inspecting ") && view.getTitle().contains("'s kit ")) {
Player p = (Player) e.getPlayer();
if (!p.hasPermission("perplayerkit.admin")) {
return;
}
String title = view.getTitle();
String[] parts = title.replace(ChatColor.BLUE + "Inspecting ", "").split("'s kit ");
String[] parts = title.replace(StyleManager.get().getPrimaryColor() + "Inspecting ", "").split("'s kit ");
if (parts.length != 2) {
return;
}
Expand Down Expand Up @@ -185,13 +186,13 @@ public void onInspectEnderchestEditorClose(InventoryCloseEvent e) {
if (inv.getSize() == 54) {
if (inv.getLocation() == null) {
InventoryView view = e.getView();
if (view.getTitle().contains(ChatColor.BLUE + "Inspecting ") && view.getTitle().contains("'s enderchest ")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Inspecting ") && view.getTitle().contains("'s enderchest ")) {
Player p = (Player) e.getPlayer();
if (!p.hasPermission("perplayerkit.admin")) {
return;
}
String title = view.getTitle();
String[] parts = title.replace(ChatColor.BLUE + "Inspecting ", "").split("'s enderchest ");
String[] parts = title.replace(StyleManager.get().getPrimaryColor() + "Inspecting ", "").split("'s enderchest ");
if (parts.length != 2) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
package dev.noah.perplayerkit.listeners;

import dev.noah.perplayerkit.KitRoomDataManager;
import dev.noah.perplayerkit.util.StyleManager;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.Material;
import org.bukkit.entity.Player;
Expand All @@ -40,7 +41,7 @@ public void onSaveButtonClick(InventoryClickEvent e) {
InventoryView view = e.getView();
Player p = (Player) e.getWhoClicked();

if (view.getTitle().contains(ChatColor.BLUE + p.getName() + "'s Kits")) {
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + p.getName() + "'s Kits")) {
ItemStack saveButton = e.getInventory().getItem(53);
if (saveButton != null && saveButton.getType() == Material.BARRIER) {
if (e.getSlot() == 53) {
Expand Down
Loading