GH-997 Add elder guardian command along with appropriate translations (#1061)

Jakubk15 · web-flow · commit 59ced4ec6b82 · 2025-07-23T18:42:58.000+02:00
* Add elder guardian command along with appropriate translations * AdditionalContainerPaper -> AdditionalOverlayPaper * Adjust to Martin's suggestions * Refactor Paper feature system * Fix build * Remove @contextual annotation from translation implementation * Fix build, change cdn annotations to okaeri equivalents * Make appropriate messages implementations extend OkaeriConfig * Make translation sections extend OkaeriConfig
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/AnvilCommand.java
@@ -1,14 +1,14 @@
 package com.eternalcode.core.feature.container;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -26,7 +26,7 @@ class AnvilCommand {
     @Permission("eternalcore.anvil")
     @DescriptionDocs(description = "Opens an anvil for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.ANVIL.open(player);
+        PaperContainer.ANVIL.open(player);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -38,7 +38,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.anvil.other")
     @DescriptionDocs(description = "Opens an anvil for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.ANVIL.open(target);
+        PaperContainer.ANVIL.open(target);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpenedBy())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/CartographyTableCommand.java
@@ -2,14 +2,14 @@
 
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -27,7 +27,7 @@ class CartographyTableCommand {
     @Permission("eternalcore.cartography")
     @DescriptionDocs(description = "Opens a cartography table for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.CARTOGRAPHY_TABLE.open(player);
+        PaperContainer.CARTOGRAPHY_TABLE.open(player);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -39,7 +39,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.cartography.other")
     @DescriptionDocs(description = "Opens a cartography table for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.CARTOGRAPHY_TABLE.open(target);
+        PaperContainer.CARTOGRAPHY_TABLE.open(target);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpenedBy())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/GrindstoneCommand.java
@@ -2,14 +2,14 @@
 
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -27,7 +27,7 @@ class GrindstoneCommand {
     @Permission("eternalcore.grindstone")
     @DescriptionDocs(description = "Opens a grindstone for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.GRINDSTONE.open(player);
+        PaperContainer.GRINDSTONE.open(player);
 
         this.announcer.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -39,7 +39,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.grindstone.other")
     @DescriptionDocs(description = "Opens a grindstone for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.GRINDSTONE.open(target);
+        PaperContainer.GRINDSTONE.open(target);
 
         this.announcer.create()
             .notice(translation -> translation.container().genericContainerOpenedFor())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/LoomCommand.java
@@ -1,14 +1,14 @@
 package com.eternalcode.core.feature.container;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -26,7 +26,7 @@ class LoomCommand {
     @Permission("eternalcore.loom")
     @DescriptionDocs(description = "Opens a loom for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.LOOM.open(player);
+        PaperContainer.LOOM.open(player);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -38,7 +38,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.loom.other")
     @DescriptionDocs(description = "Opens a loom for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.LOOM.open(target);
+        PaperContainer.LOOM.open(target);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpenedBy())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/SmithingTableCommand.java
@@ -1,14 +1,14 @@
 package com.eternalcode.core.feature.container;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -26,7 +26,7 @@ class SmithingTableCommand {
     @Permission("eternalcore.smithingtable")
     @DescriptionDocs(description = "Opens a smithing table for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.SMITHING_TABLE.open(player);
+        PaperContainer.SMITHING_TABLE.open(player);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -38,7 +38,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.smithingtable.other")
     @DescriptionDocs(description = "Opens a smithing table for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.SMITHING_TABLE.open(target);
+        PaperContainer.SMITHING_TABLE.open(target);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpenedBy())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/StonecutterCommand.java
@@ -2,14 +2,14 @@
 
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
-import com.eternalcode.containers.AdditionalContainerPaper;
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperContainer;
 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.permission.Permission;
-import dev.rollczi.litecommands.annotations.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
@@ -27,7 +27,7 @@ class StonecutterCommand {
     @Permission("eternalcore.stonecutter")
     @DescriptionDocs(description = "Opens a stonecutter for you")
     void executeSelf(@Context Player player) {
-        AdditionalContainerPaper.STONE_CUTTER.open(player);
+        PaperContainer.STONE_CUTTER.open(player);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpened())
@@ -39,7 +39,7 @@ void executeSelf(@Context Player player) {
     @Permission("eternalcore.stonecutter.other")
     @DescriptionDocs(description = "Opens a stonecutter for another player", arguments = "<player>")
     void execute(@Context CommandSender sender, @Arg Player target) {
-        AdditionalContainerPaper.STONE_CUTTER.open(target);
+        PaperContainer.STONE_CUTTER.open(target);
 
         this.noticeService.create()
             .notice(translation -> translation.container().genericContainerOpenedBy())
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/ElderGuardianCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/ElderGuardianCommand.java
@@ -0,0 +1,51 @@
+package com.eternalcode.core.feature.troll.elderguardian;
+
+import com.eternalcode.annotations.scan.command.DescriptionDocs;
+import com.eternalcode.core.compatibility.Compatibility;
+import com.eternalcode.core.compatibility.Version;
+import com.eternalcode.core.injector.annotations.Inject;
+import com.eternalcode.core.notice.NoticeService;
+import com.eternalcode.paper.PaperOverlay;
+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.flag.Flag;
+import dev.rollczi.litecommands.annotations.permission.Permission;
+import org.bukkit.entity.Player;
+
+@Command(name = "elderguardian", aliases = {"elder-guardian"})
+@Permission("eternalcore.troll.elderguardian")
+@Compatibility(from = @Version(minor = 19, patch = 2)) // Requires Minecraft 1.19.2 or higher
+public class ElderGuardianCommand {
+
+    private final NoticeService noticeService;
+
+    @Inject
+    public ElderGuardianCommand(NoticeService noticeService) {
+        this.noticeService = noticeService;
+    }
+
+    @Execute
+    @DescriptionDocs(description = {"Show an elder guardian to a player"}, arguments = {"<player>", "[-s]"})
+    void execute(@Context Player sender, @Arg Player target, @Flag("-s") boolean silent) {
+        if (silent) {
+            PaperOverlay.ELDER_GUARDIAN_SILENT.show(target);
+
+            this.noticeService.create()
+                .notice(translation -> translation.troll().elderGuardian().elderGuardianShownSilently())
+                .player(sender.getUniqueId())
+                .placeholder("{PLAYER}", target.getName())
+                .send();
+            return;
+        }
+
+        PaperOverlay.ELDER_GUARDIAN.show(target);
+        this.noticeService.create()
+            .notice(translation -> translation.troll().elderGuardian().elderGuardianShown())
+            .player(sender.getUniqueId())
+            .placeholder("{PLAYER}", target.getName())
+            .send();
+    }
+
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/ENElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/ENElderGuardianMessages.java
@@ -0,0 +1,16 @@
+package com.eternalcode.core.feature.troll.elderguardian.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class ENElderGuardianMessages extends OkaeriConfig implements ElderGuardianMessages {
+
+    public Notice elderGuardianShown =
+        Notice.chat("<green>► <white>Shown elder guardian to player <green>{PLAYER}<white>!");
+    public Notice elderGuardianShownSilently =
+        Notice.chat("<green>► <white>Shown elder guardian to player <green>{PLAYER}<white> silently!");
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/ElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/ElderGuardianMessages.java
@@ -0,0 +1,10 @@
+package com.eternalcode.core.feature.troll.elderguardian.messages;
+
+import com.eternalcode.multification.notice.Notice;
+
+public interface ElderGuardianMessages {
+
+    Notice elderGuardianShown();
+    Notice elderGuardianShownSilently();
+
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/PLElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/troll/elderguardian/messages/PLElderGuardianMessages.java
@@ -0,0 +1,14 @@
+package com.eternalcode.core.feature.troll.elderguardian.messages;
+
+import com.eternalcode.multification.notice.Notice;
+import eu.okaeri.configs.OkaeriConfig;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
+@Getter
+@Accessors(fluent = true)
+public class PLElderGuardianMessages extends OkaeriConfig implements ElderGuardianMessages {
+
+    public Notice elderGuardianShown = Notice.chat("<green>► <white>Pokazano Elder Guardian'a graczowi <green>{PLAYER}<white>!");
+    public Notice elderGuardianShownSilently = Notice.chat("<green>► <white>Pokazano Elder Guardian'a graczowi <green>{PLAYER}<white> po cichu!");
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/Translation.java
@@ -5,9 +5,9 @@
 import com.eternalcode.core.feature.adminchat.messages.AdminChatMessages;
 import com.eternalcode.core.feature.afk.messages.AfkMessages;
 import com.eternalcode.core.feature.automessage.messages.AutoMessageMessages;
-import com.eternalcode.core.feature.itemedit.messages.ItemEditMessages;
 import com.eternalcode.core.feature.helpop.messages.HelpOpSection;
 import com.eternalcode.core.feature.home.messages.HomeMessages;
+import com.eternalcode.core.feature.itemedit.messages.ItemEditMessages;
 import com.eternalcode.core.feature.jail.messages.JailMessages;
 import com.eternalcode.core.feature.language.Language;
 import com.eternalcode.core.feature.privatechat.messages.PrivateChatMessages;
@@ -19,11 +19,13 @@
 import com.eternalcode.core.feature.sudo.messages.SudoMessages;
 import com.eternalcode.core.feature.teleportrequest.messages.TeleportRequestMessages;
 import com.eternalcode.core.feature.time.messages.TimeAndWeatherMessages;
+import com.eternalcode.core.feature.troll.elderguardian.messages.ElderGuardianMessages;
 import com.eternalcode.core.feature.warp.messages.WarpMessages;
 import com.eternalcode.multification.notice.Notice;
+import org.bukkit.event.entity.EntityDamageEvent;
+
 import java.util.List;
 import java.util.Map;
-import org.bukkit.event.entity.EntityDamageEvent;
 
 public interface Translation {
 
@@ -190,6 +192,10 @@ interface ContainerSection {
         Notice genericContainerOpenedFor();
     }
 
+    interface TrollSection {
+        ElderGuardianMessages elderGuardian();
+    }
+
     Language getLanguage();
     // argument section
     ArgumentMessages argument();
@@ -245,4 +251,6 @@ interface ContainerSection {
     AutoMessageMessages autoMessage();
     // jail section
     JailMessages jailSection();
+    // troll section
+    TrollSection troll();
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/ENTranslation.java
@@ -19,17 +19,18 @@
 import com.eternalcode.core.feature.sudo.messages.ENSudoMessages;
 import com.eternalcode.core.feature.teleportrequest.messages.ENTeleportRequestMessages;
 import com.eternalcode.core.feature.time.messages.ENTimeAndWeatherMessages;
+import com.eternalcode.core.feature.troll.elderguardian.messages.ENElderGuardianMessages;
 import com.eternalcode.core.feature.warp.messages.ENWarpMessages;
 import com.eternalcode.core.translation.AbstractTranslation;
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
-import java.io.File;
 import lombok.Getter;
 import lombok.experimental.Accessors;
 import org.bukkit.Material;
 import org.bukkit.event.entity.EntityDamageEvent;
 
+import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -559,4 +560,14 @@ public static class ENLanguageSection extends OkaeriConfig implements LanguageSe
 
     @Comment({" ", "# This section is responsible for handling jail-related stuff."})
     public ENJailMessages jailSection = new ENJailMessages();
+
+    @Comment({" ", "# This section is responsible for troll-related stuff."})
+    public ENTrollSection troll = new ENTrollSection();
+
+    @Getter
+    public static class ENTrollSection extends OkaeriConfig implements TrollSection {
+
+        @Comment({" ", "# This section is responsible for elder guardian messages."})
+        public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
+    }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java b/eternalcore-core/src/main/java/com/eternalcode/core/translation/implementation/PLTranslation.java
diff --git a/eternalcore-paper/src/main/java/com/eternalcode/containers/AdditionalContainerPaper.java b/eternalcore-paper/src/main/java/com/eternalcode/containers/AdditionalContainerPaper.java
diff --git a/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperContainer.java b/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperContainer.java
diff --git a/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperFeature.java b/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperFeature.java
diff --git a/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperOverlay.java b/eternalcore-paper/src/main/java/com/eternalcode/paper/PaperOverlay.java
