GH-373 Add opponent placeholder in combat notification

eternalcombat-plugin/build.gradle.kts

@@ -96,7 +96,7 @@ bukkit {
 
 tasks {
     runServer {
-        minecraftVersion("1.21.10")
+        minecraftVersion("1.21.11")
         downloadPlugins.modrinth("WorldEdit", Versions.WORLDEDIT)
         downloadPlugins.modrinth("PacketEvents", "${Versions.PACKETEVENTS}+spigot")
         downloadPlugins.modrinth("WorldGuard", Versions.WORLDGUARD)

eternalcombat-plugin/src/main/java/com/eternalcode/combat/config/implementation/MessagesSettings.java

@@ -17,17 +17,24 @@ public class MessagesSettings extends OkaeriConfig {
         " ",
         "# Configure the combat log notification displayed to players.",
         "# You can use the {TIME} variable to display the remaining combat time.",
+        "# Placeholder {OPPONENT} will be replaced with player name or 'unknownPlayerPlaceholder' variable",
         " ",
     })
     public Notice combatNotification = BukkitNotice.builder()
-        .actionBar("Combat ends in: <red>{TIME}</red>")
+        .actionBar("Combat ends in: <red>{TIME}</red> | Enemy: <red>{OPPONENT}</red> ⚔")
         .build();
 
     @Comment({
         "# Would you like to display milliseconds instead of seconds in combat notification "
     })
     public boolean withoutMillis = true;
 
+    @Comment({
+        " ",
+        "# When player is not known this text will be used as {OPPONENT} in 'combatNotification'"
+    })
+    public String unknownPlayerPlaceholder = "Unknown";
+
     @Comment({
         "# Message displayed when a player lacks permission to execute a command.",
         "# The {PERMISSION} placeholder is replaced with the required permission."

eternalcombat-plugin/src/main/java/com/eternalcode/combat/fight/FightTask.java

@@ -4,6 +4,7 @@
 import com.eternalcode.combat.fight.event.CauseOfUnTag;
 import com.eternalcode.combat.notification.NoticeService;
 import com.eternalcode.combat.util.DurationUtil;
+import java.util.Optional;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
@@ -17,7 +18,7 @@ public class FightTask implements Runnable {
     private final FightManager fightManager;
     private final NoticeService noticeService;
 
-    public FightTask(Server server, PluginConfig config, FightManager fightManager,  NoticeService noticeService) {
+    public FightTask(Server server, PluginConfig config, FightManager fightManager, NoticeService noticeService) {
         this.server = server;
         this.config = config;
         this.fightManager = fightManager;
@@ -42,10 +43,17 @@ public void run() {
 
             Duration remaining = fightTag.getRemainingDuration();
 
+            String opponent = Optional.ofNullable(fightTag.getTagger())
+                .filter(uuid -> !uuid.equals(playerUniqueId))
+                .map(this.server::getPlayer)
+                .map(Player::getName)
+                .orElse(this.config.messagesSettings.unknownPlayerPlaceholder);
+
             this.noticeService.create()
                 .player(player.getUniqueId())
                 .notice(this.config.messagesSettings.combatNotification)
                 .placeholder("{TIME}", DurationUtil.format(remaining, this.config.messagesSettings.withoutMillis))
+                .placeholder("{OPPONENT}", opponent)
                 .send();
 
         }