Refactor messages, add compatibility for non-side-based sing's

Author: vLuckyyy

eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditCommand.java renamed to eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignEditorCommand.java

@@ -1,5 +1,7 @@
 package com.eternalcode.core.feature.signeditor;
 
+import com.eternalcode.core.compatibility.Compatibility;
+import com.eternalcode.core.compatibility.Version;
 import com.eternalcode.core.notice.NoticeService;
 import dev.rollczi.litecommands.annotations.argument.Arg;
 import dev.rollczi.litecommands.annotations.command.Command;
@@ -10,51 +12,49 @@
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
-import org.bukkit.block.sign.Side;
-import org.bukkit.block.sign.SignSide;
 import org.bukkit.entity.Player;
 
-@Command(name = "signedit")
-@Permission("eternalcode.signedit")
-public class SignEditCommand {
+@Command(name = "signeditor")
+@Permission("eternalcode.signeditor")
+@Compatibility(to = @Version(minor = 19, patch = 4))
+public class SignEditorCommand {
 
     private final NoticeService noticeService;
     private final MiniMessage miniMessage;
 
-    public SignEditCommand(NoticeService noticeService, MiniMessage miniMessage) {
+    public SignEditorCommand(NoticeService noticeService, MiniMessage miniMessage) {
         this.noticeService = noticeService;
         this.miniMessage = miniMessage;
     }
 
-    @Execute
-    void execute(@Context Player player, @Arg Integer index, @Join String text) {
+    @Execute(name = "setline")
+    void execute(@Context Player player, @Arg int index, @Join String text) {
         Block targetBlock = player.getTargetBlock(null, 5);
 
         if (!(targetBlock.getState() instanceof Sign sign)) {
             this.noticeService.create()
                 .player(player.getUniqueId())
-                .notice(translation -> translation.signEdit().noSignFound())
+                .notice(translation -> translation.signEditor().noSignFound())
                 .send();
             return;
         }
 
-        SignSide frontSide = sign.getSide(Side.FRONT);
-        if (index < 0 || index >= frontSide.getLines().length) {
+        if (index < 0 || index >= sign.getLines().length) {
             this.noticeService.create()
                 .player(player.getUniqueId())
-                .notice(translation -> translation.signEdit().invalidIndex())
+                .notice(translation -> translation.signEditor().invalidIndex())
                 .send();
             return;
         }
 
-        frontSide.setLine(index, this.miniMessage.deserialize(text).toString());
+        sign.setLine(index, this.miniMessage.deserialize(text).toString());
         sign.update();
 
         this.noticeService.create()
             .player(player.getUniqueId())
-            .placeholder("{INDEX}", index.toString())
+            .placeholder("{INDEX}", String.valueOf(index))
             .placeholder("{TEXT}", text)
-            .notice(translation -> translation.signEdit().lineSet())
+            .notice(translation -> translation.signEditor().lineSet())
             .send();
     }
 }

eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/SignSideEditorCommand.java

@@ -0,0 +1,63 @@
+package com.eternalcode.core.feature.signeditor;
+
+import com.eternalcode.core.compatibility.Compatibility;
+import com.eternalcode.core.compatibility.Version;
+import com.eternalcode.core.notice.NoticeService;
+import dev.rollczi.litecommands.annotations.argument.Arg;
+import dev.rollczi.litecommands.annotations.command.Command;
+import dev.rollczi.litecommands.annotations.context.Context;
+import dev.rollczi.litecommands.annotations.execute.Execute;
+import dev.rollczi.litecommands.annotations.join.Join;
+import dev.rollczi.litecommands.annotations.permission.Permission;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import org.bukkit.block.Block;
+import org.bukkit.block.Sign;
+import org.bukkit.block.sign.Side;
+import org.bukkit.block.sign.SignSide;
+import org.bukkit.entity.Player;
+
+@Command(name = "signeditor")
+@Permission("eternalcode.signeditor")
+@Compatibility(from = @Version(minor = 20, patch = 0))
+public class SignSideEditorCommand {
+
+    private final NoticeService noticeService;
+    private final MiniMessage miniMessage;
+
+    public SignSideEditorCommand(NoticeService noticeService, MiniMessage miniMessage) {
+        this.noticeService = noticeService;
+        this.miniMessage = miniMessage;
+    }
+
+    @Execute(name = "setline")
+    void execute(@Context Player player, @Arg Side side, @Arg int index, @Join String text) {
+        Block targetBlock = player.getTargetBlock(null, 5);
+
+        if (!(targetBlock.getState() instanceof Sign sign)) {
+            this.noticeService.create()
+                .player(player.getUniqueId())
+                .notice(translation -> translation.signEditor().noSignFound())
+                .send();
+            return;
+        }
+
+        SignSide signSide = sign.getSide(side);
+        if (index < 0 || index >= signSide.getLines().length) {
+            this.noticeService.create()
+                .player(player.getUniqueId())
+                .notice(translation -> translation.signEditor().invalidIndex())
+                .send();
+            return;
+        }
+
+        signSide.setLine(index, this.miniMessage.deserialize(text).toString());
+        sign.update();
+
+        this.noticeService.create()
+            .player(player.getUniqueId())
+            .placeholder("{INDEX}", String.valueOf(index))
+            .placeholder("{TEXT}", text)
+            .notice(translation -> translation.signEditor().lineSet())
+            .send();
+    }
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/ENSignEditorMessages.java

@@ -0,0 +1,15 @@
+package com.eternalcode.core.feature.signeditor.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+import net.dzikoysk.cdn.entity.Contextual;
+
+@Getter
+@Accessors(fluent = true)
+@Contextual
+public class ENSignEditorMessages implements SignEditorMessages {
+    public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Sign not found, please look at the sign!");
+    public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>Invalid index!");
+    public Notice lineSet = Notice.chat("<green>► <white>Line <green>{LINE} <white>set to <green>{TEXT}");
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/PLSignEditorMessages.java

@@ -0,0 +1,15 @@
+package com.eternalcode.core.feature.signeditor.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+import net.dzikoysk.cdn.entity.Contextual;
+
+@Getter
+@Accessors(fluent = true)
+@Contextual
+public class PLSignEditorMessages implements SignEditorMessages{
+    public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Nie odnaleziono tabliczki, proszę spojrzeć na tabliczkę!");
+    public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>Nieprawidłowy indeks!");
+    public Notice lineSet = Notice.chat("<green>► <white>Ustawiono linię <green>{LINE} <white>na <green>{TEXT}");
+}

eternalcore-core/src/main/java/com/eternalcode/core/feature/signeditor/messages/SignEditorMessages.java

@@ -0,0 +1,9 @@
+package com.eternalcode.core.feature.signeditor.messages;
+
+import com.eternalcode.multification.notice.Notice;
+
+public interface SignEditorMessages {
+    Notice noSignFound();
+    Notice invalidIndex();
+    Notice lineSet();
+}

eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java

@@ -2,6 +2,7 @@
 
 import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.language.Language;
+import com.eternalcode.core.feature.signeditor.messages.SignEditorMessages;
 import com.eternalcode.core.feature.warp.WarpInventoryItem;
 import com.eternalcode.multification.notice.Notice;
 import org.bukkit.Material;
@@ -482,11 +483,5 @@ interface JailSection {
     }
 
 
-    SignEditSection signEdit();
-
-    interface SignEditSection {
-        Notice noSignFound();
-        Notice invalidIndex();
-        Notice lineSet();
-    }
+    SignEditorMessages signEditor();
 }

eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java

@@ -2,6 +2,8 @@
 
 import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.language.Language;
+import com.eternalcode.core.feature.signeditor.messages.PLSignEditorMessages;
+import com.eternalcode.core.feature.signeditor.messages.SignEditorMessages;
 import com.eternalcode.core.feature.warp.WarpInventoryItem;
 import com.eternalcode.core.translation.AbstractTranslation;
 import com.eternalcode.multification.bukkit.notice.BukkitNotice;
@@ -933,13 +935,5 @@ public static class ENJailSection implements JailSection {
     }
 
     @Description({ " ", "# Ta sekcja odpowiada za wiadomości dotyczące edycji tabliczek"})
-    public PLTranslation.SignEditor signEditor = new PLTranslation.SignEditor();
-
-    @Getter
-    @Contextual
-    public static class SignEditor {
-        public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Sign not found!");
-        public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>Invalid index!");
-        public Notice lineSet = Notice.chat("<green>► <white>Line <green>{LINE} <white>set to <green>{TEXT}");
-    }
+    public PLSignEditorMessages signEditor = new PLSignEditorMessages();
 }

eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java

@@ -2,6 +2,7 @@
 
 import com.eternalcode.core.configuration.contextual.ConfigItem;
 import com.eternalcode.core.feature.language.Language;
+import com.eternalcode.core.feature.signeditor.messages.PLSignEditorMessages;
 import com.eternalcode.core.feature.warp.WarpInventoryItem;
 import com.eternalcode.core.translation.AbstractTranslation;
 import com.eternalcode.multification.bukkit.notice.BukkitNotice;
@@ -955,13 +956,5 @@ public static class PLJailSection implements JailSection {
     }
 
     @Description({ " ", "# Ta sekcja odpowiada za wiadomości dotyczące edycji tabliczek"})
-    public SignEditor signEditor = new SignEditor();
-
-    @Getter
-    @Contextual
-    public static class SignEditor {
-        public Notice noSignFound = Notice.chat("<red>✘ <dark_red>Nie odnaleziono tabliczki!");
-        public Notice invalidIndex = Notice.chat("<red>✘ <dark_red>Nieprawidłowy indeks!");
-        public Notice lineSet = Notice.chat("<green>► <white>Ustawiono linię <green>{LINE} <white>na <green>{TEXT}");
-    }
+    public PLSignEditorMessages signEditor = new PLSignEditorMessages();
 }