Listeners name refactor + Fix #831 for both Spigot and CraftBukkit

src/test/java/fr/xephi/authme/AuthMeInitializationTest.java

@@ -7,7 +7,7 @@ import fr.xephi.authme.api.NewAPI;
 import fr.xephi.authme.command.CommandHandler;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.initialization.DataFolder;
-import fr.xephi.authme.listener.AuthMeBlockListener;
+import fr.xephi.authme.listener.BlockListener;
 import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.process.Management;
 import fr.xephi.authme.process.login.ProcessSyncPlayerLogin;
@@ -113,7 +113,7 @@ public class AuthMeInitializationTest {
 
         // then
         // Take a few samples and ensure that they are not null
-        assertThat(injector.getIfAvailable(AuthMeBlockListener.class), not(nullValue()));
+        assertThat(injector.getIfAvailable(BlockListener.class), not(nullValue()));
         assertThat(injector.getIfAvailable(CommandHandler.class), not(nullValue()));
         assertThat(injector.getIfAvailable(Management.class), not(nullValue()));
         assertThat(injector.getIfAvailable(NewAPI.class), not(nullValue()));

src/test/java/fr/xephi/authme/listener/AuthMeBlockListenerTest.java

@@ -9,19 +9,22 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import fr.xephi.authme.listener.BlockListener;
+import fr.xephi.authme.listener.ListenerService;
+
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
 /**
- * Test for {@link AuthMeBlockListener}.
+ * Test for {@link BlockListener}.
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AuthMeBlockListenerTest {
 
     @InjectMocks
-    private AuthMeBlockListener listener;
+    private BlockListener listener;
 
     @Mock
     private ListenerService listenerService;

src/test/java/fr/xephi/authme/listener/ListenerConsistencyTest.java

@@ -1,6 +1,14 @@
 package fr.xephi.authme.listener;
 
 import com.google.common.collect.Sets;
+
+import fr.xephi.authme.listener.BlockListener;
+import fr.xephi.authme.listener.EntityListener;
+import fr.xephi.authme.listener.PlayerListener;
+import fr.xephi.authme.listener.PlayerListener16;
+import fr.xephi.authme.listener.PlayerListener18;
+import fr.xephi.authme.listener.ServerListener;
+
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.junit.Test;
@@ -20,9 +28,9 @@ import static org.junit.Assert.fail;
  */
 public final class ListenerConsistencyTest {
 
-    private static final Class<?>[] LISTENERS = { AuthMeBlockListener.class, AuthMeEntityListener.class,
-        AuthMePlayerListener.class, AuthMePlayerListener16.class, AuthMePlayerListener18.class,
-        AuthMeServerListener.class };
+    private static final Class<?>[] LISTENERS = { BlockListener.class, EntityListener.class,
+        PlayerListener.class, PlayerListener16.class, PlayerListener18.class,
+        ServerListener.class };
 
     private static final Set<String> CANCELED_EXCEPTIONS = Sets.newHashSet("AuthMePlayerListener#onPlayerJoin",
         "AuthMePlayerListener#onPreLogin", "AuthMePlayerListener#onPlayerLogin",

src/test/java/fr/xephi/authme/listener/ListenerServiceTest.java

@@ -6,6 +6,7 @@ import ch.jalu.injector.testing.InjectDelayed;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.hooks.PluginHooks;
+import fr.xephi.authme.listener.ListenerService;
 import fr.xephi.authme.settings.Settings;
 import fr.xephi.authme.settings.properties.RegistrationSettings;
 import fr.xephi.authme.util.ValidationService;

src/test/java/fr/xephi/authme/listener/OnJoinVerifierTest.java

@@ -4,6 +4,8 @@ import fr.xephi.authme.AntiBot;
 import fr.xephi.authme.TestHelper;
 import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.datasource.DataSource;
+import fr.xephi.authme.listener.FailedVerificationException;
+import fr.xephi.authme.listener.OnJoinVerifier;
 import fr.xephi.authme.output.MessageKey;
 import fr.xephi.authme.output.Messages;
 import fr.xephi.authme.permission.PermissionsManager;