GH-952 Expand repair time and create dedicated section for messages (#1118)

* expand repair time

* move repair to dedicated section

---------

Co-authored-by: Martin Sulikowski <[email protected]>

Author: Dioes60

eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java

@@ -8,7 +8,8 @@ public class Migrations {
         new Migration_0001_Rename_privateChat_to_msg(),
         new Migration_0002_Move_Spawn_Settings_to_spawn_config_section(),
         new Migration_0003_Move_tprp_to_dedicated_section(),
-        new Migration_0006_Move_alert_to_broadcast_section()
+        new Migration_0006_Move_alert_to_broadcast_section(),
+        new Migrations_0008_Move_repair_to_dedicated_section()
     };
 
 }

eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations_0008_Move_repair_to_dedicated_section.java

@@ -0,0 +1,17 @@
+package com.eternalcode.core.configuration.migrations;
+
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+
+public class Migrations_0008_Move_repair_to_dedicated_section extends NamedMigration {
+
+    Migrations_0008_Move_repair_to_dedicated_section() {
+        super(
+            "Move repair to dedicated section",
+            move("item.repairMessage", "repair.itemRepaired"),
+            move("item.repairAllMessage", "repair.allItemsRepaired"),
+            move("item.repairDelayMessage", "repair.delay")
+        );
+    }
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairCommand.java

@@ -69,7 +69,7 @@ void repair(@Context Player player) {
 
         this.noticeService
             .create()
-            .notice(translation -> translation.item().repairMessage())
+            .notice(translation -> translation.repair().itemRepaired())
             .player(player.getUniqueId())
             .send();
 
@@ -113,7 +113,7 @@ void repairAll(@Context Player player) {
 
         this.noticeService
             .create()
-            .notice(translation -> translation.item().repairAllMessage())
+            .notice(translation -> translation.repair().allItemsRepaired())
             .player(player.getUniqueId())
             .send();
 
@@ -157,7 +157,7 @@ void repairArmor(@Context Player player) {
 
         this.noticeService
             .create()
-            .notice(translation -> translation.item().repairMessage())
+            .notice(translation -> translation.repair().armorRepaired())
             .player(player.getUniqueId())
             .send();
 
@@ -170,7 +170,7 @@ private boolean hasRepairDelay(UUID uuid) {
 
             this.noticeService
                 .create()
-                .notice(translation -> translation.item().repairDelayMessage())
+                .notice(translation -> translation.repair().delay())
                 .placeholder("{TIME}", DurationUtil.format(time, true))
                 .player(uuid)
                 .send();

eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/RepairConfig.java

@@ -11,5 +11,5 @@
 public class RepairConfig extends OkaeriConfig implements RepairSettings {
 
     @Comment("# Repair command cooldown")
-    public Duration repairDelay = Duration.ofSeconds(5);
+    public Duration repairDelay = Duration.ofSeconds(90);
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/ENRepairMessages.java

@@ -0,0 +1,19 @@
+package com.eternalcode.core.feature.repair.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class ENRepairMessages extends OkaeriConfig implements RepairMessages {
+
+    public Notice itemRepaired = Notice.chat("<green>► <white>Item in your hand has been repaired!");
+    public Notice allItemsRepaired = Notice.chat("<green>► <white>All items in your inventory has been repaired!");
+    public Notice armorRepaired = Notice.chat("<green>► <white>Your armor has been repaired!");
+
+    public Notice delay = Notice.chat("<red>✘ <dark_red>You can use this command in <dark_red>{TIME}!");
+
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/PLRepairMessages.java

@@ -0,0 +1,18 @@
+package com.eternalcode.core.feature.repair.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import eu.okaeri.configs.annotation.Comment;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class PLRepairMessages extends OkaeriConfig implements RepairMessages {
+
+    public Notice itemRepaired = Notice.chat ("<green>► <white>Item w twojej ręce został naprawiony!");
+    public Notice allItemsRepaired = Notice.chat ("<green>► <white>Wszystkie itemy w twoim ekwipunku zostały naprawione!");
+    public Notice armorRepaired = Notice.chat("<green>► <white>Twoja zbroja została naprawiona!");
+
+    public Notice delay = Notice.chat ("<red>✘ <dark_red>Możesz użyć tej komendy za <dark_red>{TIME}!");
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/repair/messages/RepairMessages.java

@@ -0,0 +1,11 @@
+package com.eternalcode.core.feature.repair.messages;
+
+import com.eternalcode.multification.notice.Notice;
+
+public interface RepairMessages {
+
+    Notice itemRepaired();
+    Notice allItemsRepaired();
+    Notice armorRepaired();
+    Notice delay();
+}

eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ArgumentMessages.java

@@ -18,7 +18,6 @@ public interface ArgumentMessages {
     Notice noDamagedItems();
     Notice noEnchantment();
     Notice noValidEnchantmentLevel();
-    Notice invalidTimeFormat();
     Notice worldDoesntExist();
     Notice incorrectNumberOfChunks();
     Notice incorrectLocation();

eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/ENArgumentMessages.java

@@ -30,7 +30,6 @@ public class ENArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice noDamagedItems = Notice.chat("<red>✘ <dark_red>You need damaged items to use this command!");
     public Notice noEnchantment = Notice.chat("<red>✘ <dark_red>This enchantment doesn't exist");
     public Notice noValidEnchantmentLevel = Notice.chat("<red>✘ <dark_red>This enchantment level is not supported!");
-    public Notice invalidTimeFormat = Notice.chat("<red>✘ <dark_red>Invalid time format!");
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>World <red>{WORLD} <dark_red>doesn't exist!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Incorrect number of chunks!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Incorrect location format! <red>({LOCATION})");

eternalcore-core/src/main/java/com/eternalcode/core/litecommand/argument/messages/PLArgumentMessages.java

@@ -31,7 +31,6 @@ public class PLArgumentMessages extends OkaeriConfig implements ArgumentMessages
     public Notice noDamagedItems = Notice.chat("<red>✘ <dark_red>Musisz posiadać uszkodzone przedmioty!");
     public Notice noEnchantment = Notice.chat("<red>✘ <dark_red>Takie zaklęcie nie istnieje!");
     public Notice noValidEnchantmentLevel = Notice.chat("<red>✘ <dark_red>Ten poziom zaklęcia nie jest wspierany!");
-    public Notice invalidTimeFormat = Notice.chat("<red>✘ <dark_red>Nieprawidłowy format czasu!");
     public Notice worldDoesntExist = Notice.chat("<red>✘ <dark_red>Świat <dark_red>{WORLD} <red>nie istnieje!");
     public Notice incorrectNumberOfChunks = Notice.chat("<red>✘ <dark_red>Niepoprawna liczba chunków!");
     public Notice incorrectLocation = Notice.chat("<red>✘ <dark_red>Niepoprawna lokalizacja! <red>({LOCATION})");