Remove TrollSection, move contents up. group fun features into fun package.

vLuckyyy · vLuckyyy · commit 237203cceeb2 · 2025-08-03T01:19:02.000+02:00
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java b/eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java
@@ -5,7 +5,7 @@
 import com.eternalcode.core.feature.afk.AfkConfig;
 import com.eternalcode.core.feature.automessage.AutoMessageConfig;
 import com.eternalcode.core.feature.butcher.ButcherConfig;
-import com.eternalcode.core.feature.catboy.CatboyConfig;
+import com.eternalcode.core.feature.fun.catboy.CatboyConfig;
 import com.eternalcode.core.feature.chat.ChatConfig;
 import com.eternalcode.core.feature.helpop.HelpOpConfig;
 import com.eternalcode.core.feature.home.HomesConfig;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatBoyEntityService.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatBoyEntityService.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import com.eternalcode.core.injector.annotations.Inject;
 import com.eternalcode.core.injector.annotations.component.Service;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyCommand.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.injector.annotations.Inject;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyConfig.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyConfig.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import eu.okaeri.configs.OkaeriConfig;
 import eu.okaeri.configs.annotation.Comment;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyController.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyController.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import com.eternalcode.commons.scheduler.Scheduler;
 import com.eternalcode.core.feature.butcher.ButcherEntityRemoveEvent;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyServiceImpl.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyServiceImpl.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
 import com.eternalcode.core.event.EventCaller;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboySettings.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboySettings.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 public interface CatboySettings {
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyTask.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyTask.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.catboy;
+package com.eternalcode.core.feature.fun.catboy;
 
 import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
 import com.eternalcode.core.injector.annotations.Inject;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/DemoScreenCommand.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.demoscreen;
+package com.eternalcode.core.feature.fun.demoscreen;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.compatibility.Compatibility;
@@ -30,7 +30,7 @@ void self(@Context Player sender) {
         sender.showDemoScreen();
 
         this.noticeService.create()
-            .notice(translation -> translation.troll().demoScreen().shownToSelf())
+            .notice(translation -> translation.demoScreen().shownToSelf())
             .player(sender.getUniqueId())
             .send();
     }
@@ -41,7 +41,7 @@ void other(@Context Player sender, @Arg Player target) {
         target.showDemoScreen();
 
         this.noticeService.create()
-            .notice(translation -> translation.troll().demoScreen().shownToOtherPlayer())
+            .notice(translation -> translation.demoScreen().shownToOtherPlayer())
             .player(sender.getUniqueId())
             .placeholder("{PLAYER}", target.getName())
             .send();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/DemoScreenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/DemoScreenMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.demoscreen.messages;
+package com.eternalcode.core.feature.fun.demoscreen.messages;
 
 import com.eternalcode.multification.notice.Notice;
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/ENDemoScreenMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.demoscreen.messages;
+package com.eternalcode.core.feature.fun.demoscreen.messages;
 
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/PLDemoScreenMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/demoscreen/messages/PLDemoScreenMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.demoscreen.messages;
+package com.eternalcode.core.feature.fun.demoscreen.messages;
 
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/ElderGuardianCommand.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.elderguardian;
+package com.eternalcode.core.feature.fun.elderguardian;
 
 import com.eternalcode.annotations.scan.command.DescriptionDocs;
 import com.eternalcode.core.compatibility.Compatibility;
@@ -33,7 +33,7 @@ void execute(@Context Player sender, @Arg Player target, @Flag("-s") boolean sil
             PaperOverlay.ELDER_GUARDIAN_SILENT.show(target);
 
             this.noticeService.create()
-                .notice(translation -> translation.troll().elderGuardian().elderGuardianShownSilently())
+                .notice(translation -> translation.elderGuardian().elderGuardianShownSilently())
                 .player(sender.getUniqueId())
                 .placeholder("{PLAYER}", target.getName())
                 .send();
@@ -42,7 +42,7 @@ void execute(@Context Player sender, @Arg Player target, @Flag("-s") boolean sil
 
         PaperOverlay.ELDER_GUARDIAN.show(target);
         this.noticeService.create()
-            .notice(translation -> translation.troll().elderGuardian().elderGuardianShown())
+            .notice(translation -> translation.elderGuardian().elderGuardianShown())
             .player(sender.getUniqueId())
             .placeholder("{PLAYER}", target.getName())
             .send();
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ENElderGuardianMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.elderguardian.messages;
+package com.eternalcode.core.feature.fun.elderguardian.messages;
 
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/ElderGuardianMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.elderguardian.messages;
+package com.eternalcode.core.feature.fun.elderguardian.messages;
 
 import com.eternalcode.multification.notice.Notice;
 
diff --git a/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/PLElderGuardianMessages.java b/eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/elderguardian/messages/PLElderGuardianMessages.java
@@ -1,4 +1,4 @@
-package com.eternalcode.core.feature.troll.elderguardian.messages;
+package com.eternalcode.core.feature.fun.elderguardian.messages;
 
 import com.eternalcode.multification.notice.Notice;
 import eu.okaeri.configs.OkaeriConfig;
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,6 +5,8 @@
 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.fun.demoscreen.messages.DemoScreenMessages;
+import com.eternalcode.core.feature.fun.elderguardian.messages.ElderGuardianMessages;
 import com.eternalcode.core.feature.helpop.messages.HelpOpSection;
 import com.eternalcode.core.feature.home.messages.HomeMessages;
 import com.eternalcode.core.feature.itemedit.messages.ItemEditMessages;
@@ -19,14 +21,11 @@
 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.demoscreen.messages.DemoScreenMessages;
-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 {
 
@@ -194,10 +193,8 @@ interface ContainerSection {
         Notice genericContainerOpenedFor();
     }
 
-    interface TrollSection {
-        ElderGuardianMessages elderGuardian();
-        DemoScreenMessages demoScreen();
-    }
+    ElderGuardianMessages elderGuardian();
+    DemoScreenMessages demoScreen();
 
     Language getLanguage();
     // argument section
@@ -254,6 +251,4 @@ interface TrollSection {
     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,8 +19,8 @@
 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.demoscreen.messages.ENDemoScreenMessages;
-import com.eternalcode.core.feature.troll.elderguardian.messages.ENElderGuardianMessages;
+import com.eternalcode.core.feature.fun.demoscreen.messages.ENDemoScreenMessages;
+import com.eternalcode.core.feature.fun.elderguardian.messages.ENElderGuardianMessages;
 import com.eternalcode.core.feature.warp.messages.ENWarpMessages;
 import com.eternalcode.core.translation.AbstractTranslation;
 import com.eternalcode.multification.notice.Notice;
@@ -565,16 +565,9 @@ 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();
+    @Comment({" ", "# This section is responsible for elder guardian messages."})
+    public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
 
-    @Getter
-    public static class ENTrollSection extends OkaeriConfig implements TrollSection {
-
-        @Comment({" ", "# This section is responsible for elder guardian messages."})
-        public ENElderGuardianMessages elderGuardian = new ENElderGuardianMessages();
-
-        @Comment({" ", "# This section is responsible for demo screen messages."})
-        public ENDemoScreenMessages demoScreen = new ENDemoScreenMessages();
-    }
+    @Comment({" ", "# This section is responsible for demo screen messages."})
+    public ENDemoScreenMessages demoScreen = new ENDemoScreenMessages();
 }
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
@@ -19,8 +19,8 @@
 import com.eternalcode.core.feature.sudo.messages.PLSudoMessages;
 import com.eternalcode.core.feature.teleportrequest.messages.PLTeleportRequestMessages;
 import com.eternalcode.core.feature.time.messages.PLTimeAndWeatherMessages;
-import com.eternalcode.core.feature.troll.demoscreen.messages.PLDemoScreenMessages;
-import com.eternalcode.core.feature.troll.elderguardian.messages.PLElderGuardianMessages;
+import com.eternalcode.core.feature.fun.demoscreen.messages.PLDemoScreenMessages;
+import com.eternalcode.core.feature.fun.elderguardian.messages.PLElderGuardianMessages;
 import com.eternalcode.core.feature.warp.messages.PLWarpMessages;
 import com.eternalcode.core.translation.AbstractTranslation;
 import com.eternalcode.multification.notice.Notice;
@@ -589,16 +589,9 @@ public static class PLLanguageSection extends OkaeriConfig implements LanguageSe
     @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące jail'a"})
     public PLJailMessages jailSection = new PLJailMessages();
 
-    @Comment({ " ", "# Ta sekcja odpowiada za wiadomości dotyczące trollowania graczy" })
-    public PLTrollSection troll = new PLTrollSection();
+    @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące Elder Guardian'a"})
+    public PLElderGuardianMessages elderGuardian = new PLElderGuardianMessages();
 
-    @Getter
-    public static class PLTrollSection extends OkaeriConfig implements TrollSection {
-
-        @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące Elder Guardian'a"})
-        public PLElderGuardianMessages elderGuardian = new PLElderGuardianMessages();
-
-        @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące demo screen'a"})
-        public PLDemoScreenMessages demoScreen = new PLDemoScreenMessages();
-    }
+    @Comment({" ", "# Ta sekcja odpowiada za wiadomości dotyczące demo screen'a"})
+    public PLDemoScreenMessages demoScreen = new PLDemoScreenMessages();
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.eternalcode.core.feature.catboy;`
	`1`	`+package com.eternalcode.core.feature.fun.catboy;`
`2`	`2`
`3`	`3`	`import com.eternalcode.core.injector.annotations.Inject;`
`4`	`4`	`import com.eternalcode.core.injector.annotations.component.Service;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.eternalcode.core.feature.troll.demoscreen.messages;`
	`1`	`+package com.eternalcode.core.feature.fun.demoscreen.messages;`
`2`	`2`
`3`	`3`	`import com.eternalcode.multification.notice.Notice;`
`4`	`4`