GH-1220 Overhaul disposal command, translations, and migration (#1220)

vLuckyyy · web-flow · commit cb3c77b6e3e3 · 2025-10-26T15:12:19.000+01:00
* Overhaul disposal command, translations, and migration

* Add rest of messages.

* Follow review.
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0033_Move_disposal_messages_to_dedicated_section.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migration_0033_Move_disposal_messages_to_dedicated_section.java
@@ -0,0 +1,16 @@
+package com.eternalcode.core.configuration.migrations;
+
+import static eu.okaeri.configs.migrate.ConfigMigrationDsl.move;
+
+import eu.okaeri.configs.migrate.builtin.NamedMigration;
+
+public class Migration_0033_Move_disposal_messages_to_dedicated_section extends NamedMigration {
+    Migration_0033_Move_disposal_messages_to_dedicated_section() {
+        super(
+            "Move disposal messages into dedicated sections",
+            move("inventory.disposalTitle", "disposal.disposalInventoryTitle"),
+            move("inventory.disposalOpened", "disposal.disposalOpened"),
+            move("inventory.targetDisposalOpened", "disposal.disposalOpenedForTargetPlayer")
+        );
+    }
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/migrations/Migrations.java
@@ -34,5 +34,6 @@ public class Migrations {
         new Migration_0015_Move_ignore_messages_to_dedicated_section(),
         new Migration_0031_Move_death_messages_to_dedicated_section(),
         new Migration_0032_Move_join_quit_messages_to_dedicated_section(),
+        new Migration_0033_Move_disposal_messages_to_dedicated_section(),
         };
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ContainerMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ContainerMessages.java
@@ -10,9 +10,6 @@ public interface ContainerMessages {
     Notice cartographyOpened();
     Notice targetCartographyOpened();
 
-    Notice disposalOpened();
-    Notice targetDisposalOpened();
-
     Notice enderchestOpened();
     Notice targetEnderchestOpened();
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/ENContainerMessages.java
@@ -15,9 +15,6 @@ public class ENContainerMessages extends OkaeriConfig implements ContainerMessag
     Notice cartographyOpened = Notice.chat("<green>► <white>Cartography table opened!");
     Notice targetCartographyOpened = Notice.chat("<green>► <white>Opened a cartography table for {PLAYER}!");
 
-    Notice disposalOpened = Notice.chat("<green>► <white>Disposal opened!");
-    Notice targetDisposalOpened = Notice.chat("<green>► <white>Opened a disposal for {PLAYER}!");
-
     Notice enderchestOpened = Notice.chat("<green>► <white>Ender chest opened!");
     Notice targetEnderchestOpened = Notice.chat("<green>► <white>Opened an ender chest for {PLAYER}!");
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/PLContainerMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/container/messages/PLContainerMessages.java
@@ -15,9 +15,6 @@ public class PLContainerMessages extends OkaeriConfig implements ContainerMessag
     Notice cartographyOpened = Notice.chat("<green>► <white>Otworzono stół kartograficzny!");
     Notice targetCartographyOpened = Notice.chat("<green>► <white>Otworzono stół kartograficzny dla {PLAYER}!");
 
-    Notice disposalOpened = Notice.chat("<green>► <white>Otworzono śmietnik!");
-    Notice targetDisposalOpened = Notice.chat("<green>► <white>Otworzono śmietnik dla {PLAYER}!");
-
     Notice enderchestOpened = Notice.chat("<green>► <white>Otworzono enderchest!");
     Notice targetEnderchestOpened = Notice.chat("<green>► <white>Otworzono enderchest dla {PLAYER}!");
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/DisposalCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/DisposalCommand.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.container;
+package com.eternalcode.core.feature.disposal;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.commons.adventure.AdventureUtil;
@@ -16,18 +16,26 @@
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.Inventory;
 
 @Command(name = "disposal")
 @Permission("eternalcore.disposal")
 class DisposalCommand {
 
+    private static final int DISPOSAL_INVENTORY_SIZE = 54;
+
     private final NoticeService noticeService;
     private final MiniMessage miniMessage;
     private final TranslationManager translationManager;
     private final Server server;
 
     @Inject
-    DisposalCommand(MiniMessage miniMessage, TranslationManager translationManager, Server server, NoticeService noticeService) {
+    DisposalCommand(
+        MiniMessage miniMessage,
+        TranslationManager translationManager,
+        Server server,
+        NoticeService noticeService
+    ) {
         this.miniMessage = miniMessage;
         this.translationManager = translationManager;
         this.server = server;
@@ -48,21 +56,26 @@ void executeOther(@Sender CommandSender commandSender, @Arg Player target) {
 
         this.noticeService.create()
             .sender(commandSender)
-            .notice(message -> message.container().targetDisposalOpened())
+            .notice(message -> message.disposal().disposalOpenedForTargetPlayer())
             .placeholder("{PLAYER}", target.getName())
             .send();
     }
 
-    void openDisposal(Player player) {
-        Translation translation = this.translationManager.getMessages();
-        Component containerTitle = this.miniMessage.deserialize(translation.inventory().disposalTitle());
-        String serializedContainerTitle = AdventureUtil.SECTION_SERIALIZER.serialize(containerTitle);
-
-        player.openInventory(this.server.createInventory(null, 54, serializedContainerTitle));
+    private void openDisposal(Player player) {
+        Inventory disposalInventory = this.createDisposalInventory();
+        player.openInventory(disposalInventory);
 
         this.noticeService.create()
             .player(player.getUniqueId())
-            .notice(message -> message.container().disposalOpened())
+            .notice(message -> message.disposal().disposalOpened())
             .send();
     }
+
+    private Inventory createDisposalInventory() {
+        Translation translation = this.translationManager.getMessages();
+        Component containerTitle = this.miniMessage.deserialize(translation.disposal().disposalInventoryTitle());
+        String serializedTitle = AdventureUtil.SECTION_SERIALIZER.serialize(containerTitle);
+
+        return this.server.createInventory(null, DISPOSAL_INVENTORY_SIZE, serializedTitle);
+    }
 }
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/DisposalMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/DisposalMessages.java
@@ -0,0 +1,10 @@
+package com.eternalcode.core.feature.disposal.messages;
+
+import com.eternalcode.multification.notice.Notice;
+
+public interface DisposalMessages {
+    String disposalInventoryTitle();
+    Notice disposalOpened();
+    Notice disposalOpenedForTargetPlayer();
+}
+
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/ENDisposalMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/ENDisposalMessages.java
@@ -0,0 +1,14 @@
+package com.eternalcode.core.feature.disposal.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 ENDisposalMessages extends OkaeriConfig implements DisposalMessages {
+    String disposalInventoryTitle = "<gray>Trash";
+    Notice disposalOpened = Notice.chat("<green>► <white>Disposal opened!");
+    Notice disposalOpenedForTargetPlayer = Notice.chat("<green>► <white>Opened a disposal for {PLAYER}!");
+}
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/PLDisposalMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/disposal/messages/PLDisposalMessages.java
@@ -0,0 +1,14 @@
+package com.eternalcode.core.feature.disposal.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 PLDisposalMessages extends OkaeriConfig implements DisposalMessages {
+    String disposalInventoryTitle = "<gray>Kosz";
+    Notice disposalOpened = Notice.chat("<green>► <white>Otworzono śmietnik!");
+    Notice disposalOpenedForTargetPlayer = Notice.chat("<green>► <white>Otworzono śmietnik dla {PLAYER}!");
+}
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
@@ -9,6 +9,7 @@
 import com.eternalcode.core.feature.clear.messages.ClearMessages;
 import com.eternalcode.core.feature.container.messages.ContainerMessages;
 import com.eternalcode.core.feature.deathmessage.messages.DeathMessages;
+import com.eternalcode.core.feature.disposal.messages.DisposalMessages;
 import com.eternalcode.core.feature.enchant.messages.EnchantMessages;
 import com.eternalcode.core.feature.feed.messages.FeedMessages;
 import com.eternalcode.core.feature.fly.messages.FlyMessages;
@@ -98,9 +99,7 @@ interface ChatSection {
         Notice commandNotFound();
     }
 
-    interface InventorySection {
-        String disposalTitle();
-    }
+    DisposalMessages disposal();
 
     // clear section
     ClearMessages clear();
@@ -188,8 +187,6 @@ interface InventorySection {
     AfkMessages afk();
     // death message section
     DeathMessages deathMessage();
-    // inventory section
-    InventorySection inventory();
     //Seen section
     SeenMessages seen();
     // sign editor section
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
@@ -9,6 +9,7 @@
 import com.eternalcode.core.feature.clear.messages.ENClearMessages;
 import com.eternalcode.core.feature.container.messages.ENContainerMessages;
 import com.eternalcode.core.feature.deathmessage.messages.ENDeathMessages;
+import com.eternalcode.core.feature.disposal.messages.ENDisposalMessages;
 import com.eternalcode.core.feature.enchant.messages.ENEnchantMessages;
 import com.eternalcode.core.feature.feed.messages.ENFeedMessages;
 import com.eternalcode.core.feature.fly.messages.ENFlyMessages;
@@ -332,13 +333,12 @@ public static class ENChatSection extends OkaeriConfig implements ChatSection {
         "# This section is responsible for death messages"
     })
     public ENDeathMessages deathMessage = new ENDeathMessages();
-    @Comment({" ", "# Section responsible for inventories-related stuff."})
-    public ENInventorySection inventory = new ENInventorySection();
 
-    @Getter
-    public static class ENInventorySection extends OkaeriConfig implements InventorySection {
-        public String disposalTitle = "<white><bold>Trash";
-    }
+    @Comment({
+        " ",
+        "# This section is responsible for disposal messages"
+    })
+    public ENDisposalMessages disposal = new ENDisposalMessages();
 
     @Comment("# This section is responsible for /clear command")
     public ENClearMessages clear = new ENClearMessages();
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
@@ -9,6 +9,7 @@
 import com.eternalcode.core.feature.clear.messages.PLClearMessages;
 import com.eternalcode.core.feature.container.messages.PLContainerMessages;
 import com.eternalcode.core.feature.deathmessage.messages.PLDeathMessages;
+import com.eternalcode.core.feature.disposal.messages.PLDisposalMessages;
 import com.eternalcode.core.feature.enchant.messages.PLEnchantMessages;
 import com.eternalcode.core.feature.feed.messages.PLFeedMessages;
 import com.eternalcode.core.feature.fly.messages.PLFlyMessages;
@@ -349,14 +350,10 @@ public static class PLChatSection extends OkaeriConfig implements ChatSection {
 
     @Comment({
         " ",
-        "# Ta sekcja odpowiada za przeglądanie ekwipunku gracza"
+        "# Ta sekcja odpowiada za wiadomości o koszu",
     })
-    public PLInventorySection inventory = new PLInventorySection();
+    public PLDisposalMessages disposal = new PLDisposalMessages();
 
-    @Getter
-    public static class PLInventorySection extends OkaeriConfig implements InventorySection {
-        public String disposalTitle = "<white><bold>Kosz";
-    }
 
     @Comment("# Ta sekcja odpowiada za komende /clear")
     public PLClearMessages clear = new PLClearMessages();

Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ public class Migrations {`
`34`	`34`	`new Migration_0015_Move_ignore_messages_to_dedicated_section(),`
`35`	`35`	`new Migration_0031_Move_death_messages_to_dedicated_section(),`
`36`	`36`	`new Migration_0032_Move_join_quit_messages_to_dedicated_section(),`
	`37`	`+ new Migration_0033_Move_disposal_messages_to_dedicated_section(),`
`37`	`38`	`};`
`38`	`39`	`}`