From 0d3676b0c1c9f13d10575927554b9d3c2317947e Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Mon, 26 Jan 2026 15:12:51 +0530
Subject: [PATCH 1/6] customizable messages 1

---
 .../neptune/configs/impl/MessagesLocale.java  | 578 +++++++++---------
 .../feature/hotbar/impl/ItemAction.java       |   4 +-
 .../neptune/feature/party/impl/EventType.java |   5 +-
 .../lrxh/neptune/game/duel/DuelRequest.java   |   3 +-
 .../match/impl/participant/Participant.java   |  20 +-
 .../game/match/listener/MatchListener.java    |   8 +-
 .../providers/listeners/GlobalListener.java   |  12 +-
 .../placeholder/PlaceholderUtil.java          |  57 +-
 8 files changed, 367 insertions(+), 320 deletions(-)

diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
index 3e1d5680..3814e104 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
@@ -19,292 +19,318 @@
 
 @Getter
 public enum MessagesLocale implements IDataAccessor {
-    MATCH_YOU("MATCH.YOU", DataType.STRING, "You"),
-    MATCH_OPPONENT_TEAM("MATCH.OPPONENT_TEAM", DataType.STRING, "Opponent Team"),
-    MATCH_DEATH_DISCONNECT("MATCH.DEATH.DISCONNECT", DataType.STRING_LIST, "<player> &7disconnected"),
-    MATCH_DEATH_KILLED("MATCH.DEATH.KILLED", DataType.STRING_LIST, "<player> &7was killed by <killer>"),
-    MATCH_DEATH_DIED("MATCH.DEATH.DIED", DataType.STRING_LIST, "<player> &7died"),
-    MATCH_DEATH_VOID("MATCH.DEATH.VOID", DataType.STRING_LIST, "<player> &7fell into the void while fighting <killer>"),
-    QUEUE_JOIN("QUEUE.JOIN", DataType.STRING_LIST, "&7(&bDuels&7) Joined Queue"),
-    QUEUE_LEAVE("QUEUE.LEAVE", DataType.STRING_LIST, "&7(&bDuels&7) Left queue"),
-    QUEUE_ACTION_BAR("QUEUE.ACTION_BAR", DataType.STRING, "&7<kit> 1v1 &8| &a<time>"),
-    QUEUE_REPEAT("QUEUE.REPEAT.MESSAGE", DataType.STRING_LIST, "&aSearching for other players in queue..."),
-    QUEUE_REPEAT_TOGGLE("QUEUE.REPEAT.TOGGLE", DataType.BOOLEAN, "true"),
-    MATCH_STARTED("MATCH.STARTED", DataType.STRING_LIST, "&aMatch Started!"),
-    ROUND_STARTED("MATCH.ROUND.STARTED", DataType.STRING_LIST, "&aRound Started!"),
-    MATCH_FOUND("MATCH.FOUND", DataType.STRING_LIST, " ", "&a&lMatch Found!", " ", "&fKit: &a<kit>",
-            "&fOpponent: &a<opponent>", "&fPing: &b<opponent-ping>", "&fOpponent Elo: &a<opponent-elo>", "", " "),
-    MATCH_STARTING("MATCH.START.TIMER", DataType.STRING_LIST, "&fMatch starting in &b<timer>&f..."),
-    MATCH_STARTING_TITLE_HEADER("MATCH.STARTING.TITLE-HEADER", DataType.STRING, "&e<countdown-time>"),
-    MATCH_OUT_OF_BOUNDS_TITLE_HEADER("MATCH.OUT_OF_BOUNDS.TITLE-HEADER", DataType.STRING, "&cYOU ARE OUT OF BOUNDS!"),
-    MATCH_OUT_OF_BOUNDS_TITLE_FOOTER("MATCH.OUT_OF_BOUNDS.TITLE-FOOTER", DataType.STRING,
-            "&cYou will start taking damage!"),
-    RANKUP_TITLE_HEADER("RANKUP.TITLE-HEADER", DataType.STRING, "&b&lPROMOTED!"),
-    RANKUP_TITLE_FOOTER("RANKUP.TITLE-FOOTER", DataType.STRING, "&7You are now in &f<division>&7!"),
-    RANKUP_MESSAGE("RANKUP.MESSAGE", DataType.STRING_LIST,
-            "&aCongratulations! &7You've been promoted to &f<division>&7."),
-    MATCH_STARTING_TITLE_FOOTER("MATCH.STARTING.TITLE-FOOTER", DataType.STRING, ""),
-    PARKOUR_CHECKPOINT("MATCH.PARKOUR.CHECKPOINT", DataType.STRING_LIST,
-            "&a<player> finished checkpoint <checkpoint> in <time>!"),
-    PARKOUR_END("MATCH.PARKOUR.END", DataType.STRING_LIST, "&a<player> finished the parkour in <time>!"),
-    ROUND_STARTING("MATCH.ROUND.START.TIMER", DataType.STRING_LIST, "&fRound starting in &b<timer>&f..."),
-    MATCH_START_TITLE_HEADER("MATCH.START.TITLE-HEADER", DataType.STRING, "&aFight!"),
-    MATCH_START_TITLE_FOOTER("MATCH.START.TITLE-FOOTER", DataType.STRING, ""),
-    MATCH_WINNER_TITLE_HEADER("MATCH.WINNER.TITLE-HEADER", DataType.STRING, "&aVICTORY!"),
-    MATCH_WINNER_TITLE_FOOTER("MATCH.WINNER.TITLE-FOOTER", DataType.STRING, "&a<player> &fwon the match!"),
+        CANT_DO_THIS_NOW("CANT_DO_THIS_NOW", DataType.STRING_LIST,
+                        "&cYou can't do this right now!"),
+        CANT_DO_THIS_HERE("CANT_DO_THIS_HERE", DataType.STRING_LIST,
+                        "&cYou can't do this here!"),
+        MATCH_YOU("MATCH.YOU", DataType.STRING, "You"),
+        MATCH_OPPONENT_TEAM("MATCH.OPPONENT_TEAM", DataType.STRING, "Opponent Team"),
+        MATCH_DEATH_DISCONNECT("MATCH.DEATH.DISCONNECT", DataType.STRING_LIST, "<player> &7disconnected"),
+        MATCH_DEATH_KILLED("MATCH.DEATH.KILLED", DataType.STRING_LIST, "<player> &7was killed by <killer>"),
+        MATCH_DEATH_DIED("MATCH.DEATH.DIED", DataType.STRING_LIST, "<player> &7died"),
+        MATCH_DEATH_VOID("MATCH.DEATH.VOID", DataType.STRING_LIST,
+                        "<player> &7fell into the void while fighting <killer>"),
+        QUEUE_JOIN("QUEUE.JOIN", DataType.STRING_LIST, "&7(&bDuels&7) Joined Queue"),
+        QUEUE_LEAVE("QUEUE.LEAVE", DataType.STRING_LIST, "&7(&bDuels&7) Left queue"),
+        QUEUE_ACTION_BAR("QUEUE.ACTION_BAR", DataType.STRING, "&7<kit> 1v1 &8| &a<time>"),
+        QUEUE_REPEAT("QUEUE.REPEAT.MESSAGE", DataType.STRING_LIST, "&aSearching for other players in queue..."),
+        QUEUE_REPEAT_TOGGLE("QUEUE.REPEAT.TOGGLE", DataType.BOOLEAN, "true"),
+        QUEUE_NO_ARENAS("QUEUE.NO_ARENAS", DataType.STRING_LIST,
+                        "&cNo arenas were found!"),
+        MATCH_STARTED("MATCH.STARTED", DataType.STRING_LIST, "&aMatch Started!"),
+        ROUND_STARTED("MATCH.ROUND.STARTED", DataType.STRING_LIST, "&aRound Started!"),
+        MATCH_FOUND("MATCH.FOUND", DataType.STRING_LIST, " ", "&a&lMatch Found!", " ", "&fKit: &a<kit>",
+                        "&fOpponent: &a<opponent>", "&fPing: &b<opponent-ping>", "&fOpponent Elo: &a<opponent-elo>", "",
+                        " "),
+        MATCH_STARTING("MATCH.START.TIMER", DataType.STRING_LIST, "&fMatch starting in &b<timer>&f..."),
+        MATCH_STARTING_TITLE_HEADER("MATCH.STARTING.TITLE-HEADER", DataType.STRING, "&e<countdown-time>"),
+        MATCH_OUT_OF_BOUNDS_TITLE_HEADER("MATCH.OUT_OF_BOUNDS.TITLE-HEADER", DataType.STRING,
+                        "&cYOU ARE OUT OF BOUNDS!"),
+        MATCH_OUT_OF_BOUNDS_TITLE_FOOTER("MATCH.OUT_OF_BOUNDS.TITLE-FOOTER", DataType.STRING,
+                        "&cYou will start taking damage!"),
+        RANKUP_TITLE_HEADER("RANKUP.TITLE-HEADER", DataType.STRING, "&b&lPROMOTED!"),
+        RANKUP_TITLE_FOOTER("RANKUP.TITLE-FOOTER", DataType.STRING, "&7You are now in &f<division>&7!"),
+        RANKUP_MESSAGE("RANKUP.MESSAGE", DataType.STRING_LIST,
+                        "&aCongratulations! &7You've been promoted to &f<division>&7."),
+        MATCH_STARTING_TITLE_FOOTER("MATCH.STARTING.TITLE-FOOTER", DataType.STRING, ""),
+        PARKOUR_CHECKPOINT("MATCH.PARKOUR.CHECKPOINT", DataType.STRING_LIST,
+                        "&a<player> finished checkpoint <checkpoint> in <time>!"),
+        PARKOUR_END("MATCH.PARKOUR.END", DataType.STRING_LIST, "&a<player> finished the parkour in <time>!"),
+        ROUND_STARTING("MATCH.ROUND.START.TIMER", DataType.STRING_LIST, "&fRound starting in &b<timer>&f..."),
+        MATCH_START_TITLE_HEADER("MATCH.START.TITLE-HEADER", DataType.STRING, "&aFight!"),
+        MATCH_START_TITLE_FOOTER("MATCH.START.TITLE-FOOTER", DataType.STRING, ""),
+        MATCH_WINNER_TITLE_HEADER("MATCH.WINNER.TITLE-HEADER", DataType.STRING, "&aVICTORY!"),
+        MATCH_WINNER_TITLE_FOOTER("MATCH.WINNER.TITLE-FOOTER", DataType.STRING, "&a<player> &fwon the match!"),
 
-    MATCH_LOSER_TITLE_HEADER("MATCH.LOSER.TITLE-HEADER", DataType.STRING, "&cDEFEAT!"),
-    MATCH_LOSER_TITLE_FOOTER("MATCH.LOSER.TITLE-FOOTER", DataType.STRING, "&a<player> &fwon the match!"),
+        MATCH_LOSER_TITLE_HEADER("MATCH.LOSER.TITLE-HEADER", DataType.STRING, "&cDEFEAT!"),
+        MATCH_LOSER_TITLE_FOOTER("MATCH.LOSER.TITLE-FOOTER", DataType.STRING, "&a<player> &fwon the match!"),
 
-    MATCH_COMMA("MATCH.COMMA", DataType.STRING, "&7, "),
-    MATCH_END_DETAILS_SOLO("MATCH.END_DETAILS_MESSAGE.SOLO", DataType.STRING_LIST,
-            " ",
-            "&bMatch Results:",
-            "&aWinner: &e<winner> &7| &cLoser: &e<loser>",
-            " "),
-    MATCH_END_DETAILS_DUEL("MATCH.END_DETAILS_MESSAGE.DUEL", DataType.STRING_LIST,
-            " ",
-            "&bMatch Results:",
-            "&aWinner: &e<winner> &7| &cLoser: &e<loser>",
-            " "),
-    MATCH_END_DETAILS_TEAM("MATCH.END_DETAILS_MESSAGE.TEAM", DataType.STRING_LIST,
-            " ",
-            "&bMatch Results:",
-            "&aWinners: &e<winners>",
-            "&cLosers: &e<losers>",
-            " "),
-    MATCH_END_DETAILS_FFA("MATCH.END_DETAILS_MESSAGE.FFA", DataType.STRING_LIST,
-            "",
-            "&f&l<winner> &b&lwon the FFA match!",
-            " "),
-    MATCH_RESPAWN_TIMER("MATCH.RESPAWN_TIMER", DataType.STRING_LIST, "&fRespawning in &b<timer>&f..."),
-    MATCH_RESPAWNED("MATCH.RESPAWNED", DataType.STRING_LIST, "&aRespawned!"),
-    MATCH_RESPAWN_TITLE_HEADER("MATCH.RESPAWN_TITLE.HEADER", DataType.STRING, "&fRespawning in &b<timer>&f..."),
-    MATCH_RESPAWN_TITLE_FOOTER("MATCH.RESPAWNED_TITLE_FOOTER", DataType.STRING, ""),
-    MATCH_PLAY_AGAIN_ENABLED("MATCH.PLAY_AGAIN.ENABLED", DataType.BOOLEAN, "true"),
-    MATCH_PLAY_AGAIN("MATCH.PLAY_AGAIN.MESSAGE", DataType.STRING, "&bDo you want to play again? &a(Click here)"),
-    MATCH_PLAY_AGAIN_HOVER("MATCH.PLAY_AGAIN.HOVER", DataType.STRING, "&aClick to play again!"),
-    MATCH_COMBO_MESSAGE_ENABLE("MATCH.COMBO_MESSAGE.ENABLE", DataType.BOOLEAN, "true"),
-    MATCH_COMBO_MESSAGE_5("MATCH.COMBO_MESSAGE.5COMBO", DataType.STRING_LIST, "&a5 COMBO!"),
-    MATCH_COMBO_MESSAGE_10("MATCH.COMBO_MESSAGE.10COMBO", DataType.STRING_LIST, "&e10 COMBO!"),
-    MATCH_COMBO_MESSAGE_20("MATCH.COMBO_MESSAGE.20COMBO", DataType.STRING_LIST, "&c!!!20 COMBO!!!"),
-    MATCH_BUILD_LIMIT("MATCH.BUILD_LIMIT", DataType.STRING_LIST, "&cYou have reached the build limit!"),
-    KIT_EDITOR_START("KIT_EDITOR.START", "This is sent when the player starts editing a kit.", DataType.STRING_LIST,
-            "&bOpen your Inventory to edit layout!",
-            "&bYou can use &f/kiteditor reset <kit> &bto reset the kit!"),
-    KIT_EDITOR_STOP("KIT_EDITOR.STOP", "This is sent when the player finishes editing a kit.", DataType.STRING_LIST,
-            "&aKit layout has been saved."),
-    KIT_EDITOR_RESET("KIT_EDITOR.RESET", "This is sent when the player resets a kit.", DataType.STRING_LIST,
-            "&aKit has been reset."),
-    DUEL_REQUEST_RECEIVER("DUEL.SENT", DataType.STRING_LIST, " ",
-            "&bDuel Request",
-            " ",
-            "&fSender: &a<sender>",
-            "&fKit: &a<kit>",
-            "&fArena: &a<arena>",
-            "&fRounds: &b<rounds>",
-            " ",
-            "<accept> <deny>"),
-    DUEL_REQUEST_SENDER("DUEL.SENDER", DataType.STRING_LIST, " ",
-            "&bDuel Request Sent",
-            " ",
-            "&fReceiver: &a<receiver>",
-            "&fKit: &a<kit>",
-            "&fArena: &a<arena>",
-            "&fRounds: &b<rounds>",
-            " "),
-    DUEL_DENY_SENDER("DUEL.SENDER_DENY", DataType.STRING_LIST, "&cDuel Denied."),
-    DUEL_DENY_RECEIVER("DUEL.RECEIVER_DENY", DataType.STRING_LIST, "&cYour duel to &c<player> &cwas denied."),
-    DUEL_ACCEPT("DUEL.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
-    DUEL_ACCEPT_HOVER("DUEL.ACCEPT_HOVER", DataType.STRING, "&aClick to accept duel request"),
-    DUEL_DENY("DUEL.DENY", DataType.STRING, "&c&l(DENY)"),
-    DUEL_DENY_HOVER("DUEL.DENY_HOVER", DataType.STRING, "&cClick to deny duel request"),
-    DUEL_ALREADY_SENT("DUEL.ALREADY_SENT", DataType.STRING, "&cYou have already sent <player> a duel request."),
-    DUEL_EXPIRED("DUEL.EXPIRED", DataType.STRING_LIST, "&cYour duel request to <player> has expired."),
-    DUEL_NOT_ONLINE("DUEL.NOT_ONLINE", DataType.STRING_LIST, "&cPlayer isn't online!"),
-    YOU_CANT_SEND_DUEL("DUEL.YOU_CANT_SEND_DUEL", DataType.STRING_LIST, "&cYou can't send duel requests right now!"),
-    CANT_DUEL_SELF("DUEL.CANT_DUEL_SELF", DataType.STRING_LIST, "&cYou can't duel yourself!"),
-    PLAYER_CANT_ACCEPT_DUEL("DUEL.PLAYER_CANT_ACCEPT_DUEL", DataType.STRING_LIST,
-            "&cPlayer can't accept duel requests!"),
-    YOU_DONT_HAVE_DUEL_REQUEST("DUEL.YOU_DONT_HAVE_DUEL_REQUEST", DataType.STRING_LIST,
-            "&cYou don't have any duel request from this player!"),
-    DUEL_REQUEST_COULDNT_BE_ACCEPTED("DUEL.REQUEST_COULDNT_BE_ACCEPTED", DataType.STRING_LIST,
-            "&cDuel request couldn't be accepted!"),
+        MATCH_COMMA("MATCH.COMMA", DataType.STRING, "&7, "),
+        MATCH_END_DETAILS_SOLO("MATCH.END_DETAILS_MESSAGE.SOLO", DataType.STRING_LIST,
+                        " ",
+                        "&bMatch Results:",
+                        "&aWinner: &e<winner> &7| &cLoser: &e<loser>",
+                        " "),
+        MATCH_END_DETAILS_DUEL("MATCH.END_DETAILS_MESSAGE.DUEL", DataType.STRING_LIST,
+                        " ",
+                        "&bMatch Results:",
+                        "&aWinner: &e<winner> &7| &cLoser: &e<loser>",
+                        " "),
+        MATCH_END_DETAILS_TEAM("MATCH.END_DETAILS_MESSAGE.TEAM", DataType.STRING_LIST,
+                        " ",
+                        "&bMatch Results:",
+                        "&aWinners: &e<winners>",
+                        "&cLosers: &e<losers>",
+                        " "),
+        MATCH_END_DETAILS_FFA("MATCH.END_DETAILS_MESSAGE.FFA", DataType.STRING_LIST,
+                        "",
+                        "&f&l<winner> &b&lwon the FFA match!",
+                        " "),
+        MATCH_RESPAWN_TIMER("MATCH.RESPAWN_TIMER", DataType.STRING_LIST, "&fRespawning in &b<timer>&f..."),
+        MATCH_RESPAWNED("MATCH.RESPAWNED", DataType.STRING_LIST, "&aRespawned!"),
+        MATCH_RESPAWN_TITLE_HEADER("MATCH.RESPAWN_TITLE.HEADER", DataType.STRING, "&fRespawning in &b<timer>&f..."),
+        MATCH_RESPAWN_TITLE_FOOTER("MATCH.RESPAWNED_TITLE_FOOTER", DataType.STRING, ""),
+        MATCH_PLAY_AGAIN_ENABLED("MATCH.PLAY_AGAIN.ENABLED", DataType.BOOLEAN, "true"),
+        MATCH_PLAY_AGAIN("MATCH.PLAY_AGAIN.MESSAGE", DataType.STRING, "&bDo you want to play again? &a(Click here)"),
+        MATCH_PLAY_AGAIN_HOVER("MATCH.PLAY_AGAIN.HOVER", DataType.STRING, "&aClick to play again!"),
+        MATCH_COMBO_MESSAGE_ENABLE("MATCH.COMBO_MESSAGE.ENABLE", DataType.BOOLEAN, "true"),
+        MATCH_COMBO_MESSAGE_5("MATCH.COMBO_MESSAGE.5COMBO", DataType.STRING_LIST, "&a5 COMBO!"),
+        MATCH_COMBO_MESSAGE_10("MATCH.COMBO_MESSAGE.10COMBO", DataType.STRING_LIST, "&e10 COMBO!"),
+        MATCH_COMBO_MESSAGE_20("MATCH.COMBO_MESSAGE.20COMBO", DataType.STRING_LIST, "&c!!!20 COMBO!!!"),
+        MATCH_BED_STATUS_NOT_BROKEN("MATCH.BED_STATUS.NOT_BROKEN", DataType.STRING, "&a✔"),
+        MATCH_BED_STATUS_BROKEN("MATCH.BED_STATUS.BROKEN", DataType.STRING, "&c<members-left>"),
+        MATCH_BOXING_COMBO_PLACEHOLDER("MATCH.COMBO_PLACEHOLDER", DataType.STRING, "&e(<combo> Combo)"),
+        MATCH_BOXING_COMBO_NO_COMBO_PLACEHOLDER("MATCH.COMBO_NO_COMBO_PLACEHOLDER", DataType.STRING, ""),
+        MATCH_BOXING_HIT_DIFFERENCE_HIGHER("MATCH.HIT_DIFFERENCE_PLACEHOLDER", DataType.STRING,
+                        "&a(<hit-difference> Hits)"),
+        MATCH_BOXING_HIT_DIFFERENCE_EQUAL("MATCH.HIT_DIFFERENCE_PLACEHOLDER", DataType.STRING,
+                        "&e(<hit-difference> Hits)"),
+        MATCH_BOXING_HIT_DIFFERENCE_LOWER("MATCH.HIT_DIFFERENCE_PLACEHOLDER", DataType.STRING,
+                        "&c(<hit-difference> Hits)"),
+        MATCH_BUILD_LIMIT("MATCH.BUILD_LIMIT", DataType.STRING_LIST, "&cYou have reached the build limit!"),
+        KIT_EDITOR_START("KIT_EDITOR.START", "This is sent when the player starts editing a kit.", DataType.STRING_LIST,
+                        "&bOpen your Inventory to edit layout!",
+                        "&bYou can use &f/kiteditor reset <kit> &bto reset the kit!"),
+        KIT_EDITOR_STOP("KIT_EDITOR.STOP", "This is sent when the player finishes editing a kit.", DataType.STRING_LIST,
+                        "&aKit layout has been saved."),
+        KIT_EDITOR_RESET("KIT_EDITOR.RESET", "This is sent when the player resets a kit.", DataType.STRING_LIST,
+                        "&aKit has been reset."),
+        DUEL_REQUEST_RECEIVER("DUEL.SENT", DataType.STRING_LIST, " ",
+                        "&bDuel Request",
+                        " ",
+                        "&fSender: &a<sender>",
+                        "&fKit: &a<kit>",
+                        "&fArena: &a<arena>",
+                        "&fRounds: &b<rounds>",
+                        " ",
+                        "<accept> <deny>"),
+        DUEL_REQUEST_SENDER("DUEL.SENDER", DataType.STRING_LIST, " ",
+                        "&bDuel Request Sent",
+                        " ",
+                        "&fReceiver: &a<receiver>",
+                        "&fKit: &a<kit>",
+                        "&fArena: &a<arena>",
+                        "&fRounds: &b<rounds>",
+                        " "),
+        DUEL_DENY_SENDER("DUEL.SENDER_DENY", DataType.STRING_LIST, "&cDuel Denied."),
+        DUEL_DENY_RECEIVER("DUEL.RECEIVER_DENY", DataType.STRING_LIST, "&cYour duel to &c<player> &cwas denied."),
+        DUEL_ACCEPT("DUEL.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
+        DUEL_ACCEPT_HOVER("DUEL.ACCEPT_HOVER", DataType.STRING, "&aClick to accept duel request"),
+        DUEL_DENY("DUEL.DENY", DataType.STRING, "&c&l(DENY)"),
+        DUEL_DENY_HOVER("DUEL.DENY_HOVER", DataType.STRING, "&cClick to deny duel request"),
+        DUEL_ALREADY_SENT("DUEL.ALREADY_SENT", DataType.STRING, "&cYou have already sent <player> a duel request."),
+        DUEL_EXPIRED("DUEL.EXPIRED", DataType.STRING_LIST, "&cYour duel request to <player> has expired."),
+        DUEL_NOT_ONLINE("DUEL.NOT_ONLINE", DataType.STRING_LIST, "&cPlayer isn't online!"),
+        YOU_CANT_SEND_DUEL("DUEL.YOU_CANT_SEND_DUEL", DataType.STRING_LIST,
+                        "&cYou can't send duel requests right now!"),
+        CANT_DUEL_SELF("DUEL.CANT_DUEL_SELF", DataType.STRING_LIST, "&cYou can't duel yourself!"),
+        PLAYER_CANT_ACCEPT_DUEL("DUEL.PLAYER_CANT_ACCEPT_DUEL", DataType.STRING_LIST,
+                        "&cPlayer can't accept duel requests!"),
+        YOU_DONT_HAVE_DUEL_REQUEST("DUEL.YOU_DONT_HAVE_DUEL_REQUEST", DataType.STRING_LIST,
+                        "&cYou don't have any duel request from this player!"),
+        DUEL_REQUEST_COULDNT_BE_ACCEPTED("DUEL.REQUEST_COULDNT_BE_ACCEPTED", DataType.STRING_LIST,
+                        "&cDuel request couldn't be accepted!"),
 
-    REMATCH_REQUEST_RECEIVER("REMATCH.SENT", DataType.STRING_LIST, " ",
-            "&e&lRematch Request",
-            "&eYou have received a rematch request from &a<sender>&e.",
-            " ",
-            "<accept> <deny>"),
-    REMATCH_REQUEST_SENDER("REMATCH.SENDER", DataType.STRING_LIST, " ",
-            "&e&lRematch Request Sent",
-            "&eYou have sent a rematch request to &a<receiver>&e.",
-            " "),
-    REMATCH_ACCEPT("REMATCH.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
-    REMATCH_ACCEPT_HOVER("REMATCH.ACCEPT_HOVER", DataType.STRING, "&aClick to accept rematch request"),
-    REMATCH_DENY("REMATCH.DENY", DataType.STRING, "&c&l(DENY)"),
-    REMATCH_DENY_HOVER("REMATCH.DENY_HOVER", DataType.STRING, "&cClick to deny rematch request"),
-    REMATCH_EXPIRED("REMATCH.EXPIRED", DataType.STRING_LIST, "&cYour rematch request to <player> has expired."),
-    SPECTATE_START("MATCH.SPECTATE.START", DataType.STRING_LIST, "&b<player> &fstarted spectating match."),
-    MATCH_FORFEIT("MATCH.FORFEIT", DataType.STRING_LIST, "&cSomeone rage quit"),
-    SPECTATE_STOP("MATCH.SPECTATE.STOP", DataType.STRING_LIST, "&b<player> &fstopped spectating match."),
-    SPECTATE_NOT_ALLOWED("MATCH.SPECTATE.SPECTATE_NOT_ALLOWED", DataType.STRING_LIST,
-            "&c<player> has spectating disabled."),
-    SPECTATE_LEAVE_IN_PARTY("MATCH.SPECTATE.SPECTATE_LEAVE_IN_PARTY", DataType.STRING,
-            "&cYou are not allowed to leave spectating mode while being in a party!"),
-    SPECTATE_PERMISSION_FLAG("MATCH.SPECTATE.NO_PERMISSION_FLAG", DataType.STRING_LIST,
-            "&cYou don't have permission to use this flag!"),
-    SPECTATE_SELF("MATCH.SPECTATE.SELF", DataType.STRING_LIST,
-            "&cYou can't spectate yourself!"),
-    SPECTATE_IN_MATCH("MATCH.SPECTATE.IN_MATCH", DataType.STRING_LIST,
-            "&cYou can't spectate while in a match!"),
-    SPECTATE_TARGET_NOT_IN_MATCH("MATCH.SPECTATE.TARGET_NOT_IN_MATCH", DataType.STRING_LIST,
-            "&cPlayer isn't in a match!"),
-    SPECTATE_STARTED("MATCH.SPECTATE.START", DataType.STRING_LIST,
-            "&bYou are now spectating &f<player>&b."),
-    SPECTATE_STARTED_SILENT("MATCH.SPECTATE.START.SILENT", DataType.STRING_LIST,
-            "&bYou silently started spectating &f<player>&b."),
-    ERROR_MESSAGE("ERROR_MESSAGE", DataType.STRING, "&c<error>"),
-    JOIN_MESSAGE("JOIN_MESSAGE", DataType.STRING, "&8[&a+&8] &7<player> &7joined"),
-    LEAVE_MESSAGE("LEAVE_MESSAGE", DataType.STRING, "&8[&c-&8] &7<player> &7left"),
-    PARTY_CREATE("PARTY.CREATE", DataType.STRING_LIST, "&aCreated party!"),
-    PARTY_DISBANDED("PARTY.DISBANDED", DataType.STRING_LIST, "&cParty has been disbanded."),
-    PARTY_INVITE_CONFIRM("PARTY.INVITE.CONFIRM", DataType.STRING_LIST,
-            "&bRight click &f<player> again to send a party invite."),
-    PARTY_INVITED("PARTY.INVITED", DataType.STRING_LIST, "&f<player> &bhas been invited to the party!"),
-    PARTY_NOT_IN("PARTY.NOT_IN", DataType.STRING_LIST, "&cYou are not in a party."),
-    PARTY_NOT_IN_PARTY("PARTY.NOT_IN_PARTY", DataType.STRING_LIST, "&c<player> isn't in a party."),
-    PARTY_NOT_LEADER("PARTY.NOT_LEADER", DataType.STRING_LIST, "&cPlayer <player> isn't a leader of a party."),
-    PARTY_PRIVATE("PARTY.PRIVATE", DataType.STRING_LIST, "&cThis party is private."),
-    PARTY_NOT_IN_SAME_PARTY("PARTY.NOT_IN_SAME_PARTY", DataType.STRING_LIST, "&c<player> isn't in your party."),
-    PARTY_JOINED("PARTY.JOINED", DataType.STRING_LIST, "&f<player> &bjoined the party!"),
-    PARTY_JOINED_FROM_ADVERTISEMENT("PARTY.JOINED_FROM_ADVERTISEMENT", DataType.STRING_LIST,
-            "&f<player> &bjoined the party from the advertisement!"),
-    PARTY_INVITATION("PARTY.INVITATION", DataType.STRING_LIST,
-            "&bYou have been invited to &f<leader>'s &bparty <accept>"),
-    PARTY_INVITE_OWN("PARTY.INVITE_OWN", DataType.STRING_LIST, "&cYou can't invite yourself to the party."),
-    PARTY_TRANSFER_OWN("PARTY.TRANSFER", DataType.STRING_LIST, "&cYou can't transfer a party to yourself."),
-    PARTY_ACCEPT("PARTY.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
-    PARTY_ACCEPT_HOVER("PARTY.ACCEPT_HOVER", DataType.STRING, "&aClick to accept party request"),
-    PARTY_NO_PERMISSION("PARTY.NO_PERMISSION", DataType.STRING_LIST, "&cYou do not have permission to do this."),
-    PARTY_DISABLED("PARTY.DISABLED", DataType.STRING_LIST, "&c<player> has party requests disabled!"),
-    PARTY_ALREADY_IN("PARTY.ALREADY_IN", DataType.STRING_LIST, "&cYou are already in a party."),
-    PARTY_ALREADY_SENT("PARTY.ALREADY_SENT", DataType.STRING_LIST, "&cYou have already sent <player> a party request."),
-    PARTY_ALREADY_PARTY("PARTY.ALREADY_IN_PARTY", DataType.STRING_LIST, "&c<player> is already in a party."),
-    PARTY_TRANSFER("PARTY.TRANSFER.MEMBERS", DataType.STRING_LIST,
-            "&f<leader> &btransferred the party to &f<target>&b."),
-    PARTY_ADVERTISE_MESSAGE("PARTY.ADVERTISE.MESSAGE", DataType.STRING_LIST,
-            "&f<leader> &6wants you in their party! <join>"),
-    PARTY_ADVERTISE_JOIN("PARTY.ADVERTISE.JOIN", DataType.STRING, "&a(Join)"),
-    PARTY_ADVERTISE_JOIN_HOVER("PARTY.ADVERTISE.JOIN_HOVER", DataType.STRING, "&aClick to join &f<leader>&a's party."),
-    PARTY_KICK("PARTY.KICK", DataType.STRING_LIST, "&f<player> &bhas been kicked from the party."),
-    PARTY_CANNOT_CREATE("PARTY.CANNOT_CREATE", DataType.STRING_LIST, "&cYou can only create a party while in lobby!"),
-    PARTY_LEFT("PARTY.LEFT", DataType.STRING_LIST, "&f<player> &bhas left the party."),
-    PARTY_INFO("PARTY.INFO", DataType.STRING_LIST,
-            " ",
-            "&7&m------------------------------------------------",
-            "&fPrivacy: &b<privacy>",
-            "&fLeader: &b<leader>",
-            "&fSize: &b<size>/<party-max>",
-            "&7&m------------------------------------------------"),
-    PARTY_MAX_SIZE("PARTY.MAX_SIZE_REACHED", DataType.STRING_LIST, "&cYou have reached max party size"),
-    PARTY_MAX_SIZE_SETTING("PARTY.MAX_SIZE_SETTING_REACHED", DataType.STRING_LIST, "&cThis party can only have a size limit of <max> players!"),
-    PARTY_NOT_ENOUGH_MEMBERS("PARTY.NOT_ENOUGH_MEMBERS", DataType.STRING_LIST,
-            "&cYou need at least 2 players to start a party event."),
-    PARTY_HELP("PARTY.HELP", "Message sent on /party help", DataType.STRING_LIST,
-            "&bParty Help",
-            " ",
-            "&b/party create",
-            "&b/party invite <player>",
-            "&b/party disband",
-            "&b/party leave",
-            "&b/party kick <player>",
-            "&b/party join <player>",
-            "&b/party transfer <player>",
-            "&b/party advertise",
-            " "),
-    PARTY_EXPIRED("PARTY.EXPIRED", DataType.STRING_LIST, "&cYour party request to &c<player> &chas expired."),
-    START_FOLLOW("FOLLOW.STARTED", DataType.STRING_LIST, "&bStarted following &f<player>"),
-    STOP_FOLLOWING("FOLLOW.STOPPED", DataType.STRING_LIST, "&cStopped following <player>"),
-    NOT_ONLINE("NOT_ONLINE", DataType.STRING_LIST, "&c<player> isn't online!"),
-    CANT_BREAK_OWN_BED("CANT.BREAK_OWN_BED", DataType.STRING_LIST, "&cYou can't break your own bed!"),
-    BED_BREAK_TITLE("BEDWARS.OWN_BREAK.TITLE", DataType.STRING, "&cBED DESTROYED!"),
-    BED_BREAK_FOOTER("BEDWARS.OWN_BREAK.FOOTER", DataType.STRING, "&fYou will no longer respawn!"),
-    BLUE_BED_BROKEN_MESSAGE("BEDWARS.BLUE_BREAK.MESSAGE", DataType.STRING, "&9Blue Bed &7was broken by <player>"),
-    RED_BED_BROKEN_MESSAGE("BEDWARS.RED_BREAK.MESSAGE", DataType.STRING, "&cRed Bed &7was broken by <player>"),
-    MATCH_ENDERPEARL_COOLDOWN_ON_GOING("MATCH.ENDERPEARL_COOLDOWN.ON_GOING", DataType.STRING_LIST,
-            "&cEnderpearl cooldown&7: &e<time>s"),
-    FFA_KILLSTREAK_ANNOUNCE_RULES("FFA.KILLSTREAK_RULES",
-            "Rules: 5,10,15 (exact); >5 (above); <5 (below); +5 (every 5 kills). Multiple rules separated by ,",
-            DataType.STRING, "+5"),
-    FFA_KILL_ANNOUNCE("FFA.KILL_ANNOUNCE", DataType.STRING_LIST,
-            "&b⚔ &b<player> &fwas killed by &b<killer>",
-            "&b⚔ &b<player> &fwas 360 no-scoped by &b<killer>",
-            "&b⚔ &b<player> &fwas diddled by &b<killer>",
-            "&b⚔ &b<player> &fwas sent a j*b application by &b<killer>"),
-    FFA_KILLSTREAK_ANNOUNCE_ENABLED("FFA.KILLSTREAK_ANNOUNCE.ENABLED", DataType.BOOLEAN, "false"),
-    IN_MATCH_BLOCKED_COMMAND_MESSAGE("IN_MATCH_BLOCKED_COMMAND", DataType.STRING_LIST, "&cThis command is blocked while in a match!"),
-    FFA_KILLSTREAK_ANNOUNCE_MESSAGE("FFA.KILLSTREAK_ANNOUNCE.MESSAGE", DataType.STRING_LIST,
-            " ", "&b<player> &fis now on a &b&l<killstreak> KILLSTREAK!", " ");
+        REMATCH_REQUEST_RECEIVER("REMATCH.SENT", DataType.STRING_LIST, " ",
+                        "&e&lRematch Request",
+                        "&eYou have received a rematch request from &a<sender>&e.",
+                        " ",
+                        "<accept> <deny>"),
+        REMATCH_REQUEST_SENDER("REMATCH.SENDER", DataType.STRING_LIST, " ",
+                        "&e&lRematch Request Sent",
+                        "&eYou have sent a rematch request to &a<receiver>&e.",
+                        " "),
+        REMATCH_ACCEPT("REMATCH.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
+        REMATCH_ACCEPT_HOVER("REMATCH.ACCEPT_HOVER", DataType.STRING, "&aClick to accept rematch request"),
+        REMATCH_DENY("REMATCH.DENY", DataType.STRING, "&c&l(DENY)"),
+        REMATCH_DENY_HOVER("REMATCH.DENY_HOVER", DataType.STRING, "&cClick to deny rematch request"),
+        REMATCH_EXPIRED("REMATCH.EXPIRED", DataType.STRING_LIST, "&cYour rematch request to <player> has expired."),
+        SPECTATE_START("MATCH.SPECTATE.START", DataType.STRING_LIST, "&b<player> &fstarted spectating match."),
+        MATCH_FORFEIT("MATCH.FORFEIT", DataType.STRING_LIST, "&cSomeone rage quit"),
+        SPECTATE_STOP("MATCH.SPECTATE.STOP", DataType.STRING_LIST, "&b<player> &fstopped spectating match."),
+        SPECTATE_NOT_ALLOWED("MATCH.SPECTATE.SPECTATE_NOT_ALLOWED", DataType.STRING_LIST,
+                        "&c<player> has spectating disabled."),
+        SPECTATE_LEAVE_IN_PARTY("MATCH.SPECTATE.SPECTATE_LEAVE_IN_PARTY", DataType.STRING,
+                        "&cYou are not allowed to leave spectating mode while being in a party!"),
+        SPECTATE_PERMISSION_FLAG("MATCH.SPECTATE.NO_PERMISSION_FLAG", DataType.STRING_LIST,
+                        "&cYou don't have permission to use this flag!"),
+        SPECTATE_SELF("MATCH.SPECTATE.SELF", DataType.STRING_LIST,
+                        "&cYou can't spectate yourself!"),
+        SPECTATE_IN_MATCH("MATCH.SPECTATE.IN_MATCH", DataType.STRING_LIST,
+                        "&cYou can't spectate while in a match!"),
+        SPECTATE_TARGET_NOT_IN_MATCH("MATCH.SPECTATE.TARGET_NOT_IN_MATCH", DataType.STRING_LIST,
+                        "&cPlayer isn't in a match!"),
+        SPECTATE_STARTED("MATCH.SPECTATE.START", DataType.STRING_LIST,
+                        "&bYou are now spectating &f<player>&b."),
+        SPECTATE_STARTED_SILENT("MATCH.SPECTATE.START.SILENT", DataType.STRING_LIST,
+                        "&bYou silently started spectating &f<player>&b."),
+        ERROR_MESSAGE("ERROR_MESSAGE", DataType.STRING, "&c<error>"),
+        JOIN_MESSAGE("JOIN_MESSAGE", DataType.STRING, "&8[&a+&8] &7<player> &7joined"),
+        LEAVE_MESSAGE("LEAVE_MESSAGE", DataType.STRING, "&8[&c-&8] &7<player> &7left"),
+        PARTY_CREATE("PARTY.CREATE", DataType.STRING_LIST, "&aCreated party!"),
+        PARTY_DISBANDED("PARTY.DISBANDED", DataType.STRING_LIST, "&cParty has been disbanded."),
+        PARTY_INVITE_CONFIRM("PARTY.INVITE.CONFIRM", DataType.STRING_LIST,
+                        "&bRight click &f<player> again to send a party invite."),
+        PARTY_INVITED("PARTY.INVITED", DataType.STRING_LIST, "&f<player> &bhas been invited to the party!"),
+        PARTY_NOT_IN("PARTY.NOT_IN", DataType.STRING_LIST, "&cYou are not in a party."),
+        PARTY_NOT_IN_PARTY("PARTY.NOT_IN_PARTY", DataType.STRING_LIST, "&c<player> isn't in a party."),
+        PARTY_NOT_LEADER("PARTY.NOT_LEADER", DataType.STRING_LIST, "&cPlayer <player> isn't a leader of a party."),
+        PARTY_PRIVATE("PARTY.PRIVATE", DataType.STRING_LIST, "&cThis party is private."),
+        PARTY_NOT_IN_SAME_PARTY("PARTY.NOT_IN_SAME_PARTY", DataType.STRING_LIST, "&c<player> isn't in your party."),
+        PARTY_JOINED("PARTY.JOINED", DataType.STRING_LIST, "&f<player> &bjoined the party!"),
+        PARTY_JOINED_FROM_ADVERTISEMENT("PARTY.JOINED_FROM_ADVERTISEMENT", DataType.STRING_LIST,
+                        "&f<player> &bjoined the party from the advertisement!"),
+        PARTY_INVITATION("PARTY.INVITATION", DataType.STRING_LIST,
+                        "&bYou have been invited to &f<leader>'s &bparty <accept>"),
+        PARTY_INVITE_OWN("PARTY.INVITE_OWN", DataType.STRING_LIST, "&cYou can't invite yourself to the party."),
+        PARTY_TRANSFER_OWN("PARTY.TRANSFER", DataType.STRING_LIST, "&cYou can't transfer a party to yourself."),
+        PARTY_ACCEPT("PARTY.ACCEPT", DataType.STRING, "&a&l(ACCEPT)"),
+        PARTY_ACCEPT_HOVER("PARTY.ACCEPT_HOVER", DataType.STRING, "&aClick to accept party request"),
+        PARTY_NO_PERMISSION("PARTY.NO_PERMISSION", DataType.STRING_LIST, "&cYou do not have permission to do this."),
+        PARTY_DISABLED("PARTY.DISABLED", DataType.STRING_LIST, "&c<player> has party requests disabled!"),
+        PARTY_ALREADY_IN("PARTY.ALREADY_IN", DataType.STRING_LIST, "&cYou are already in a party."),
+        PARTY_ALREADY_SENT("PARTY.ALREADY_SENT", DataType.STRING_LIST,
+                        "&cYou have already sent <player> a party request."),
+        PARTY_ALREADY_PARTY("PARTY.ALREADY_IN_PARTY", DataType.STRING_LIST, "&c<player> is already in a party."),
+        PARTY_TRANSFER("PARTY.TRANSFER.MEMBERS", DataType.STRING_LIST,
+                        "&f<leader> &btransferred the party to &f<target>&b."),
+        PARTY_ADVERTISE_MESSAGE("PARTY.ADVERTISE.MESSAGE", DataType.STRING_LIST,
+                        "&f<leader> &6wants you in their party! <join>"),
+        PARTY_ADVERTISE_JOIN("PARTY.ADVERTISE.JOIN", DataType.STRING, "&a(Join)"),
+        PARTY_ADVERTISE_JOIN_HOVER("PARTY.ADVERTISE.JOIN_HOVER", DataType.STRING,
+                        "&aClick to join &f<leader>&a's party."),
+        PARTY_KICK("PARTY.KICK", DataType.STRING_LIST, "&f<player> &bhas been kicked from the party."),
+        PARTY_CANNOT_CREATE("PARTY.CANNOT_CREATE", DataType.STRING_LIST,
+                        "&cYou can only create a party while in lobby!"),
+        PARTY_LEFT("PARTY.LEFT", DataType.STRING_LIST, "&f<player> &bhas left the party."),
+        PARTY_INFO("PARTY.INFO", DataType.STRING_LIST,
+                        " ",
+                        "&7&m------------------------------------------------",
+                        "&fPrivacy: &b<privacy>",
+                        "&fLeader: &b<leader>",
+                        "&fSize: &b<size>/<party-max>",
+                        "&7&m------------------------------------------------"),
+        PARTY_MAX_SIZE("PARTY.MAX_SIZE_REACHED", DataType.STRING_LIST, "&cYou have reached max party size"),
+        PARTY_MAX_SIZE_SETTING("PARTY.MAX_SIZE_SETTING_REACHED", DataType.STRING_LIST,
+                        "&cThis party can only have a size limit of <max> players!"),
+        PARTY_NOT_ENOUGH_MEMBERS("PARTY.NOT_ENOUGH_MEMBERS", DataType.STRING_LIST,
+                        "&cYou need at least 2 players to start a party event."),
+        PARTY_HELP("PARTY.HELP", "Message sent on /party help", DataType.STRING_LIST,
+                        "&bParty Help",
+                        " ",
+                        "&b/party create",
+                        "&b/party invite <player>",
+                        "&b/party disband",
+                        "&b/party leave",
+                        "&b/party kick <player>",
+                        "&b/party join <player>",
+                        "&b/party transfer <player>",
+                        "&b/party advertise",
+                        " "),
+        PARTY_EXPIRED("PARTY.EXPIRED", DataType.STRING_LIST, "&cYour party request to &c<player> &chas expired."),
+        START_FOLLOW("FOLLOW.STARTED", DataType.STRING_LIST, "&bStarted following &f<player>"),
+        STOP_FOLLOWING("FOLLOW.STOPPED", DataType.STRING_LIST, "&cStopped following <player>"),
+        NOT_ONLINE("NOT_ONLINE", DataType.STRING_LIST, "&c<player> isn't online!"),
+        CANT_BREAK_OWN_BED("CANT.BREAK_OWN_BED", DataType.STRING_LIST, "&cYou can't break your own bed!"),
+        BED_BREAK_TITLE("BEDWARS.OWN_BREAK.TITLE", DataType.STRING, "&cBED DESTROYED!"),
+        BED_BREAK_FOOTER("BEDWARS.OWN_BREAK.FOOTER", DataType.STRING, "&fYou will no longer respawn!"),
+        BLUE_BED_BROKEN_MESSAGE("BEDWARS.BLUE_BREAK.MESSAGE", DataType.STRING, "&9Blue Bed &7was broken by <player>"),
+        RED_BED_BROKEN_MESSAGE("BEDWARS.RED_BREAK.MESSAGE", DataType.STRING, "&cRed Bed &7was broken by <player>"),
+        MATCH_ENDERPEARL_COOLDOWN_ON_GOING("MATCH.ENDERPEARL_COOLDOWN.ON_GOING", DataType.STRING_LIST,
+                        "&cEnderpearl cooldown&7: &e<time>s"),
+        FFA_KILLSTREAK_ANNOUNCE_RULES("FFA.KILLSTREAK_RULES",
+                        "Rules: 5,10,15 (exact); >5 (above); <5 (below); +5 (every 5 kills). Multiple rules separated by ,",
+                        DataType.STRING, "+5"),
+        FFA_KILL_ANNOUNCE("FFA.KILL_ANNOUNCE", DataType.STRING_LIST,
+                        "&b⚔ &b<player> &fwas killed by &b<killer>",
+                        "&b⚔ &b<player> &fwas 360 no-scoped by &b<killer>",
+                        "&b⚔ &b<player> &fwas diddled by &b<killer>",
+                        "&b⚔ &b<player> &fwas sent a j*b application by &b<killer>"),
+        FFA_KILLSTREAK_ANNOUNCE_ENABLED("FFA.KILLSTREAK_ANNOUNCE.ENABLED", DataType.BOOLEAN, "false"),
+        IN_MATCH_BLOCKED_COMMAND_MESSAGE("IN_MATCH_BLOCKED_COMMAND", DataType.STRING_LIST,
+                        "&cThis command is blocked while in a match!"),
+        FFA_KILLSTREAK_ANNOUNCE_MESSAGE("FFA.KILLSTREAK_ANNOUNCE.MESSAGE", DataType.STRING_LIST,
+                        " ", "&b<player> &fis now on a &b&l<killstreak> KILLSTREAK!", " ");
 
-    private final String path;
-    private final String comment;
-    private final List<String> defaultValue = new ArrayList<>();
-    private final DataType dataType;
+        private final String path;
+        private final String comment;
+        private final List<String> defaultValue = new ArrayList<>();
+        private final DataType dataType;
 
-    MessagesLocale(String path, @Nullable String comment, DataType dataType, String... defaultValue) {
-        this.path = path;
-        this.comment = comment;
-        this.defaultValue.addAll(Arrays.asList(defaultValue));
-        this.dataType = dataType;
-    }
+        MessagesLocale(String path, @Nullable String comment, DataType dataType, String... defaultValue) {
+                this.path = path;
+                this.comment = comment;
+                this.defaultValue.addAll(Arrays.asList(defaultValue));
+                this.dataType = dataType;
+        }
 
-    MessagesLocale(String path, DataType dataType, String... defaultValue) {
-        this.path = path;
-        this.comment = null;
-        this.defaultValue.addAll(Arrays.asList(defaultValue));
-        this.dataType = dataType;
-    }
+        MessagesLocale(String path, DataType dataType, String... defaultValue) {
+                this.path = path;
+                this.comment = null;
+                this.defaultValue.addAll(Arrays.asList(defaultValue));
+                this.dataType = dataType;
+        }
 
-    @Override
-    public ConfigFile getConfigFile() {
-        return ConfigService.get().getMessagesConfig();
-    }
+        @Override
+        public ConfigFile getConfigFile() {
+                return ConfigService.get().getMessagesConfig();
+        }
 
-    @Override
-    public String getHeader() {
-        return "Replace with NONE to disable";
-    }
+        @Override
+        public String getHeader() {
+                return "Replace with NONE to disable";
+        }
 
-    public void send(Player player, Replacement... replacements) {
-        final UUID playerUUID = player.getUniqueId();
-        if (dataType.equals(DataType.STRING_LIST)) {
-            for (String message : getStringList()) {
-                if (message.equals("NONE"))
-                    continue;
-                PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, message, replacements));
-            }
-        } else if (dataType.equals(DataType.STRING)) {
-            if (getString().equals("NONE"))
-                return;
-            PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, getString(), replacements));
+        public void send(Player player, Replacement... replacements) {
+                final UUID playerUUID = player.getUniqueId();
+                if (dataType.equals(DataType.STRING_LIST)) {
+                        for (String message : getStringList()) {
+                                if (message.equals("NONE"))
+                                        continue;
+                                PlayerUtil.sendMessage(playerUUID,
+                                                CC.returnMessage(player, message, replacements));
+                        }
+                } else if (dataType.equals(DataType.STRING)) {
+                        if (getString().equals("NONE"))
+                                return;
+                        PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, getString(), replacements));
+                }
         }
-    }
 
-    public void send(UUID playerUUID, Replacement... replacements) {
-        Player player = Bukkit.getPlayer(playerUUID);
-        if (player == null)
-            return;
-        if (dataType.equals(DataType.STRING_LIST)) {
-            for (String message : getStringList()) {
-                if (message.equals("NONE"))
-                    continue;
-                PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, message, replacements));
-            }
-        } else if (dataType.equals(DataType.STRING)) {
-            if (getString().equals("NONE"))
-                return;
-            PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, getString(), replacements));
+        public void send(UUID playerUUID, Replacement... replacements) {
+                Player player = Bukkit.getPlayer(playerUUID);
+                if (player == null)
+                        return;
+                if (dataType.equals(DataType.STRING_LIST)) {
+                        for (String message : getStringList()) {
+                                if (message.equals("NONE"))
+                                        continue;
+                                PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, message, replacements));
+                        }
+                } else if (dataType.equals(DataType.STRING)) {
+                        if (getString().equals("NONE"))
+                                return;
+                        PlayerUtil.sendMessage(playerUUID, CC.returnMessage(player, getString(), replacements));
+                }
         }
