Skip to content

Commit 075bc91

Browse files
rossnoahrossnoah
committed
change getMainColor to getPrimaryColor
1 parent 82cb9a4 commit 075bc91

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎src/main/java/dev/noah/perplayerkit/commands/EnderchestCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void viewOnlyEC(Player p) {
5252

5353
ItemStack fill = ItemUtil.createGlassPane();
5454

55-
Menu menu = ChestMenu.builder(5).title(StyleManager.get().getMainColor() + "View Only Enderchest").build();
55+
Menu menu = ChestMenu.builder(5).title(StyleManager.get().getPrimaryColor() + "View Only Enderchest").build();
5656

5757

5858
for (int i = 0; i < 9; i++) {

‎src/main/java/dev/noah/perplayerkit/commands/RegearCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626

2727
public class RegearCommand implements CommandExecutor, Listener {
2828

29-
public static final ItemStack REGEAR_SHULKER_ITEM = ItemUtil.createItem(Material.WHITE_SHULKER_BOX, 1, StyleManager.get().getMainColor() + "Regear Shulker", "&7● Restocks Your Kit", "&7● Use " + StyleManager.get().getMainColor() + "/rg &7to get another regear shulker");
30-
public static final ItemStack REGEAR_SHELL_ITEM = ItemUtil.createItem(Material.SHULKER_SHELL, 1, StyleManager.get().getMainColor() + "Regear Shell", "&7● Restocks Your Kit", "&7● Click to use!");
29+
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");
30+
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!");
3131

3232
private final Plugin plugin;
3333
private final CooldownManager commandCooldownManager;
@@ -193,7 +193,7 @@ public record RegearInventoryHolder(
193193

194194
@Override
195195
public @NotNull Inventory getInventory() {
196-
Inventory inventory = Bukkit.createInventory(this, 27, StyleManager.get().getMainColor() + "Regear Shulker");
196+
Inventory inventory = Bukkit.createInventory(this, 27, StyleManager.get().getPrimaryColor() + "Regear Shulker");
197197
inventory.setItem(13, REGEAR_SHELL_ITEM);
198198
return inventory;
199199
}

‎src/main/java/dev/noah/perplayerkit/gui/GUI.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static void addLoadPublicKit(Slot slot, String id) {
6464
}
6565

6666
public static Menu createPublicKitMenu() {
67-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Public Kit Room").redraw(true).build();
67+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Public Kit Room").redraw(true).build();
6868
}
6969

7070
public static boolean removeKitDeletionFlag(Player player) {
@@ -349,7 +349,7 @@ public Menu ViewPublicKitMenu(Player p, String id) {
349349
}
350350
return null;
351351
}
352-
Menu menu = ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Viewing Public Kit: " + id).redraw(true).build();
352+
Menu menu = ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Viewing Public Kit: " + id).redraw(true).build();
353353

354354
for (int i = 0; i < 54; i++) {
355355
menu.getSlot(i).setItem(ItemUtil.createGlassPane());
@@ -650,31 +650,31 @@ public void addEditLoadEC(Slot slot, int i) {
650650
}
651651

652652
public Menu createKitMenu(int slot) {
653-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Kit: " + slot).build();
653+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Kit: " + slot).build();
654654
}
655655

656656
public Menu createPublicKitMenu(String id) {
657-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Public Kit: " + id).build();
657+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Public Kit: " + id).build();
658658
}
659659

660660
public Menu createECMenu(int slot) {
661-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Enderchest: " + slot).build();
661+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Enderchest: " + slot).build();
662662
}
663663

664664
public Menu createInspectMenu(int slot, String playerName) {
665-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Inspecting " + playerName + "'s kit " + slot).build();
665+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Inspecting " + playerName + "'s kit " + slot).build();
666666
}
667667

668668
public Menu createInspectEcMenu(int slot, String playerName) {
669-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Inspecting " + playerName + "'s enderchest " + slot).build();
669+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Inspecting " + playerName + "'s enderchest " + slot).build();
670670
}
671671

672672
public Menu createMainMenu(Player p) {
673-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + p.getName() + "'s Kits").build();
673+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + p.getName() + "'s Kits").build();
674674
}
675675

676676
public Menu createKitRoom() {
677-
return ChestMenu.builder(6).title(StyleManager.get().getMainColor() + "Kit Room").redraw(true).build();
677+
return ChestMenu.builder(6).title(StyleManager.get().getPrimaryColor() + "Kit Room").redraw(true).build();
678678
}
679679

680680
public void allowModification(Slot slot) {

‎src/main/java/dev/noah/perplayerkit/listeners/KitMenuCloseListener.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public void onKitEditorClose(InventoryCloseEvent e) {
4242
if (inv.getSize() == 54) {
4343
if (inv.getLocation() == null) {
4444
InventoryView view = e.getView();
45-
if (view.getTitle().contains(StyleManager.get().getMainColor() + "Kit: ")) {
45+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Kit: ")) {
4646
Player p = (Player) e.getPlayer();
4747
UUID uuid = p.getUniqueId();
48-
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getMainColor() + "Kit: ", ""));
48+
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Kit: ", ""));
4949
ItemStack[] kit = new ItemStack[41];
5050
ItemStack[] chestitems = e.getInventory().getContents();
5151

@@ -68,9 +68,9 @@ public void onPublicKitEditorClose(InventoryCloseEvent e) {
6868
if (inv.getSize() == 54) {
6969
if (inv.getLocation() == null) {
7070
InventoryView view = e.getView();
71-
if (view.getTitle().contains(StyleManager.get().getMainColor() + "Public Kit: ")) {
71+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Public Kit: ")) {
7272
Player player = (Player) e.getPlayer();
73-
String publickit = view.getTitle().replace(StyleManager.get().getMainColor() + "Public Kit: ", "");
73+
String publickit = view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Public Kit: ", "");
7474
ItemStack[] kit = new ItemStack[41];
7575
ItemStack[] chestitems = e.getInventory().getContents();
7676

@@ -93,10 +93,10 @@ public void onEnderchestEditorClose(InventoryCloseEvent e) {
9393
if (inv.getSize() == 54) {
9494
if (inv.getLocation() == null) {
9595
InventoryView view = e.getView();
96-
if (view.getTitle().contains(StyleManager.get().getMainColor() + "Enderchest: ")) {
96+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Enderchest: ")) {
9797
Player p = (Player) e.getPlayer();
9898
UUID uuid = p.getUniqueId();
99-
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getMainColor() + "Enderchest: ", ""));
99+
int slot = Integer.parseInt(view.getTitle().replace(StyleManager.get().getPrimaryColor() + "Enderchest: ", ""));
100100
ItemStack[] kit = new ItemStack[27];
101101
ItemStack[] chestitems = e.getInventory().getContents();
102102

@@ -119,13 +119,13 @@ public void onInspectKitEditorClose(InventoryCloseEvent e) {
119119
if (inv.getSize() == 54) {
120120
if (inv.getLocation() == null) {
121121
InventoryView view = e.getView();
122-
if (view.getTitle().contains(StyleManager.get().getMainColor() + "Inspecting ") && view.getTitle().contains("'s kit ")) {
122+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Inspecting ") && view.getTitle().contains("'s kit ")) {
123123
Player p = (Player) e.getPlayer();
124124
if (!p.hasPermission("perplayerkit.admin")) {
125125
return;
126126
}
127127
String title = view.getTitle();
128-
String[] parts = title.replace(StyleManager.get().getMainColor() + "Inspecting ", "").split("'s kit ");
128+
String[] parts = title.replace(StyleManager.get().getPrimaryColor() + "Inspecting ", "").split("'s kit ");
129129
if (parts.length != 2) {
130130
return;
131131
}
@@ -186,13 +186,13 @@ public void onInspectEnderchestEditorClose(InventoryCloseEvent e) {
186186
if (inv.getSize() == 54) {
187187
if (inv.getLocation() == null) {
188188
InventoryView view = e.getView();
189-
if (view.getTitle().contains(StyleManager.get().getMainColor() + "Inspecting ") && view.getTitle().contains("'s enderchest ")) {
189+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + "Inspecting ") && view.getTitle().contains("'s enderchest ")) {
190190
Player p = (Player) e.getPlayer();
191191
if (!p.hasPermission("perplayerkit.admin")) {
192192
return;
193193
}
194194
String title = view.getTitle();
195-
String[] parts = title.replace(StyleManager.get().getMainColor() + "Inspecting ", "").split("'s enderchest ");
195+
String[] parts = title.replace(StyleManager.get().getPrimaryColor() + "Inspecting ", "").split("'s enderchest ");
196196
if (parts.length != 2) {
197197
return;
198198
}

‎src/main/java/dev/noah/perplayerkit/listeners/KitRoomSaveListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void onSaveButtonClick(InventoryClickEvent e) {
4141
InventoryView view = e.getView();
4242
Player p = (Player) e.getWhoClicked();
4343

44-
if (view.getTitle().contains(StyleManager.get().getMainColor() + p.getName() + "'s Kits")) {
44+
if (view.getTitle().contains(StyleManager.get().getPrimaryColor() + p.getName() + "'s Kits")) {
4545
ItemStack saveButton = e.getInventory().getItem(53);
4646
if (saveButton != null && saveButton.getType() == Material.BARRIER) {
4747
if (e.getSlot() == 53) {

‎src/main/java/dev/noah/perplayerkit/util/StyleManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Material getGlassMaterial() {
5454
return glassMaterial;
5555
}
5656

57-
public String getMainColor() {
57+
public String getPrimaryColor() {
5858
return titleColor;
5959
}
6060
}

0 commit comments

Comments
 (0)