Code cleanup, remove some ancient compatibility

Author: dmulloy2

modules/API/src/main/java/com/comphenix/protocol/async/AsyncListenerHandler.java

@@ -24,8 +24,6 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.bukkit.plugin.Plugin;
-
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.error.Report;
 import com.comphenix.protocol.error.ReportType;
@@ -36,10 +34,11 @@
 import com.comphenix.protocol.timing.TimedListenerManager;
 import com.comphenix.protocol.timing.TimedListenerManager.ListenerType;
 import com.comphenix.protocol.timing.TimedTracker;
-import com.comphenix.protocol.utility.WrappedScheduler;
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 
+import org.bukkit.plugin.Plugin;
+
 /**
  * Represents a handler for an asynchronous event.
  * <p>
@@ -345,8 +344,7 @@ public void run() {
 	}
 
 	private void scheduleAsync(Runnable runnable) {
-		// Handle deprecation
-		WrappedScheduler.runAsynchronouslyRepeat(listener.getPlugin(), filterManager.getScheduler(), runnable, 0L, -1L);
+		listener.getPlugin().getServer().getScheduler().runTaskAsynchronously(listener.getPlugin(), runnable);
 	}
 
 	/**

modules/API/src/main/java/com/comphenix/protocol/utility/WrappedScheduler.java

@@ -14,33 +14,17 @@
  *  if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
  *  02111-1307 USA
  */
-
 package com.comphenix.protocol.wrappers;
 
 import java.lang.ref.WeakReference;
 import java.lang.reflect.Array;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
