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 a5204268..e3eb572e 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 AdapterParameteters params) { + public PacketAdapter(@Nonnull AdapterParameters 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 AdapterParameteters params() { - return new AdapterParameteters(); + public static AdapterParameters params() { + return new AdapterParameters(); } /** @@ -385,8 +385,8 @@ public abstract class PacketAdapter implements PacketListener { * @return Helper object. */ @Deprecated - public static AdapterParameteters params(Plugin plugin, Integer... packets) { - return new AdapterParameteters().plugin(plugin).packets(packets); + public static AdapterParameters params(Plugin plugin, Integer... packets) { + return new AdapterParameters().plugin(plugin).packets(packets); } /** @@ -397,17 +397,23 @@ public abstract class PacketAdapter implements PacketListener { * @param packets - the packet types the listener is looking for. * @return Helper object. */ - public static AdapterParameteters params(Plugin plugin, PacketType... packets) { - return new AdapterParameteters().plugin(plugin).types(packets); + public static AdapterParameters params(Plugin plugin, PacketType... packets) { + return new AdapterParameters().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 AdapterParameteters {
+ public static class AdapterParameters {
private Plugin plugin;
private ConnectionSide connectionSide;
private PacketType[] packets;
@@ -422,7 +428,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param plugin - the plugin.
* @return This builder, for chaining.
*/
- public AdapterParameteters plugin(@Nonnull Plugin plugin) {
+ public AdapterParameters plugin(@Nonnull Plugin plugin) {
this.plugin = Preconditions.checkNotNull(plugin, "plugin cannot be NULL.");
return this;
}
@@ -432,7 +438,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param connectionSide - the new packet type.
* @return This builder, for chaining.
*/
- public AdapterParameteters connectionSide(@Nonnull ConnectionSide connectionSide) {
+ public AdapterParameters connectionSide(@Nonnull ConnectionSide connectionSide) {
this.connectionSide = Preconditions.checkNotNull(connectionSide, "connectionside cannot be NULL.");
return this;
}
@@ -441,7 +447,7 @@ public abstract class PacketAdapter implements PacketListener {
* Set this adapter to also look for client-side packets.
* @return This builder, for chaining.
*/
- public AdapterParameteters clientSide() {
+ public AdapterParameters clientSide() {
return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.CLIENT_SIDE));
}
@@ -449,7 +455,7 @@ public abstract class PacketAdapter implements PacketListener {
* Set this adapter to also look for server-side packets.
* @return This builder, for chaining.
*/
- public AdapterParameteters serverSide() {
+ public AdapterParameters serverSide() {
return connectionSide(ConnectionSide.add(connectionSide, ConnectionSide.SERVER_SIDE));
}
@@ -460,7 +466,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param listenerPriority - the new event priority.
* @return This builder, for chaining.
*/
- public AdapterParameteters listenerPriority(@Nonnull ListenerPriority listenerPriority) {
+ public AdapterParameters listenerPriority(@Nonnull ListenerPriority listenerPriority) {
this.listenerPriority = Preconditions.checkNotNull(listenerPriority, "listener priority cannot be NULL.");
return this;
}
@@ -472,7 +478,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param gamePhase - the new game phase.
* @return This builder, for chaining.
*/
- public AdapterParameteters gamePhase(@Nonnull GamePhase gamePhase) {
+ public AdapterParameters gamePhase(@Nonnull GamePhase gamePhase) {
this.gamePhase = Preconditions.checkNotNull(gamePhase, "gamePhase cannot be NULL.");
return this;
}
@@ -481,7 +487,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 AdapterParameteters loginPhase() {
+ public AdapterParameters loginPhase() {
return gamePhase(GamePhase.LOGIN);
}
@@ -492,7 +498,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param options - every option to use.
* @return This builder, for chaining.
*/
- public AdapterParameteters options(@Nonnull ListenerOptions... options) {
+ public AdapterParameters options(@Nonnull ListenerOptions... options) {
this.options = Preconditions.checkNotNull(options, "options cannot be NULL.");
return this;
}
@@ -504,7 +510,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param options - every option to use.
* @return This builder, for chaining.
*/
- public AdapterParameteters options(@Nonnull Set extends ListenerOptions> options) {
+ public AdapterParameters options(@Nonnull Set extends ListenerOptions> options) {
Preconditions.checkNotNull(options, "options cannot be NULL.");
this.options = options.toArray(new ListenerOptions[0]);
return this;
@@ -515,7 +521,7 @@ public abstract class PacketAdapter implements PacketListener {
* @param option - the option to add.
* @return This builder, for chaining.
*/
- private AdapterParameteters addOption(ListenerOptions option) {
+ private AdapterParameters addOption(ListenerOptions option) {
if (options == null) {
return options(option);
} else {
@@ -529,7 +535,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 AdapterParameteters optionIntercept() {
+ public AdapterParameters optionIntercept() {
return addOption(ListenerOptions.INTERCEPT_INPUT_BUFFER);
}
@@ -539,7 +545,7 @@ public abstract class PacketAdapter implements PacketListener {
* This is no longer relevant in 1.7.2.
* @return This builder, for chaining.
*/
- public AdapterParameteters optionManualGamePhase() {
+ public AdapterParameters optionManualGamePhase() {
return addOption(ListenerOptions.DISABLE_GAMEPHASE_DETECTION);
}
@@ -549,7 +555,7 @@ public abstract class PacketAdapter implements PacketListener {
* This allows ProtocolLib to perform certain optimizations.
* @return This builder, for chaining.
*/
- public AdapterParameteters optionAsync() {
+ public AdapterParameters optionAsync() {
return addOption(ListenerOptions.ASYNC);
}
@@ -563,7 +569,7 @@ public abstract class PacketAdapter implements PacketListener {
* @return This builder, for chaining.
*/
@Deprecated
- public AdapterParameteters packets(@Nonnull Integer... packets) {
+ public AdapterParameters packets(@Nonnull Integer... packets) {
Preconditions.checkNotNull(packets, "packets cannot be NULL");
PacketType[] types = new PacketType[packets.length];
@@ -582,7 +588,7 @@ public abstract class PacketAdapter implements PacketListener {
* @return This builder, for chaining.
*/
@Deprecated
- public AdapterParameteters packets(@Nonnull Set