Remove spigot proxy listener. Moving to https://github.com/Fernthedev/AskPlaceHolder

Author: Fernthedev

core/src/main/java/com/github/fernthedev/fernapi/universal/FernAPIChannels.java

@@ -13,7 +13,7 @@ private FernAPIChannels() {
 
     public static final String PlaceHolderValue = "PlaceHolderValue";
 
-    public static final Channel PlaceHolderBungeeChannel = new Channel("ferncommands", "ph", Channel.ChannelAction.BOTH);
+    public static final Channel PlaceHolderBungeeChannel = new Channel("fernapi", "ph", Channel.ChannelAction.BOTH);
 
     public static final Channel VANISH_CHANNEL = new Channel("fernapi", "vanish", Channel.ChannelAction.BOTH);
 

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

@@ -12,22 +12,23 @@
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 
 public class ProxyAskPlaceHolder extends PluginMessageHandler {
 
     private final ProxyPlaceholderRunnable proxyPlaceholderRunnable;
+    private final CompletableFuture<PlaceHolderResponse> completableFuture;
     private IFPlayer<?> player;
     private String placeHolderValue;
 
     public static final String PLACEHOLDER_NOT_FOUND = "NoPlaceHolderFound";
     public static final String PLACEHOLDER_API_NOT_ENABLE = "PlaceHolderDisabled";
 
-    boolean checked;
-    boolean placeHolderReplaced;
+    private boolean responseReceived;
+    private boolean placeHolderReplaced;
     private String oldPlaceValue;
 
     private static final Map<UUID, ProxyAskPlaceHolder> instances = new HashMap<>();
-    private UUID uuid;
 
     /**
      * Internal use
@@ -42,6 +43,7 @@ public class ProxyAskPlaceHolder extends PluginMessageHandler {
     private ProxyAskPlaceHolder() {
         Universal.getMethods().getAbstractLogger().info("Registered PlaceHolderAPI Listener");
         proxyPlaceholderRunnable = (player, placeHolder, isReplaced) -> {};
+        completableFuture = null;
     }
 
     public String getPlaceHolderResult() {
@@ -52,13 +54,14 @@ public String getPlaceHolderResult() {
     public ProxyAskPlaceHolder(IFPlayer<?> player, String placeHolderValue, ProxyPlaceholderRunnable proxyPlaceholderRunnable) {
         this.player = player;
         this.proxyPlaceholderRunnable = proxyPlaceholderRunnable;
+        completableFuture = new CompletableFuture<>();
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(stream);
 
         PluginMessageData data = new PluginMessageData(stream, player.getCurrentServerName(), FernAPIChannels.getPlaceHolderResult, FernAPIChannels.PlaceHolderBungeeChannel);
 
-        uuid = UUID.randomUUID();
+        UUID uuid = UUID.randomUUID();
         if (!instances.isEmpty()) {
             while (instances.containsKey(uuid)) {
                 uuid = UUID.randomUUID();
@@ -72,7 +75,7 @@ public ProxyAskPlaceHolder(IFPlayer<?> player, String placeHolderValue, ProxyPla
         oldPlaceValue = placeHolderValue;
         data.addData(uuid.toString()); //MESSAGE 2 (UUID)
 
-        checked = false;
+        responseReceived = false;
         Universal.getMessageHandler().sendPluginData(player, data);
         instances.put(uuid, this);
     }
@@ -81,7 +84,9 @@ public boolean isPlaceHolderReplaced() {
         return placeHolderReplaced;
     }
 
-
+    public boolean isResponseReceived() {
+        return responseReceived;
+    }
 
     /**
      * This is the channel name that will be registered incoming and outgoing
@@ -131,7 +136,11 @@ public void onMessageReceived(PluginMessageData data, Channel channel) {
                         instance.placeHolderReplaced = !instance.placeHolderValue.equals(instance.oldPlaceValue);
                     }
 
-                    instance.checked = true;
+                    instance.responseReceived = true;
+
+                    // Fire completable future complete.
+                    completableFuture.complete(new PlaceHolderResponse(instance.player, instance.placeHolderValue, instance.isPlaceHolderReplaced()));
+
                     instance.proxyPlaceholderRunnable.onFinish(instance.player, instance.placeHolderValue, instance.isPlaceHolderReplaced());
                     instances.remove(uuide);
 
@@ -163,4 +172,32 @@ public interface ProxyPlaceholderRunnable {
         void onFinish(IFPlayer<?> player, String placeHolder, boolean isReplaced);
 
     }
+
+    public CompletableFuture<PlaceHolderResponse> getCompletableFuture() {
+        return completableFuture;
+    }
+
+    public class PlaceHolderResponse {
+        private final IFPlayer<?> player;
+        private final String placeholder;
+        private final boolean isReplaced;
+
+        public PlaceHolderResponse(IFPlayer<?> player, String placeholder, boolean isReplaced) {
+            this.player = player;
+            this.placeholder = placeholder;
+            this.isReplaced = isReplaced;
+        }
+
+        public IFPlayer<?> getPlayer() {
+            return player;
+        }
+
+        public String getPlaceholder() {
+            return placeholder;
+        }
+
+        public boolean isReplaced() {
+            return isReplaced;
+        }
+    }
 }

spigot/src/main/java/com/github/fernthedev/fernapi/server/spigot/FernSpigotAPI.java

@@ -3,7 +3,6 @@
 import co.aikar.commands.PaperCommandManager;
 import com.github.fernthedev.fernapi.server.spigot.chat.SpigotChatHandler;
 import com.github.fernthedev.fernapi.server.spigot.interfaces.SpigotPluginData;
-import com.github.fernthedev.fernapi.server.spigot.network.PlaceHolderAPI.PlaceHolderAPIResponder;
 import com.github.fernthedev.fernapi.server.spigot.network.SpigotMessageHandler;
 import com.github.fernthedev.fernapi.server.spigot.network.SpigotNetworkHandler;
 import com.github.fernthedev.fernapi.server.spigot.pluginhandlers.VaultHandler;
@@ -45,8 +44,6 @@ public void onEnable() {
         );
 //        UUIDFetcher.setFetchManager(new UUIDSpigot());
 
-        Universal.getMessageHandler().registerMessageHandler(new PlaceHolderAPIResponder(this));
-
 //        if (Bukkit.getPluginManager().isPluginEnabled(VaultHandler.VAULT_PLUGIN_NAME) && (!ListUtil.containsString(getDescription().getSoftDepend(), VaultHandler.VAULT_PLUGIN_NAME) && !ListUtil.containsString(getDescription().getDepend(), VaultHandler.VAULT_PLUGIN_NAME))) {
 //            Universal.debug("[WARNING/CAN BE IGNORED] Vault has been enabled though not added to soft dependencies or dependencies in plugin.yml. If you want to use VaultHandler which is included in the FernSpigotAPI you must add it to your dependencies/soft dependencies. Dependencies list: " + getDescription().getDepend() + " Soft Dependencies: " + getDescription().getSoftDepend());
 //        }