Improve/cleanup injector (#2992)

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

@@ -607,8 +607,6 @@ private void processPacket(int workerID, PacketEvent packet, String methodName)
 
  } catch (OutOfMemoryError e) {
  throw e;
- } catch (ThreadDeath e) {
- throw e;
  } catch (Throwable e) {
  // Minecraft doesn't want your Exception.
  filterManager.getErrorReporter().reportMinimal(listener.getPlugin(), methodName, e);

src/main/java/com/comphenix/protocol/error/DetailedErrorReporter.java

@@ -30,8 +30,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
 import com.comphenix.protocol.ProtocolConfig;
-import com.comphenix.protocol.ProtocolLib;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolLogger;
 import com.comphenix.protocol.collections.ExpireHashMap;
@@ -41,11 +45,6 @@
 import com.google.common.base.Preconditions;
 import com.google.common.primitives.Primitives;
 
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import org.bukkit.Bukkit;
-import org.bukkit.plugin.Plugin;
-
 /**
  * Internal class used to handle exceptions.
  * 
@@ -479,7 +478,7 @@ public static String getStringDescription(Object value) {
  } catch (LinkageError ex) {
  // Apache is probably missing
  apacheCommonsMissing = true;
- } catch (ThreadDeath | OutOfMemoryError e) {
+ } catch (OutOfMemoryError e) {
  throw e;
  } catch (Throwable ex) {
  // Don't use the error logger to log errors in error logging (that could lead to infinite loops)

src/main/java/com/comphenix/protocol/events/ListenerOptions.java

@@ -13,6 +13,7 @@ public enum ListenerOptions {
  * Disable the automatic game phase detection that will normally force {@link GamePhase#LOGIN} when a packet ID is
  * known to be transmitted during login.
  */
+ @Deprecated
  DISABLE_GAMEPHASE_DETECTION,
 
  /**

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

@@ -17,7 +17,12 @@
 
 package com.comphenix.protocol.events;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.Set;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.injector.GamePhase;
@@ -90,20 +95,6 @@ public static Builder newBuilder(ListeningWhitelist template) {
  return new Builder(template);
  }
 
- /**
- * Construct a copy of a given enum.
- *
- * @param options - the options to copy, or NULL to indicate the empty set.
- * @return A copy of the enum set.
- */
- private static <T extends Enum<T>> EnumSet<T> safeEnumSet(Collection<T> options, Class<T> enumClass) {
- if (options != null && !options.isEmpty()) {
- return EnumSet.copyOf(options);
- } else {
- return EnumSet.noneOf(enumClass);
- }
- }
-
  /**
  * Construct a copy of a given set.
  *
@@ -311,6 +302,7 @@ public Builder types(Collection<PacketType> types) {
  * @param gamePhase - the gamephase.
  * @return This builder, for chaining.
  */
+ @Deprecated
  public Builder gamePhase(GamePhase gamePhase) {
  this.gamePhase = gamePhase;
  return this;
@@ -321,6 +313,7 @@ public Builder gamePhase(GamePhase gamePhase) {
  *
  * @return This builder, for chaining.
  */
+ @Deprecated
  public Builder gamePhaseBoth() {
  return gamePhase(GamePhase.BOTH);
  }

src/main/java/com/comphenix/protocol/injector/GamePhase.java

@@ -22,6 +22,7 @@
  *
  * @author Kristian
  */
+@Deprecated
 public enum GamePhase {
  /**
  * Only listen for packets sent or received before a player has logged in.

src/main/java/com/comphenix/protocol/injector/NetworkProcessor.java

@@ -1,13 +1,14 @@
 package com.comphenix.protocol.injector;
 
+import java.util.Deque;
+
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.error.ErrorReporter;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketPostListener;
 import com.comphenix.protocol.events.ScheduledPacket;
-import java.util.Deque;
 
 /**
  * Represents a processor for network markers.
@@ -43,7 +44,7 @@ public void invokePostEvent(PacketEvent event, NetworkMarker marker) {
  for (PacketPostListener listener : marker.getPostListeners()) {
  try {
  listener.onPostEvent(event);
- } catch (OutOfMemoryError | ThreadDeath e) {
+ } catch (OutOfMemoryError e) {
  throw e;
  } catch (Throwable e) {
  this.reporter.reportMinimal(listener.getPlugin(), "SentListener.run()", e);

src/main/java/com/comphenix/protocol/injector/PacketConstructor.java

@@ -172,8 +172,6 @@ public PacketConstructor withPacket(PacketType type, Object[] values) {
  result = unwrapper.unwrapItem(values[i]);
  } catch (OutOfMemoryError e) {
  throw e;
- } catch (ThreadDeath e) {
- throw e;
  } catch (Throwable e) {
  lastException = e;
  }

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

@@ -46,14 +46,10 @@
 import com.comphenix.protocol.injector.netty.WirePacket;
 import com.comphenix.protocol.injector.netty.manager.NetworkManagerInjector;
 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.utility.MinecraftReflection;
 import com.comphenix.protocol.utility.MinecraftVersion;
 import com.google.common.collect.ImmutableSet;
 
-import io.netty.channel.Channel;
-
 public class PacketFilterManager implements ListenerInvoker, InternalManager {
 
  // plugin verifier reports
@@ -80,7 +76,6 @@ public class PacketFilterManager implements ListenerInvoker, InternalManager {
  private final Set<PacketListener> registeredListeners;
 
  // injectors
- private final PlayerInjectionHandler playerInjectionHandler;
  private final NetworkManagerInjector networkManagerInjector;
 
  // status of this manager
@@ -111,18 +106,16 @@ public PacketFilterManager(PacketFilterBuilder builder) {
  // injectors
  this.networkManagerInjector = new NetworkManagerInjector(
  builder.getLibrary(),
- builder.getServer(),
  this,
  builder.getReporter());
- this.playerInjectionHandler = this.networkManagerInjector.getPlayerInjectionHandler();
 
  // ensure that all packet types are loaded and synced
  PacketRegistry.getClientPacketTypes();
  PacketRegistry.getServerPacketTypes();
 
  // hook into all connected players
  for (Player player : this.server.getOnlinePlayers()) {
-  this.playerInjectionHandler.injectPlayer(player, ConflictStrategy.BAIL_OUT);
+  this.networkManagerInjector.getInjector(player).inject();
  }
  }
 
@@ -180,7 +173,7 @@ public void sendServerPacket(Player receiver, PacketContainer packet, NetworkMar
  }
 
  // process outbound
- this.playerInjectionHandler.sendServerPacket(receiver, packet, marker, filters);
+ this.networkManagerInjector.getInjector(receiver).sendServerPacket(packet.getHandle(), marker, filters);
  }
  }
 
@@ -192,13 +185,7 @@ public void sendWirePacket(Player receiver, int id, byte[] bytes) {
  @Override
  public void sendWirePacket(Player receiver, WirePacket packet) {
  if (!this.closed) {
- // special case - we just throw the wire packet down the pipeline without processing it
- Channel outboundChannel = this.playerInjectionHandler.getChannel(receiver);
- if (outboundChannel == null) {
- throw new IllegalArgumentException("Unable to obtain connection of player " + receiver);
- }
-
- outboundChannel.writeAndFlush(packet);
+ this.networkManagerInjector.getInjector(receiver).sendWirePacket(packet);
  }
  }
 
@@ -240,13 +227,13 @@ public void receiveClientPacket(Player sender, PacketContainer packet, NetworkMa
  }
 
  // post to the player inject, reset our cancel state change
- this.playerInjectionHandler.receiveClientPacket(sender, nmsPacket);
+ this.networkManagerInjector.getInjector(sender).receiveClientPacket(nmsPacket);
  }
  }
 
  @Override
  public int getProtocolVersion(Player player) {
- return this.playerInjectionHandler.getProtocolVersion(player);
+ return this.networkManagerInjector.getInjector(player).getProtocolVersion();
  }
 
  @Override
@@ -447,12 +434,12 @@ public void registerEvents(PluginManager manager, Plugin plugin) {
 
  @EventHandler(priority = EventPriority.LOWEST)
  public void handleLogin(PlayerLoginEvent event) {
-  PacketFilterManager.this.playerInjectionHandler.updatePlayer(event.getPlayer());
+  networkManagerInjector.getInjector(event.getPlayer()).inject();
  }
 
  @EventHandler(priority = EventPriority.LOWEST)
  public void handleJoin(PlayerJoinEvent event) {
-  PacketFilterManager.this.playerInjectionHandler.updatePlayer(event.getPlayer());
+  networkManagerInjector.getInjector(event.getPlayer()).inject();
  }
 
  @EventHandler(priority = EventPriority.MONITOR)

src/main/java/com/comphenix/protocol/injector/netty/Injector.java

@@ -1,9 +1,12 @@
 package com.comphenix.protocol.injector.netty;
 
+import java.net.SocketAddress;
+
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.events.NetworkMarker;
-import org.bukkit.entity.Player;
 
 /**
  * Represents an injected client connection.
@@ -23,12 +26,8 @@ public interface Injector {
  * Inject the current channel.
  * <p>
  * Note that only active channels can be injected.
- *
- * @return TRUE if we injected the channel, false if we could not inject or it was already injected.
  */
- boolean inject();
-
- void uninject();
+ void inject();
 
  /**
  * Close the current injector.
@@ -46,16 +45,7 @@ public interface Injector {
 
  void receiveClientPacket(Object packet);
 
- /**
- * Retrieve the current protocol state.
- *
- * @return The current protocol.
- * @deprecated use {@link #getCurrentProtocol(PacketType.Sender)} instead.
- */
- @Deprecated
- default Protocol getCurrentProtocol() {
- return this.getCurrentProtocol(PacketType.Sender.SERVER);
- }
+ void sendWirePacket(WirePacket packet);
 
  /**
  * Retrieve the current protocol state. Note that since 1.20.2 the client and server direction can be in different
@@ -66,21 +56,7 @@ default Protocol getCurrentProtocol() {
  */
  Protocol getCurrentProtocol(PacketType.Sender sender);
 
- /**
- * Retrieve the network marker associated with a given packet.
- *
- * @param packet - the packet.
- * @return The network marker.
- */
- NetworkMarker getMarker(Object packet);
-
- /**
- * Associate a given network marker with a specific packet.
- *
- * @param packet - the NMS packet.
- * @param marker - the associated marker.
- */
- void saveMarker(Object packet, NetworkMarker marker);
+ SocketAddress getAddress();
 
  /**
  * Retrieve the current player or temporary player associated with the injector.
@@ -98,6 +74,8 @@ default Protocol getCurrentProtocol() {
 
  void disconnect(String message);
 
+ boolean isConnected();
+
  /**
  * Determine if the channel has already been injected.
  *

src/main/java/com/comphenix/protocol/injector/netty/channel/EmptyInjector.java

@@ -1,10 +1,14 @@
 package com.comphenix.protocol.injector.netty.channel;
 
+import java.net.SocketAddress;
+
+import org.bukkit.entity.Player;
+
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Protocol;
 import com.comphenix.protocol.events.NetworkMarker;
 import com.comphenix.protocol.injector.netty.Injector;
-import org.bukkit.entity.Player;
+import com.comphenix.protocol.injector.netty.WirePacket;
 
 final class EmptyInjector implements Injector {
 
@@ -17,17 +21,20 @@ public EmptyInjector(Player player) {
  }
 
  @Override
- public int getProtocolVersion() {
- return Integer.MIN_VALUE;
+ public SocketAddress getAddress() {
+ if (this.player != null) {
+ return this.player.getAddress();
+ }
+ return null;
  }
 
  @Override
- public boolean inject() {
- return false;
+ public int getProtocolVersion() {
+ return Integer.MIN_VALUE;
  }
 
  @Override
- public void uninject() {
+ public void inject() {
  }
 
  @Override
@@ -43,17 +50,12 @@ public void receiveClientPacket(Object packet) {
  }
 
  @Override
- public Protocol getCurrentProtocol(PacketType.Sender sender) {
- return Protocol.HANDSHAKING;
- }
-
- @Override
- public NetworkMarker getMarker(Object packet) {
- return null;
+ public void sendWirePacket(WirePacket packet) {
  }
 
  @Override
- public void saveMarker(Object packet, NetworkMarker marker) {
+ public Protocol getCurrentProtocol(PacketType.Sender sender) {
+ return Protocol.HANDSHAKING;
  }
 
  @Override
@@ -70,6 +72,11 @@ public void setPlayer(Player player) {
  public void disconnect(String message) {
  }
 
+ @Override
+ public boolean isConnected() {
+ return false;
+ }
+
  @Override
  public boolean isInjected() {
  return false;