From d8bcb4b9a770b50678840d56d001f7e17802a19c Mon Sep 17 00:00:00 2001 From: Brianna O'Keefe Date: Sun, 31 Mar 2024 18:06:12 -0500 Subject: [PATCH] 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());