Update to 1.7.10, update readme, organize imports

ProtocolLib/pom.xml

@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.comphenix.protocol</groupId>
   <artifactId>ProtocolLib</artifactId>
@@ -26,8 +27,8 @@
 
   <repositories>
     <repository>
-      <id>bukkit-rep</id>
+      <id>md_5-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
+      <url>http://repo.md-5.net/content/repositories/public/</url>
     </repository>
     <repository>
       <id>comphenix-releases</id>
@@ -203,14 +204,22 @@
   </licenses>
 
   <developers>
+    <developer>
+      <id>dmulloy2</id>
+      <name>Dan Mulloy</name>
+      <url>http://shadowvolt.com/</url>
+      <roles>
+        <role>developer</role>
+        <role>maintainer</role>
+      </roles>
+    </developer>
     <developer>
       <id>aadnk</id>
       <name>Kristian S. Stangeland</name>
       <email>kr_stang@hotmail.com</email>
       <url>http://comphenix.net/</url>
       <roles>
-        <role>developer</role>
+        <role>former author</role>
-        <role>maintainer</role>
       </roles>
       <timezone>1</timezone>
     </developer>
@@ -230,10 +239,14 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-  		<groupId>org.bukkit</groupId>
+      <groupId>org.spigotmc</groupId>
-  		<artifactId>craftbukkit</artifactId>
+      <artifactId>spigot-api</artifactId>
-  		<version>1.7.8-R0.1-SNAPSHOT</version>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
-  		<scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.spigotmc</groupId>
+      <artifactId>spigot</artifactId>
+      <version>1.7.10-R0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

ProtocolLib/src/main/java/com/comphenix/protocol/CommandProtocol.java

@@ -19,6 +19,7 @@ package com.comphenix.protocol;
 
 import java.io.File;
 import java.io.IOException;
+
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;

ProtocolLib/src/main/java/com/comphenix/protocol/PacketType.java

@@ -9,12 +9,12 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
 import org.bukkit.Bukkit;
+
 import com.comphenix.protocol.events.ConnectionSide;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.reflect.ObjectEnum;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
-
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ComparisonChain;

ProtocolLib/src/main/java/com/comphenix/protocol/concurrency/ConcurrentPlayerMap.java

@@ -8,10 +8,10 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
-import com.comphenix.protocol.utility.SafeCacheBuilder;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import com.comphenix.protocol.utility.SafeCacheBuilder;
 import com.google.common.base.Function;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.RemovalListener;

ProtocolLib/src/main/java/com/comphenix/protocol/error/BasicErrorReporter.java

@@ -1,6 +1,7 @@
 package com.comphenix.protocol.error;
 
 import java.io.PrintStream;
+
 import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.error.Report.ReportBuilder;

ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java

@@ -26,7 +26,6 @@ import java.util.Set;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.injector.GamePhase;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
-
 import com.google.common.base.Objects;
 import com.google.common.collect.Sets;
 

ProtocolLib/src/main/java/com/comphenix/protocol/events/MonitorAdapter.java

@@ -23,10 +23,6 @@ import java.util.logging.Logger;
 import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.Packets;
-import com.comphenix.protocol.events.ConnectionSide;
-import com.comphenix.protocol.events.ListenerPriority;
-import com.comphenix.protocol.events.ListeningWhitelist;
-import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.GamePhase;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.reflect.FieldAccessException;

ProtocolLib/src/main/java/com/comphenix/protocol/events/NetworkMarker.java

@@ -12,6 +12,8 @@ import java.util.PriorityQueue;
 
 import javax.annotation.Nonnull;
 
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.utility.ByteBufferInputStream;

ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketContainer.java

@@ -49,20 +49,19 @@ import org.bukkit.inventory.ItemStack;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
-import com.comphenix.protocol.PacketType.Sender;
 import com.comphenix.protocol.injector.StructureCache;
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.FuzzyReflection;
 import com.comphenix.protocol.reflect.ObjectWriter;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.reflect.cloning.AggregateCloner;
+import com.comphenix.protocol.reflect.cloning.AggregateCloner.BuilderParameters;
 import com.comphenix.protocol.reflect.cloning.BukkitCloner;
 import com.comphenix.protocol.reflect.cloning.Cloner;
 import com.comphenix.protocol.reflect.cloning.CollectionCloner;
 import com.comphenix.protocol.reflect.cloning.FieldCloner;
 import com.comphenix.protocol.reflect.cloning.ImmutableDetector;
 import com.comphenix.protocol.reflect.cloning.SerializableCloner;
-import com.comphenix.protocol.reflect.cloning.AggregateCloner.BuilderParameters;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.reflect.instances.DefaultInstances;
 import com.comphenix.protocol.utility.MinecraftMethods;
@@ -72,7 +71,11 @@ import com.comphenix.protocol.wrappers.BukkitConverters;
 import com.comphenix.protocol.wrappers.ChunkCoordIntPair;
 import com.comphenix.protocol.wrappers.ChunkPosition;
 import com.comphenix.protocol.wrappers.EnumWrappers;
+import com.comphenix.protocol.wrappers.EnumWrappers.ChatVisibility;
+import com.comphenix.protocol.wrappers.EnumWrappers.ClientCommand;
 import com.comphenix.protocol.wrappers.EnumWrappers.Difficulty;
+import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
+import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
 import com.comphenix.protocol.wrappers.WrappedAttribute;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
