Make vanish use futures. Also adding the missing Vanish response in https://github.com/Fernthedev/AskPlaceHolder

Author: Fernthedev

core/src/main/java/com/github/fernthedev/fernapi/universal/api/IFPlayer.java

@@ -1,7 +1,6 @@
 package com.github.fernthedev.fernapi.universal.api;
 
 import com.github.fernthedev.fernapi.universal.data.network.IServerInfo;
-import com.github.fernthedev.fernapi.universal.exceptions.FernRuntimeException;
 import com.github.fernthedev.fernapi.universal.exceptions.network.PluginTimeoutException;
 import com.github.fernthedev.fernapi.universal.util.UUIDFetcher;
 import com.github.fernthedev.fernapi.universal.util.network.vanish.VanishProxyCheck;
@@ -15,6 +14,8 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
 
 @Getter
 public abstract class IFPlayer<T> implements FernCommandIssuer {
@@ -111,33 +112,40 @@ public boolean isPlayerNull() {
         return isPlayer || isDataNull;
     }
 
-    public boolean isVanished() {
-        final boolean[] vanished = new boolean[1];
-        try {
-            new VanishProxyCheck(this, (player, isVanished, timedOut) -> {
-                if (timedOut) throw new PluginTimeoutException("The vanish check timed out. The server must have FernAPI enabled and registered");
+    public CompletableFuture<Boolean> isVanished() {
+        return isVanished(10, TimeUnit.SECONDS);
+    }
 
-                vanished[0] = isVanished;
-            }).awaitVanishResponse(20);
-        } catch (InterruptedException e) {
-            throw new FernRuntimeException("Interrupted", e);
-        }
+    public CompletableFuture<Boolean> isVanished(int amount, TimeUnit timeUnit) {
+        CompletableFuture<Boolean> completableFuture = new CompletableFuture<>();
+
+        new VanishProxyCheck(this, (player, isVanished, timedOut) -> {
+            if (timedOut) throw new PluginTimeoutException("The vanish check timed out. The server must have FernAPI enabled and registered");
+
+            completableFuture.complete(isVanished);
+        }).setTimeout(amount, timeUnit);
 
-        return vanished[0];
+        return completableFuture;
     }
 
-    public boolean canSee(IFPlayer<?> player) {
-        return player.isVanished() && hasVanishPermission("acf.seevanish");
+    public CompletableFuture<Boolean> canSee(IFPlayer<?> player) {
+        if (hasVanishPermission()) return CompletableFuture.completedFuture(true);
+
+        return player.isVanished().thenApply(aBoolean -> !aBoolean || hasVanishPermission());
     }
 
 
 
-    public static boolean canSee(FernCommandIssuer commandIssuer, IFPlayer<?> player) {
-        if (!commandIssuer.isPlayer()) return true;
+    public static CompletableFuture<Boolean> canSee(FernCommandIssuer commandIssuer, IFPlayer<?> player) {
+        if (!commandIssuer.isPlayer()) return CompletableFuture.completedFuture(true);
+        if (commandIssuer.hasVanishPermission("acf.seevanish")) return CompletableFuture.completedFuture(true);
+
+
+        CompletableFuture<Boolean> vanished = player.isVanished();
 
-        boolean vanished = player.isVanished();
 
-        return !vanished || commandIssuer.hasVanishPermission();
+       // Invert to see if it can be seen
+        return vanished.thenApply(v -> !v);
     }
 
     /**

core/src/main/java/com/github/fernthedev/fernapi/universal/api/OfflineFPlayer.java

@@ -9,6 +9,7 @@
 
 import java.net.InetSocketAddress;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public class OfflineFPlayer<P> extends IFPlayer<IFPlayer<P>> {
 
@@ -104,12 +105,12 @@ public String getCurrentServerName() {
     }
 
     @Override
-    public boolean isVanished() {
+    public CompletableFuture<Boolean> isVanished() {
         return player.isVanished();
     }
 
     @Override
-    public boolean canSee(IFPlayer<?> player) {
+    public CompletableFuture<Boolean> canSee(IFPlayer<?> player) {
         return player.canSee(player);
     }
 

core/src/main/java/com/github/fernthedev/fernapi/universal/util/UniversalContextResolvers.java

@@ -9,6 +9,7 @@
 import com.github.fernthedev.fernapi.universal.api.IFConsole;
 import com.github.fernthedev.fernapi.universal.api.IFPlayer;
 import com.github.fernthedev.fernapi.universal.api.OfflineFPlayer;
+import lombok.SneakyThrows;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -292,13 +293,14 @@ public static IFPlayer<?> findPlayerSmart(CommandIssuer issuer, String search) {
         return Universal.getMethods().getPlayerFromName(name);
     }
 
+    @SneakyThrows
     private static void findMatches(String search, CommandIssuer requester, List<? extends IFPlayer<?>> matches, List<IFPlayer<?>> confirmList) {
         // Remove vanished players from smart matching.
         Iterator<? extends IFPlayer<?>> iter = matches.iterator();
         //noinspection Duplicates
         while (iter.hasNext()) {
             IFPlayer<?> player = iter.next();
-            if (requester instanceof IFPlayer<?> && !((IFPlayer<?>) requester).canSee(player)) {
+            if (requester instanceof IFPlayer<?> && !((IFPlayer<?>) requester).canSee(player).get()) {
                 if (requester.hasPermission("acf.seevanish")) {
                     if (!search.endsWith(":confirm")) {
                         confirmList.add(player);

core/src/main/java/com/github/fernthedev/fernapi/universal/util/network/vanish/VanishProxyCheck.java

@@ -13,18 +13,20 @@
 
 import java.io.ByteArrayOutputStream;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
 public class VanishProxyCheck extends PluginMessageHandler {
 
     private static Object o;
 
-    private VanishFunction vanishFunction;
-    private IFPlayer<?> player;
+    private final CompletableFuture<VanishProxyResponse> completableFuture;
+    private final VanishFunction vanishFunction;
+    private final IFPlayer<?> player;
 
-    private static Map<UUID, VanishProxyCheck> instances = new HashMap<>();
+    private static final Map<UUID, VanishProxyCheck> instances = new HashMap<>();
 
-    private UUID uuid;
+    private final UUID uuid;
 
     /**
      * Internal use
@@ -38,16 +40,19 @@ public class VanishProxyCheck extends PluginMessageHandler {
      * @param timeout  The amount of time to wait
      * @param timeUnit The unit of time
      */
-    public void setTimeout(long timeout, TimeUnit timeUnit) {
+    public VanishProxyCheck setTimeout(long timeout, TimeUnit timeUnit) {
         VanishProxyCheck vanishProxyCheck = this;
 
         Universal.getScheduler().runSchedule(() -> {
             if (instances.containsKey(vanishProxyCheck.uuid)) {
+                completableFuture.complete(new VanishProxyResponse(player, false, true));
                 vanishFunction.run(player, false, true);
                 instances.remove(vanishProxyCheck.uuid);
 
             }
         }, timeout, timeUnit);
+
+        return this;
     }
 
 
@@ -60,6 +65,10 @@ private VanishProxyCheck() {
 
         o = new Object();
         Universal.getMethods().getAbstractLogger().info("Registered VanishProxyCheck Listener");
+        completableFuture = null;
+        player = null;
+        vanishFunction = null;
+        uuid = null;
     }
 
     /**
@@ -72,6 +81,7 @@ public VanishProxyCheck(@NonNull IFPlayer<?> player, @NonNull VanishFunction van
         this.vanishFunction = vanishFunction;
         this.player = player;
         uuid = UUID.randomUUID();
+        completableFuture = new CompletableFuture<>();
 
         instances.put(uuid, this);
 
@@ -118,11 +128,12 @@ public void onMessageReceived(PluginMessageData data, Channel channel) {
         if (Universal.getMethods().getServerType().isProxy()) {
             boolean vanished = Boolean.parseBoolean(dataQueue.remove());
 
-            System.out.println(vanished + " vanished");
+            Universal.debug(vanished + " vanished");
 
 
             VanishProxyCheck vanishProxyCheck = instances.get(uuidCheck);
             if (vanishProxyCheck != null) {
+                completableFuture.complete(new VanishProxyResponse(vanishProxyCheck.player, vanished, false));
                 Universal.getScheduler().runAsync(() -> vanishFunction.run(vanishProxyCheck.player, vanished, false));
 
                 instances.remove(vanishProxyCheck.uuid);
@@ -134,6 +145,9 @@ public void onMessageReceived(PluginMessageData data, Channel channel) {
      * Synchronise to await message response
      *
      * @param millis The amount of time to wait
+     *               
+     * @deprecated Use {@link CompletableFuture#join()} with {@link #completableFuture}
+     *               
      * @throws InterruptedException
      */
     public void awaitVanishResponse(int millis) throws InterruptedException {
@@ -142,5 +156,7 @@ public void awaitVanishResponse(int millis) throws InterruptedException {
         }
     }
 
-
+    public CompletableFuture<VanishProxyResponse> getCompletableFuture() {
+        return completableFuture;
+    }
 }

core/src/main/java/com/github/fernthedev/fernapi/universal/util/network/vanish/VanishProxyResponse.java

@@ -0,0 +1,27 @@
+package com.github.fernthedev.fernapi.universal.util.network.vanish;
+
+import com.github.fernthedev.fernapi.universal.api.IFPlayer;
+
+public class VanishProxyResponse {
+    private final IFPlayer<?> player;
+    private final boolean isVanished;
+    private final boolean timedOut;
+
+    public VanishProxyResponse(IFPlayer<?> player, boolean isVanished, boolean timedOut) {
+        this.player = player;
+        this.isVanished = isVanished;
+        this.timedOut = timedOut;
+    }
+
+    public IFPlayer<?> getPlayer() {
+        return player;
+    }
+
+    public boolean isVanished() {
+        return isVanished;
+    }
+
+    public boolean isTimedOut() {
+        return timedOut;
+    }
+}

spigot/build.gradle

@@ -6,10 +6,6 @@ plugins {
 sourceCompatibility = 1.8
 
 repositories {
-    maven {
-        name = 'placeholderapi'
-        url = 'http://repo.extendedclip.com/content/repositories/placeholderapi/'
-    }
     maven {
         name = 'spigotmc-repo'
         url = 'https://hub.spigotmc.org/nexus/content/groups/public/'
@@ -29,7 +25,6 @@ dependencies {
     compile "net.kyori:adventure-platform-bukkit:$adventureAPIPlatform"
     api'fr.minuskube.inv:smart-invs:1.2.7'
     api ("me.lucko:helper:5.6.5")
-    compileOnly group: 'me.clip', name: 'placeholderapi', version: '2.9.2'
 
     compileOnly 'org.spigotmc:spigot-api:1.14.4-R0.1-SNAPSHOT' // The Spigot API with no shadowing. Requires the OSS repo.
     compileOnly "com.github.MilkBowl:VaultAPI:1.7"

spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/player/SpigotFPlayer.java

@@ -4,19 +4,18 @@
 import com.github.fernthedev.fernapi.universal.api.IFPlayer;
 import com.github.fernthedev.fernapi.universal.data.chat.BaseMessage;
 import com.github.fernthedev.fernapi.universal.data.network.IServerInfo;
-import com.github.fernthedev.fernapi.universal.handlers.NetworkHandler;
 import net.kyori.adventure.audience.Audience;
 import net.md_5.bungee.api.chat.BaseComponent;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import org.bukkit.ChatColor;
-import org.bukkit.Server;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.MetadataValue;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.InetSocketAddress;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public class SpigotFPlayer extends IFPlayer<Player> {
 
@@ -66,24 +65,24 @@ public void sendMessage(BaseMessage baseMessage) {
     public IServerInfo getServerInfo() {
         if (player == null) return null;
 
-        return ((NetworkHandler<Server>) Universal.getNetworkHandler()).toServer(player.getServer());
+        return Universal.getNetworkHandler().toServer(player.getServer());
     }
 
     private BaseComponent[] message(String text) {
         return new ComponentBuilder(ChatColor.translateAlternateColorCodes('&',text)).create();
     }
 
     @Override
-    public boolean isVanished() {
+    public CompletableFuture<Boolean> isVanished() {
         for (MetadataValue meta : player.getMetadata("vanished")) {
-            if (meta.asBoolean()) return true;
+            if (meta.asBoolean()) return CompletableFuture.completedFuture(true);
         }
-        return false;
+        return CompletableFuture.completedFuture(false);
     }
 
 
     @Override
-    public boolean canSee(IFPlayer<?> player) {
-        return this.player.canSee((Player) player.getPlayer());
+    public CompletableFuture<Boolean> canSee(IFPlayer<?> player) {
+        return CompletableFuture.completedFuture(this.player.canSee((Player) player.getPlayer()));
     }
 }

sponge/src/main/java/com/github/fernthedev/fernapi/server/sponge/player/SpongeFPlayer.java

@@ -13,6 +13,7 @@
 
 import java.net.InetSocketAddress;
 import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
 
 public class SpongeFPlayer extends IFPlayer<Player> {
 
@@ -88,7 +89,7 @@ public IServerInfo getServerInfo() {
     }
 
     @Override
-    public boolean isVanished() {
+    public CompletableFuture<Boolean> isVanished() {
         throw new FernRuntimeException("This method does not work on Sponge yet. Use Universal.getMethods().getServerType() to check for Sponge");
     }