Merge pull request #9 from Fernthedev/beta

1.9b1 changes to master

Author: Fernthedev

.idea/modules/com.github.fernthedev.FernAPI.iml

@@ -55,7 +55,7 @@ repositories {
 
 group = 'com.github.fernthedev'
 
-version = '1.8.5'
+version = '1.9b1'
 def developer = "FernTheDev"
 def MCVersion = "1.14.4"
 archivesBaseName = "FernAPI"

.idea/modules/com.github.fernthedev.FernAPI.main.iml

@@ -1,19 +1,23 @@
 package com.github.fernthedev.fernapi.server.bungee;
 
+import com.github.fernthedev.fernapi.server.bungee.interfaces.BungeeScheduledTaskWrapper;
 import com.github.fernthedev.fernapi.server.bungee.player.BungeeFConsole;
 import com.github.fernthedev.fernapi.server.bungee.player.BungeeFPlayer;
 import com.github.fernthedev.fernapi.universal.Universal;
 import com.github.fernthedev.fernapi.universal.api.CommandSender;
+import com.github.fernthedev.fernapi.universal.data.ScheduleTaskWrapper;
 import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
-import com.github.fernthedev.fernapi.universal.handlers.IFPlayer;
-import com.github.fernthedev.fernapi.universal.misc.MethodInterface;
+import com.github.fernthedev.fernapi.universal.api.IFPlayer;
+import com.github.fernthedev.fernapi.universal.handlers.MethodInterface;
 import com.github.fernthedev.fernapi.universal.handlers.ServerType;
 import lombok.NonNull;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 
+import java.io.File;
 import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
@@ -85,4 +89,38 @@ public void runAsync(Runnable runnable) {
     public List<IFPlayer> getPlayers() {
         return ProxyServer.getInstance().getPlayers().stream().map(proxiedPlayer -> Universal.getMethods().convertPlayerObjectToFPlayer(proxiedPlayer)).collect(Collectors.toList());
     }
+
+    @Override
+    public File getDataFolder() {
+        return fernBungeeAPI.getDataFolder();
+    }
+
+    /**
+     * Schedules a task to be executed asynchronously after the specified delay
+     * is up.
+     *  @param task  the task to run
+     * @param delay the delay before this task will be executed
+     * @param unit  the unit in which the delay will be measured
+     * @return
+     */
+    @Override
+    public ScheduleTaskWrapper runSchedule(Runnable task, long delay, TimeUnit unit) {
+        return new BungeeScheduledTaskWrapper(ProxyServer.getInstance().getScheduler().schedule(fernBungeeAPI, task, delay, unit));
+    }
+
+    /**
+     * Schedules a task to be executed asynchronously after the specified delay
+     * is up. The scheduled task will continue running at the specified
+     * interval. The interval will not begin to count down until the last task
+     * invocation is complete.
+     *  @param task   the task to run
+     * @param delay  the delay before this task will be executed
+     * @param period the interval before subsequent executions of this task
+     * @param unit   the unit in which the delay and period will be measured
+     * @return
+     */
+    @Override
+    public ScheduleTaskWrapper runSchedule(Runnable task, long delay, long period, TimeUnit unit) {
+        return new BungeeScheduledTaskWrapper(ProxyServer.getInstance().getScheduler().schedule(fernBungeeAPI, task, delay, period, unit));
+    }
 }

.idea/modules/com.github.fernthedev.FernAPI.test.iml

@@ -9,6 +9,7 @@
 import com.github.fernthedev.fernapi.universal.ProxyAskPlaceHolder;
 import com.github.fernthedev.fernapi.universal.UUIDFetcher;
 import com.github.fernthedev.fernapi.universal.Universal;
+import com.github.fernthedev.fernapi.universal.data.network.vanish.VanishProxyCheck;
 import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
 import net.md_5.bungee.api.plugin.Plugin;
 
@@ -25,8 +26,9 @@ public void onEnable() {
                 new BungeeCommandHandler(this),
                 new BungeeNetworkHandler());
         UUIDFetcher.setFetchManager(new UUIDBungee());
-        getProxy().getPluginManager().registerListener(this,messageHandler);
+        getProxy().getPluginManager().registerListener(this, messageHandler);
         Universal.getMessageHandler().registerMessageHandler(new ProxyAskPlaceHolder());
+        Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck());
     }
 
     @Override

