Start working on BungeeAuth support

This commit is contained in:
games647 committed 2016-03-20 12:49:24 +01:00
1 parent 5608821fe3
commit 10bfd279d6
12 files changed
+128 -14

No files matched your search

@@ -6,7 +6,6 @@ import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.utility.SafeCacheBuilder;
import com.github.games647.fastlogin.bukkit.commands.CrackedCommand;
import com.github.games647.fastlogin.bukkit.commands.PremiumCommand;
import com.github.games647.fastlogin.bukkit.hooks.AuthPlugin;
import com.github.games647.fastlogin.bukkit.listener.BukkitJoinListener;
import com.github.games647.fastlogin.bukkit.listener.BungeeCordListener;
import com.github.games647.fastlogin.bukkit.listener.EncryptionPacketListener;
@@ -28,6 +27,7 @@ import java.util.logging.Level;
import org.apache.commons.lang.RandomStringUtils;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
import com.github.games647.fastlogin.bukkit.hooks.BukkitAuthPlugin;
/**
* This plugin checks if a player has a paid account and if so tries to skip offline mode authentication.
@@ -58,7 +58,7 @@ public class FastLoginBukkit extends JavaPlugin {
}
});
private AuthPlugin authPlugin;
private BukkitAuthPlugin authPlugin;
private final MojangApiConnector mojangApiConnector = new MojangApiConnector(this);
@Override
@@ -157,7 +157,7 @@ public class FastLoginBukkit extends JavaPlugin {
*
* @return interface to any supported auth plugin
*/
public AuthPlugin getAuthPlugin() {
public BukkitAuthPlugin getAuthPlugin() {
return authPlugin;
}
@@ -172,7 +172,7 @@ public class FastLoginBukkit extends JavaPlugin {
}
private boolean registerHooks() {
AuthPlugin authPluginHook = null;
BukkitAuthPlugin authPluginHook = null;
try {
String hooksPackage = this.getClass().getPackage().getName() + ".hooks";
//Look through all classes in the hooks package and look for supporting plugins on the server
@@ -181,10 +181,10 @@ public class FastLoginBukkit extends JavaPlugin {
String pluginName = clazzInfo.getSimpleName().replace("Hook", "");
Class<?> clazz = clazzInfo.load();
//uses only member classes which uses AuthPlugin interface (skip interfaces)
if (AuthPlugin.class.isAssignableFrom(clazz)
if (BukkitAuthPlugin.class.isAssignableFrom(clazz)
//check only for enabled plugins. A single plugin could be disabled by plugin managers
&& getServer().getPluginManager().isPluginEnabled(pluginName)) {
authPluginHook = (AuthPlugin) clazz.newInstance();
authPluginHook = (BukkitAuthPlugin) clazz.newInstance();
getLogger().log(Level.INFO, "Hooking into auth plugin: {0}", pluginName);
break;
}
@@ -11,7 +11,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 {
@Override
public void forceLogin(Player player) {
@@ -3,9 +3,9 @@ package com.github.games647.fastlogin.bukkit.hooks;
import org.bukkit.entity.Player;
/**
* Represents a supporting authentication plugin
* Represents a supporting authentication plugin in Bukkit/Spigot/... servers
*/
public interface AuthPlugin {
public interface BukkitAuthPlugin {
/**
* Login the premium (paid account) player after
@@ -20,7 +20,7 @@ import org.bukkit.entity.Player;
*
* Bukkit: http://dev.bukkit.org/server-mods/crazylogin/
*/
public class CrazyLoginHook implements AuthPlugin {
public class CrazyLoginHook implements BukkitAuthPlugin {
private final PlayerListener playerListener = getListener();
@@ -21,7 +21,7 @@ import org.bukkit.entity.Player;
* on join:
* https://github.com/lenis0012/LoginSecurity-2/blob/master/src/main/java/com/lenis0012/bukkit/ls/LoginSecurity.java#L282
*/
public class LoginSecurityHook implements AuthPlugin {
public class LoginSecurityHook implements BukkitAuthPlugin {
@Override
public void forceLogin(Player player) {
@@ -11,7 +11,7 @@ import org.royaldev.royalauth.Config;
*
* Bukkit: http://dev.bukkit.org/bukkit-plugins/royalauth/
*/
public class RoyalAuthHook implements AuthPlugin {
public class RoyalAuthHook implements BukkitAuthPlugin {
@Override
public void forceLogin(Player player) {
@@ -61,7 +61,7 @@ import ultraauth.api.UltraAuthAPI;
* 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 {
@Override
public void forceLogin(Player player) {
@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
*
* Bukkit: http://dev.bukkit.org/bukkit-plugins/xauth/
*/
public class xAuthHook implements AuthPlugin {
public class xAuthHook implements BukkitAuthPlugin {
@Override
public void forceLogin(Player player) {