- Fixed compile errors caught in CI

Fernthedev · Fernthedev · commit dc040ad62a0d · 2019-12-09T19:06:34.000-04:00
- Added constructor initializing for new Scheduler API
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/bungee/FernBungeeAPI.java b/src/main/java/com/github/fernthedev/fernapi/server/bungee/FernBungeeAPI.java
@@ -3,11 +3,10 @@
 import com.github.fernthedev.fernapi.server.bungee.chat.BungeeChatHandler;
 import com.github.fernthedev.fernapi.server.bungee.command.BungeeCommandHandler;
 import com.github.fernthedev.fernapi.server.bungee.database.BungeeDatabase;
-import com.github.fernthedev.fernapi.server.bungee.interfaces.UUIDBungee;
 import com.github.fernthedev.fernapi.server.bungee.network.BungeeMessageHandler;
 import com.github.fernthedev.fernapi.server.bungee.network.BungeeNetworkHandler;
+import com.github.fernthedev.fernapi.server.bungee.scheduler.BungeeScheduler;
 import com.github.fernthedev.fernapi.universal.ProxyAskPlaceHolder;
-import com.github.fernthedev.fernapi.universal.util.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;
@@ -24,8 +23,8 @@ public void onEnable() {
                 messageHandler,
                  new BungeeDatabase(this),
                 new BungeeCommandHandler(this),
-                new BungeeNetworkHandler());
-        UUIDFetcher.setFetchManager(new UUIDBungee());
+                new BungeeNetworkHandler(),
+                new BungeeScheduler(this));
         getProxy().getPluginManager().registerListener(this, messageHandler);
         Universal.getMessageHandler().registerMessageHandler(new ProxyAskPlaceHolder());
         Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck());
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/bungee/interfaces/UUIDBungee.java b/src/main/java/com/github/fernthedev/fernapi/server/bungee/interfaces/UUIDBungee.java
@@ -1,13 +1,12 @@
 package com.github.fernthedev.fernapi.server.bungee.interfaces;
 
+import com.github.fernthedev.fernapi.universal.Universal;
 import com.github.fernthedev.fernapi.universal.handlers.UUIDFetchManager;
 import com.github.fernthedev.fernapi.universal.util.UUIDFetcher;
-import com.github.fernthedev.fernapi.universal.Universal;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
 
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
 import static com.github.fernthedev.fernapi.universal.util.UUIDFetcher.*;
@@ -41,21 +40,7 @@ public void runHourTask() {
 
     }
 
-    @Override
-    public String getNameFromPlayer(UUID uuid) {
-        if(ProxyServer.getInstance().getPlayer(uuid) != null && ProxyServer.getInstance().getPlayer(uuid).isConnected()) {
-            return ProxyServer.getInstance().getPlayer(uuid).getName();
-        }
-        return null;
-    }
 
