From 2cd50d23ad3522590b2e20761b2866032cb41b95 Mon Sep 17 00:00:00 2001 From: games647 Date: Sun, 11 Sep 2016 20:07:21 +0200 Subject: [PATCH] Revert converting auth hooks to the new format -> backwards compatibility --- .../com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java | 3 +-- .../github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java | 3 +-- .../com/github/games647/fastlogin/bukkit/hooks/LogItHook.java | 3 +-- .../games647/fastlogin/bukkit/hooks/LoginSecurityHook.java | 3 +-- .../github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java | 3 +-- .../github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java | 3 +-- .../com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java | 3 +-- .../java/com/github/games647/fastlogin/core/AuthPlugin.java | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java index 8cbdd8a9..97aa8f05 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/AuthMeHook.java @@ -1,7 +1,6 @@ package com.github.games647.fastlogin.bukkit.hooks; import com.avaje.ebeaninternal.api.ClassUtil; -import com.github.games647.fastlogin.core.AuthPlugin; import fr.xephi.authme.api.API; import fr.xephi.authme.api.NewAPI; @@ -15,7 +14,7 @@ import org.bukkit.entity.Player; * Bukkit: http://dev.bukkit.org/bukkit-plugins/authme-reloaded/ * Spigot: https://www.spigotmc.org/resources/authme-reloaded.6269/ */ -public class AuthMeHook implements AuthPlugin { +public class AuthMeHook implements BukkitAuthPlugin { private final boolean isNewAPIAvailable; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java index 40fb6851..3822d279 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.github.games647.fastlogin.core.AuthPlugin; import de.st_ddt.crazylogin.CrazyLogin; import de.st_ddt.crazylogin.data.LoginPlayerData; @@ -24,7 +23,7 @@ import org.bukkit.entity.Player; * * Bukkit: http://dev.bukkit.org/server-mods/crazylogin/ */ -public class CrazyLoginHook implements AuthPlugin { +public class CrazyLoginHook implements BukkitAuthPlugin { protected final CrazyLogin crazyLoginPlugin = CrazyLogin.getPlugin(); private final PlayerListener playerListener = getListener(); diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java index 15dcc054..6df52d26 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LogItHook.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.github.games647.fastlogin.core.AuthPlugin; import io.github.lucaseasedup.logit.CancelledState; import io.github.lucaseasedup.logit.LogItCore; @@ -15,7 +14,7 @@ import org.bukkit.entity.Player; * Bukkit: Unknown * Spigot: Unknown */ -public class LogItHook implements AuthPlugin { +public class LogItHook implements BukkitAuthPlugin { @Override public boolean forceLogin(Player player) { diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java index 5dd860ed..16c01a0f 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/LoginSecurityHook.java @@ -2,7 +2,6 @@ package com.github.games647.fastlogin.bukkit.hooks; import com.avaje.ebeaninternal.api.ClassUtil; import com.github.games647.fastlogin.bukkit.FastLoginBukkit; -import com.github.games647.fastlogin.core.AuthPlugin; import com.google.common.base.Charsets; import com.lenis0012.bukkit.loginsecurity.LoginSecurity; import com.lenis0012.bukkit.loginsecurity.session.AuthService; @@ -27,7 +26,7 @@ import org.bukkit.entity.Player; * Bukkit: http://dev.bukkit.org/bukkit-plugins/loginsecurity/ * Spigot: https://www.spigotmc.org/resources/loginsecurity.19362/ */ -public class LoginSecurityHook implements AuthPlugin { +public class LoginSecurityHook implements BukkitAuthPlugin { protected final com.lenis0012.bukkit.ls.LoginSecurity securityPlugin; protected final FastLoginBukkit plugin = (FastLoginBukkit) Bukkit.getPluginManager().getPlugin("FastLogin"); diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java index c39e9909..0fef0c76 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/RoyalAuthHook.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.github.games647.fastlogin.core.AuthPlugin; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -20,7 +19,7 @@ import org.royaldev.royalauth.RoyalAuth; * * Bukkit: http://dev.bukkit.org/bukkit-plugins/royalauth/ */ -public class RoyalAuthHook implements AuthPlugin { +public class RoyalAuthHook implements BukkitAuthPlugin { private final RoyalAuth royalAuthPlugin = (RoyalAuth) Bukkit.getPluginManager().getPlugin("RoyalAuth"); diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java index 99794081..228dca7f 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.github.games647.fastlogin.core.AuthPlugin; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; @@ -21,7 +20,7 @@ import ultraauth.managers.PlayerManager; * Bukkit: http://dev.bukkit.org/bukkit-plugins/ultraauth-aa/ * Spigot: https://www.spigotmc.org/resources/ultraauth.17044/ */ -public class UltraAuthHook implements AuthPlugin { +public class UltraAuthHook implements BukkitAuthPlugin { protected final Plugin ultraAuthPlugin = Main.main; diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java index 350b248e..7deb16e2 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java @@ -1,6 +1,5 @@ package com.github.games647.fastlogin.bukkit.hooks; -import com.github.games647.fastlogin.core.AuthPlugin; import de.luricos.bukkit.xAuth.xAuth; import de.luricos.bukkit.xAuth.xAuthPlayer; @@ -21,7 +20,7 @@ import org.bukkit.entity.Player; * * Bukkit: http://dev.bukkit.org/bukkit-plugins/xauth/ */ -public class xAuthHook implements AuthPlugin { +public class xAuthHook implements BukkitAuthPlugin { protected final xAuth xAuthPlugin = xAuth.getPlugin(); diff --git a/core/src/main/java/com/github/games647/fastlogin/core/AuthPlugin.java b/core/src/main/java/com/github/games647/fastlogin/core/AuthPlugin.java index 3231077f..7772fa07 100644 --- a/core/src/main/java/com/github/games647/fastlogin/core/AuthPlugin.java +++ b/core/src/main/java/com/github/games647/fastlogin/core/AuthPlugin.java @@ -39,7 +39,7 @@ public interface AuthPlugin { * @param password a strong random generated password * @return if the operation was successful */ - boolean forceRegister(T player, String password) throws Exception; + boolean forceRegister(T player, String password); /** * Checks whether an account exists for this player name.