Merge branch 'main' into feat/v3

Author: NonSwag

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-rc-4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

plugin/build.gradle.kts

@@ -40,7 +40,7 @@ dependencies {
     compileOnly("com.github.ElgarL:groupmanager:3.2")
     compileOnly("com.github.decentsoftware-eu:decentholograms:2.9.6")
     compileOnly("de.oliver:FancyHolograms:2.7.0")
-    compileOnly("de.oliver:FancyNpcs:2.6.0")
+    compileOnly("de.oliver:FancyNpcs:2.7.0")
     compileOnly("me.clip:placeholderapi:2.11.6")
     compileOnly("net.citizensnpcs:citizens-main:2.0.39-SNAPSHOT")
     compileOnly("net.luckperms:api:5.5")

plugin/src/main/java/net/thenextlvl/service/ServicePlugin.java

@@ -87,23 +87,25 @@ public void onLoad() {
 
     @Override
     public void onEnable() {
-        loadServicePermissionWrapper();
-        loadServiceEconomyWrapper();
-        loadServiceChatWrapper();
+        getServer().getGlobalRegionScheduler().execute(this, () -> {
+            loadServicePermissionWrapper();
+            loadServiceEconomyWrapper();
+            loadServiceChatWrapper();
 
-        loadPermissionServices();
-        loadGroupServices();
-        loadChatServices();
-        loadHologramServices();
-        loadNpcServices();
+            loadPermissionServices();
+            loadGroupServices();
+            loadChatServices();
+            loadHologramServices();
+            loadNpcServices();
 
-        loadVaultPermissionWrapper();
-        loadVaultEconomyWrapper();
-        loadVaultChatWrapper();
+            loadVaultPermissionWrapper();
+            loadVaultEconomyWrapper();
+            loadVaultChatWrapper();
 
-        registerPlaceholders();
+            registerPlaceholders();
 
-        addCustomCharts();
+            addCustomCharts();
+        });
     }
 
     private void registerPlaceholders() {
@@ -114,10 +116,10 @@ private void registerPlaceholders() {
                 .registerStore(new ServiceEconomyPlaceholderStore(this))
                 .registerStore(new ServiceGroupPlaceholderStore(this))
                 .register();
-        
+
         var authors = new ArrayList<>(getPluginMeta().getAuthors());
         authors.add("creatorfromhell");
-        
+
         new PlaceholderExpansionBuilder(this, "vaultunlocked")
                 .setAuthors(authors)
                 .setVersion("2.13.1")

plugin/src/main/java/net/thenextlvl/service/command/ServiceInfoCommand.java

@@ -138,10 +138,11 @@ private int infoPermissions(CommandContext<CommandSourceStack> context) {
             .build();
 
     private <T> List<TextComponent> getRegistrations(Class<T> registration, @Nullable T loaded, Function<T, String> mapper) {
+        var name = loaded != null ? mapper.apply(loaded) : null;
         return plugin.getServer().getServicesManager().getRegistrations(registration).stream()
                 .map(RegisteredServiceProvider::getProvider)
-                .filter(controller -> controller != loaded)
                 .map(mapper)
+                .filter(provider -> !provider.equals(name))
                 .map(Component::text)
                 .toList();
     }