build.gradle

@@ -0,0 +1,40 @@
+package com.github.fernthedev.fernapi.server.bungee.interfaces;
+
+import com.github.fernthedev.fernapi.universal.data.ScheduleTaskWrapper;
+import net.md_5.bungee.api.scheduler.ScheduledTask;
+
+public class BungeeScheduledTaskWrapper extends ScheduleTaskWrapper<ScheduledTask, Integer> {
+
+
+    public BungeeScheduledTaskWrapper(ScheduledTask task) {
+        super(task);
+    }
+
+    /**
+     * Gets the unique ID of this task.
+     *
+     * @return this tasks ID
+     */
+    @Override
+    public Integer getId() {
+        return scheduleTask.getId();
+    }
+
+    /**
+     * Get the actual method which will be executed by this task.
+     *
+     * @return the {@link Runnable} behind this task
+     */
+    @Override
+    public Runnable getTask() {
+        return scheduleTask.getTask();
+    }
+
+    /**
+     * Cancel this task to suppress subsequent executions.
+     */
+    @Override
+    public void cancel() {
+        scheduleTask.cancel();
+    }
+}

src/main/java/com/github/fernthedev/fernapi/server/bungee/BungeeInterface.java

@@ -8,7 +8,7 @@
 import com.github.fernthedev.fernapi.universal.data.network.PluginMessageData;
 import com.github.fernthedev.fernapi.universal.exceptions.network.NotEnoughDataException;
 import com.github.fernthedev.fernapi.universal.exceptions.network.ServerDoesNotExistException;
-import com.github.fernthedev.fernapi.universal.handlers.IFPlayer;
+import com.github.fernthedev.fernapi.universal.api.IFPlayer;
 import com.github.fernthedev.fernapi.universal.handlers.PluginMessageHandler;
 import com.google.gson.Gson;
 import lombok.NonNull;

src/main/java/com/github/fernthedev/fernapi/server/bungee/FernBungeeAPI.java

@@ -1,5 +1,6 @@
 package com.github.fernthedev.fernapi.server.bungee.player;
 
+import com.github.fernthedev.fernapi.universal.api.IFConsole;
 import com.github.fernthedev.fernapi.universal.data.chat.BaseMessage;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
@@ -8,7 +9,7 @@
 
 import java.util.Collection;
 
-public class BungeeFConsole implements com.github.fernthedev.fernapi.universal.api.CommandSender {
+public class BungeeFConsole extends IFConsole {
     private CommandSender commandSender;
 
     public BungeeFConsole(CommandSender commandSender) {

src/main/java/com/github/fernthedev/fernapi/server/bungee/interfaces/BungeeScheduledTaskWrapper.java

@@ -1,7 +1,7 @@
 package com.github.fernthedev.fernapi.server.bungee.player;
 
 import com.github.fernthedev.fernapi.universal.data.chat.BaseMessage;
-import com.github.fernthedev.fernapi.universal.handlers.IFPlayer;
+import com.github.fernthedev.fernapi.universal.api.IFPlayer;
 import lombok.Getter;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.chat.*;

src/main/java/com/github/fernthedev/fernapi/server/bungee/network/BungeeMessageHandler.java

@@ -10,6 +10,7 @@
 import com.github.fernthedev.fernapi.server.spigot.pluginhandlers.VaultHandler;
 import com.github.fernthedev.fernapi.universal.UUIDFetcher;
 import com.github.fernthedev.fernapi.universal.Universal;
+import com.github.fernthedev.fernapi.universal.data.network.vanish.VanishProxyCheck;
 import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
 import lombok.Getter;
 import org.bukkit.Bukkit;
@@ -38,7 +39,7 @@ public void onEnable() {
             vaultHandler.hook();
         }
 
-
+        Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck());
     }
 
     @Override