1.3.2 Release Stable!

* Code cleanup

* Custom NotNull and Nullable annotations added

* Example packages removed, please see https://github.com/retrooper/packetevents-example

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.retrooper</groupId>
     <artifactId>packetevents</artifactId>
-    <version>1.3.1.3</version>
+    <version>1.3.2</version>
     <packaging>jar</packaging>
     <name>packetevents</name>
     <properties>

src/main/java/io/github/retrooper/packetevents/PacketEvents.java

@@ -2,7 +2,7 @@
 
 import io.github.retrooper.packetevents.enums.ClientVersion;
 import io.github.retrooper.packetevents.enums.ServerVersion;
-import io.github.retrooper.packetevents.event.PacketHandler;
+import io.github.retrooper.packetevents.annotations.PacketHandler;
 import io.github.retrooper.packetevents.event.PacketListener;
 import io.github.retrooper.packetevents.event.impl.PacketLoginEvent;
 import io.github.retrooper.packetevents.event.impl.PlayerInjectEvent;
@@ -17,17 +17,15 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerLoginEvent;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.scheduler.BukkitTask;
 
-import javax.annotation.Nullable;
+import io.github.retrooper.packetevents.annotations.Nullable;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 
-public class PacketEvents implements PacketListener, Listener {
+public final class PacketEvents implements PacketListener{
 
 
     /*
@@ -40,7 +38,7 @@ public class PacketEvents implements PacketListener, Listener {
 
     private static final ServerVersion version = ServerVersion.getVersion();
     private static PacketEvents instance;
-    private static EventManager eventManager = new EventManager();
+    private static final EventManager eventManager = new EventManager();
 
     private static int currentTick;
 
@@ -62,7 +60,6 @@ public static void start(final Plugin plugin) {
         if (!hasRegistered) {
             //Register Bukkit and PacketListener
             getEventManager().registerListener(getInstance());
-            Bukkit.getPluginManager().registerEvents(getInstance(), plugin);
 
             //Initialize the TinyProtocolHandler
             TinyProtocolHandler.initTinyProtocol(plugin);
@@ -230,22 +227,6 @@ public void onPostInject(final PostPlayerInjectEvent e) {
         final ClientVersion clientVersion = PacketEvents.getClientVersion(e.getPlayer());
     }
 
-    @EventHandler
-    public void onLogin(final PlayerLoginEvent e) {
-        final Plugin[] plugins = Bukkit.getPluginManager().getPlugins();
-        boolean canJoin = true;
-        for (final Plugin pl : plugins) {
-            if (!pl.isEnabled()) {
-                canJoin = false;
-                break;
-            }
-        }
-        if (!canJoin) {
-            e.setResult(PlayerLoginEvent.Result.KICK_OTHER);
-            e.setKickMessage("Please wait for the server to finish loading all plugins");
-        }
-    }
-
     @EventHandler
     public void onJoin(PlayerJoinEvent e) {
         if (hasInjected(e.getPlayer())) {

src/main/java/io/github/retrooper/packetevents/annotations/NotNull.java

@@ -0,0 +1,13 @@
+package io.github.retrooper.packetevents.annotations;
+
+
+import java.lang.annotation.*;
+/**
+ *  Is for sure not null.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NotNull {
+
+
+}

src/main/java/io/github/retrooper/packetevents/annotations/Nullable.java

@@ -0,0 +1,16 @@
+package io.github.retrooper.packetevents.annotations;
+
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ *  Could be null.
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nullable {
+
+
+}

src/main/java/io/github/retrooper/packetevents/event/PacketHandler.java → src/main/java/io/github/retrooper/packetevents/annotations/PacketHandler.java

@@ -1,4 +1,4 @@
-package io.github.retrooper.packetevents.event;
+package io.github.retrooper.packetevents.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/io/github/retrooper/packetevents/event/impl/PlayerUninjectEvent.java

@@ -3,7 +3,7 @@
 import io.github.retrooper.packetevents.event.PacketEvent;
 import org.bukkit.entity.Player;
 
-public class PlayerUninjectEvent extends PacketEvent {
+public final class PlayerUninjectEvent extends PacketEvent {
     private final Player player;
 
     public PlayerUninjectEvent(final Player player) {

src/main/java/io/github/retrooper/packetevents/event/impl/ServerTickEvent.java

@@ -3,7 +3,7 @@
 import io.github.retrooper.packetevents.PacketEvents;
 import io.github.retrooper.packetevents.event.PacketEvent;
 
-public class ServerTickEvent extends PacketEvent {
+public final class ServerTickEvent extends PacketEvent {
     private final int tick;
     private final double tps;
     public ServerTickEvent(final int tick, final long timestamp) {

src/main/java/io/github/retrooper/packetevents/event/manager/EventManager.java

@@ -1,7 +1,7 @@
 package io.github.retrooper.packetevents.event.manager;
 
 import io.github.retrooper.packetevents.event.PacketEvent;
-import io.github.retrooper.packetevents.event.PacketHandler;
+import io.github.retrooper.packetevents.annotations.PacketHandler;
 import io.github.retrooper.packetevents.event.PacketListener;
 
 import java.lang.reflect.InvocationTargetException;
@@ -10,7 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 
-public class EventManager {
+public final class EventManager {
 
     private HashMap<PacketListener, List<Method>> registeredMethods = new HashMap<PacketListener, List<Method>>();