Skip to content

Commit

Permalink
Fixed some inconsistencies
Browse files Browse the repository at this point in the history
Added TaskWrapper return type to runAsync to IScheduler
Added IFPlayer.isVanished to check if Vanished using VanishProxyCheck
Added VanishProxyCheck.awaitVanishResponse to wait for response
  • Loading branch information
Fernthedev committed Dec 17, 2019
1 parent 3e89db8 commit 8aa1c53
Show file tree
Hide file tree
Showing 46 changed files with 367 additions and 122 deletions.
45 changes: 45 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 60 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions .idea/modules/FernAPI.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/modules/all/FernAPI.all.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules/bungee/FernAPI.bungee.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/modules/bungee/FernAPI.bungee.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules/spigot/FernAPI.spigot.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/modules/spigot/FernAPI.spigot.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/modules/sponge/FernAPI.sponge.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/modules/sponge/FernAPI.sponge.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/modules/velocity/FernAPI.velocity.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file.
2 changes: 2 additions & 0 deletions all/build/tmp/jar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

2 changes: 2 additions & 0 deletions all/build/tmp/javadocJar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

2 changes: 2 additions & 0 deletions all/build/tmp/shadowJar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

2 changes: 2 additions & 0 deletions all/build/tmp/sourcesJar/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Manifest-Version: 1.0

8 changes: 1 addition & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,8 @@ plugins {
//apply plugin: 'com.github.johnrengelman.shadow'
//apply plugin: 'maven-publish'


archivesBaseName = "FernAPI"

def developer = "FernTheDev"
def MCVersion = "1.14.4"



sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
Expand All @@ -42,7 +36,7 @@ allprojects {
apply plugin: 'maven-publish'

group = 'com.github.Fernthedev'
version = '1.9b5-modules'
version = '1.9b6'
description = 'An API for universal code'

repositories {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
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.ProxyAskPlaceHolder;
import com.github.fernthedev.fernapi.universal.Universal;
import com.github.fernthedev.fernapi.universal.data.network.vanish.VanishProxyCheck;
import com.github.fernthedev.fernapi.universal.util.network.vanish.VanishProxyCheck;
import com.github.fernthedev.fernapi.universal.handlers.FernAPIPlugin;
import net.md_5.bungee.api.plugin.Plugin;

Expand All @@ -27,7 +27,7 @@ public void onEnable() {
new BungeeScheduler(this));
getProxy().getPluginManager().registerListener(this, messageHandler);
Universal.getMessageHandler().registerMessageHandler(new ProxyAskPlaceHolder());
Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck());
Universal.getMessageHandler().registerMessageHandler(new VanishProxyCheck(this));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ public BungeeScheduledTaskWrapper runSchedule(Runnable task, long delay, TimeUni
* Runs the given runnable in async
*
* @param runnable the runnable
* @return
*/
@Override
public void runAsync(Runnable runnable) {
fernBungeeAPI.getProxy().getScheduler().runAsync(fernBungeeAPI, runnable);
public BungeeScheduledTaskWrapper runAsync(Runnable runnable) {
return new BungeeScheduledTaskWrapper(fernBungeeAPI.getProxy().getScheduler().runAsync(fernBungeeAPI, runnable));
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.github.fernthedev.fernapi.universal.api.IFPlayer;
import com.github.fernthedev.fernapi.universal.data.network.IPMessageHandler;
import com.github.fernthedev.fernapi.universal.exceptions.FernRuntimeException;
import com.github.fernthedev.fernapi.universal.exceptions.setup.IncorrectSetupException;
import com.github.fernthedev.fernapi.universal.handlers.*;
import com.github.fernthedev.fernapi.universal.mysql.DatabaseHandler;
Expand All @@ -24,13 +25,13 @@ private Universal() {}
@Setter
private static boolean debug = false;

private static MethodInterface mi;
private static MethodInterface<?> mi;
private static IChatHandler ch;
private static IPMessageHandler mh;
private static DatabaseHandler db;
private static CommandHandler comhand;
private static NetworkHandler nh;
private static IScheduler sh;
private static IScheduler<?,?> sh;

private static FernAPIPlugin plugin;

Expand All @@ -39,7 +40,12 @@ public static Universal getInstance() {
return instance == null ? instance = new Universal() : instance;
}

public void setup(@NonNull MethodInterface methodInterface, FernAPIPlugin aplugin, IChatHandler chatHandler, IPMessageHandler messageHandler, DatabaseHandler databaseHandler, CommandHandler commandHandler, NetworkHandler networkHandler, IScheduler iScheduler) {
public void setup(@NonNull MethodInterface<?> methodInterface, FernAPIPlugin aplugin,
IChatHandler chatHandler, IPMessageHandler messageHandler, DatabaseHandler databaseHandler,
CommandHandler commandHandler, NetworkHandler networkHandler, IScheduler<?,?> iScheduler) {
if (setup) throw new FernRuntimeException("The interface has already been registered.");


methodInterface.getLogger().info("Registered interface");
setup = true;
mi = methodInterface;
Expand Down Expand Up @@ -72,43 +78,7 @@ public static void debug(Object message) {
}
}

/**
* Shortcut to getMethods()
* This shortcut might me removed in later versions, attempt to avoid it
*/
@Deprecated
public static IFPlayer convertObjectPlayerToFPlayer(Object player) {
return getMethods().convertPlayerObjectToFPlayer(player);
}

/**
* Shortcut to getMethods()
* This shortcut might me removed in later versions, attempt to avoid it
*/
@Deprecated
public static Object convertFPlayerToPlayer(@NonNull IFPlayer ifPlayer) {
return getMethods().convertFPlayerToPlayer(ifPlayer);
}

/**
* Shortcut to getMethods()
* This shortcut might me removed in later versions, attempt to avoid it
*/
@Deprecated
public static IFPlayer getPlayerFromName(String name) {
return getMethods().getPlayerFromName(name);
}

/**
* Shortcut to getMethods()
* This shortcut might me removed in later versions, attempt to avoid it
*/
@Deprecated
public static IFPlayer getPlayerFromUUID(UUID uuid) {
return getMethods().getPlayerFromUUID(uuid);
}

public static MethodInterface getMethods() {
public static MethodInterface<?> getMethods() {
checkNull();
return mi;
}
Expand Down
Loading

0 comments on commit 8aa1c53

Please sign in to comment.