-    }
 }
\ No newline at end of file
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/impl/ItemAction.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/impl/ItemAction.java
index b3e075a8..05ee74b2 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/impl/ItemAction.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/hotbar/impl/ItemAction.java
@@ -37,7 +37,7 @@ public void execute(Player player) {
             Profile profile = API.getProfile(player);
 
             if (profile.getState().equals(ProfileState.IN_PARTY)) {
-                player.sendMessage(CC.color("&cYou can't queue while in a party."));
+                MessagesLocale.CANT_DO_THIS_NOW.send(player.getUniqueId());
                 return;
             }
             new QueueMenu().open(player);
@@ -178,7 +178,7 @@ public void execute(Player player) {
                 return;
             match.getKit().getRandomArena().thenAccept(arena -> {
                 if (arena == null) {
-                    player.sendMessage(CC.error("No arenas were found!"));
+                    MessagesLocale.QUEUE_NO_ARENAS.send(player);
                     return;
                 }
                 DuelRequest duelRequest = new DuelRequest(profile.getPlayerUUID(), match.getKit(), arena, false,
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/feature/party/impl/EventType.java b/Plugin/src/main/java/dev/lrxh/neptune/feature/party/impl/EventType.java
index f79e2ab2..8efd827c 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/feature/party/impl/EventType.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/feature/party/impl/EventType.java
@@ -2,6 +2,7 @@
 
 import dev.lrxh.neptune.Neptune;
 import dev.lrxh.neptune.configs.impl.MenusLocale;
+import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.game.kit.Kit;
 import dev.lrxh.neptune.game.match.MatchService;
 import dev.lrxh.neptune.game.match.impl.participant.Participant;
@@ -24,7 +25,7 @@ public void start(List<Participant> participants, Kit kit) {
                 if (arena == null) {
 
                     for (Participant participant : participants) {
-                        participant.sendMessage(CC.error("No arenas were found!"));
+                        MessagesLocale.QUEUE_NO_ARENAS.send(participant.getPlayer());
                     }
                     return;
                 }
@@ -67,7 +68,7 @@ public void start(List<Participant> participants, Kit kit) {
             kit.getRandomArena().thenAccept(arena -> {
                 if (arena == null) {
                     participants.forEach(p ->
-                            p.sendMessage(CC.error("No arenas were found! Please contact an admin.")));
+                            MessagesLocale.QUEUE_NO_ARENAS.send(p.getPlayer()));
                     return;
                 }
                 if (!arena.isSetup()) {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/duel/DuelRequest.java b/Plugin/src/main/java/dev/lrxh/neptune/game/duel/DuelRequest.java
index dce0e666..8cdb4615 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/duel/DuelRequest.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/duel/DuelRequest.java
@@ -2,6 +2,7 @@
 
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.Neptune;
+import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.game.arena.VirtualArena;
 import dev.lrxh.neptune.game.kit.Kit;
 import dev.lrxh.neptune.game.match.MatchService;
@@ -94,7 +95,7 @@ public void partyDuel(UUID receiver) {
         if (arena == null) {
 
             for (Participant participant : participants) {
-                participant.sendMessage(CC.error("No arenas were found!"));
+                MessagesLocale.QUEUE_NO_ARENAS.send(participant.getPlayer());
             }
             return;
         }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
index 968d1736..b23c60f7 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
@@ -206,23 +206,17 @@ public void handleHit(Participant opponent) {
         }
     }
 
-    public String getHitsDifference(Participant otherParticipant) {
-        if (hits - otherParticipant.getHits() > 0) {
-            return "&a(+" + (hits - otherParticipant.getHits()) + ")";
-        } else if (hits - otherParticipant.getHits() < 0) {
-            return "&c(" + (hits - otherParticipant.getHits()) + ")";
-        } else {
-            return "&e(" + (hits - otherParticipant.getHits()) + ")";
-        }
-    }
-
     public String getHitsDifference(IParticipant otherParticipant) {
+        String hitDiff = String.valueOf(hits - otherParticipant.getHits());
         if (hits - otherParticipant.getHits() > 0) {
-            return "&a(+" + (hits - otherParticipant.getHits()) + ")";
+            return MessagesLocale.MATCH_BOXING_HIT_DIFFERENCE_HIGHER.getString().replace("<hit-difference>",
+                    hitDiff);
         } else if (hits - otherParticipant.getHits() < 0) {
-            return "&c(" + (hits - otherParticipant.getHits()) + ")";
+            return MessagesLocale.MATCH_BOXING_HIT_DIFFERENCE_LOWER.getString().replace("<hit-difference>",
+                    hitDiff);
         } else {
-            return "&e(" + (hits - otherParticipant.getHits()) + ")";
+            return MessagesLocale.MATCH_BOXING_HIT_DIFFERENCE_EQUAL.getString().replace("<hit-difference>",
+                    hitDiff);
         }
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/listener/MatchListener.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/listener/MatchListener.java
index 811f0fc7..7d2a0a9a 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/listener/MatchListener.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/listener/MatchListener.java
@@ -113,7 +113,7 @@ public void onBlockPlaceEvent(BlockPlaceEvent event) {
         if (match != null && match.getKit().is(KitRule.BUILD)) {
             if (match.getState().equals(MatchState.STARTING)) {
                 event.setCancelled(true);
-                player.sendMessage(CC.color("&cYou can't place blocks yet!"));
+                MessagesLocale.CANT_DO_THIS_NOW.send(player);
                 return;
             }
 
@@ -129,7 +129,7 @@ public void onBlockPlaceEvent(BlockPlaceEvent event) {
             // Check arena boundaries
             if (!LocationUtil.isInside(blockLocation, arena.getMin(), arena.getMax())) {
                 event.setCancelled(true);
-                player.sendMessage(CC.color("&cYou can't build outside the arena!"));
+                MessagesLocale.CANT_DO_THIS_HERE.send(player);
                 return;
             }
 
@@ -531,7 +531,7 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
         if (match != null && match.getKit().is(KitRule.BUILD)) {
             if (match.getState().equals(MatchState.STARTING)) {
                 event.setCancelled(true);
-                player.sendMessage(CC.color("&cYou can't place blocks yet!"));
+                MessagesLocale.CANT_DO_THIS_NOW.send(player);
                 return;
             }
 
@@ -545,7 +545,7 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
 
             if (!LocationUtil.isInside(blockLocation, arena.getMin(), arena.getMax())) {
                 event.setCancelled(true);
-                player.sendMessage(CC.color("&cYou can't place water outside the arena!"));
+                MessagesLocale.CANT_DO_THIS_HERE.send(player);
                 return;
             }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/providers/listeners/GlobalListener.java b/Plugin/src/main/java/dev/lrxh/neptune/providers/listeners/GlobalListener.java
index 6dfb0743..c7fd82a9 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/providers/listeners/GlobalListener.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/providers/listeners/GlobalListener.java
@@ -8,7 +8,6 @@
 import dev.lrxh.neptune.profile.data.ProfileState;
 import dev.lrxh.neptune.profile.impl.Profile;
 import dev.lrxh.neptune.providers.clickable.Replacement;
-import dev.lrxh.neptune.utils.CC;
 import dev.lrxh.neptune.utils.tasks.NeptuneRunnable;
 import dev.lrxh.neptune.utils.tasks.TaskScheduler;
 
@@ -161,14 +160,7 @@ public void onBlockBreak(BlockBreakEvent event) {
         if (profile.getState().equals(ProfileState.IN_SPECTATOR)) event.setCancelled(true);
         if (isPlayerNotInMatch(profile)) {
             event.setCancelled(true);
-            ProfileState state = profile.getState();
-            if (state.equals(ProfileState.IN_KIT_EDITOR)) {
-                player.sendMessage(CC.color("&cYou can't break blocks in the kit editor!"));
-            } else if (state.equals(ProfileState.IN_QUEUE)) {
-                player.sendMessage(CC.color("&cYou can't break blocks while in queue!"));
-            } else {
-                player.sendMessage(CC.color("&cYou can't break blocks here!"));
-            }
+            MessagesLocale.CANT_DO_THIS_NOW.send(player);
         }
     }
 
@@ -180,7 +172,7 @@ public void onBucketEmpty(PlayerBucketEmptyEvent event) {
         if (profile != null && profile.getState().equals(ProfileState.IN_CUSTOM)) return;
         if (isPlayerNotInMatch(profile)) {
             event.setCancelled(true);
-            player.sendMessage(CC.color("&cYou can't place liquids here!"));
+            MessagesLocale.CANT_DO_THIS_NOW.send(player);
         }
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
index c8e3d12c..b356498b 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/providers/placeholder/PlaceholderUtil.java
@@ -2,6 +2,7 @@
 
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.Neptune;
+import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.feature.divisions.impl.Division;
 import dev.lrxh.neptune.feature.party.Party;
 import dev.lrxh.neptune.feature.queue.QueueEntry;
@@ -121,8 +122,8 @@ public String format(String line, Player player) {
                 Participant blue = soloFightMatch.getParticipantB();
                 line = line.replaceAll("<red-hits>", String.valueOf(red.getHits()));
                 line = line.replaceAll("<blue-hits>", String.valueOf(blue.getHits()));
-                line = line.replaceAll("<red-combo>", red.getCombo() > 1 ? "&e(" + red.getCombo() + " Combo)" : "");
-                line = line.replaceAll("<blue-combo>", blue.getCombo() > 1 ? "&e(" + blue.getCombo() + " Combo)" : "");
+                line = line.replaceAll("<red-combo>", red.getCombo() > 1 ? MessagesLocale.MATCH_BOXING_COMBO_PLACEHOLDER.toString().replaceAll("<combo>", String.valueOf(red.getCombo())) : MessagesLocale.MATCH_BOXING_COMBO_NO_COMBO_PLACEHOLDER.toString());
+                line = line.replaceAll("<blue-combo>", blue.getCombo() > 1 ? MessagesLocale.MATCH_BOXING_COMBO_PLACEHOLDER.toString().replaceAll("<combo>", String.valueOf(blue.getCombo())) : MessagesLocale.MATCH_BOXING_COMBO_NO_COMBO_PLACEHOLDER.toString());
                 line = line.replaceAll("<red-points>", String.valueOf(red.getPoints()));
                 line = line.replaceAll("<blue-points>", String.valueOf(blue.getPoints()));
                 line = line.replaceAll("<red-difference>", String.valueOf(red.getHitsDifference(blue)));
@@ -136,8 +137,16 @@ public String format(String line, Player player) {
                         String.valueOf(PlayerUtil.getPing(blue.getPlayer())));
 
                 if (match.getKit().is(KitRule.BED_WARS)) {
-                    line = line.replaceAll("<red-bed-status>", !red.isBedBroken() ? "&a✔" : "&c1");
-                    line = line.replaceAll("<blue-bed-status>", !blue.isBedBroken() ? "&a✔" : "&c1");
+                    line = line.replaceAll("<red-bed-status>",
+                            !red.isBedBroken()
+                                    ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                            "1")
+                                    : "&c1");
+                    line = line.replaceAll("<blue-bed-status>",
+                            !blue.isBedBroken()
+                                    ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                            "1")
+                                    : "&c1");
                 }
 
                 if (participant != null) {
@@ -146,12 +155,12 @@ public String format(String line, Player player) {
 
                     line = line.replaceAll("<hits>", String.valueOf(participant.getHits()));
                     line = line.replaceAll("<combo>",
-                            participant.getCombo() > 1 ? "&e(" + participant.getCombo() + " Combo)" : "");
+                            participant.getCombo() > 1 ? MessagesLocale.MATCH_BOXING_COMBO_PLACEHOLDER.toString().replaceAll("<combo>", String.valueOf(participant.getCombo())) : MessagesLocale.MATCH_BOXING_COMBO_NO_COMBO_PLACEHOLDER.toString());
                     line = line.replaceAll("<opponent>", participant.getOpponent().getNameUnColored());
                     line = line.replaceAll("<opponent-ping>",
                             String.valueOf(opponentPlayer == null ? 0 : opponentPlayer.getPing()));
                     line = line.replaceAll("<opponent-combo>",
-                            opponent.getCombo() > 1 ? "&e(" + opponent.getCombo() + " Combo)" : "");
+                            opponent.getCombo() > 1 ? MessagesLocale.MATCH_BOXING_COMBO_PLACEHOLDER.toString().replaceAll("<combo>", String.valueOf(opponent.getCombo())) : MessagesLocale.MATCH_BOXING_COMBO_NO_COMBO_PLACEHOLDER.toString());
                     line = line.replaceAll("<opponent-hits>", String.valueOf(opponent.getHits()));
                     line = line.replaceAll("<diffrence>", participant.getHitsDifference(opponent)); // to be removed
                     line = line.replaceAll("<difference>", participant.getHitsDifference(opponent));
@@ -159,8 +168,16 @@ public String format(String line, Player player) {
                     line = line.replaceAll("<opponent-points>", String.valueOf(opponent.getPoints()));
 
                     if (match.getKit().is(KitRule.BED_WARS)) {
-                        line = line.replaceAll("<bed-status>", !participant.isBedBroken() ? "&a✔" : "&c1");
-                        line = line.replaceAll("<opponent-bed-status>", !opponent.isBedBroken() ? "&a✔" : "&c1");
+                        line = line.replaceAll("<bed-status>", !participant.isBedBroken()
+                                ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                        "1")
+                                : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                        "1"));
+                        line = line.replaceAll("<opponent-bed-status>", !opponent.isBedBroken()
+                                ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                        "1")
+                                : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                        "1"));
                     }
                 }
             } else if (match instanceof TeamFightMatch teamFightMatch) {
@@ -173,9 +190,17 @@ public String format(String line, Player player) {
 
                 if (match.getKit().is(KitRule.BED_WARS)) {
                     line = line.replaceAll("<red-bed-status>",
-                            !redTeam.isBedBroken() ? "&a✔" : "&c" + redTeam.getAliveParticipants());
+                            !redTeam.isBedBroken()
+                                    ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                            String.valueOf(redTeam.getAliveParticipants()))
+                                    : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                            String.valueOf(redTeam.getAliveParticipants())));
                     line = line.replaceAll("<blue-bed-status>",
-                            !blueTeam.isBedBroken() ? "&a✔" : "&c" + blueTeam.getAliveParticipants());
+                            !blueTeam.isBedBroken()
+                                    ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll("<members-left>",
+                                            String.valueOf(blueTeam.getAliveParticipants()))
+                                    : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                            String.valueOf(blueTeam.getAliveParticipants())));
                 }
                 if (participant != null) {
                     MatchTeam matchTeam = teamFightMatch.getParticipantTeam(participant);
@@ -191,9 +216,17 @@ public String format(String line, Player player) {
                     }
                     if (match.getKit().is(KitRule.BED_WARS)) {
                         line = line.replaceAll("<team-bed-status>",
-                                !matchTeam.isBedBroken() ? "&a✔" : "&c" + matchTeam.getAliveParticipants());
+                                !matchTeam.isBedBroken()
+                                        ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll(
+                                                "<members-left>", String.valueOf(matchTeam.getAliveParticipants()))
+                                        : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                                String.valueOf(matchTeam.getAliveParticipants())));
                         line = line.replaceAll("<opponent-team-bed-status>",
-                                !opponentTeam.isBedBroken() ? "&a✔" : "&c" + opponentTeam.getAliveParticipants());
+                                !opponentTeam.isBedBroken()
+                                        ? MessagesLocale.MATCH_BED_STATUS_NOT_BROKEN.toString().replaceAll(
+                                                "<members-left>", String.valueOf(opponentTeam.getAliveParticipants()))
+                                        : MessagesLocale.MATCH_BED_STATUS_BROKEN.toString().replaceAll("<members-left>",
+                                                String.valueOf(opponentTeam.getAliveParticipants())));
                     }
                 }
             } else if (match instanceof FfaFightMatch ffaFightMatch) {

From 1bffd8d48d6470bd8c27871ddf0daa8347f0322a Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Mon, 26 Jan 2026 18:22:39 +0530
Subject: [PATCH 2/6] Add customization for drink messages

---
 .../drink/argument/ArgumentParser.java        | 23 +++++++++++++------
 .../drink/command/DrinkAuthorizer.java        |  6 ++---
 .../neptune/configs/impl/MessagesLocale.java  |  4 ++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/Plugin/src/main/java/com/jonahseguin/drink/argument/ArgumentParser.java b/Plugin/src/main/java/com/jonahseguin/drink/argument/ArgumentParser.java
index f57c80b6..17cc6cd4 100644
--- a/Plugin/src/main/java/com/jonahseguin/drink/argument/ArgumentParser.java
+++ b/Plugin/src/main/java/com/jonahseguin/drink/argument/ArgumentParser.java
@@ -11,6 +11,8 @@
 import com.jonahseguin.drink.parametric.CommandParameter;
 import com.jonahseguin.drink.parametric.DrinkProvider;
 
+import dev.lrxh.neptune.configs.impl.MessagesLocale;
+
 import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +62,8 @@ public List<String> combineMultiWordArguments(List<String> args) {
     }
 
     @Nonnull
-    public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull DrinkCommand command, @Nonnull CommandArgs args) throws CommandExitMessage, CommandArgumentException {
+    public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull DrinkCommand command,
+            @Nonnull CommandArgs args) throws CommandExitMessage, CommandArgumentException {
 
         Preconditions.checkNotNull(command, "DrinkCommand cannot be null");
         Preconditions.checkNotNull(args, "CommandArgs cannot be null");
@@ -88,7 +91,8 @@ public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull Dri
                     continue;
                 }
 
-                Object o = provider.provide(new CommandArg(args.getSender(), value, args), parameter.getAllAnnotations());
+                Object o = provider.provide(new CommandArg(args.getSender(), value, args),
+                        parameter.getAllAnnotations());
                 o = commandService.getModifierService().executeModifiers(execution, parameter, o);
                 arguments[i] = o;
                 continue;
@@ -104,7 +108,8 @@ public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull Dri
 
                     value = parameter.getDefaultOptionalValue();
 
-                    Object o = provider.provide(new CommandArg(args.getSender(), value, args), parameter.getAllAnnotations());
+                    Object o = provider.provide(new CommandArg(args.getSender(), value, args),
+                            parameter.getAllAnnotations());
                     o = commandService.getModifierService().executeModifiers(execution, parameter, o);
                     arguments[i] = o;
                     continue;
@@ -112,7 +117,8 @@ public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull Dri
 
                 try {
 
-                    Object o = provider.provide(new CommandArg(args.getSender(), value, args), parameter.getAllAnnotations());
+                    Object o = provider.provide(new CommandArg(args.getSender(), value, args),
+                            parameter.getAllAnnotations());
                     o = commandService.getModifierService().executeModifiers(execution, parameter, o);
                     arguments[i] = o;
 
@@ -120,7 +126,8 @@ public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull Dri
 
                     value = parameter.getDefaultOptionalValue();
 
-                    Object o = provider.provide(new CommandArg(args.getSender(), value, args), parameter.getAllAnnotations());
+                    Object o = provider.provide(new CommandArg(args.getSender(), value, args),
+                            parameter.getAllAnnotations());
                     o = commandService.getModifierService().executeModifiers(execution, parameter, o);
                     arguments[i] = o;
 
@@ -133,13 +140,15 @@ public Object[] parseArguments(@Nonnull CommandExecution execution, @Nonnull Dri
             if (provider.doesConsumeArgument()) {
 
                 if (!args.hasNext()) {
-                    throw new CommandArgumentException("Missing argument for: " + provider.argumentDescription());
+                    throw new CommandArgumentException(MessagesLocale.MISSING_ARGUMENT.getString()
+                            .replaceAll("<command>", provider.argumentDescription()));
                 }
 
                 value = args.next();
 
                 if (value == null && !provider.allowNullArgument()) {
-                    throw new CommandArgumentException("Argument already consumed for next argument: " + provider.argumentDescription() + " (this is a provider error!)");
+                    throw new CommandArgumentException("Argument already consumed for next argument: "
+                            + provider.argumentDescription() + " (this is a provider error!)");
                 }
             }
 
diff --git a/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java b/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
index 5fd41149..1f4b11ac 100644
--- a/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
+++ b/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
@@ -5,18 +5,18 @@
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
+import dev.lrxh.neptune.configs.impl.MessagesLocale;
+
 import javax.annotation.Nonnull;
 
 @Getter
 @Setter
 public class DrinkAuthorizer {
 
-    private String noPermissionMessage = ChatColor.RED + "You do not have permission to perform this command.";
-
     public boolean isAuthorized(@Nonnull CommandSender sender, @Nonnull DrinkCommand command) {
         if (command.getPermission() != null && command.getPermission().length() > 0) {
             if (!sender.hasPermission(command.getPermission())) {
-                sender.sendMessage(noPermissionMessage);
+                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', MessagesLocale.NO_PERMISSION.getString()));
                 return false;
             }
         }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
index 3814e104..99112a3e 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/MessagesLocale.java
@@ -23,6 +23,10 @@ public enum MessagesLocale implements IDataAccessor {
                         "&cYou can't do this right now!"),
         CANT_DO_THIS_HERE("CANT_DO_THIS_HERE", DataType.STRING_LIST,
                         "&cYou can't do this here!"),
+        NO_PERMISSION("NO_PERMISSION", DataType.STRING,
+                        "&cYou do not have permission to do this."),
+        MISSING_ARGUMENT("MISSING_ARGUMENT", DataType.STRING,
+                        "Missing argument for: <command>"),
         MATCH_YOU("MATCH.YOU", DataType.STRING, "You"),
         MATCH_OPPONENT_TEAM("MATCH.OPPONENT_TEAM", DataType.STRING, "Opponent Team"),
         MATCH_DEATH_DISCONNECT("MATCH.DEATH.DISCONNECT", DataType.STRING_LIST, "<player> &7disconnected"),

From 564fc293dd43a09d19bcde3e711deb3eb27a778a Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Tue, 3 Feb 2026 19:14:50 +0530
Subject: [PATCH 3/6] Add customizable sounds

---
 .../lrxh/neptune/configs/ConfigService.java   |  3 +
 .../neptune/configs/impl/SoundsLocale.java    | 60 +++++++++++++++++++
 .../game/match/impl/ffa/FfaFightMatch.java    |  6 +-
 .../match/impl/participant/Participant.java   |  3 +-
 .../game/match/impl/solo/SoloFightMatch.java  | 10 ++--
 .../game/match/impl/team/TeamFightMatch.java  |  8 +--
 .../match/tasks/MatchRespawnRunnable.java     |  4 +-
 .../match/tasks/MatchSecondRoundRunnable.java |  4 +-
 .../game/match/tasks/MatchStartRunnable.java  |  4 +-
 .../lrxh/neptune/utils/menu/MenuListener.java |  5 +-
 10 files changed, 86 insertions(+), 21 deletions(-)
 create mode 100644 Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java

diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
index 8815eff1..4af7c514 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/ConfigService.java
@@ -18,6 +18,7 @@ public class ConfigService {
     private ConfigFile divisionsConfig;
     private ConfigFile cosmeticsConfig;
     private ConfigFile killMessagesConfig;
+    private ConfigFile soundsConfig;
 
     public static ConfigService get() {
         if (instance == null) instance = new ConfigService();
@@ -36,6 +37,7 @@ public void load() {
         divisionsConfig = new ConfigFile("divisions");
         cosmeticsConfig = new ConfigFile("cosmetics");
         killMessagesConfig = new ConfigFile("kill-messages");
+        soundsConfig = new ConfigFile("sounds");
 
         initialize();
     }
@@ -47,5 +49,6 @@ public void initialize() {
         MenusLocale.FILTER_NAME.load();
         ScoreboardLocale.TITLE.load();
         CosmeticsLocale.LIGHTNING_DISPLAY_NAME.load();
+        SoundsLocale.MATCH_START.load();
     }
 }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
new file mode 100644
index 00000000..577b6cb8
--- /dev/null
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
@@ -0,0 +1,60 @@
+package dev.lrxh.neptune.configs.impl;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.bukkit.NamespacedKey;
+import org.bukkit.Registry;
+import org.bukkit.Sound;
+import org.jetbrains.annotations.Nullable;
+
+import dev.lrxh.neptune.configs.ConfigService;
+import dev.lrxh.neptune.configs.impl.handler.DataType;
+import dev.lrxh.neptune.configs.impl.handler.IDataAccessor;
+import dev.lrxh.neptune.utils.ConfigFile;
+import lombok.Getter;
+
+@Getter
+public enum SoundsLocale implements IDataAccessor {
+    MATCH_START("match-start", "Plays for all players when the match starts", DataType.STRING, "ENTITY_FIREWORK_ROCKET_BLAST"),
+    MATCH_START_COUNTDOWN("match-start-countdown", "Plays for all players after each second in the match start countdown and new round start countdown", DataType.STRING, "UI_BUTTON_CLICK"),
+    PLAYER_KILL("player-kill", "Plays for the player who killed another player", DataType.STRING, "UI_BUTTON_CLICK"),
+    PLAYER_DEATH("player-death", "Plays for the player who died", DataType.STRING, "BLOCK_NOTE_BLOCK_PLING"),
+    PLAYER_RESPAWN("player-respawn", "Plays for the player who respawned", DataType.STRING, "UI_BUTTON_CLICK"),
+    BED_BROKEN("bed-broken", "Plays for all players when a bed is broken", DataType.STRING, "ENTITY_ENDER_DRAGON_GROWL"),
+    MATCH_PARTICIPANT_DIED("match-participant-died", "Plays for all players when someone in the match dies", DataType.STRING, "ENTITY_PLAYER_ATTACK_STRONG"),
+    MENU_BUTTON_CLICK("menu-button-click", "Plays when a player clicks a button in a menu", DataType.STRING, "UI_BUTTON_CLICK");
+
+    private final String path;
+    private final String comment;
+    private final List<String> defaultValue = new ArrayList<>();
+    private final DataType dataType;
+    SoundsLocale(String path, @Nullable String comment, DataType dataType, String... defaultValue) {
+        this.path = path;
+        this.comment = comment;
+        this.defaultValue.addAll(Arrays.asList(defaultValue));
+        this.dataType = dataType;
+    }
+
+    SoundsLocale(String path, DataType dataType, String... defaultValue) {
+        this.path = path;
+        this.comment = null;
+        this.defaultValue.addAll(Arrays.asList(defaultValue));
+        this.dataType = dataType;
+    }
+
+    @Override
+    public String getHeader() {
+        return "";
+    }
+
+    @Override
+    public ConfigFile getConfigFile() {
+        return ConfigService.get().getMainConfig();
+    }
+
+    public static Sound getSound(SoundsLocale sound) {
+        return Registry.SOUNDS.get(NamespacedKey.fromString(sound.getString()));
+    }
+}
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java
index 67996a16..7355b581 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/ffa/FfaFightMatch.java
@@ -4,6 +4,7 @@
 import dev.lrxh.api.match.participant.IParticipant;
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.arena.VirtualArena;
 import dev.lrxh.neptune.game.kit.Kit;
 import dev.lrxh.neptune.game.match.Match;
@@ -18,7 +19,6 @@
 import dev.lrxh.neptune.utils.PlayerUtil;
 import lombok.Getter;
 import net.kyori.adventure.text.TextComponent;
-import org.bukkit.Sound;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -85,7 +85,7 @@ public void onDeath(Participant participant) {
         }
 
         if (participant.getLastAttacker() != null) {
-            participant.getLastAttacker().playSound(Sound.UI_BUTTON_CLICK);
+            participant.getLastAttacker().playSound(SoundsLocale.getSound(SoundsLocale.PLAYER_KILL));
         }
 
         sendDeathMessage(participant);
@@ -143,7 +143,7 @@ public void onLeave(Participant participant, boolean quit) {
     public void startMatch() {
         setState(MatchState.IN_ROUND);
         showPlayerForSpectators();
-        playSound(Sound.ENTITY_FIREWORK_ROCKET_BLAST);
+        playSound(SoundsLocale.getSound(SoundsLocale.MATCH_START));
         sendTitle(CC.color(MessagesLocale.MATCH_START_TITLE_HEADER.getString()), CC.color(MessagesLocale.MATCH_START_TITLE_FOOTER.getString()), 20);
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
index b23c60f7..2970a58c 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/participant/Participant.java
@@ -4,6 +4,7 @@
 import dev.lrxh.api.match.participant.IParticipant;
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.kit.impl.KitRule;
 import dev.lrxh.neptune.game.match.Match;
 import dev.lrxh.neptune.game.match.impl.team.TeamFightMatch;
@@ -64,7 +65,7 @@ public void reset() {
 
     public void setDead(boolean dead) {
         this.dead = dead;
-        playSound(Sound.BLOCK_NOTE_BLOCK_PLING);
+        playSound(SoundsLocale.getSound(SoundsLocale.PLAYER_DEATH));
     }
 
     public boolean setCurrentCheckPoint(Location location) {
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java
index 2be8ee8a..e85c63eb 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/solo/SoloFightMatch.java
@@ -6,6 +6,7 @@
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
 import dev.lrxh.neptune.configs.impl.SettingsLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.feature.hotbar.HotbarService;
 import dev.lrxh.neptune.feature.leaderboard.LeaderboardService;
 import dev.lrxh.neptune.feature.leaderboard.impl.LeaderboardPlayerEntry;
@@ -33,7 +34,6 @@
 import lombok.Setter;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;
-import org.bukkit.Sound;
 
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
@@ -202,7 +202,7 @@ public void sendEndMessage() {
     @Override
     public void breakBed(Participant participant, Participant breaker) {
         participant.setBedBroken(true);
-        playSound(Sound.ENTITY_ENDER_DRAGON_GROWL);
+        playSound(SoundsLocale.getSound(SoundsLocale.BED_BROKEN));
         SoloMatchBedDestroyEvent event = new SoloMatchBedDestroyEvent(this, participant, breaker);
         Bukkit.getPluginManager().callEvent(event);
     }
@@ -221,7 +221,7 @@ public void onDeath(Participant participant) {
 
         participant.setDead(true);
 
-        playSound(Sound.ENTITY_PLAYER_ATTACK_STRONG);
+        playSound(SoundsLocale.getSound(SoundsLocale.MATCH_PARTICIPANT_DIED));
 
         Participant participantKiller = participantA.getNameColored().equals(participant.getNameColored())
                 ? participantB
@@ -250,7 +250,7 @@ public void onDeath(Participant participant) {
         }
 
         if (participant.getLastAttacker() != null) {
-            participant.getLastAttacker().playSound(Sound.UI_BUTTON_CLICK);
+            participant.getLastAttacker().playSound(SoundsLocale.getSound(SoundsLocale.PLAYER_KILL));
         }
 
         this.setEnded(true);
@@ -294,7 +294,7 @@ public void onLeave(Participant participant, boolean quit) {
     public void startMatch() {
         setState(MatchState.IN_ROUND);
         showPlayerForSpectators();
-        playSound(Sound.ENTITY_FIREWORK_ROCKET_BLAST);
+        playSound(SoundsLocale.getSound(SoundsLocale.MATCH_START));
         sendTitle(CC.color(MessagesLocale.MATCH_START_TITLE_HEADER.getString()),
                 CC.color(MessagesLocale.MATCH_START_TITLE_FOOTER.getString()), 20);
     }
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java
index a1bb0504..4c289c26 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/impl/team/TeamFightMatch.java
@@ -6,6 +6,7 @@
 import dev.lrxh.api.match.team.IMatchTeam;
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.arena.VirtualArena;
 import dev.lrxh.neptune.game.kit.Kit;
 import dev.lrxh.neptune.game.kit.impl.KitRule;
@@ -24,7 +25,6 @@
 import lombok.Setter;
 import net.kyori.adventure.text.TextComponent;
 import org.bukkit.Bukkit;
-import org.bukkit.Sound;
 
 import java.util.List;
 import java.util.UUID;
@@ -103,7 +103,7 @@ public void sendEndMessage() {
     public void breakBed(Participant participant, Participant breaker) {
         MatchTeam team = getParticipantTeam(participant);
         team.setBedBroken(true);
-        playSound(Sound.ENTITY_ENDER_DRAGON_GROWL);
+        playSound(SoundsLocale.getSound(SoundsLocale.BED_BROKEN));
         TeamMatchBedDestroyEvent event = new TeamMatchBedDestroyEvent(this, team, breaker);
         Bukkit.getPluginManager().callEvent(event);
     }
@@ -133,7 +133,7 @@ public void onDeath(Participant participant) {
             addSpectator(participant.getPlayer(), participant.getPlayer(), false, false);
 
             if (participant.getLastAttacker() != null) {
-                participant.getLastAttacker().playSound(Sound.UI_BUTTON_CLICK);
+                participant.getLastAttacker().playSound(SoundsLocale.getSound(SoundsLocale.PLAYER_KILL));
             }
 
             sendDeathMessage(participant);
@@ -181,7 +181,7 @@ public void onLeave(Participant participant, boolean quit) {
     public void startMatch() {
         setState(MatchState.IN_ROUND);
         showPlayerForSpectators();
-        playSound(Sound.ENTITY_FIREWORK_ROCKET_BLAST);
+        playSound(SoundsLocale.getSound(SoundsLocale.MATCH_START));
         sendTitle(CC.color(MessagesLocale.MATCH_START_TITLE_FOOTER.getString()), CC.color(MessagesLocale.MATCH_START_TITLE_FOOTER.getString()), 10);
     }
 
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchRespawnRunnable.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchRespawnRunnable.java
index 2677cccd..9b95365a 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchRespawnRunnable.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchRespawnRunnable.java
@@ -2,6 +2,7 @@
 
 import dev.lrxh.api.events.MatchParticipantRespawnEvent;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.match.Match;
 import dev.lrxh.neptune.game.match.MatchService;
 import dev.lrxh.neptune.game.match.impl.participant.Participant;
@@ -13,7 +14,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
-import org.bukkit.Sound;
 
 public class MatchRespawnRunnable extends NeptuneRunnable {
 
@@ -63,7 +63,7 @@ public void run() {
             return;
         }
 
-        participant.playSound(Sound.UI_BUTTON_CLICK);
+        participant.playSound(SoundsLocale.getSound(SoundsLocale.PLAYER_RESPAWN));
 
         participant.sendTitle(CC.color(MessagesLocale.MATCH_RESPAWN_TITLE_HEADER.getString().replace("<timer>", String.valueOf(respawnTimer))),
                 CC.color(MessagesLocale.MATCH_RESPAWN_TITLE_FOOTER.getString().replace("<timer>", String.valueOf(respawnTimer))),
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java
index 8c384712..d8d2a3a8 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchSecondRoundRunnable.java
@@ -2,6 +2,7 @@
 
 import dev.lrxh.api.events.MatchNewRoundStartEvent;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.kit.impl.KitRule;
 import dev.lrxh.neptune.game.match.Match;
 import dev.lrxh.neptune.game.match.MatchService;
@@ -11,7 +12,6 @@
 import dev.lrxh.neptune.utils.CC;
 import dev.lrxh.neptune.utils.tasks.NeptuneRunnable;
 import org.bukkit.Bukkit;
-import org.bukkit.Sound;
 
 public class MatchSecondRoundRunnable extends NeptuneRunnable {
 
@@ -50,7 +50,7 @@ public void run() {
         }
 
         if (match.getState().equals(MatchState.STARTING)) {
-            match.playSound(Sound.UI_BUTTON_CLICK);
+            match.playSound(SoundsLocale.getSound(SoundsLocale.MATCH_START_COUNTDOWN));
 
             match.sendTitle(CC.color(MessagesLocale.MATCH_STARTING_TITLE_HEADER.getString().replace("<countdown-time>", String.valueOf(respawnTimer))),
                     CC.color(MessagesLocale.MATCH_STARTING_TITLE_FOOTER.getString().replace("<countdown-time>", String.valueOf(respawnTimer))),
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchStartRunnable.java b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchStartRunnable.java
index c6c77d87..a672e79d 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchStartRunnable.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/game/match/tasks/MatchStartRunnable.java
@@ -3,6 +3,7 @@
 import dev.lrxh.api.events.MatchStartEvent;
 import dev.lrxh.neptune.API;
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
 import dev.lrxh.neptune.game.match.Match;
 import dev.lrxh.neptune.game.match.impl.MatchState;
 import dev.lrxh.neptune.game.match.impl.ffa.FfaFightMatch;
@@ -14,7 +15,6 @@
 import dev.lrxh.neptune.utils.Time;
 import dev.lrxh.neptune.utils.tasks.NeptuneRunnable;
 import org.bukkit.Bukkit;
-import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 
 import java.util.UUID;
@@ -60,7 +60,7 @@ public void run() {
             return;
         }
         if (match.getState().equals(MatchState.STARTING)) {
-            match.playSound(Sound.UI_BUTTON_CLICK);
+            match.playSound(SoundsLocale.getSound(SoundsLocale.MATCH_START_COUNTDOWN));
             match.sendTitle(
                     CC.color(MessagesLocale.MATCH_STARTING_TITLE_HEADER.getString().replace("<countdown-time>",
                             String.valueOf(startTimer))),
diff --git a/Plugin/src/main/java/dev/lrxh/neptune/utils/menu/MenuListener.java b/Plugin/src/main/java/dev/lrxh/neptune/utils/menu/MenuListener.java
index 8b4919d8..0fca9729 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/utils/menu/MenuListener.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/utils/menu/MenuListener.java
@@ -1,7 +1,8 @@
 package dev.lrxh.neptune.utils.menu;
 
 import dev.lrxh.neptune.API;
-import org.bukkit.Sound;
+import dev.lrxh.neptune.configs.impl.SoundsLocale;
+
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -28,7 +29,7 @@ public void onButtonPress(InventoryClickEvent event) {
             if (button != null) {
 
                 if (API.getProfile(player).getSettingData().isMenuSound()) {
-                    player.playSound(player.getLocation(), Sound.UI_BUTTON_CLICK, 1.0f, 1.0f);
+                    player.playSound(player.getLocation(), SoundsLocale.getSound(SoundsLocale.MENU_BUTTON_CLICK), 1.0f, 1.0f);
                 }
 
                 button.onClick(event.getClick(), player);

From ced363be2cbd2656a8e0765de2848bd56520dfc2 Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Sat, 7 Feb 2026 00:18:50 +0530
Subject: [PATCH 4/6] =?UTF-8?q?=F0=9F=A4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
index 577b6cb8..f107bc4e 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
@@ -51,7 +51,7 @@ public String getHeader() {
 
     @Override
     public ConfigFile getConfigFile() {
-        return ConfigService.get().getMainConfig();
+        return ConfigService.get().getSoundsConfig();
     }
 
     public static Sound getSound(SoundsLocale sound) {

From f9d83b064c70187ef646a3004a8a5a8f6cb09a10 Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Sun, 8 Feb 2026 12:37:11 +0530
Subject: [PATCH 5/6] Change bukkit sound strings to namespacedkey strings

---
 .../neptune/configs/impl/SoundsLocale.java    | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
index f107bc4e..2d3cdcd3 100644
--- a/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
+++ b/Plugin/src/main/java/dev/lrxh/neptune/configs/impl/SoundsLocale.java
@@ -13,18 +13,19 @@
 import dev.lrxh.neptune.configs.impl.handler.DataType;
 import dev.lrxh.neptune.configs.impl.handler.IDataAccessor;
 import dev.lrxh.neptune.utils.ConfigFile;
+import dev.lrxh.neptune.utils.ServerUtils;
 import lombok.Getter;
 
 @Getter
 public enum SoundsLocale implements IDataAccessor {
-    MATCH_START("match-start", "Plays for all players when the match starts", DataType.STRING, "ENTITY_FIREWORK_ROCKET_BLAST"),
-    MATCH_START_COUNTDOWN("match-start-countdown", "Plays for all players after each second in the match start countdown and new round start countdown", DataType.STRING, "UI_BUTTON_CLICK"),
-    PLAYER_KILL("player-kill", "Plays for the player who killed another player", DataType.STRING, "UI_BUTTON_CLICK"),
-    PLAYER_DEATH("player-death", "Plays for the player who died", DataType.STRING, "BLOCK_NOTE_BLOCK_PLING"),
-    PLAYER_RESPAWN("player-respawn", "Plays for the player who respawned", DataType.STRING, "UI_BUTTON_CLICK"),
-    BED_BROKEN("bed-broken", "Plays for all players when a bed is broken", DataType.STRING, "ENTITY_ENDER_DRAGON_GROWL"),
-    MATCH_PARTICIPANT_DIED("match-participant-died", "Plays for all players when someone in the match dies", DataType.STRING, "ENTITY_PLAYER_ATTACK_STRONG"),
-    MENU_BUTTON_CLICK("menu-button-click", "Plays when a player clicks a button in a menu", DataType.STRING, "UI_BUTTON_CLICK");
+    MATCH_START("match-start", "Plays for all players when the match starts", DataType.STRING, "entity.firework_rocket.blast"),
+    MATCH_START_COUNTDOWN("match-start-countdown", "Plays for all players after each second in the match start countdown and new round start countdown", DataType.STRING, "ui.button.click"),
+    PLAYER_KILL("player-kill", "Plays for the player who killed another player", DataType.STRING, "ui.button.click"),
+    PLAYER_DEATH("player-death", "Plays for the player who died", DataType.STRING, "block.note_block.ping"),
+    PLAYER_RESPAWN("player-respawn", "Plays for the player who respawned", DataType.STRING, "ui.button.click"),
+    BED_BROKEN("bed-broken", "Plays for all players when a bed is broken", DataType.STRING, "entity.ender_dragon.growl"),
+    MATCH_PARTICIPANT_DIED("match-participant-died", "Plays for all players when someone in the match dies", DataType.STRING, "entity.player.attack.strong"),
+    MENU_BUTTON_CLICK("menu-button-click", "Plays when a player clicks a button in a menu", DataType.STRING, "ui.button.click");
 
     private final String path;
     private final String comment;
@@ -55,6 +56,11 @@ public ConfigFile getConfigFile() {
     }
 
     public static Sound getSound(SoundsLocale sound) {
-        return Registry.SOUNDS.get(NamespacedKey.fromString(sound.getString()));
+        try {
+            return Registry.SOUNDS.get(NamespacedKey.fromString(sound.getString()));
+        } catch (NullPointerException e) {
+            ServerUtils.error("Sound does not exist! path: " + sound.getPath() + ", value: " + sound.getString());
+            return null;
+        }
     }
 }

From c0789b8dc8efe38c889e9a353ca975473fe753d6 Mon Sep 17 00:00:00 2001
From: mallusrgreat <mallusrgreat@duck.com>
Date: Mon, 9 Feb 2026 00:13:16 +0530
Subject: [PATCH 6/6] Use color util in no permission message

---
 .../java/com/jonahseguin/drink/command/DrinkAuthorizer.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java b/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
index 1f4b11ac..f3caf984 100644
--- a/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
+++ b/Plugin/src/main/java/com/jonahseguin/drink/command/DrinkAuthorizer.java
@@ -2,10 +2,10 @@
 
 import lombok.Getter;
 import lombok.Setter;
-import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 import dev.lrxh.neptune.configs.impl.MessagesLocale;
+import dev.lrxh.neptune.utils.CC;
 
 import javax.annotation.Nonnull;
 
@@ -16,7 +16,7 @@ public class DrinkAuthorizer {
     public boolean isAuthorized(@Nonnull CommandSender sender, @Nonnull DrinkCommand command) {
         if (command.getPermission() != null && command.getPermission().length() > 0) {
             if (!sender.hasPermission(command.getPermission())) {
-                sender.sendMessage(ChatColor.translateAlternateColorCodes('&', MessagesLocale.NO_PERMISSION.getString()));
+                sender.sendMessage(CC.color(MessagesLocale.NO_PERMISSION.getString()));
                 return false;
             }
         }