From 3680f9bfec636db467b7e02dcd22fedaf8d2fa7e Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 31 Mar 2024 17:59:01 -0500 Subject: [PATCH 1/4] Added a quick access edit button to the kit preview. --- .../com/craftaro/ultimatekits/gui/PreviewKitGui.java | 9 +++++++++ src/main/resources/en_US.lang | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java b/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java index 0d06369..575b27d 100644 --- a/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java +++ b/src/main/java/com/craftaro/ultimatekits/gui/PreviewKitGui.java @@ -94,6 +94,15 @@ public class PreviewKitGui extends Gui { setButton(0, 0, GuiUtils.createButtonItem(buttonItem, plugin.getLocale().getMessage("interface.button.back").getMessage()), event -> event.player.closeInventory()); } + + if (player.hasPermission("ultimatekits.admin")) { + setButton(0, 4, GuiUtils.createButtonItem(XMaterial.REDSTONE, + plugin.getLocale().getMessage("interface.button.edit").getMessage()), + event -> { + exit(); + plugin.getGuiManager().showGUI(player, new KitEditorGui(plugin, player, kit, this)); + }); + } } // purchase button if (buyable) { diff --git a/src/main/resources/en_US.lang b/src/main/resources/en_US.lang index f2f634f..7664c7a 100644 --- a/src/main/resources/en_US.lang +++ b/src/main/resources/en_US.lang @@ -42,6 +42,7 @@ interface: next: '&7Next Page' last: '&7Last Page' clickeco: '&7Click to buy for &a%price%&7.' + edit: '&6Edit' preview: title: '&9Previewing kit: &8%kit%' yesno: From d8bcb4b9a770b50678840d56d001f7e17802a19c Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 31 Mar 2024 18:06:12 -0500 Subject: [PATCH 2/4] Don't show the kit items chance if all are 100%. --- src/main/java/com/craftaro/ultimatekits/kit/Kit.java | 11 ++++++++++- .../java/com/craftaro/ultimatekits/kit/KitItem.java | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java index 57cc71d..e5220f4 100644 --- a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java +++ b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java @@ -126,7 +126,7 @@ public class Kit implements Cloneable { if ((!item.getSerialized().startsWith("/") && !item.getSerialized().startsWith(Settings.CURRENCY_SYMBOL.getString())) || commands) { //ToDO: I doubt this is correct. ItemStack stack = moveable ? item.getMoveableItem() : item.getItem(); if (preview) { - stack = item.getItemForDisplay(); + stack = item.getItemForDisplay(this); } if (stack == null) { continue; @@ -243,6 +243,15 @@ public class Kit implements Cloneable { return this.name; } + public boolean all100Percent() { + for (KitItem item : this.contents) { + if (item.getChance() != 100) { + return false; + } + } + return true; + } + public ItemStack getDisplayItem() { return this.displayItem; } diff --git a/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java b/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java index 324ee3b..5478bbf 100644 --- a/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java +++ b/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java @@ -206,7 +206,7 @@ public class KitItem implements Cloneable { return compileOptions(item); } - public ItemStack getItemForDisplay() { + public ItemStack getItemForDisplay(Kit kit) { if (this.content == null) { return null; } @@ -225,7 +225,7 @@ public class KitItem implements Cloneable { meta.setLore(Collections.singletonList(ChatColor.translateAlternateColorCodes('&', this.displayLore))); } - if (UltimateKits.getInstance().getConfig().getBoolean("Main.Display Chance In Preview")) { + if (UltimateKits.getInstance().getConfig().getBoolean("Main.Display Chance In Preview") && !kit.all100Percent()) { ArrayDeque lore; if (meta.hasLore()) { lore = new ArrayDeque<>(meta.getLore()); From 635d20f8d9546ebc17ed06082c9531e9609dbeb6 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 31 Mar 2024 18:22:39 -0500 Subject: [PATCH 3/4] Removed this strange moveable stuff. --- .../com/craftaro/ultimatekits/gui/KitEditorGui.java | 9 +-------- src/main/java/com/craftaro/ultimatekits/kit/Kit.java | 4 ---- .../java/com/craftaro/ultimatekits/kit/KitItem.java | 12 +++--------- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java b/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java index d0f0eb7..39f5554 100644 --- a/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java +++ b/src/main/java/com/craftaro/ultimatekits/gui/KitEditorGui.java @@ -377,15 +377,8 @@ public class KitEditorGui extends DoubleGui { if (itemStack.getItemMeta().hasLore()) { ItemMeta meta = itemStack.getItemMeta(); List newLore = new ArrayList<>(); - for (String line : meta.getLore()) { - if (line.contains("Moveable")) { - continue; - } - if (line.equals(TextUtils.formatText("&8----"))) { - break; - } + for (String line : meta.getLore()) newLore.add(line); - } meta.setLore(newLore); itemStack.setItemMeta(meta); } diff --git a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java index e5220f4..7248d14 100644 --- a/src/main/java/com/craftaro/ultimatekits/kit/Kit.java +++ b/src/main/java/com/craftaro/ultimatekits/kit/Kit.java @@ -80,14 +80,10 @@ public class Kit implements Cloneable { List list = new ArrayList<>(); for (ItemStack is : items) { if (is != null && is.getType() != Material.AIR) { - if (is.getItemMeta().hasLore()) { ItemMeta meta = is.getItemMeta(); List newLore = new ArrayList<>(); for (String line : meta.getLore()) { - if (line.contains("Moveable")) { - continue; - } if (line.equals(TextUtils.formatText("&8----"))) { break; } diff --git a/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java b/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java index 5478bbf..9089029 100644 --- a/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java +++ b/src/main/java/com/craftaro/ultimatekits/kit/KitItem.java @@ -195,15 +195,9 @@ public class KitItem implements Cloneable { return null; } ItemStack item = this.content.getItemForDisplay().clone(); - ItemMeta meta = item.getItemMeta(); - List lore = meta.hasLore() && meta.getLore().get(0).equals(TextUtils.formatText("&8&oMoveable")) - ? new ArrayList<>() : new ArrayList<>(Collections.singletonList(TextUtils.formatText("&8&oMoveable"))); - if (meta.hasLore()) { - lore.addAll(meta.getLore()); - } - meta.setLore(lore); - item.setItemMeta(meta); - return compileOptions(item); + NBTItem nbtItem = new NBTItem(item); + nbtItem.setBoolean("moveable", true); + return compileOptions(nbtItem.getItem()); } public ItemStack getItemForDisplay(Kit kit) { From 0bb306f90f812cfcd8b80038524ae74b6455f246 Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 31 Mar 2024 18:23:03 -0500 Subject: [PATCH 4/4] version 3.0.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9adae6..cc2fa97 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.craftaro UltimateKits - 3.0.1 + 3.0.2 UltimateKits Creating and displaying your server's kits has never been easier