From ce4779f49d44899132464bc1ea957caaba4b6bdb Mon Sep 17 00:00:00 2001 From: Dan Mulloy Date: Fri, 19 Feb 2016 12:56:57 -0500 Subject: [PATCH] Revert "Fix spelling mistake in PacketAdapter" This reverts commit cc4d035b634826ed1885f13a17b407eb93090072. --- .../protocol/events/PacketAdapter.java | 62 +++++++++---------- .../io/NbtConfigurationSerializerTest.java | 3 +- 2 files changed, 30 insertions(+), 35 deletions(-) diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java b/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java index e3eb572e..a5204268 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/events/PacketAdapter.java @@ -48,7 +48,7 @@ public abstract class PacketAdapter implements PacketListener { * Initialize a packet adapter using a collection of parameters. Use {@link #params()} to get an instance to this builder. * @param params - the parameters. */ - public PacketAdapter(@Nonnull AdapterParameters params) { + public PacketAdapter(@Nonnull AdapterParameteters params) { this( checkValidity(params).plugin, params.connectionSide, params.listenerPriority, params.gamePhase, params.options, params.packets @@ -371,8 +371,8 @@ public abstract class PacketAdapter implements PacketListener { * This is often simpler and better than passing them directly to each constructor. * @return Helper object. */ - public static AdapterParameters params() { - return new AdapterParameters(); + public static AdapterParameteters params() { + return new AdapterParameteters(); } /** @@ -385,8 +385,8 @@ public abstract class PacketAdapter implements PacketListener { * @return Helper object. */ @Deprecated - public static AdapterParameters params(Plugin plugin, Integer... packets) { - return new AdapterParameters().plugin(plugin).packets(packets); + public static AdapterParameteters params(Plugin plugin, Integer... packets) { + return new AdapterParameteters().plugin(plugin).packets(packets); } /** @@ -397,23 +397,17 @@ public abstract class PacketAdapter implements PacketListener { * @param packets - the packet types the listener is looking for. * @return Helper object. */ - public static AdapterParameters params(Plugin plugin, PacketType... packets) { - return new AdapterParameters().plugin(plugin).types(packets); + public static AdapterParameteters params(Plugin plugin, PacketType... packets) { + return new AdapterParameteters().plugin(plugin).types(packets); } - - /** - * @deprecated Name misspelled. Use {@link AdapterParameters} - */ - @Deprecated - public static class AdapterParameteters extends AdapterParameters { - } - + /** * Represents a builder for passing parameters to the packet adapter constructor. *

+ * Note: Never make spelling mistakes in a public API! * @author Kristian */ - public static class AdapterParameters { + public static class AdapterParameteters { private Plugin plugin; private ConnectionSide connectionSide; private PacketType[] packets; @@ -428,7 +422,7 @@ public abstract class PacketAdapter implements PacketListener { * @param plugin - the plugin. * @return This builder, for chaining. */ - public AdapterParameters plugin(@Nonnull Plugin plugin) { + public AdapterParameteters plugin(@Nonnull Plugin plugin) { this.plugin = Preconditions.checkNotNull(plugin, "plugin cannot be NULL."); return this; } @@ -438,7 +432,7 @@ public abstract class PacketAdapter implements PacketListener { * @param connectionSide - the new packet type. * @return This builder, for chaining. */ - public AdapterParameters connectionSide(@Nonnull ConnectionSide connectionSide) { + public AdapterParameteters connectionSide(@Nonnull ConnectionSide connectionSide) { this.connectionSide = Preconditions.checkNotNull(connectionSide, "connectionside cannot be NULL."); return this; } @@ -447,7 +441,7 @@ public abstract class PacketAdapter implements PacketListener { * Set this adapter to also look for client-side packets. * @return This builder, for chaining. */ - public AdapterParameters clientSide() { + public AdapterParameteters clientSide() { return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.CLIENT_SIDE)); } @@ -455,7 +449,7 @@ public abstract class PacketAdapter implements PacketListener { * Set this adapter to also look for server-side packets. * @return This builder, for chaining. */ - public AdapterParameters serverSide() { + public AdapterParameteters serverSide() { return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.SERVER_SIDE)); } @@ -466,7 +460,7 @@ public abstract class PacketAdapter implements PacketListener { * @param listenerPriority - the new event priority. * @return This builder, for chaining. */ - public AdapterParameters listenerPriority(@Nonnull ListenerPriority listenerPriority) { + public AdapterParameteters listenerPriority(@Nonnull ListenerPriority listenerPriority) { this.listenerPriority = Preconditions.checkNotNull(listenerPriority, "listener priority cannot be NULL."); return this; } @@ -478,7 +472,7 @@ public abstract class PacketAdapter implements PacketListener { * @param gamePhase - the new game phase. * @return This builder, for chaining. */ - public AdapterParameters gamePhase(@Nonnull GamePhase gamePhase) { + public AdapterParameteters gamePhase(@Nonnull GamePhase gamePhase) { this.gamePhase = Preconditions.checkNotNull(gamePhase, "gamePhase cannot be NULL."); return this; } @@ -487,7 +481,7 @@ public abstract class PacketAdapter implements PacketListener { * Set the game phase to {@link GamePhase#LOGIN}, allowing ProtocolLib to intercept login packets. * @return This builder, for chaining. */ - public AdapterParameters loginPhase() { + public AdapterParameteters loginPhase() { return gamePhase(GamePhase.LOGIN); } @@ -498,7 +492,7 @@ public abstract class PacketAdapter implements PacketListener { * @param options - every option to use. * @return This builder, for chaining. */ - public AdapterParameters options(@Nonnull ListenerOptions... options) { + public AdapterParameteters options(@Nonnull ListenerOptions... options) { this.options = Preconditions.checkNotNull(options, "options cannot be NULL."); return this; } @@ -510,7 +504,7 @@ public abstract class PacketAdapter implements PacketListener { * @param options - every option to use. * @return This builder, for chaining. */ - public AdapterParameters options(@Nonnull Set options) { + public AdapterParameteters options(@Nonnull Set options) { Preconditions.checkNotNull(options, "options cannot be NULL."); this.options = options.toArray(new ListenerOptions[0]); return this; @@ -521,7 +515,7 @@ public abstract class PacketAdapter implements PacketListener { * @param option - the option to add. * @return This builder, for chaining. */ - private AdapterParameters addOption(ListenerOptions option) { + private AdapterParameteters addOption(ListenerOptions option) { if (options == null) { return options(option); } else { @@ -535,7 +529,7 @@ public abstract class PacketAdapter implements PacketListener { * Set the listener option to {@link ListenerOptions#INTERCEPT_INPUT_BUFFER}, causing ProtocolLib to read the raw packet data from the network stream. * @return This builder, for chaining. */ - public AdapterParameters optionIntercept() { + public AdapterParameteters optionIntercept() { return addOption(ListenerOptions.INTERCEPT_INPUT_BUFFER); } @@ -545,7 +539,7 @@ public abstract class PacketAdapter implements PacketListener { * This is no longer relevant in 1.7.2. * @return This builder, for chaining. */ - public AdapterParameters optionManualGamePhase() { + public AdapterParameteters optionManualGamePhase() { return addOption(ListenerOptions.DISABLE_GAMEPHASE_DETECTION); } @@ -555,7 +549,7 @@ public abstract class PacketAdapter implements PacketListener { * This allows ProtocolLib to perform certain optimizations. * @return This builder, for chaining. */ - public AdapterParameters optionAsync() { + public AdapterParameteters optionAsync() { return addOption(ListenerOptions.ASYNC); } @@ -569,7 +563,7 @@ public abstract class PacketAdapter implements PacketListener { * @return This builder, for chaining. */ @Deprecated - public AdapterParameters packets(@Nonnull Integer... packets) { + public AdapterParameteters packets(@Nonnull Integer... packets) { Preconditions.checkNotNull(packets, "packets cannot be NULL"); PacketType[] types = new PacketType[packets.length]; @@ -588,7 +582,7 @@ public abstract class PacketAdapter implements PacketListener { * @return This builder, for chaining. */ @Deprecated - public AdapterParameters packets(@Nonnull Set packets) { + public AdapterParameteters packets(@Nonnull Set packets) { return packets(packets.toArray(new Integer[0])); } @@ -599,7 +593,7 @@ public abstract class PacketAdapter implements PacketListener { * @param packets - the packet types to look for. * @return This builder, for chaining. */ - public AdapterParameters types(@Nonnull PacketType... packets) { + public AdapterParameteters types(@Nonnull PacketType... packets) { // Set the connection side as well if (connectionSide == null) { for (PacketType type : packets) { @@ -620,7 +614,7 @@ public abstract class PacketAdapter implements PacketListener { * @param packets - a set of packet types to look for. * @return This builder, for chaining. */ - public AdapterParameters types(@Nonnull Set packets) { + public AdapterParameteters types(@Nonnull Set packets) { return types(packets.toArray(new PacketType[0])); } } @@ -628,7 +622,7 @@ public abstract class PacketAdapter implements PacketListener { /** * Determine if the required parameters are set. */ - private static AdapterParameters checkValidity(AdapterParameters params) { + private static AdapterParameteters checkValidity(AdapterParameteters params) { if (params == null) throw new IllegalArgumentException("params cannot be NULL."); if (params.plugin == null) diff --git a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java index ea96614b..8a2232bd 100644 --- a/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java +++ b/ProtocolLib/src/test/java/com/comphenix/protocol/wrappers/nbt/io/NbtConfigurationSerializerTest.java @@ -17,12 +17,13 @@ public class NbtConfigurationSerializerTest { BukkitInitialization.initializePackage(); } + @SuppressWarnings("unchecked") @Test public void testSerialization() { NbtCompound compound = NbtFactory.ofCompound("hello"); compound.put("age", (short) 30); compound.put("name", "test"); - compound.put("values", new int[] { 1, 2, 3 }); + compound.put("values", new int[] { 1, 2, 3}); compound.put(NbtFactory.ofList("telephone", "12345678", "81549300")); compound.put(NbtFactory.ofList("lists", NbtFactory.ofList("", "a", "a", "b", "c")));