Fix adventure checks in some weird platforms

VelixDevelopments · Nov 4, 2024 · ffc59f1 · ffc59f1
1 parent fa7358b
commit ffc59f1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/bukkit/src/main/java/dev/velix/imperat/BukkitConfigBuilder.java b/bukkit/src/main/java/dev/velix/imperat/BukkitConfigBuilder.java
@@ -14,6 +14,7 @@
 import dev.velix.imperat.type.ParameterWorld;
 import dev.velix.imperat.util.reflection.Reflections;
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -92,12 +93,12 @@ public BukkitConfigBuilder applyBrigadier(boolean supportBrigadier) {
     }
 
     private static AdventureProvider<CommandSender> loadAdventure(Plugin plugin, @Nullable AdventureProvider<CommandSender> provider) {
-        if (Reflections.findClass("net.kyori.adventure.audience.Audience")) {
+        if (Reflections.findClass(() -> Audience.class)) {
             if (provider != null) {
                 return provider;
             } else if (Audience.class.isAssignableFrom(CommandSender.class)) {
                 return new CastingAdventure<>();
-            } else if (Reflections.findClass("net.kyori.adventure.platform.bukkit.BukkitAudiences")) {
+            } else if (Reflections.findClass(() -> BukkitAudiences.class)) {
                 return new BukkitAdventure(plugin);
             }
         }

diff --git a/bungee/src/main/java/dev/velix/imperat/BungeeConfigBuilder.java b/bungee/src/main/java/dev/velix/imperat/BungeeConfigBuilder.java
@@ -8,6 +8,7 @@
 import dev.velix.imperat.resolvers.BungeePermissionResolver;
 import dev.velix.imperat.type.ParameterProxiedPlayer;
 import dev.velix.imperat.util.reflection.Reflections;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -30,7 +31,7 @@ private BungeeConfigBuilder(Plugin plugin, @Nullable AdventureProvider<CommandSe
     }
 
     private AdventureProvider<CommandSender> loadAdventureProvider() {
-        if (Reflections.findClass("net.kyori.adventure.platform.bungeecord.BungeeAudiences")) {
+        if (Reflections.findClass(() -> BungeeAudiences.class)) {
             return new BungeeAdventure(plugin);
         }
         return new EmptyAdventure<>();

diff --git a/bungee/src/main/java/dev/velix/imperat/BungeeImperat.java b/bungee/src/main/java/dev/velix/imperat/BungeeImperat.java
@@ -1,15 +1,13 @@
 package dev.velix.imperat;
 
 import dev.velix.imperat.adventure.AdventureProvider;
-import dev.velix.imperat.adventure.BungeeAdventure;
-import dev.velix.imperat.adventure.EmptyAdventure;
 import dev.velix.imperat.command.BaseImperat;
 import dev.velix.imperat.command.Command;
 import dev.velix.imperat.util.ImperatDebugger;
 import dev.velix.imperat.util.StringUtils;
-import dev.velix.imperat.util.reflection.Reflections;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Plugin;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
 
@@ -20,20 +18,13 @@ public final class BungeeImperat extends BaseImperat<BungeeSource> {
 
     BungeeImperat(
         Plugin plugin,
-        AdventureProvider<CommandSender> adventureProvider,
+        @NotNull AdventureProvider<CommandSender> adventureProvider,
         ImperatConfig<BungeeSource> config
     ) {
         super(config);
         this.plugin = plugin;
+        this.adventureProvider = adventureProvider;
         ImperatDebugger.setLogger(plugin.getLogger());
-        this.adventureProvider = adventureProvider != null ? adventureProvider : loadAdventureProvider();
-    }
-
-    private AdventureProvider<CommandSender> loadAdventureProvider() {
-        if (Reflections.findClass("net.kyori.adventure.platform.bungeecord.BungeeAudiences")) {
-            return new BungeeAdventure(plugin);
-        }
-        return new EmptyAdventure<>();
     }
 
     @Override

diff --git a/core/src/main/java/dev/velix/imperat/util/reflection/Reflections.java b/core/src/main/java/dev/velix/imperat/util/reflection/Reflections.java
@@ -4,6 +4,7 @@
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
+import java.util.function.Supplier;
 
 public final class Reflections {
 
@@ -117,6 +118,17 @@ public boolean hasField(final Object target) {
         throw new IllegalArgumentException("Cannot find field with valueType " + fieldType);
     }
 
+    /**
+     * @return false if the {@link Class} was NOT found
+     */
+    public static boolean findClass(final Supplier<Class<?>> classSupplier) {
+        try {
+            return classSupplier.get() != null;
+        } catch (final Exception e) {
+            return false;
+        }
+    }
+
     /**
      * Finds any {@link Class} of the provided paths
      *