Altitude/fishing_event
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made rarity be able to use <tags> in the name for colors

Browse Source 
Made Sell window bigger so a whole inventory fits in it
This commit is contained in:
Teriuihi 2023-09-25 22:15:50 +02:00
parent 7b818cb126
commit c5cca1c5aa
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/alttd/fishingevent/fish/Fish.java
View File

@ -60,7 +60,7 @@ public abstract class Fish {
TagResolver resolver = TagResolver.resolver( TagResolver resolver = TagResolver.resolver(
Placeholder.component("player", player.name()), Placeholder.component("player", player.name()),
Placeholder.parsed("length", String.format("%.2f", length)), Placeholder.parsed("length", String.format("%.2f", length)),
Placeholder.parsed("rarity", getRarity().displayName()) Placeholder.unparsed("rarity", getRarity().displayName())
); );
itemMeta.lore(fishLore(resolver)); itemMeta.lore(fishLore(resolver));

5
src/main/java/com/alttd/fishingevent/gui/GUI.java
View File

@ -20,6 +20,11 @@ public abstract class GUI {
guiActions = new HashMap<>(); guiActions = new HashMap<>();
} }
public GUI(int size, Component name) {
inventory = Bukkit.createInventory(null, size, name);
guiActions = new HashMap<>();
}
public GUIAction getGuiAction(int slot) { public GUIAction getGuiAction(int slot) {
return guiActions.get(slot); return guiActions.get(slot);
} }

3
src/main/java/com/alttd/fishingevent/gui/windows/SellWindow.java
View File

@ -10,7 +10,6 @@ import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.persistence.PersistentDataType; import org.bukkit.persistence.PersistentDataType;
@ -24,7 +23,7 @@ public class SellWindow extends GUI {
private final Player player; private final Player player;
public SellWindow(FishingEvent fishingEvent, Player player, Logger logger) { 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.fishingEvent = fishingEvent;
this.logger = logger; this.logger = logger;
this.player = player; this.player = player;

2
src/main/java/com/alttd/fishingevent/timer/EventManager.java
View File

@ -67,7 +67,7 @@ public class EventManager {
ScoreboardManager.getInstance().getTop10().stream().limit(3).forEachOrdered(playerScore -> 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( message.set(message.get().append(Component.newline()).append(MiniMessage.miniMessage().deserialize(Messages.TIMER.WINNER_FORMAT, TagResolver.resolver(
Placeholder.component("player", playerScore.player().displayName()), 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.component("fish", playerScore.fish().fishName()),
Placeholder.parsed("length", String.format("%.2f", playerScore.biggestFish())) Placeholder.parsed("length", String.format("%.2f", playerScore.biggestFish()))
))))); )))));