@@ -80,10 +83,6 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedServerPing;
 import com.comphenix.protocol.wrappers.WrappedStatistic;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
-import com.comphenix.protocol.wrappers.EnumWrappers.ChatVisibility;
-import com.comphenix.protocol.wrappers.EnumWrappers.ClientCommand;
-import com.comphenix.protocol.wrappers.EnumWrappers.EntityUseAction;
-import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.google.common.base.Function;
 import com.google.common.base.Preconditions;

ProtocolLib/src/main/java/com/comphenix/protocol/events/ScheduledPacket.java

@@ -5,9 +5,10 @@ import java.lang.reflect.InvocationTargetException;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.PacketStream;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.PacketType.Sender;
-import com.google.common.base.Preconditions;import com.google.common.base.Objects;
+import com.comphenix.protocol.ProtocolLibrary;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
 
 /**
  * Represents a packet that is scheduled for transmission at a later stage.

ProtocolLib/src/main/java/com/comphenix/protocol/injector/DelayedPacketManager.java

@@ -5,6 +5,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
 import javax.annotation.Nonnull;
 
 import org.bukkit.Location;
@@ -16,8 +17,8 @@ import org.bukkit.plugin.PluginManager;
 
 import com.comphenix.protocol.AsynchronousManager;
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.PacketType.Sender;
+import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/PacketFilterManager.java

@@ -19,7 +19,6 @@ package com.comphenix.protocol.injector;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -58,19 +57,28 @@ import com.comphenix.protocol.async.AsyncMarker;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.events.*;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.comphenix.protocol.events.ListenerOptions;
+import com.comphenix.protocol.events.ListenerPriority;
+import com.comphenix.protocol.events.ListeningWhitelist;
+import com.comphenix.protocol.events.NetworkMarker;
+import com.comphenix.protocol.events.PacketAdapter;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
+import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.netty.NettyProtocolInjector;
 import com.comphenix.protocol.injector.packet.InterceptWritePacket;
 import com.comphenix.protocol.injector.packet.PacketInjector;
 import com.comphenix.protocol.injector.packet.PacketInjectorBuilder;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.injector.player.PlayerInjectionHandler;
+import com.comphenix.protocol.injector.player.PlayerInjectionHandler.ConflictStrategy;
 import com.comphenix.protocol.injector.player.PlayerInjector.ServerHandlerNull;
 import com.comphenix.protocol.injector.player.PlayerInjectorBuilder;
-import com.comphenix.protocol.injector.player.PlayerInjectionHandler.ConflictStrategy;
 import com.comphenix.protocol.injector.spigot.SpigotPacketInjector;
 import com.comphenix.protocol.reflect.FieldAccessException;
 import com.comphenix.protocol.reflect.FuzzyReflection;
+import com.comphenix.protocol.utility.BukkitUtil;
 import com.comphenix.protocol.utility.EnhancerFactory;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
@@ -498,7 +506,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 					unhookTask.cancel();
 				else
 					// Inject our hook into already existing players
-					initializePlayers(server.getOnlinePlayers());
+					initializePlayers(BukkitUtil.getOnlinePlayers());
 			}
 		}
 	}
@@ -519,7 +527,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 					@Override
 					public void run() {
 						// Inject our hook into already existing players
-						uninitializePlayers(server.getOnlinePlayers());
+						uninitializePlayers(BukkitUtil.getOnlinePlayers());
 					}
 				});
 			}
@@ -699,7 +707,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 	@Override
 	public void broadcastServerPacket(PacketContainer packet) {
 		Preconditions.checkNotNull(packet, "packet cannot be NULL.");
-		broadcastServerPacket(packet, Arrays.asList(server.getOnlinePlayers()));
+		broadcastServerPacket(packet, BukkitUtil.getOnlinePlayers());
 	}
 
 	@Override
@@ -964,7 +972,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 	 * Initialize the packet injection for every player.
 	 * @param players - list of players to inject.
 	 */
