Remove the nasty UltraAuth fakeplayer workaround

CHANGELOG.md

@@ -1,5 +1,6 @@
 ######1.9
 
+* Remove the nasty UltraAuth fakeplayer workaround by using a new api method. You should UltraAuth if you have it
 * Upgrade to Java 8
 * Drop support for LoginSecurity 1.X since 2.X seems to be stable
 * Refactored/Cleaned up a lot of code

bukkit/pom.xml

@@ -176,7 +176,7 @@
             <version>2.0.2</version>
             <optional>true</optional>
             <scope>system</scope>
-            <systemPath>${project.basedir}/lib/UltraAuth v2.0.2.jar</systemPath>
+            <systemPath>${project.basedir}/lib/UltraAuth v2.1.2.jar</systemPath>
         </dependency>
     </dependencies>
 </project>

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/CrazyLoginHook.java

@@ -25,7 +25,7 @@ import org.bukkit.entity.Player;
  */
 public class CrazyLoginHook implements AuthPlugin<Player> {
 
-    protected final CrazyLogin crazyLoginPlugin = CrazyLogin.getPlugin();
+    private final CrazyLogin crazyLoginPlugin = CrazyLogin.getPlugin();
     private final PlayerListener playerListener = getListener();
 
     @Override
@@ -83,7 +83,7 @@ public class CrazyLoginHook implements AuthPlugin<Player> {
     }
 
     @Override
-    public boolean forceRegister(final Player player, String password) {
+    public boolean forceRegister(Player player, String password) {
         CrazyLoginDataDatabase crazyDatabase = crazyLoginPlugin.getCrazyDatabase();
 
         //this executes a sql query and accesses only thread safe collections so we can run it async

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/UltraAuthHook.java

@@ -22,10 +22,10 @@ import ultraauth.managers.PlayerManager;
  */
 public class UltraAuthHook implements AuthPlugin<Player> {
 
-    protected final Plugin ultraAuthPlugin = Main.main;
+    private final Plugin ultraAuthPlugin = Main.main;
 
     @Override
-    public boolean forceLogin(final Player player) {
+    public boolean forceLogin(Player player) {
         //not thread-safe
         Future<Boolean> future = Bukkit.getScheduler().callSyncMethod(ultraAuthPlugin, () -> {
             UltraAuthAPI.authenticatedPlayer(player);
@@ -42,7 +42,7 @@ public class UltraAuthHook implements AuthPlugin<Player> {
 
     @Override
     public boolean isRegistered(String playerName) throws Exception {
-        return UltraAuthAPI.isRegisterd(new FakePlayer(playerName));
+        return UltraAuthAPI.isRegisterd(playerName);
     }
 
     @Override

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/hooks/xAuthHook.java

@@ -22,7 +22,7 @@ import org.bukkit.entity.Player;
  */
 public class xAuthHook implements AuthPlugin<Player> {
 
-    protected final xAuth xAuthPlugin = xAuth.getPlugin();
+    private final xAuth xAuthPlugin = xAuth.getPlugin();
 
     @Override
     public boolean forceLogin(Player player) {

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/BungeeCordListener.java

@@ -32,7 +32,7 @@ public class BungeeCordListener implements PluginMessageListener {
 
     private static final String FILE_NAME = "proxy-whitelist.txt";
 
-    protected final FastLoginBukkit plugin;
+    private final FastLoginBukkit plugin;
     //null if whitelist is empty so bungeecord support is disabled
     private final Set<UUID> proxyIds;
 

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocolsupport/ProtocolSupportListener.java

@@ -16,7 +16,7 @@ import protocolsupport.api.events.PlayerPropertiesResolveEvent;
 
 public class ProtocolSupportListener extends JoinManagement<Player, ProtocolLoginSource> implements Listener {
 
-    protected final FastLoginBukkit plugin;
+    private final FastLoginBukkit plugin;
 
     public ProtocolSupportListener(FastLoginBukkit plugin) {
         super(plugin.getCore(), plugin.getCore().getAuthPluginHook());

bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java

@@ -18,7 +18,7 @@ import org.bukkit.entity.Player;
 public class ForceLoginTask implements Runnable {
 
     private final FastLoginBukkit plugin;
-    protected final Player player;
+    private final Player player;
 
     public ForceLoginTask(FastLoginBukkit plugin, Player player) {
         this.plugin = plugin;

bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PlayerConnectionListener.java

@@ -32,7 +32,7 @@ import net.md_5.bungee.event.EventPriority;
  */
 public class PlayerConnectionListener implements Listener {
 
-    protected final FastLoginBungee plugin;
+    private final FastLoginBungee plugin;
 
     public PlayerConnectionListener(FastLoginBungee plugin) {
         this.plugin = plugin;

bungee/src/main/java/com/github/games647/fastlogin/bungee/listener/PluginMessageListener.java

@@ -19,7 +19,7 @@ import net.md_5.bungee.event.EventHandler;
 
 public class PluginMessageListener implements Listener {
 
-    protected final FastLoginBungee plugin;
+    private final FastLoginBungee plugin;
 
     public PluginMessageListener(FastLoginBungee plugin) {
         this.plugin = plugin;