From d8df5a7667ff6b118b63e0e6f2ed24d76c105dae Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Fri, 6 Dec 2013 18:09:57 +0100 Subject: [PATCH] Revert renaming "AdapterParameteters" to "AdapterParameters". Backwards compatibility is more important than spelling. --- .../protocol/events/PacketAdapter.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 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 7ae85e08..fcb5eb47 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 @@ -344,8 +344,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(); } /** @@ -358,8 +358,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); } /** @@ -370,8 +370,8 @@ 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); } /** @@ -380,7 +380,7 @@ public abstract class PacketAdapter implements PacketListener { * 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; @@ -395,7 +395,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; } @@ -405,7 +405,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; } @@ -414,7 +414,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)); } @@ -422,7 +422,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)); } @@ -433,7 +433,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; } @@ -445,7 +445,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; } @@ -454,7 +454,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); } @@ -465,7 +465,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; } @@ -474,7 +474,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 options(ListenerOptions.INTERCEPT_INPUT_BUFFER); } @@ -488,7 +488,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]; @@ -507,7 +507,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])); } @@ -518,7 +518,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) { @@ -537,7 +537,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])); } } @@ -545,7 +545,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)