From c5cca1c5aacb8838a2132afb8d332cebeaf80e06 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Mon, 25 Sep 2023 22:15:50 +0200 Subject: [PATCH] Made rarity be able to use in the name for colors Made Sell window bigger so a whole inventory fits in it --- src/main/java/com/alttd/fishingevent/fish/Fish.java | 2 +- src/main/java/com/alttd/fishingevent/gui/GUI.java | 5 +++++ .../java/com/alttd/fishingevent/gui/windows/SellWindow.java | 3 +-- src/main/java/com/alttd/fishingevent/timer/EventManager.java | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alttd/fishingevent/fish/Fish.java b/src/main/java/com/alttd/fishingevent/fish/Fish.java index d9a6eed..c94771f 100644 --- a/src/main/java/com/alttd/fishingevent/fish/Fish.java +++ b/src/main/java/com/alttd/fishingevent/fish/Fish.java @@ -60,7 +60,7 @@ public abstract class Fish { TagResolver resolver = TagResolver.resolver( Placeholder.component("player", player.name()), Placeholder.parsed("length", String.format("%.2f", length)), - Placeholder.parsed("rarity", getRarity().displayName()) + Placeholder.unparsed("rarity", getRarity().displayName()) ); itemMeta.lore(fishLore(resolver)); diff --git a/src/main/java/com/alttd/fishingevent/gui/GUI.java b/src/main/java/com/alttd/fishingevent/gui/GUI.java index 9c5c0c5..e64599b 100644 --- a/src/main/java/com/alttd/fishingevent/gui/GUI.java +++ b/src/main/java/com/alttd/fishingevent/gui/GUI.java @@ -20,6 +20,11 @@ public abstract class GUI { guiActions = new HashMap<>(); } + public GUI(int size, Component name) { + inventory = Bukkit.createInventory(null, size, name); + guiActions = new HashMap<>(); + } + public GUIAction getGuiAction(int slot) { return guiActions.get(slot); } diff --git a/src/main/java/com/alttd/fishingevent/gui/windows/SellWindow.java b/src/main/java/com/alttd/fishingevent/gui/windows/SellWindow.java index e59ff00..1e3b98a 100644 --- a/src/main/java/com/alttd/fishingevent/gui/windows/SellWindow.java +++ b/src/main/java/com/alttd/fishingevent/gui/windows/SellWindow.java @@ -10,7 +10,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import org.bukkit.NamespacedKey; import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; @@ -24,7 +23,7 @@ public class SellWindow extends GUI { private final Player player; public SellWindow(FishingEvent fishingEvent, Player player, Logger logger) { - super(InventoryType.CHEST, MiniMessage.miniMessage().deserialize(Messages.GUI.SELL_GUI_NAME)); + super(4 * 9, MiniMessage.miniMessage().deserialize(Messages.GUI.SELL_GUI_NAME)); this.fishingEvent = fishingEvent; this.logger = logger; this.player = player; diff --git a/src/main/java/com/alttd/fishingevent/timer/EventManager.java b/src/main/java/com/alttd/fishingevent/timer/EventManager.java index 362f317..119ec6a 100644 --- a/src/main/java/com/alttd/fishingevent/timer/EventManager.java +++ b/src/main/java/com/alttd/fishingevent/timer/EventManager.java @@ -67,7 +67,7 @@ public class EventManager { ScoreboardManager.getInstance().getTop10().stream().limit(3).forEachOrdered(playerScore -> message.set(message.get().append(Component.newline()).append(MiniMessage.miniMessage().deserialize(Messages.TIMER.WINNER_FORMAT, TagResolver.resolver( Placeholder.component("player", playerScore.player().displayName()), - Placeholder.unparsed("rarity", playerScore.fish().getRarity().displayName()), + Placeholder.component("rarity", MiniMessage.miniMessage().deserialize(playerScore.fish().getRarity().displayName())), Placeholder.component("fish", playerScore.fish().fishName()), Placeholder.parsed("length", String.format("%.2f", playerScore.biggestFish())) )))));