-    @Override
-    public UUID getUUIDFromPlayer(String name) {
-        if(ProxyServer.getInstance().getPlayer(name) != null && ProxyServer.getInstance().getPlayer(name).isConnected()) {
-            return ProxyServer.getInstance().getPlayer(name).getUniqueId();
-        }
-        return null;
-    }
 
     public void stopTimerRequest() {
         if(requestTask != null) {
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/spigot/FernSpigotAPI.java b/src/main/java/com/github/fernthedev/fernapi/server/spigot/FernSpigotAPI.java
@@ -8,6 +8,7 @@
 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;
+import com.github.fernthedev.fernapi.server.spigot.scheduler.SpigotScheduler;
 import com.github.fernthedev.fernapi.universal.util.UUIDFetcher;
 import com.github.fernthedev.fernapi.universal.Universal;
 import com.github.fernthedev.fernapi.universal.data.network.vanish.VanishProxyCheck;
@@ -29,8 +30,9 @@ public void onEnable() {
                 new SpigotChatHandler(),
                 new SpigotMessageHandler(this),
                 new SpigotDatabase(this),new SpigotCommandHandler(),
-                new SpigotNetworkHandler());
-        UUIDFetcher.setFetchManager(new UUIDSpigot());
+                new SpigotNetworkHandler(),
+                new SpigotScheduler(this));
+//        UUIDFetcher.setFetchManager(new UUIDSpigot());
 
         Universal.getMessageHandler().registerMessageHandler(new PlaceHolderAPIResponder(this));
         if(Bukkit.getPluginManager().isPluginEnabled("Vault")) {
@@ -48,8 +50,5 @@ public void onDisable() {
         getServer().getScheduler().cancelTasks(this);
     }
 
-    @Override
-    public void cancelTask(int id) {
-        getServer().getScheduler().cancelTask(id);
-    }
+
 }
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/spigot/interfaces/UUIDSpigot.java b/src/main/java/com/github/fernthedev/fernapi/server/spigot/interfaces/UUIDSpigot.java
@@ -54,12 +54,12 @@ public void run() {
 
     public void stopTimerRequest() {
         if(requestBukkitRunnable != null) {
-            Universal.getMethods().getInstance().cancelTask(requestBukkitRunnable.getTaskId());
+            Universal.getScheduler().cancelTask(requestBukkitRunnable.getTaskId());
         }
     }
 
     public void stopHourTask() {
-        if(banBukkitRunnable != null) Universal.getMethods().getInstance().cancelTask(banBukkitRunnable.getTaskId());
+        if(banBukkitRunnable != null) Universal.getScheduler().cancelTask(banBukkitRunnable.getTaskId());
     }
 
 
@@ -68,7 +68,7 @@ private static void print(Object log) {
         Universal.getMethods().getLogger().info("[" + Universal.getMethods().getServerType() + "] [UUIDFetcher] " + log);
     }
 
-    private static void debug(Object log) {
+    private static void debug(String log) {
         Universal.debug("[" + Universal.getMethods().getServerType() + "] [UUIDFetcher] " + log);
     }
 }
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/sponge/FernSpongeAPI.java b/src/main/java/com/github/fernthedev/fernapi/server/sponge/FernSpongeAPI.java
@@ -3,10 +3,9 @@
 import com.github.fernthedev.fernapi.server.sponge.chat.SpongeChatHandler;
 import com.github.fernthedev.fernapi.server.sponge.command.SpongeCommandHandler;
 import com.github.fernthedev.fernapi.server.sponge.database.SpongeDatabase;
-import com.github.fernthedev.fernapi.server.sponge.interfaces.UUIDSponge;
 import com.github.fernthedev.fernapi.server.sponge.network.SpongeMessageHandler;
 import com.github.fernthedev.fernapi.server.sponge.network.SpongeNetworkHandler;
-import com.github.fernthedev.fernapi.universal.util.UUIDFetcher;
+import com.github.fernthedev.fernapi.server.sponge.scheduler.SpongeScheduler;
 import com.github.fernthedev.fernapi.universal.Universal;
 import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
 import com.google.inject.Inject;
@@ -53,7 +52,8 @@ public void onServerStart(GameStartedServerEvent event) {
                 new SpongeChatHandler(),
                 new SpongeMessageHandler(this),
                 new SpongeDatabase(this),new SpongeCommandHandler(this),
-                new SpongeNetworkHandler());
+                new SpongeNetworkHandler(),
+                new SpongeScheduler(this));
     }
 
     @Listener
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/velocity/FernVelocityAPI.java b/src/main/java/com/github/fernthedev/fernapi/server/velocity/FernVelocityAPI.java
@@ -3,11 +3,10 @@
 import com.github.fernthedev.fernapi.server.velocity.chat.VelocityChatHandler;
 import com.github.fernthedev.fernapi.server.velocity.command.VelocityCommandHandler;
 import com.github.fernthedev.fernapi.server.velocity.database.VelocityDatabase;
-import com.github.fernthedev.fernapi.server.velocity.interfaces.UUIDVelocity;
 import com.github.fernthedev.fernapi.server.velocity.network.VelocityMessageHandler;
 import com.github.fernthedev.fernapi.server.velocity.network.VelocityNetworkHandler;
+import com.github.fernthedev.fernapi.server.velocity.scheduler.VelocityScheduler;
 import com.github.fernthedev.fernapi.universal.ProxyAskPlaceHolder;
-import com.github.fernthedev.fernapi.universal.util.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;
@@ -47,9 +46,10 @@ public FernVelocityAPI(ProxyServer server, Logger logger) {
                 messageHandler,
                 new VelocityDatabase(this),
                 new VelocityCommandHandler(this),
-                new VelocityNetworkHandler());
+                new VelocityNetworkHandler(),
+                new VelocityScheduler());
 