-	public void initializePlayers(Player[] players) {
+	public void initializePlayers(List<Player> players) {
 		for (Player player : players)
 			playerInjection.injectPlayer(player, ConflictStrategy.OVERRIDE);
 	}
@@ -973,7 +981,7 @@ public final class PacketFilterManager implements ProtocolManager, ListenerInvok
 	 * Uninitialize the packet injection of every player.
 	 * @param players - list of players to uninject.
 	 */
-	public void uninitializePlayers(Player[] players) {
+	public void uninitializePlayers(List<Player> players) {
 		for (Player player : players) {
 			playerInjection.uninjectPlayer(player);
 		}

ProtocolLib/src/main/java/com/comphenix/protocol/injector/SortedPacketListenerList.java

@@ -25,8 +25,8 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.timing.TimedListenerManager;
-import com.comphenix.protocol.timing.TimedTracker;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
+import com.comphenix.protocol.timing.TimedTracker;
 
 /**
  * Registry of synchronous packet listeners.

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/BootstrapList.java

@@ -6,14 +6,13 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.Callable;
 
-import com.google.common.collect.Lists;
-
 import net.minecraft.util.io.netty.channel.Channel;
-
 // Hopefully, CB won't version these as well
 import net.minecraft.util.io.netty.channel.ChannelFuture;
 import net.minecraft.util.io.netty.channel.ChannelHandler;
 
+import com.google.common.collect.Lists;
+
 class BootstrapList implements List<Object> {
 	private List<Object> delegate;
 	private ChannelHandler handler;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelInjector.java

@@ -35,7 +35,6 @@ import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.error.Report.ReportBuilder;
 import com.comphenix.protocol.events.ConnectionSide;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/ChannelProxy.java

@@ -5,10 +5,6 @@ import java.net.SocketAddress;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
-import com.comphenix.protocol.reflect.accessors.Accessors;
-import com.comphenix.protocol.reflect.accessors.FieldAccessor;
-import com.google.common.collect.Maps;
-
 import net.minecraft.util.io.netty.buffer.ByteBufAllocator;
 import net.minecraft.util.io.netty.channel.Channel;
 import net.minecraft.util.io.netty.channel.ChannelConfig;
@@ -21,6 +17,10 @@ import net.minecraft.util.io.netty.channel.EventLoop;
 import net.minecraft.util.io.netty.util.Attribute;
 import net.minecraft.util.io.netty.util.AttributeKey;
 
+import com.comphenix.protocol.reflect.accessors.Accessors;
+import com.comphenix.protocol.reflect.accessors.FieldAccessor;
+import com.google.common.collect.Maps;
+
 abstract class ChannelProxy implements Channel {
 	// Mark that a certain object does not contain a message field
 	private static final FieldAccessor MARK_NO_MESSAGE = new FieldAccessor() {

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/InjectionFactory.java

@@ -3,7 +3,9 @@ package com.comphenix.protocol.injector.netty;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.annotation.Nonnull;
+
 import net.minecraft.util.io.netty.channel.Channel;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/netty/NettyProtocolInjector.java

@@ -7,8 +7,6 @@ import java.lang.reflect.Method;
 import java.net.InetSocketAddress;
 import java.util.List;
 import java.util.Set;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
 
 import net.minecraft.util.io.netty.channel.Channel;
 import net.minecraft.util.io.netty.channel.ChannelFuture;
@@ -18,12 +16,19 @@ import net.minecraft.util.io.netty.channel.ChannelInboundHandler;
 import net.minecraft.util.io.netty.channel.ChannelInboundHandlerAdapter;
 import net.minecraft.util.io.netty.channel.ChannelInitializer;
 
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.concurrency.PacketTypeSet;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
-import com.comphenix.protocol.events.*;
+import com.comphenix.protocol.events.ConnectionSide;
+import com.comphenix.protocol.events.ListenerOptions;
+import com.comphenix.protocol.events.NetworkMarker;
+import com.comphenix.protocol.events.PacketContainer;
+import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.ListenerInvoker;
 import com.comphenix.protocol.injector.packet.PacketInjector;
 import com.comphenix.protocol.injector.packet.PacketRegistry;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyNetworkMarker.java

@@ -5,6 +5,7 @@ import java.io.DataInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+
 import javax.annotation.Nonnull;
 
 import com.comphenix.protocol.PacketType;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/LegacyPacketRegistry.java

@@ -4,8 +4,8 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 
 import javax.annotation.Nullable;
 
@@ -19,7 +19,6 @@ import com.comphenix.protocol.reflect.fuzzy.FuzzyFieldContract;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.wrappers.TroveWrapper;
-
 import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableSet;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ProxyPacketInjector.java

@@ -24,14 +24,15 @@ import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Map;
 import java.util.Set;
-import org.bukkit.entity.Player;
 
 import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
 import net.sf.cglib.proxy.Enhancer;
 import net.sf.cglib.proxy.Factory;
-import net.sf.cglib.proxy.CallbackFilter;
 import net.sf.cglib.proxy.NoOp;
 
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Sender;
 import com.comphenix.protocol.error.ErrorReporter;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/ReadPacketModifier.java

@@ -23,6 +23,9 @@ import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.util.Map;
 
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Sender;
 import com.comphenix.protocol.error.ErrorReporter;
@@ -34,9 +37,6 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.NetworkProcessor;
 import com.google.common.collect.MapMaker;
 
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
 class ReadPacketModifier implements MethodInterceptor {
 	public static final ReportType REPORT_CANNOT_HANDLE_CLIENT_PACKET = new ReportType("Cannot handle client packet.");
 	

ProtocolLib/src/main/java/com/comphenix/protocol/injector/packet/WritePacketModifier.java

@@ -22,20 +22,18 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.lang.reflect.Method;
 import java.util.Map;
-import java.util.PriorityQueue;
+
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
 
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;
-import com.comphenix.protocol.events.PacketOutputHandler;
 import com.comphenix.protocol.injector.NetworkProcessor;
 import com.google.common.collect.MapMaker;
 
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
 public class WritePacketModifier implements MethodInterceptor {
 	public static final ReportType REPORT_CANNOT_WRITE_SERVER_PACKET = new ReportType("Cannot write server packet.");
 	

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedArrayList.java

@@ -23,6 +23,11 @@ import java.util.ArrayList;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
@@ -33,11 +38,6 @@ import com.comphenix.protocol.utility.EnhancerFactory;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.google.common.collect.MapMaker;
 
-import net.sf.cglib.proxy.Callback;
-import net.sf.cglib.proxy.Enhancer;
-import net.sf.cglib.proxy.MethodInterceptor;
-import net.sf.cglib.proxy.MethodProxy;
-
 /**
  * The array list that notifies when packets are sent by the server.
  * 

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkObjectInjector.java

@@ -18,6 +18,7 @@
 package com.comphenix.protocol.injector.player;
 
 import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.CallbackFilter;
@@ -26,8 +27,6 @@ import net.sf.cglib.proxy.LazyLoader;
 import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 
-import java.lang.reflect.Method;
-
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetworkServerInjector.java

@@ -22,7 +22,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
-import net.sf.cglib.proxy.*;
+import net.sf.cglib.proxy.Callback;
+import net.sf.cglib.proxy.CallbackFilter;
+import net.sf.cglib.proxy.Enhancer;
+import net.sf.cglib.proxy.Factory;
+import net.sf.cglib.proxy.MethodInterceptor;
+import net.sf.cglib.proxy.MethodProxy;
+import net.sf.cglib.proxy.NoOp;
 
 import org.bukkit.entity.Player;
 

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/PlayerInjector.java

@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Map;
+
 import net.sf.cglib.proxy.Factory;
 
 import org.bukkit.entity.Player;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java

@@ -26,7 +26,6 @@ import java.net.Socket;
 import java.net.SocketAddress;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.TimeUnit;
 
@@ -36,7 +35,6 @@ import org.bukkit.Server;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.PacketType.Sender;
 import com.comphenix.protocol.Packets;
 import com.comphenix.protocol.concurrency.BlockingHashMap;
@@ -52,8 +50,8 @@ import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.GamePhase;
 import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.injector.PlayerLoggedOutException;
 import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks;
+import com.comphenix.protocol.injector.PlayerLoggedOutException;
 import com.comphenix.protocol.injector.packet.PacketRegistry;
 import com.comphenix.protocol.injector.server.AbstractInputStreamLookup;
 import com.comphenix.protocol.injector.server.BukkitSocketInjector;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/AbstractInputStreamLookup.java

@@ -3,6 +3,7 @@ package com.comphenix.protocol.injector.server;
 import java.io.InputStream;
 import java.net.Socket;
 import java.net.SocketAddress;
+
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
 

ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/DummyPlayerHandler.java

@@ -7,7 +7,6 @@ import java.net.InetSocketAddress;
 import org.bukkit.entity.Player;
 
 import com.comphenix.protocol.PacketType;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.concurrency.PacketTypeSet;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketContainer;

ProtocolLib/src/main/java/com/comphenix/protocol/injector/spigot/SpigotPacketInjector.java

@@ -9,11 +9,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentMap;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-
 import net.sf.cglib.proxy.Callback;
 import net.sf.cglib.proxy.CallbackFilter;
 import net.sf.cglib.proxy.Enhancer;
@@ -22,9 +17,13 @@ import net.sf.cglib.proxy.MethodInterceptor;
 import net.sf.cglib.proxy.MethodProxy;
 import net.sf.cglib.proxy.NoOp;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Sender;
-import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.concurrency.PacketTypeSet;
 import com.comphenix.protocol.error.DelegatedErrorReporter;
 import com.comphenix.protocol.error.ErrorReporter;
@@ -35,7 +34,6 @@ import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.ListenerInvoker;
-import com.comphenix.protocol.injector.PacketFilterBuilder;
 import com.comphenix.protocol.injector.PacketFilterManager;
 import com.comphenix.protocol.injector.PlayerLoggedOutException;
 import com.comphenix.protocol.injector.packet.LegacyNetworkMarker;
@@ -48,7 +46,6 @@ import com.comphenix.protocol.reflect.MethodInfo;
 import com.comphenix.protocol.reflect.fuzzy.FuzzyMethodContract;
 import com.comphenix.protocol.utility.EnhancerFactory;
 import com.comphenix.protocol.utility.MinecraftReflection;
-
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MapMaker;

ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Metrics.java

@@ -45,14 +45,6 @@ package com.comphenix.protocol.metrics;
  * either expressed or implied, of anybody else.
  */
 
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.PluginDescriptionFile;
-
-import com.comphenix.protocol.utility.WrappedScheduler;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -71,6 +63,15 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.logging.Level;
 
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.PluginDescriptionFile;
+
+import com.comphenix.protocol.utility.BukkitUtil;
+import com.comphenix.protocol.utility.WrappedScheduler;
+
 /**
  * <p> The metrics class obtains data about a plugin and submits statistics about it to the metrics backend. </p> <p>
  * Public methods provided by this class: </p>
@@ -243,6 +244,7 @@ public class Metrics {
 
                 private boolean firstPost = true;
 
+                @Override
 				public void run() {
                     try {
                         // This has to be synchronized or it can collide with the disable method.
@@ -373,7 +375,7 @@ public class Metrics {
         boolean onlineMode = Bukkit.getServer().getOnlineMode(); // TRUE if online mode is enabled
         String pluginVersion = description.getVersion();
         String serverVersion = Bukkit.getVersion();
-        int playersOnline = Bukkit.getServer().getOnlinePlayers().length;
+        int playersOnline = BukkitUtil.getOnlinePlayers().size();
 
         // END server software specific section -- all code below does not use any code outside of this class / Java
 

ProtocolLib/src/main/java/com/comphenix/protocol/metrics/Updater.java

@@ -7,7 +7,13 @@
 // Somewhat modified by aadnk.
 package com.comphenix.protocol.metrics;
 
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -28,7 +34,6 @@ import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
 import com.comphenix.protocol.utility.MinecraftVersion;
 import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
 
 /**
  * Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/ClassAnalyser.java

@@ -4,16 +4,16 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.List;
 
-import com.comphenix.protocol.reflect.ClassAnalyser.AsmMethod.AsmOpcodes;
-import com.comphenix.protocol.reflect.compiler.EmptyClassVisitor;
-import com.comphenix.protocol.reflect.compiler.EmptyMethodVisitor;
-import com.google.common.collect.Lists;
-
 import net.sf.cglib.asm.ClassReader;
 import net.sf.cglib.asm.MethodVisitor;
 import net.sf.cglib.asm.Opcodes;
 import net.sf.cglib.asm.Type;
 
+import com.comphenix.protocol.reflect.ClassAnalyser.AsmMethod.AsmOpcodes;
+import com.comphenix.protocol.reflect.compiler.EmptyClassVisitor;
+import com.comphenix.protocol.reflect.compiler.EmptyMethodVisitor;
+import com.google.common.collect.Lists;
+
 public class ClassAnalyser {	
 	/**
 	 * Represents a method in ASM.

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/BoxingHelper.java

@@ -17,7 +17,9 @@
 
 package com.comphenix.protocol.reflect.compiler;
 
-import net.sf.cglib.asm.*;
+import net.sf.cglib.asm.MethodVisitor;
+import net.sf.cglib.asm.Opcodes;
+import net.sf.cglib.asm.Type;
 
 /**
  * Used by the compiler to automatically box and unbox values.

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/compiler/StructureCompiler.java

@@ -25,6 +25,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import net.sf.cglib.asm.ClassWriter;
+import net.sf.cglib.asm.FieldVisitor;
+import net.sf.cglib.asm.Label;
+import net.sf.cglib.asm.MethodVisitor;
+import net.sf.cglib.asm.Opcodes;
+import net.sf.cglib.asm.Type;
+
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
@@ -32,8 +39,6 @@ import com.comphenix.protocol.reflect.StructureModifier;
 import com.google.common.base.Objects;
 import com.google.common.primitives.Primitives;
 
-import net.sf.cglib.asm.*;
-
 // public class CompiledStructureModifierPacket20<TField> extends CompiledStructureModifier<TField> {
 //	
 //		private Packet20NamedEntitySpawn typedTarget;

ProtocolLib/src/main/java/com/comphenix/protocol/reflect/instances/DefaultInstances.java

@@ -18,7 +18,8 @@
 package com.comphenix.protocol.reflect.instances;
 
 import java.lang.reflect.Constructor;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
 
 import javax.annotation.Nullable;
 

ProtocolLib/src/main/java/com/comphenix/protocol/timing/TimingReportGenerator.java

@@ -6,6 +6,7 @@ import java.io.IOException;
 import java.io.Writer;
 import java.util.Date;
 import java.util.Map;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
 import com.google.common.base.Charsets;

ProtocolLib/src/main/java/com/comphenix/protocol/utility/BukkitUtil.java

@@ -0,0 +1,37 @@
+package com.comphenix.protocol.utility;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+/**
+ * Utility methods relating to Bukkit.
+ * @author dmulloy2
+ */
+
+public class BukkitUtil {
+
+	private static Method getOnlinePlayers;
+
+	/**
+	 * Gets a list of online {@link Player}s. This also provides backwards
+	 * compatibility as Bukkit changed <code>getOnlinePlayers</code>.
+	 *
+	 * @return A list of online Players
+	 */
+	@SuppressWarnings("unchecked")
+	public static List<Player> getOnlinePlayers() {
+		try {
+			if (getOnlinePlayers == null)
+				getOnlinePlayers = Bukkit.class.getMethod("getOnlinePlayers");
+			if (getOnlinePlayers.getReturnType() != Collection.class)
+				return Arrays.asList((Player[]) getOnlinePlayers.invoke(null));
+		} catch (Throwable ex) {
+		}
+		return (List<Player>) Bukkit.getOnlinePlayers();
+	}
+}

ProtocolLib/src/main/java/com/comphenix/protocol/utility/ByteBufAdapter.java

@@ -12,15 +12,15 @@ import java.nio.channels.GatheringByteChannel;
 import java.nio.channels.ScatteringByteChannel;
 import java.nio.channels.WritableByteChannel;
 
+import net.minecraft.util.io.netty.buffer.AbstractByteBuf;
+import net.minecraft.util.io.netty.buffer.ByteBuf;
+import net.minecraft.util.io.netty.buffer.ByteBufAllocator;
+
 import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.LimitInputStream;
 
-import net.minecraft.util.io.netty.buffer.AbstractByteBuf;
-import net.minecraft.util.io.netty.buffer.ByteBuf;
-import net.minecraft.util.io.netty.buffer.ByteBufAllocator;
-
 /**
  * Construct a ByteBuf around an input stream and an output stream.
  * <p>

ProtocolLib/src/main/java/com/comphenix/protocol/utility/MinecraftVersion.java

@@ -24,8 +24,8 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.bukkit.Server;
-import com.comphenix.protocol.ProtocolLibrary;
 
+import com.comphenix.protocol.ProtocolLibrary;
 import com.google.common.base.Objects;
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Ordering;

ProtocolLib/src/main/java/com/comphenix/protocol/utility/RemappedClassSource.java

@@ -22,6 +22,7 @@ package com.comphenix.protocol.utility;
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import java.lang.reflect.Method;
+
 import org.bukkit.Bukkit;
 
 import com.comphenix.protocol.reflect.FieldUtils;

ProtocolLib/src/main/java/com/comphenix/protocol/utility/StreamSerializer.java

@@ -7,6 +7,7 @@ import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
+
 import javax.annotation.Nonnull;
 
 import org.bukkit.inventory.ItemStack;

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedServerPing.java

@@ -7,11 +7,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
-import javax.imageio.ImageIO;
 
-import org.bukkit.Bukkit;
+import javax.imageio.ImageIO;
-import org.bukkit.Server;
-import org.bukkit.entity.Player;
 
 import net.minecraft.util.com.mojang.authlib.GameProfile;
 import net.minecraft.util.io.netty.buffer.ByteBuf;
@@ -19,6 +16,10 @@ import net.minecraft.util.io.netty.buffer.Unpooled;
 import net.minecraft.util.io.netty.handler.codec.base64.Base64;
 import net.minecraft.util.io.netty.util.IllegalReferenceCountException;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Server;
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
@@ -28,6 +29,7 @@ import com.comphenix.protocol.reflect.accessors.Accessors;
 import com.comphenix.protocol.reflect.accessors.ConstructorAccessor;
 import com.comphenix.protocol.reflect.accessors.FieldAccessor;
 import com.comphenix.protocol.reflect.accessors.MethodAccessor;
+import com.comphenix.protocol.utility.BukkitUtil;
 import com.comphenix.protocol.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
 import com.google.common.base.Charsets;
@@ -258,7 +260,7 @@ public class WrappedServerPing extends AbstractWrapper {
 				// Recreate the count and maximum
 				Server server = Bukkit.getServer();
 				setPlayersMaximum(server.getMaxPlayers());
-				setPlayersOnline(server.getOnlinePlayers().length);
+				setPlayersOnline(BukkitUtil.getOnlinePlayers().size());
 			} else {
 				PLAYERS.set(handle, players = null);
 			}

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/WrappedSignedProperty.java

@@ -3,6 +3,7 @@ package com.comphenix.protocol.wrappers;
 import java.security.PublicKey;
 
 import net.minecraft.util.com.mojang.authlib.properties.Property;
+
 import com.google.common.base.Objects;
 
 /**

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtBase.java

@@ -17,8 +17,6 @@
 
 package com.comphenix.protocol.wrappers.nbt;
 
-import com.comphenix.protocol.wrappers.nbt.NbtBase;
-import com.comphenix.protocol.wrappers.nbt.NbtType;
 
 /**
  * Represents a generic container for an NBT element.

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/TileEntityAccessor.java

@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.concurrent.ConcurrentMap;
 
-import net.minecraft.server.v1_7_R3.NBTTagCompound;
-import net.minecraft.server.v1_7_R3.TileEntityChest;
 import net.sf.cglib.asm.ClassReader;
 import net.sf.cglib.asm.MethodVisitor;
 import net.sf.cglib.asm.Opcodes;
@@ -108,6 +106,7 @@ class TileEntityAccessor<T extends BlockState> {
 						private int readMethods;
 						private int writeMethods;
 
+						@Override
 						public void visitMethodInsn(int opcode, String owner, String name, String desc) {
 							// This must be a virtual call on NBTTagCompound that accepts a String
 							if (opcode == Opcodes.INVOKEVIRTUAL &&

ProtocolLib/src/main/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializer.java

@@ -8,6 +8,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 

ProtocolLib/src/test/java/com/comphenix/integration/protocol/TestPingPacket.java

@@ -8,7 +8,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
-import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
 import com.comphenix.protocol.PacketType;

ProtocolLib/src/test/java/com/comphenix/protocol/BukkitInitialization.java

@@ -3,21 +3,20 @@ package com.comphenix.protocol;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-
+import net.minecraft.server.v1_7_R4.Block;
-import net.minecraft.server.v1_7_R3.Block;
+import net.minecraft.server.v1_7_R4.Item;
-import net.minecraft.server.v1_7_R3.Item;
+import net.minecraft.server.v1_7_R4.StatisticList;
-import net.minecraft.server.v1_7_R3.StatisticList;
-
-// Will have to be updated for every version though
-import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemFactory;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.Server;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemFactory;
 import org.bukkit.inventory.ItemFactory;
 import org.bukkit.inventory.meta.ItemMeta;
+
 import com.comphenix.protocol.reflect.FieldUtils;
 import com.comphenix.protocol.utility.MinecraftReflection;
+// Will have to be updated for every version though
 
 /**
  * Used to ensure that ProtocolLib and Bukkit is prepared to be tested.

ProtocolLib/src/test/java/com/comphenix/protocol/MinecraftVersionTest.java

@@ -17,7 +17,9 @@
 
 package com.comphenix.protocol;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.junit.Test;
 

ProtocolLib/src/test/java/com/comphenix/protocol/PacketTypeTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/concurrency/BlockingHashMapTest.java

@@ -17,7 +17,7 @@
 
 package com.comphenix.protocol.concurrency;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;

ProtocolLib/src/test/java/com/comphenix/protocol/events/PacketContainerTest.java

@@ -17,24 +17,28 @@
 
 package com.comphenix.protocol.events;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.lang.reflect.Array;
 import java.util.List;
 import java.util.UUID;
 
-import net.minecraft.server.v1_7_R3.AttributeModifier;
+import net.minecraft.server.v1_7_R4.AttributeModifier;
-import net.minecraft.server.v1_7_R3.AttributeSnapshot;
+import net.minecraft.server.v1_7_R4.AttributeSnapshot;
-import net.minecraft.server.v1_7_R3.PacketPlayOutUpdateAttributes;
+import net.minecraft.server.v1_7_R4.PacketPlayOutUpdateAttributes;
 
 import org.apache.commons.lang.SerializationUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import org.apache.commons.lang.builder.ToStringStyle;
-// Will have to be updated for every version though
-import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemFactory;
-
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.WorldType;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
@@ -59,8 +63,8 @@ import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
-
 import com.google.common.collect.Lists;
+// Will have to be updated for every version though
 
 // Ensure that the CraftItemFactory is mockable
 @RunWith(org.powermock.modules.junit4.PowerMockRunner.class)
@@ -106,15 +110,15 @@ public class PacketContainerTest {
 		byte[] testArray = new byte[] { 1, 2, 3 };
 
 		// It's NULL at first
-		assertArrayEquals(null, (byte[]) bytes.read(0));
+		assertArrayEquals(null, bytes.read(0));
 		customPayload.getModifier().writeDefaults();
 
 		// Then it should create an empty array
-		assertArrayEquals(new byte[0], (byte[]) bytes.read(0));
+		assertArrayEquals(new byte[0], bytes.read(0));
 
 		// Check and see if we can write to it
 		bytes.write(0, testArray);
-		assertArrayEquals(testArray, (byte[]) bytes.read(0));
+		assertArrayEquals(testArray, bytes.read(0));
 	}
 
 	@Test
@@ -132,7 +136,7 @@ public class PacketContainerTest {
 	@Test
 	public void testGetIntegers() {
 		PacketContainer updateSign = new PacketContainer(PacketType.Play.Server.UPDATE_SIGN);
-		testPrimitive(updateSign.getIntegers(), 0, (int)0, (int)1);
+		testPrimitive(updateSign.getIntegers(), 0, 0, 1);
 	}
 
 	@Test
@@ -150,7 +154,7 @@ public class PacketContainerTest {
 	@Test
 	public void testGetDoubles() {
 		PacketContainer explosion = new PacketContainer(PacketType.Play.Server.EXPLOSION);
-		testPrimitive(explosion.getDoubles(), 0, (double)0, (double)0.8);
+		testPrimitive(explosion.getDoubles(), 0, (double)0, 0.8);
 	}
 
 	@Test
@@ -173,12 +177,12 @@ public class PacketContainerTest {
 		int[] testArray = new int[] { 1, 2, 3 };
 
 		// Pre and post conditions
-		assertArrayEquals(null, (int[]) integers.read(0));
+		assertArrayEquals(null, integers.read(0));
 		mapChunkBulk.getModifier().writeDefaults();
-		assertArrayEquals(new int[0], (int[]) integers.read(0));
+		assertArrayEquals(new int[0], integers.read(0));
 
 		integers.write(0, testArray);
-		assertArrayEquals(testArray, (int[]) integers.read(0));
+		assertArrayEquals(testArray, integers.read(0));
 	}
 
 	@Test

ProtocolLib/src/test/java/com/comphenix/protocol/injector/PluginVerifierTest.java

@@ -1,25 +1,25 @@
 package com.comphenix.protocol.injector;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.bukkit.Server;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
 import org.bukkit.plugin.PluginLoadOrder;
 import org.bukkit.plugin.PluginManager;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
+
 import com.comphenix.protocol.injector.PluginVerifier.VerificationResult;
 import com.google.common.base.Objects;
 import com.google.common.collect.Lists;

ProtocolLib/src/test/java/com/comphenix/protocol/injector/SortedCopyOnWriteArrayTest.java

@@ -17,7 +17,8 @@
 
 package com.comphenix.protocol.injector;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
 import java.util.ArrayList;
 import java.util.Collections;

ProtocolLib/src/test/java/com/comphenix/protocol/reflect/accessors/AccessorsTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.reflect.accessors;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 

ProtocolLib/src/test/java/com/comphenix/protocol/reflect/cloning/AggregateClonerTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.reflect.cloning;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.List;

ProtocolLib/src/test/java/com/comphenix/protocol/utility/MinecraftReflectionTest.java

@@ -1,17 +1,18 @@
 package com.comphenix.protocol.utility;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
-
+import static org.mockito.Mockito.times;
-import net.minecraft.server.v1_7_R3.ChatComponentText;
+import static org.mockito.Mockito.verify;
-import net.minecraft.server.v1_7_R3.ChatSerializer;
+import net.minecraft.server.v1_7_R4.ChatComponentText;
-import net.minecraft.server.v1_7_R3.ChunkCoordIntPair;
+import net.minecraft.server.v1_7_R4.ChatSerializer;
-import net.minecraft.server.v1_7_R3.IChatBaseComponent;
+import net.minecraft.server.v1_7_R4.ChunkCoordIntPair;
-import net.minecraft.server.v1_7_R3.NBTCompressedStreamTools;
+import net.minecraft.server.v1_7_R4.IChatBaseComponent;
-import net.minecraft.server.v1_7_R3.ServerPing;
+import net.minecraft.server.v1_7_R4.NBTCompressedStreamTools;
-import net.minecraft.server.v1_7_R3.ServerPingPlayerSample;
+import net.minecraft.server.v1_7_R4.ServerPing;
-import net.minecraft.server.v1_7_R3.ServerPingServerData;
+import net.minecraft.server.v1_7_R4.ServerPingPlayerSample;
-import net.minecraft.server.v1_7_R3.WatchableObject;
+import net.minecraft.server.v1_7_R4.ServerPingServerData;
+import net.minecraft.server.v1_7_R4.WatchableObject;
 
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;

ProtocolLib/src/test/java/com/comphenix/protocol/utility/SnapshotVersionTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.utility;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Calendar;
 import java.util.Date;

ProtocolLib/src/test/java/com/comphenix/protocol/utility/StreamSerializerTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.utility;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -8,10 +8,10 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import net.minecraft.server.v1_7_R3.IntHashMap;
+import net.minecraft.server.v1_7_R4.IntHashMap;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/ChunkCoordIntPairTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -15,15 +15,15 @@ public class ChunkCoordIntPairTest {
 
 	@Test
 	public void test() {
-		net.minecraft.server.v1_7_R3.ChunkCoordIntPair pair = new net.minecraft.server.v1_7_R3.ChunkCoordIntPair(1, 2);
+		net.minecraft.server.v1_7_R4.ChunkCoordIntPair pair = new net.minecraft.server.v1_7_R4.ChunkCoordIntPair(1, 2);
 		ChunkCoordIntPair specific = ChunkCoordIntPair.getConverter().getSpecific(pair);
 
 		assertEquals(1, specific.getChunkX());
 		assertEquals(2, specific.getChunkZ());
 
-		net.minecraft.server.v1_7_R3.ChunkCoordIntPair roundtrip = 
+		net.minecraft.server.v1_7_R4.ChunkCoordIntPair roundtrip =
-			(net.minecraft.server.v1_7_R3.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
+			(net.minecraft.server.v1_7_R4.ChunkCoordIntPair) ChunkCoordIntPair.getConverter().
-			getGeneric(net.minecraft.server.v1_7_R3.ChunkCoordIntPair.class, specific);
+			getGeneric(net.minecraft.server.v1_7_R4.ChunkCoordIntPair.class, specific);
 
 		assertEquals(1, roundtrip.x);
 		assertEquals(2, roundtrip.z);

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/CloningTest.java

@@ -1,10 +1,10 @@
 package com.comphenix.protocol.wrappers;
 
+import static org.junit.Assert.assertEquals;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 import com.comphenix.protocol.BukkitInitialization;
 import com.comphenix.protocol.reflect.cloning.AggregateCloner;
 

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/EnumWrappersTest.java

@@ -1,13 +1,12 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-
+import net.minecraft.server.v1_7_R4.EnumChatVisibility;
-import net.minecraft.server.v1_7_R3.EnumChatVisibility;
+import net.minecraft.server.v1_7_R4.EnumClientCommand;
-import net.minecraft.server.v1_7_R3.EnumClientCommand;
+import net.minecraft.server.v1_7_R4.EnumDifficulty;
-import net.minecraft.server.v1_7_R3.EnumDifficulty;
+import net.minecraft.server.v1_7_R4.EnumEntityUseAction;
-import net.minecraft.server.v1_7_R3.EnumEntityUseAction;
+import net.minecraft.server.v1_7_R4.EnumGamemode;
-import net.minecraft.server.v1_7_R3.EnumGamemode;
+import net.minecraft.server.v1_7_R4.EnumProtocol;
-import net.minecraft.server.v1_7_R3.EnumProtocol;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedAttributeTest.java

@@ -1,12 +1,14 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
-import net.minecraft.server.v1_7_R3.AttributeModifier;
+import net.minecraft.server.v1_7_R4.AttributeModifier;
-import net.minecraft.server.v1_7_R3.AttributeSnapshot;
+import net.minecraft.server.v1_7_R4.AttributeSnapshot;
-import net.minecraft.server.v1_7_R3.PacketPlayOutUpdateAttributes;
+import net.minecraft.server.v1_7_R4.PacketPlayOutUpdateAttributes;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedChatComponentTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedChunkCoordinateTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedGameProfileTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.util.UUID;
 

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedIntHashMapTest.java

@@ -1,6 +1,7 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedServerPingTest.java

@@ -1,6 +1,7 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/WrappedWatchableObjectTest.java

@@ -1,9 +1,9 @@
 package com.comphenix.protocol.wrappers;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtCompoundTest.java

@@ -17,10 +17,11 @@
 
 package com.comphenix.protocol.wrappers.nbt;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+
 import com.comphenix.protocol.BukkitInitialization;
 
 public class NbtCompoundTest {

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/NbtFactoryTest.java

@@ -17,7 +17,7 @@
 
 package com.comphenix.protocol.wrappers.nbt;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -27,7 +27,7 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 
 import org.bukkit.Material;
-import org.bukkit.craftbukkit.v1_7_R3.inventory.CraftItemFactory;
+import org.bukkit.craftbukkit.v1_7_R4.inventory.CraftItemFactory;
 import org.bukkit.inventory.ItemStack;
 import org.junit.BeforeClass;
 import org.junit.Test;

ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java

@@ -1,6 +1,6 @@
 package com.comphenix.protocol.wrappers.nbt.io;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.junit.BeforeClass;

Readme.md

@@ -11,6 +11,8 @@ Critically, different plugins that use this approach may _hook_ into the same cl
 with unpredictable outcomes. More than often this causes plugins to crash, but it may also 
 lead to more subtle bugs.
 
+Currently maintained by dmulloy2 on behalf of [SpigotMC](http://www.spigotmc.org/)
+
 
 ### Resources