Improve UX - Add configurable formats for home list entries and integrate TranslationManager into HomeCommand and HomeAdminCommand for better customization.

Author: vLuckyyy

eternalcore-core/src/main/java/com/eternalcode/core/feature/home/command/HomeCommand.java

@@ -8,6 +8,7 @@
 import com.eternalcode.core.feature.home.HomesSettings;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.core.translation.TranslationManager;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
 import dev.rollczi.litecommands.annotations.context.Sender;
@@ -22,27 +23,28 @@
 @Permission("eternalcore.home")
 class HomeCommand {
 
-    private static final String CLICK_COMMAND_FORMATTED_LIST = "<click:run_command:'/home %s'>%s</click>";
-
     private final HomesSettings homesSettings;
     private final NoticeService noticeService;
     private final HomeService homeService;
     private final HomeTeleportService homeTeleportService;
     private final PluginConfiguration pluginConfiguration;
+    private final TranslationManager translationManager;
 
     @Inject
     HomeCommand(
         HomesSettings homesSettings,
         NoticeService noticeService,
         HomeService homeService,
         HomeTeleportService homeTeleportService,
-        PluginConfiguration pluginConfiguration
+        PluginConfiguration pluginConfiguration,
+        TranslationManager translationManager
     ) {
         this.homesSettings = homesSettings;
         this.noticeService = noticeService;
         this.homeService = homeService;
         this.homeTeleportService = homeTeleportService;
         this.pluginConfiguration = pluginConfiguration;
+        this.translationManager = translationManager;
     }
 
     @Execute
@@ -59,8 +61,6 @@ void execute(@Sender Player player) {
         }
 
         if (playerHomes.size() > 1) {
-            String homes = this.formatHomeList(playerHomes);
-
             Optional<Home> mainHome = playerHomes.stream()
                 .filter(home -> home.getName().equals(this.homesSettings.defaultName()))
                 .findFirst();
@@ -70,6 +70,8 @@ void execute(@Sender Player player) {
                 return;
             }
 
+            String homes = this.formatHomeList(playerHomes);
+
             this.noticeService.create()
                 .player(player.getUniqueId())
                 .notice(translation -> translation.home().homeList())
@@ -90,14 +92,12 @@ void execute(@Sender Player player, @Arg Home home) {
     }
 
     private String formatHomeList(Collection<Home> homes) {
+        String format = this.translationManager.getMessages().home().homeListEntryFormat();
         return homes.stream()
-            .map(home -> String.format(
-                CLICK_COMMAND_FORMATTED_LIST,
-                home.getName(),
-                home.getName()
-            ))
-            .collect(Collectors.joining(
-                this.pluginConfiguration.format.separator
-            ));
+            .map(home -> {
+                String homeName = home.getName();
+                return format.replace("{HOME}", homeName);
+            })
+            .collect(Collectors.joining(this.pluginConfiguration.format.separator));
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/home/homeadmin/HomeAdminCommand.java

@@ -6,6 +6,7 @@
 import com.eternalcode.core.feature.home.HomeManager;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.core.translation.TranslationManager;
 import com.eternalcode.core.viewer.Viewer;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
@@ -25,21 +26,22 @@
 @Permission("eternalcore.home.admin")
 class HomeAdminCommand {
 
-    private static final String CLICK_SUGGEST_COMMAND_FORMATTED_LIST = "<click:run_command:'/homeadmin home %s %s'>%s</click>";
-
     private final HomeManager homeManager;
     private final NoticeService noticeService;
     private final PluginConfiguration pluginConfiguration;
+    private final TranslationManager translationManager;
 
     @Inject
     public HomeAdminCommand(
         HomeManager homeManager,
         NoticeService noticeService,
-        PluginConfiguration pluginConfiguration
+        PluginConfiguration pluginConfiguration,
+        TranslationManager translationManager
     ) {
         this.homeManager = homeManager;
         this.noticeService = noticeService;
         this.pluginConfiguration = pluginConfiguration;
+        this.translationManager = translationManager;
     }
 
     @Execute(name = "sethome")
@@ -180,15 +182,12 @@ private void sendHomeListNotice(Viewer viewer, Collection<Home> homes, OfflinePl
     }
 
     private String formatHomeList(Collection<Home> homes, String playerName) {
+        String format = this.translationManager.getMessages().home().homeListEntryFormatAsAdmin();
+
         return homes.stream()
-            .map(home -> String.format(
-                CLICK_SUGGEST_COMMAND_FORMATTED_LIST,
-                playerName,
-                home.getName(),
-                home.getName()
-            ))
-            .collect(Collectors.joining(
-                this.pluginConfiguration.format.separator
-            ));
+            .map(home -> format
+                .replace("{HOME}", home.getName())
+                .replace("{PLAYER}", playerName))
+            .collect(Collectors.joining(this.pluginConfiguration.format.separator));
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/ENHomeMessages.java

@@ -11,6 +11,12 @@
 public class ENHomeMessages extends OkaeriConfig implements HomeMessages {
     @Comment("# {HOMES} - List of homes (separated by commas)")
     Notice homeList = Notice.chat("<color:#9d6eef>► <white>Available homes: <color:#9d6eef>{HOMES}");
+    @Comment({
+        " ",
+        "# Format for single home entry in user's home list. Set to \"\" if you don't want this feature.",
+        "# {HOME} - Home name"
+    })
+    String homeListEntryFormat = "<hover:show_text:'<gray>Click to teleport'><click:run_command:'/home {HOME}'>{HOME}</click></hover>";
 
     @Comment({ " ", "# {HOME} - Home name" })
     Notice create = Notice.chat("<color:#9d6eef>► <white>Home <color:#9d6eef>{HOME} <white>has been created.");
@@ -33,8 +39,13 @@ public class ENHomeMessages extends OkaeriConfig implements HomeMessages {
     Notice createAsAdmin = Notice.chat("<color:#9d6eef>► <white>Home <color:#9d6eef>{HOME} <white>has been created for <color:#9d6eef>{PLAYER}<white>.");
     Notice deleteAsAdmin = Notice.chat("<color:#9d6eef>► <white>Home <color:#9d6eef>{HOME} <white>has been deleted for <color:#9d6eef>{PLAYER}<white>.");
     Notice homeListAsAdmin = Notice.chat("<color:#9d6eef>► <white>Available homes for <color:#9d6eef>{PLAYER}<white>: <color:#9d6eef>{HOMES}");
-    Notice noHomesOnListAsAdmin =
-        Notice.chat("<red>► <dark_red>Player <red>{PLAYER} <dark_red>does not have any homes!");
+    @Comment({
+        " ",
+        "# Format for single home entry in admin's home list. Set to \"\" if you don't want this feature.",
+        "# {HOME} - Home name, {PLAYER} - Player name"
+    })
+    String homeListEntryFormatAsAdmin = "<hover:show_text:'<gray>Click to teleport'><click:run_command:'/homeadmin home {PLAYER} {HOME}'>{HOME}</click></hover>";
+    Notice noHomesOnListAsAdmin = Notice.chat("<red>► <dark_red>Player <red>{PLAYER} <dark_red>does not have any homes!");
 
     @Comment({
         " ",

eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/HomeMessages.java

@@ -4,6 +4,7 @@
 
 public interface HomeMessages {
     Notice homeList();
+    String homeListEntryFormat();
     Notice create();
     Notice delete();
     Notice limit();
@@ -16,6 +17,7 @@ public interface HomeMessages {
     Notice createAsAdmin();
     Notice deleteAsAdmin();
     Notice homeListAsAdmin();
+    String homeListEntryFormatAsAdmin();
     Notice noHomesOnListAsAdmin();
     Notice teleportedAsAdmin();
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/home/messages/PLHomeMessages.java

@@ -11,6 +11,13 @@
 public class PLHomeMessages extends OkaeriConfig implements HomeMessages {
     @Comment({ " ", "# {HOMES} - Lista domów" })
     Notice homeList = Notice.chat("<color:#9d6eef>► <white>Lista domów: <color:#9d6eef>{HOMES}!");
+    @Comment({
+        " ",
+        "# Format pojedynczego wpisu w liście domów gracza. Ustaw na \"\" jeśli nie chcesz tego feature'a.",
+        "# {HOME} - Nazwa domu"
+    })
+    String homeListEntryFormat = "<hover:show_text:'<gray>Kliknij aby się teleportować'><click:run_command:'/home {HOME}'>{HOME}</click></hover>";
+
 
     @Comment({ " ", "# {HOME} - Nazwa domu" })
     Notice create = Notice.chat("<color:#9d6eef>► <white>Stworzono dom o nazwie <color:#9d6eef>{HOME}<white>!");
@@ -39,6 +46,12 @@ public class PLHomeMessages extends OkaeriConfig implements HomeMessages {
             "<color:#9d6eef>► <white>Usunięto dom <color:#9d6eef>{HOME} <white>dla gracza <color:#9d6eef>{PLAYER}<white>!");
     Notice homeListAsAdmin = Notice
             .chat("<color:#9d6eef>► <white>Lista domów gracza <color:#9d6eef>{PLAYER}<white>: <color:#9d6eef>{HOMES}!");
+    @Comment({
+        " ",
+        "# Format pojedynczego wpisu w liście domów (widok admina). Ustaw na \"\" jeśli nie chcesz tego feature'a.",
+        "# {HOME} - Nazwa domu, {PLAYER} - Nick gracza"
+    })
+    String homeListEntryFormatAsAdmin = "<hover:show_text:'<gray>Kliknij aby się teleportować'><click:run_command:'/homeadmin home {PLAYER} {HOME}'>{HOME}</click></hover>";
     Notice noHomesOnListAsAdmin = Notice.chat("<red>► <dark_red>Gracz <red>{PLAYER} <dark_red>nie posiada domów.");
 
     @Comment({