From f18a162897da77b10fc718c8a2ce90797182fdd9 Mon Sep 17 00:00:00 2001 From: Ryder Belserion Date: Thu, 22 Aug 2024 10:14:22 -0400 Subject: [PATCH] fix lore not showing up on items in /ca --- CHANGELOG.md | 10 +--- .../controllers/GuiListener.java | 60 ++++++++++++------- 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7e495c..11e9166 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,2 @@ ### Fixed: -- Issue with file manager not properly loading/reloading files. -- Reload config files on /crazyauctions reload - -### Added: -- `Help-Msg` to the messages.yml -```yml -Messages: - Help-Msg: '&cPlease do /crazyauctions help for more information.' -``` \ No newline at end of file +- Lore not showing up on items in /ca \ No newline at end of file diff --git a/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java b/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java index cb573ac..f86206f 100644 --- a/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java +++ b/src/main/java/com/badbones69/crazyauctions/controllers/GuiListener.java @@ -68,11 +68,13 @@ public class GuiListener implements Listener { if (data.contains("Items")) { for (String i : data.getConfigurationSection("Items").getKeys(false)) { - List lore = new ArrayList<>(); - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + i + ".Item")); if (itemBuilder != null && data.contains("Items." + i + ".Item") && (cat.getItems().contains(itemBuilder.getItemStack().getType()) || cat == Category.NONE)) { + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); + if (data.getBoolean("Items." + i + ".Biddable")) { if (sell == ShopType.BID) { String seller = data.getString("Items." + i + ".Seller"); @@ -296,7 +298,11 @@ public class GuiListener implements Listener { if (data.contains("Items")) { for (String i : data.getConfigurationSection("Items").getKeys(false)) { if (data.getString("Items." + i + ".Seller").equalsIgnoreCase(player.getUniqueId().toString())) { - List lore = new ArrayList<>(); + ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + i + ".Item")); + + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); String price = Methods.getPrice(i, false); String time = Methods.convertToTime(data.getLong("Items." + i + ".Time-Till-Expire")); @@ -308,8 +314,6 @@ public class GuiListener implements Listener { .replace("%time%", time)); } - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + i + ".Item")); - itemBuilder.setLore(lore); items.add(itemBuilder.build()); @@ -344,7 +348,11 @@ public class GuiListener implements Listener { for (String i : data.getConfigurationSection("OutOfTime/Cancelled").getKeys(false)) { if (data.getString("OutOfTime/Cancelled." + i + ".Seller") != null) { if (data.getString("OutOfTime/Cancelled." + i + ".Seller").equalsIgnoreCase(player.getUniqueId().toString())) { - List lore = new ArrayList<>(); + ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("OutOfTime/Cancelled." + i + ".Item")); + + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); String price = Methods.getPrice(i, true); String time = Methods.convertToTime(data.getLong("OutOfTime/Cancelled." + i + ".Full-Time")); @@ -356,8 +364,6 @@ public class GuiListener implements Listener { .replace("%time%", time)); } - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("OutOfTime/Cancelled." + i + ".Item")); - itemBuilder.setLore(lore); items.add(itemBuilder.build()); @@ -442,8 +448,14 @@ public class GuiListener implements Listener { ItemBuilder itemBuilder = new ItemBuilder().setMaterial(id).setName(name).setAmount(1); + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); + if (config.contains("Settings.GUISettings.OtherSettings." + o + ".Lore")) { - itemBuilder.setLore(config.getStringList("Settings.GUISettings.OtherSettings." + o + ".Lore")).build(); + lore.addAll(config.getStringList("Settings.GUISettings.OtherSettings." + o + ".Lore")); + + itemBuilder.setLore(lore); } item = itemBuilder.build(); @@ -463,7 +475,11 @@ public class GuiListener implements Listener { } } - List lore = new ArrayList<>(); + ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + ID + ".Item")); + + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); String price = Methods.getPrice(ID, false); String time = Methods.convertToTime(data.getLong("Items." + ID + ".Time-Till-Expire")); @@ -484,8 +500,6 @@ public class GuiListener implements Listener { .replace("%time%", time)); } - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + ID + ".Item")); - itemBuilder.setLore(lore); inv.setItem(4, itemBuilder.build()); @@ -549,7 +563,11 @@ public class GuiListener implements Listener { if (data.contains("Items")) { for (String i : data.getConfigurationSection("Items").getKeys(false)) { if (data.getString("Items." + i + ".Seller").equalsIgnoreCase(other)) { - List lore = new ArrayList<>(); + ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + ID + ".Item")); + + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); String price = Methods.getPrice(i, false); String time = Methods.convertToTime(data.getLong("Items." + i + ".Time-Till-Expire")); @@ -592,8 +610,6 @@ public class GuiListener implements Listener { } } - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(data.getString("Items." + ID + ".Item")); - itemBuilder.setLore(lore); items.add(itemBuilder.build()); @@ -657,7 +673,9 @@ public class GuiListener implements Listener { String price = Methods.getPrice(ID, false); if (config.contains("Settings.GUISettings.OtherSettings.Bidding.Lore")) { - List lore = new ArrayList<>(); + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); for (String l : config.getStringList("Settings.GUISettings.OtherSettings.Bidding.Lore")) { lore.add(l.replace("%Bid%", String.valueOf(bid)) @@ -678,7 +696,11 @@ public class GuiListener implements Listener { ItemStack item = Methods.fromBase64(data.getString("Items." + ID + ".Item")); - List lore = new ArrayList<>(); + ItemBuilder itemBuilder = ItemBuilder.convertItemStack(item); + + List lore = new ArrayList<>(itemBuilder.getUpdatedLore()); + + lore.add(" "); String price = Methods.getPrice(ID, false); String time = Methods.convertToTime(data.getLong("Items." + ID + ".Time-Till-Expire")); @@ -708,8 +730,6 @@ public class GuiListener implements Listener { .replace("%time%", time)); } - ItemBuilder itemBuilder = ItemBuilder.convertItemStack(item); - itemBuilder.setLore(lore); return itemBuilder.build(); @@ -1440,4 +1460,4 @@ public class GuiListener implements Listener { } } } -} +} \ No newline at end of file