GH-594 Add Folia Support (#955)

* Unrelated changes

* Support folia

* Fix hasRequest performance issue

Author: Rollczi

buildSrc/src/main/kotlin/Versions.kt

@@ -22,7 +22,7 @@ object Versions {
     const val ORMLITE = "6.1"
     const val HIKARI_CP = "6.3.0"
 
-    const val LITE_COMMANDS = "3.9.7"
+    const val LITE_COMMANDS = "3.10.2"
     const val LITE_SKULL_API = "1.3.0"
 
     const val GUAVA = "33.4.8-jre"

eternalcore-core/build.gradle.kts

@@ -52,6 +52,7 @@ eternalShadow {
     // EternalCode Commons & GitCheck
     library("com.eternalcode:eternalcode-commons-bukkit:${Versions.ETERNALCODE_COMMONS}")
     library("com.eternalcode:eternalcode-commons-adventure:${Versions.ETERNALCODE_COMMONS}")
+    library("com.eternalcode:eternalcode-commons-folia:${Versions.ETERNALCODE_COMMONS}")
     library("com.eternalcode:gitcheck:${Versions.GIT_CHECK}")
     libraryRelocate(
         "com.eternalcode.commons",
@@ -76,6 +77,7 @@ eternalShadow {
     // command framework & skull library
     library("dev.rollczi:liteskullapi:${Versions.LITE_SKULL_API}")
     library("dev.rollczi:litecommands-bukkit:${Versions.LITE_COMMANDS}")
+    library("dev.rollczi:litecommands-folia:${Versions.LITE_COMMANDS}")
     library("dev.rollczi:litecommands-adventure-platform:${Versions.LITE_COMMANDS}")
     libraryRelocate(
         "dev.rollczi.litecommands",

eternalcore-core/src/main/java/com/eternalcode/core/EternalCore.java

@@ -36,11 +36,10 @@
 
 class EternalCore {
 
-    private final EternalCoreEnvironment eternalCoreEnvironment;
     private final Publisher publisher;
 
     public EternalCore(Plugin plugin) {
-        this.eternalCoreEnvironment = new EternalCoreEnvironment(plugin.getLogger());
+        EternalCoreEnvironment environment = new EternalCoreEnvironment(plugin.getLogger());
 
         CompatibilityService compatibilityService = new CompatibilityService();
         BeanProcessor beanProcessor = BeanProcessorFactory.defaultProcessors(plugin);
@@ -87,7 +86,7 @@ public EternalCore(Plugin plugin) {
         this.publisher = beanFactory.getDependency(Publisher.class);
 
         EternalCoreApiProvider.initialize(new EternalCoreApiImpl(beanFactory));
-        this.eternalCoreEnvironment.initialize();
+        environment.initialize();
         this.publisher.publish(new EternalInitializeEvent());
     }
 

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/LiteCommandsSetup.java

@@ -13,6 +13,7 @@
 import dev.rollczi.litecommands.annotations.LiteCommandsAnnotations;
 import dev.rollczi.litecommands.bukkit.LiteBukkitFactory;
 import dev.rollczi.litecommands.bukkit.LiteBukkitMessages;
+import dev.rollczi.litecommands.folia.FoliaExtension;
 import net.kyori.adventure.platform.AudienceProvider;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import org.bukkit.Server;
@@ -32,6 +33,7 @@ class LiteCommandsSetup {
         LiteCommandsAnnotations<CommandSender> liteCommandsAnnotations
     ) {
         return LiteBukkitFactory.builder("eternalcore", plugin, server)
+            .extension(new FoliaExtension(plugin))
             .commands(liteCommandsAnnotations)
             .message(LiteBukkitMessages.WORLD_NOT_EXIST, (invocation, world) -> noticeService.create()
                 .sender(invocation.sender())

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/configurator/CommandConfigurator.java

@@ -9,6 +9,9 @@
 import dev.rollczi.litecommands.command.builder.CommandBuilder;
 import dev.rollczi.litecommands.editor.Editor;
 import dev.rollczi.litecommands.meta.Meta;
+import dev.rollczi.litecommands.permission.PermissionSet;
+import java.util.List;
+import java.util.function.UnaryOperator;
 import org.bukkit.command.CommandSender;
 
 @LiteCommandEditor
@@ -34,16 +37,23 @@ public CommandBuilder<CommandSender> edit(CommandBuilder<CommandSender> context)
 
             context = context.editChild(child, editor -> editor.name(subCommand.name())
                 .aliases(subCommand.aliases())
-                .applyMeta(meta -> meta.list(Meta.PERMISSIONS, permissions -> permissions.addAll(command.permissions())))
+                .applyMeta(editPermissions(command.permissions()))
                 .enabled(subCommand.isEnabled())
             );
         }
 
         return context
             .name(command.name())
             .aliases(command.aliases())
-            .applyMeta(meta -> meta.list(Meta.PERMISSIONS, permissions -> permissions.addAll(command.permissions())))
+            .applyMeta(editPermissions(command.permissions()))
             .enabled(command.isEnabled());
     }
 
+    private static UnaryOperator<Meta> editPermissions(List<String> permissions) {
+        return meta -> meta.listEditor(Meta.PERMISSIONS)
+            .clear()
+            .add(new PermissionSet(permissions))
+            .apply();
+    }
+
 }

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/handler/InvalidUsageHandlerImpl.java

@@ -14,15 +14,15 @@
 import org.bukkit.command.CommandSender;
 
 @LiteHandler(InvalidUsage.class)
-public class InvalidUsageHandlerImpl implements InvalidUsageHandler<CommandSender> {
+class InvalidUsageHandlerImpl implements InvalidUsageHandler<CommandSender> {
 
     private static final Placeholders<String> SCHEME = Placeholders.of("{USAGE}", scheme -> scheme);
 
     private final ViewerService viewerService;
     private final NoticeService noticeService;
 
     @Inject
-    public InvalidUsageHandlerImpl(ViewerService viewerService, NoticeService noticeService) {
+    InvalidUsageHandlerImpl(ViewerService viewerService, NoticeService noticeService) {
         this.viewerService = viewerService;
         this.noticeService = noticeService;
     }

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/handler/NoticeBroadcastHandler.java

@@ -8,7 +8,7 @@
 import org.bukkit.command.CommandSender;
 
 @LiteHandler(NoticeBroadcast.class)
-public class NoticeBroadcastHandler implements ResultHandler<CommandSender, NoticeBroadcast> {
+class NoticeBroadcastHandler implements ResultHandler<CommandSender, NoticeBroadcast> {
 
     @Override
     public void handle(Invocation<CommandSender> invocation, NoticeBroadcast result, ResultHandlerChain<CommandSender> chain) {

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/handler/NoticeHandler.java

@@ -12,7 +12,7 @@
 import org.bukkit.command.CommandSender;
 
 @LiteHandler(Notice.class)
-public class NoticeHandler implements ResultHandler<CommandSender, Notice> {
+class NoticeHandler implements ResultHandler<CommandSender, Notice> {
 
     private final ViewerService viewerService;
     private final NoticeService noticeService;

eternalcore-core/src/main/java/com/eternalcode/core/bridge/litecommand/handler/PermissionMessage.java

@@ -12,7 +12,7 @@
 import org.bukkit.command.CommandSender;
 
 @LiteHandler(MissingPermissions.class)
-public class PermissionMessage implements MissingPermissionsHandler<CommandSender> {
+class PermissionMessage implements MissingPermissionsHandler<CommandSender> {
 
     private final ViewerService viewerService;
     private final NoticeService noticeService;

eternalcore-core/src/main/java/com/eternalcode/core/feature/catboy/CatboyServiceImpl.java

@@ -1,5 +1,6 @@
 package com.eternalcode.core.feature.catboy;
 
+import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
 import com.eternalcode.core.event.EventCaller;
 import com.eternalcode.core.feature.catboy.event.CatboyChangeTypeEvent;
 import com.eternalcode.core.feature.catboy.event.CatboySwitchEvent;
@@ -23,16 +24,19 @@ class CatboyServiceImpl implements CatboyService {
 
     private final CatBoyEntityService catBoyEntityService;
     private final CatBoySettings catBoySettings;
+    private final MinecraftScheduler scheduler;
 
     @Inject
     CatboyServiceImpl(
         EventCaller eventCaller,
         CatBoyEntityService catBoyEntityService,
-        CatBoySettings catBoySettings
+        CatBoySettings catBoySettings,
+        MinecraftScheduler scheduler
     ) {
         this.eventCaller = eventCaller;
         this.catBoyEntityService = catBoyEntityService;
         this.catBoySettings = catBoySettings;
+        this.scheduler = scheduler;
     }
 
     @Override
@@ -43,17 +47,16 @@ public void markAsCatboy(Player player, Cat.Type type) {
         Cat cat = this.catBoyEntityService.createCatboyEntity(player, type);
         player.addPassenger(cat);
         player.setWalkSpeed(this.catBoySettings.getCatboyWalkSpeed());
-
         this.eventCaller.callEvent(new CatboySwitchEvent(player, true));
     }
 
     @Override
     public void unmarkAsCatboy(Player player) {
         this.catboys.remove(player.getUniqueId());
+
         player.getPassengers().forEach(entity -> entity.remove());
         player.getPassengers().clear();
         player.setWalkSpeed(DEFAULT_WALK_SPEED);
-
         this.eventCaller.callEvent(new CatboySwitchEvent(player, false));
     }