GH-1193 Simplify /broadcast command. (#1193)

* Simplified title command

* changed name from subtitle to text

* Use the titleHeader instead of message format

---------

Co-authored-by: Paweł Malanich <malanichpawel@gmail.com>
Co-authored-by: Jakubk15 <77227023+Jakubk15@users.noreply.github.com>

Author: 3 people

eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/BroadcastCommand.java

@@ -10,10 +10,9 @@
 import dev.rollczi.litecommands.annotations.flag.Flag;
 import dev.rollczi.litecommands.annotations.join.Join;
 import dev.rollczi.litecommands.annotations.permission.Permission;
-import net.kyori.adventure.bossbar.BossBar;
-
 import java.time.Duration;
 import java.util.function.Function;
+import net.kyori.adventure.bossbar.BossBar;
 
 @Command(name = "broadcast", aliases = "bc")
 @Permission("eternalcore.broadcast")
@@ -35,15 +34,14 @@ void executeChat(@Flag("-raw") boolean raw, @Join String text) {
     }
 
     @Execute(name = "title")
-    @DescriptionDocs(description = "Broadcasts a TITLE message to all players.", arguments = "[-raw] <text>")
-    void executeTitle(@Flag("-raw") boolean raw, @Join String title) {
-        this.sendBroadcast(formatted -> Notice.title(formatted, "", this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut()), title, raw);
-    }
-
-    @Execute(name = "subtitle")
-    @DescriptionDocs(description = "Broadcasts a SUBTITLE message to all players.", arguments = "[-raw] <text>")
-    void executeSubtitle(@Flag("-raw") boolean raw, @Join String subtitle) {
-        this.sendBroadcast(formatted -> Notice.title("", formatted, this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut()), subtitle, raw);
+    @DescriptionDocs(description = "Broadcasts a combined title message to all players.", arguments = "[-raw] <text>")
+    void executeTitle(@Flag("-raw") boolean raw, @Join String text) {
+        this.noticeService.create()
+            .notice(translation -> Notice.title(
+                raw ? " " : translation.broadcast().titleHeader(), text,
+                this.settings.titleFadeIn(), this.settings.titleStay(), this.settings.titleFadeOut()))
+            .onlinePlayers()
+            .send();
     }
 
     @Execute(name = "actionbar")

eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/messages/BroadcastMessages.java

@@ -3,5 +3,6 @@
 public interface BroadcastMessages {
 
     String messageFormat();
+    String titleHeader();
 
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/messages/ENBroadcastMessages.java

@@ -12,4 +12,7 @@ public class ENBroadcastMessages extends OkaeriConfig implements BroadcastMessag
     @Comment("# {BROADCAST} - Broadcast")
     public String messageFormat = "<red><bold>BROADCAST:</bold> <gray>{BROADCAST}";
 
+    @Comment("# Used only in title broadcasts")
+    public String titleHeader = "<red><bold>BROADCAST:</bold>";
+
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/broadcast/messages/PLBroadcastMessages.java

@@ -12,4 +12,7 @@ public class PLBroadcastMessages extends OkaeriConfig implements BroadcastMessag
     @Comment("# {BROADCAST} - Ogłoszenie")
     public String messageFormat = "<red><bold>OGŁOSZENIE:</bold> <gray>{BROADCAST}";
 
+    @Comment("# Używane tylko w ogłoszeniach tytułowych")
+    public String titleHeader = "<red><bold>OGŁOSZENIE:</bold>";
+
 }