-        UUIDFetcher.setFetchManager(new UUIDVelocity(this));
+//        UUIDFetcher.setFetchManager(new UUIDVelocity(this));
         Universal.getMessageHandler().registerMessageHandler(new ProxyAskPlaceHolder());
         Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck());
     }
@@ -66,9 +66,4 @@ public void onProxyStop(ProxyShutdownEvent event) {
         Universal.getInstance().onDisable();
     }
 
-    @Override
-    public void cancelTask(int id) {
-        getLogger().warn("FernAPI currently does not support cancelling tasks using IDs on Velocity due to it's limited scheduling API.");
-    }
-
 }
diff --git a/src/main/java/com/github/fernthedev/fernapi/server/velocity/scheduler/VelocityScheduler.java b/src/main/java/com/github/fernthedev/fernapi/server/velocity/scheduler/VelocityScheduler.java
@@ -20,7 +20,9 @@ public void cancelTask(UUID id) {
 
     @Override
     public void cancelAllTasks() {
-
+        for (VelocityScheduledTaskWrapper task : taskWrapperMap.values()) {
+            task.cancel();
+        }
     }
 
     /**
diff --git a/src/main/java/com/github/fernthedev/fernapi/universal/Universal.java b/src/main/java/com/github/fernthedev/fernapi/universal/Universal.java
@@ -4,7 +4,6 @@
 import com.github.fernthedev.fernapi.universal.data.network.IPMessageHandler;
 import com.github.fernthedev.fernapi.universal.exceptions.setup.IncorrectSetupException;
 import com.github.fernthedev.fernapi.universal.handlers.*;
-import com.github.fernthedev.fernapi.universal.handlers.MethodInterface;
 import com.github.fernthedev.fernapi.universal.mysql.DatabaseHandler;
 import lombok.NonNull;
 
diff --git a/src/main/java/com/github/fernthedev/fernapi/universal/data/network/vanish/VanishProxyCheck.java b/src/main/java/com/github/fernthedev/fernapi/universal/data/network/vanish/VanishProxyCheck.java
@@ -36,7 +36,7 @@ public class VanishProxyCheck extends PluginMessageHandler {
     public void setTimeout(long timeout, TimeUnit timeUnit) {
         VanishProxyCheck vanishProxyCheck = this;
 
-        Universal.getMethods().runSchedule(() -> {
+        Universal.getScheduler().runSchedule(() -> {
             if (instances.contains(vanishProxyCheck)) {
                 vanishProxyCheck.vanishRunnable.run(player, false, true);
                 instances.remove(vanishProxyCheck);

Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ public void run() {`
`54`	`54`
`55`	`55`	`public void stopTimerRequest() {`
`56`	`56`	`if(requestBukkitRunnable != null) {`
`57`		`- Universal.getMethods().getInstance().cancelTask(requestBukkitRunnable.getTaskId());`
	`57`	`+ Universal.getScheduler().cancelTask(requestBukkitRunnable.getTaskId());`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public void stopHourTask() {`
`62`		`- if(banBukkitRunnable != null) Universal.getMethods().getInstance().cancelTask(banBukkitRunnable.getTaskId());`
	`62`	`+ if(banBukkitRunnable != null) Universal.getScheduler().cancelTask(banBukkitRunnable.getTaskId());`
`63`	`63`	`}`
`64`	`64`
`65`	`65`
`@@ -68,7 +68,7 @@ private static void print(Object log) {`
`68`	`68`	`Universal.getMethods().getLogger().info("[" + Universal.getMethods().getServerType() + "] [UUIDFetcher] " + log);`
`69`	`69`	`}`
`70`	`70`
`71`		`- private static void debug(Object log) {`
	`71`	`+ private static void debug(String log) {`
`72`	`72`	`Universal.debug("[" + Universal.getMethods().getServerType() + "] [UUIDFetcher] " + log);`
`73`	`73`	`}`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ public void cancelTask(UUID id) {`
`20`	`20`
`21`	`21`	`@Override`
`22`	`22`	`public void cancelAllTasks() {`
`23`		`-`
	`23`	`+ for (VelocityScheduledTaskWrapper task : taskWrapperMap.values()) {`
	`24`	`+ task.cancel();`
	`25`	`+ }`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`/**`