-import org.bukkit.WorldType;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
-import org.bukkit.util.Vector;
-
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
@@ -66,6 +50,16 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+import org.bukkit.Material;
+import org.bukkit.Sound;
+import org.bukkit.World;
+import org.bukkit.WorldType;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+import org.bukkit.util.Vector;
+
 /**
  * Contains several useful equivalent converters for normal Bukkit types.
  * 
@@ -123,7 +117,7 @@ public class BukkitConverters {
 	 * Represents a typical equivalence converter.
 	 * 
 	 * @author Kristian
-	 * @param <T> - type that can be converted.
+	 * @param <TType> - type that can be converted.
 	 */
 	public static abstract class IgnoreNullConverter<TType> implements EquivalentConverter<TType> {
 		@Override

modules/API/src/main/java/com/comphenix/protocol/wrappers/BukkitConverters.java

@@ -16,21 +16,8 @@
  */
 package com.comphenix.protocol.wrappers;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-
-import org.apache.commons.lang.Validate;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
+import java.lang.reflect.*;
+import java.util.*;
 
 import com.comphenix.protocol.injector.BukkitUnwrapper;
 import com.comphenix.protocol.reflect.FieldAccessException;
@@ -47,6 +34,10 @@
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableBiMap;
 
+import org.apache.commons.lang.Validate;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+
 /**
  * Represents a DataWatcher in 1.8 thru 1.10
  * 
@@ -419,7 +410,7 @@ public void setObject(int index, Object value) {
 	 * Sets the DataWatcher Item at a given index to a new value.
 	 * 
 	 * @param index Index of the object to set
-	 * @param Serializer Serializer from {@link Serializer#get(Class)}
+	 * @param serializer Serializer from {@link Registry#get(Class)}
 	 * @param value New value
 	 * @param update Whether or not to inform the client
 	 * 
@@ -463,7 +454,7 @@ public void setObject(int index, WrappedWatchableObject value) {
 	 * @param value Wrapped value
 	 * @param update Whether or not to inform the client
 	 * 
-	 * @see {@link #setObject(WrappedDataWatcherObject, Object)}
+	 * @see #setObject(WrappedDataWatcherObject, Object)
 	 */
 	public void setObject(WrappedDataWatcherObject object, WrappedWatchableObject value, boolean update) {
 		setObject(object, value.getRawValue(), update);
@@ -893,14 +884,15 @@ public String toString() {
 	 *   <li>Float</li>
 	 *   <li>String</li>
 	 *   <li>IChatBaseComponent</li>
-	 *   <li>Optional&lt;ItemStack&gt;</li>
+	 *   <li>ItemStack</li>
 	 *   <li>Optional&lt;IBlockData&gt;</li>
 	 *   <li>Boolean</li>
 	 *   <li>Vector3f</li>
 	 *   <li>BlockPosition</li>
 	 *   <li>Optional&lt;BlockPosition&gt;</li>
 	 *   <li>EnumDirection</li>
 	 *   <li>Optional&lt;UUID&gt;</li>
+	 *   <li>NBTTagCompound</li>
 	 * </ul>
 	 *
 	 * @author dmulloy2
@@ -1078,5 +1070,13 @@ public static Serializer getDirectionSerializer() {
 		public static Serializer getUUIDSerializer(boolean optional) {
 			return get(UUID.class, optional);
 		}
+
+		/**
+		 * Gets the serializer for NBT Compound tags
+		 * @return The serializer
+		 */
+		public static Serializer getNBTCompoundSerializer() {
+			return get(MinecraftReflection.getNBTCompoundClass(), false);
+		}
 	}
 }

modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedDataWatcher.java

@@ -27,6 +27,9 @@
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.Serializer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
+import com.comphenix.protocol.wrappers.nbt.NbtBase;
+import com.comphenix.protocol.wrappers.nbt.NbtCompound;
+import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.google.common.base.Optional;
 
 /**
@@ -235,6 +238,8 @@ static Object getWrapped(Object value) {
 			return BlockPosition.getConverter().getSpecific(value);
 		} else if (is(EnumWrappers.getDirectionClass(), value)) {
 			return EnumWrappers.getDirectionConverter().getSpecific(value);
+		} else if (is(MinecraftReflection.getNBTCompoundClass(), value)) {
+			return NbtFactory.fromNMSCompound(value);
 		}
 
 		// Legacy classes
@@ -277,6 +282,8 @@ static Object getUnwrapped(Object wrapped) {
 			return BlockPosition.getConverter().getGeneric(MinecraftReflection.getBlockPositionClass(), (BlockPosition) wrapped);
 		} else if (wrapped instanceof Direction) {
 			return EnumWrappers.getDirectionConverter().getGeneric(EnumWrappers.getDirectionClass(), (Direction) wrapped);
+		} else if (wrapped instanceof NbtCompound) {
+			return NbtFactory.fromBase((NbtCompound) wrapped).getHandle();
 		}
 
 		// Legacy classes

modules/API/src/main/java/com/comphenix/protocol/wrappers/WrappedWatchableObject.java

@@ -133,7 +133,7 @@ public static <T> NbtWrapper<T> fromBase(NbtBase<T> base) {
 	 * Set the NBT compound tag of a given item stack.
 	 * <p>
 	 * The item stack must be a wrapper for a CraftItemStack. Use
-	 * {@link MinecraftReflection#getCraftItemStack(ItemStack)} if not.
+	 * {@link MinecraftReflection#getBukkitItemStack(Object)} if not.
 	 * @param stack - the item stack, cannot be air.
 	 * @param compound - the new NBT compound, or NULL to remove it.
 	 * @throws IllegalArgumentException If the stack is not a CraftItemStack, or it represents air.
@@ -151,7 +151,7 @@ public static void setItemTag(ItemStack stack, NbtCompound compound) {
 	 * material, damage value or count.
 	 * <p>
 	 * The item stack must be a wrapper for a CraftItemStack. Use
-	 * {@link MinecraftReflection#getCraftItemStack(ItemStack)} if not.
+	 * {@link MinecraftReflection#getBukkitItemStack(Object)} if not.
 	 * @param stack - the item stack.
 	 * @return A wrapper for its NBT tag.
 	 */

modules/API/src/main/java/com/comphenix/protocol/wrappers/nbt/NbtFactory.java

@@ -23,19 +23,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.FileHandler;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.LogRecord;
-import java.util.logging.Logger;
-
-import org.apache.commons.io.HexDump;
-import org.bukkit.ChatColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
+import java.util.logging.*;
 
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.PacketType.Sender;
@@ -45,6 +33,13 @@
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.google.common.base.Charsets;
 
+import org.apache.commons.io.HexDump;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+
 /**
  * Logs packets to a given stream
  * @author dmulloy2
@@ -99,16 +94,16 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 						type = PacketType.findCurrent(protocol, pSender, id);
 					} catch (NumberFormatException ex) { // Check packet names
 						String name = args[2];
-						outer: for (PacketType packet : PacketType.values()) {
+						for (PacketType packet : PacketType.values()) {
 							if (packet.getProtocol() == protocol && packet.getSender() == pSender) {
 								if (packet.name().equalsIgnoreCase(name)) {
 									type = packet;
-									break outer;
+									break;
 								}
 								for (String className : packet.getClassNames()) {
 									if (className.equalsIgnoreCase(name)) {
 										type = packet;
-										break outer;
+										break;
 									}
 								}
 							}
@@ -248,9 +243,8 @@ public Plugin getPlugin() {
 		return plugin;
 	}
 
-	private static enum LogLocation {
-		CONSOLE,
-		FILE;
+	private enum LogLocation {
+		CONSOLE, FILE
 	}
 
 	private static class LogFormatter extends Formatter {