📝 Fix messages

Author: Maxlego08

API/src/main/java/fr/maxlego08/essentials/api/messages/Message.java

@@ -1008,6 +1008,13 @@ public enum Message {
     COMMAND_DEATH_MESSAGE_TOGGLE_DISABLE("#C084FC☠ #B794F4Death messages are now #E9D5FFhidden #B794F4for %player%#B794F4."),
     COMMAND_DEATH_MESSAGE_TOGGLE_ENABLE("#C084FC☠ #B794F4Death messages are now #E9D5FFvisible #B794F4for %player%#B794F4."),
     DESCRIPTION_DEATH_MESSAGE_TOGGLE("Toggle death messages visibility"),
+
+    // Death messages used by DeathMessageModule (fallback messages when no custom config is set)
+    DEATH_MESSAGE_GENERIC("#99E0FF%player% &7died."),
+    DEATH_MESSAGE_PLAYER("#99E0FF%player% &7was slain by #34cfe0%killer% &7using %weapon%&7."),
+    DEATH_MESSAGE_MOB("#99E0FF%player% &7was killed by &c%mob%&7."),
+    DEATH_MESSAGE_MYTHIC_MOB("#99E0FF%player% &7was slain by <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"),
+    DEATH_MESSAGE_FISTS("&7fists"),
     ;
 
     private EssentialsPlugin plugin;

src/main/java/fr/maxlego08/essentials/commands/commands/deathmessage/CommandDeathMessageToggle.java

@@ -0,0 +1,51 @@
+package fr.maxlego08.essentials.commands.commands.deathmessage;
+
+import fr.maxlego08.essentials.api.EssentialsPlugin;
+import fr.maxlego08.essentials.api.commands.CommandResultType;
+import fr.maxlego08.essentials.api.commands.Permission;
+import fr.maxlego08.essentials.api.messages.Message;
+import fr.maxlego08.essentials.api.user.Option;
+import fr.maxlego08.essentials.api.user.User;
+import fr.maxlego08.essentials.module.modules.DeathMessageModule;
+import fr.maxlego08.essentials.zutils.utils.commands.VCommand;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class CommandDeathMessageToggle extends VCommand {
+
+    public CommandDeathMessageToggle(EssentialsPlugin plugin) {
+        super(plugin);
+        this.setModule(DeathMessageModule.class);
+        this.setPermission(Permission.ESSENTIALS_DEATH_MESSAGE_TOGGLE);
+        this.setDescription(Message.DESCRIPTION_DEATH_MESSAGE_TOGGLE);
+        this.addOptionalArg("player");
+    }
+
+    @Override
+    protected CommandResultType perform(EssentialsPlugin plugin) {
+
+        Player player = this.argAsPlayer(0, this.player);
+
+        if (player == null) {
+            return CommandResultType.SYNTAX_ERROR;
+        }
+
+        if (player.equals(this.player) || !hasPermission(sender, Permission.ESSENTIALS_DEATH_MESSAGE_TOGGLE_OTHER)) {
+            toggleDeathMessage(player, this.user, sender);
+        } else {
+            User otherUser = getUser(player);
+            if (otherUser == null) return CommandResultType.SYNTAX_ERROR;
+            toggleDeathMessage(player, otherUser, sender);
+        }
+
+        return CommandResultType.SUCCESS;
+    }
+
+    private void toggleDeathMessage(Player player, User user, CommandSender sender) {
+        user.setOption(Option.DEATH_MESSAGE_DISABLE, !user.getOption(Option.DEATH_MESSAGE_DISABLE));
+        boolean isDeathMessageDisable = user.getOption(Option.DEATH_MESSAGE_DISABLE);
+
+        Message messageKey = isDeathMessageDisable ? Message.COMMAND_DEATH_MESSAGE_TOGGLE_DISABLE : Message.COMMAND_DEATH_MESSAGE_TOGGLE_ENABLE;
+        message(sender, messageKey, "%player%", user == this.user ? Message.YOU.getMessageAsString() : player.getName());
+    }
+}

src/main/resources/messages/messages.yml

@@ -1039,4 +1039,11 @@ command-pub:
   message: "&8[&fPUB&8] <white>%player%<dark_gray>: <red>%message%"
 step-doesnt-exist: "<error>Step &f%step% <error>does not exist."
 step-already-exist: "<error>Step &f%step% <error>already started."
-step-doesnt-started: "<error>Step &f%step% <error>is not started."
+step-doesnt-started: "<error>Step &f%step% <error>is not started."
+
+# Death Messages (fallback when no custom config is set)
+death-message-generic: "#99E0FF%player% &7died."
+death-message-player: "#99E0FF%player% &7was slain by #34cfe0%killer% &7using %weapon%&7."
+death-message-mob: "#99E0FF%player% &7was killed by &c%mob%&7."
+death-message-mythic-mob: "#99E0FF%player% &7was slain by <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"
+death-message-fists: "&7fists"

src/main/resources/messages/messages_de.yml

@@ -1039,6 +1039,14 @@ random-word-clear: "<success>Das Zufallswort wurde gelöscht."
 step-already-exist: "<error>Schritt &f%step% <error>hat bereits begonnen."
 step-doesnt-exist: "<error>Schritt &f%step% <error>existiert nicht."
 step-doesnt-started: "<error>Schritt &f%step% <error>wurde nicht gestartet."
+
+# Todesnachrichten (Fallback wenn keine benutzerdefinierte Konfiguration gesetzt ist)
+death-message-generic: "#99E0FF%player% &7ist gestorben."
+death-message-player: "#99E0FF%player% &7wurde von #34cfe0%killer% &7mit %weapon% &7getötet."
+death-message-mob: "#99E0FF%player% &7wurde von &c%mob% &7getötet."
+death-message-mythic-mob: "#99E0FF%player% &7wurde von <gradient:#ff6600:#ff0000>%mob%</gradient> &7getötet!"
+death-message-fists: "&7Fäusten"
+
 teleport-message-spawn-console: "<success>Du hast den Spieler <white>%player% <success>zum Spawn teleportiert."
 teleport-random-start: "&7Suche nach einem Ziel... du darfst dich nicht bewegen."
 worldedit-permission-error: "<error>Du kannst WorldEdit hier nicht verwenden."

src/main/resources/messages/messages_es.yml

@@ -993,6 +993,14 @@ random-word-clear: "<success>La palabra aleatoria ha sido limpiada."
 step-already-exist: "<error>El paso &f%step% <error>ya ha comenzado."
 step-doesnt-exist: "<error>El paso &f%step% <error>no existe."
 step-doesnt-started: "<error>El paso &f%step% <error>no se ha iniciado."
+
+# Mensajes de muerte (fallback cuando no hay configuración personalizada)
+death-message-generic: "#99E0FF%player% &7ha muerto."
+death-message-player: "#99E0FF%player% &7fue asesinado por #34cfe0%killer% &7usando %weapon%&7."
+death-message-mob: "#99E0FF%player% &7fue asesinado por &c%mob%&7."
+death-message-mythic-mob: "#99E0FF%player% &7fue asesinado por <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"
+death-message-fists: "&7puños"
+
 teleport-message-spawn-console: "<success>Acabas de teletransportar al jugador <white>%player% <success>al spawn."
 teleport-random-start: "&7Buscando un destino... no debes moverte."
 worldedit-permission-error: "<error>No puedes usar worldedit aquí."

src/main/resources/messages/messages_fr.yml

@@ -1008,4 +1008,11 @@ command-pub:
   message: "&8[&fPUB&8] <white>%player%<dark_gray>: <red>%message%"
 step-doesnt-exist: "<error>L'étape &f%step% <error>n'existe pas."
 step-already-exist: "<error>L'étape &f%step% <error>a déjà commencé."
-step-doesnt-started: "<error>L'étape &f%step% <error>n'a pas commencé."
+step-doesnt-started: "<error>L'étape &f%step% <error>n'a pas commencé."
+
+# Messages de mort (fallback quand aucune config personnalisée n'est définie)
+death-message-generic: "#99E0FF%player% &7est mort."
+death-message-player: "#99E0FF%player% &7a été tué par #34cfe0%killer% &7avec %weapon%&7."
+death-message-mob: "#99E0FF%player% &7a été tué par &c%mob%&7."
+death-message-mythic-mob: "#99E0FF%player% &7a été tué par <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"
+death-message-fists: "&7ses poings"

src/main/resources/messages/messages_it.yml

@@ -1002,6 +1002,14 @@ random-word-clear: "<success>La parola casuale è stata cancellata."
 step-already-exist: "<error>Lo step &f%step% <error>è già iniziato."
 step-doesnt-exist: "<error>Lo step &f%step% <error>non esiste."
 step-doesnt-started: "<error>Lo step &f%step% <error>non è stato avviato."
+
+# Messaggi di morte (fallback quando non c'è configurazione personalizzata)
+death-message-generic: "#99E0FF%player% &7è morto."
+death-message-player: "#99E0FF%player% &7è stato ucciso da #34cfe0%killer% &7con %weapon%&7."
+death-message-mob: "#99E0FF%player% &7è stato ucciso da &c%mob%&7."
+death-message-mythic-mob: "#99E0FF%player% &7è stato ucciso da <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"
+death-message-fists: "&7pugni"
+
 teleport-message-spawn-console: "<success>Hai appena teletrasportato il giocatore <white>%player% <success>allo spawn."
 teleport-random-start: "&7Ricerca di una destinazione... non devi muoverti."
 worldedit-permission-error: "<error>Non puoi usare worldedit qui."

src/main/resources/messages/messages_nl.yml

@@ -1036,3 +1036,10 @@ random-word-clear: "<success>Het willekeurige woord is gewist."
 step-doesnt-exist: "<error>Stap &f%step% <error>bestaat niet."
 step-already-exist: "<error>Stap &f%step% <error>is al gestart."
 step-doesnt-started: "<error>Stap &f%step% <error>is niet gestart."
+
+# Doodsberichten (fallback wanneer geen aangepaste configuratie is ingesteld)
+death-message-generic: "#99E0FF%player% &7is gestorven."
+death-message-player: "#99E0FF%player% &7werd gedood door #34cfe0%killer% &7met %weapon%&7."
+death-message-mob: "#99E0FF%player% &7werd gedood door &c%mob%&7."
+death-message-mythic-mob: "#99E0FF%player% &7werd gedood door <gradient:#ff6600:#ff0000>%mob%</gradient>&7!"
+death-message-fists: "&7vuisten"