From 9195e677ab07f67d39209a5ff3e2539ff355eb93 Mon Sep 17 00:00:00 2001 From: "Kristian S. Stangeland" Date: Mon, 25 Feb 2013 20:32:27 +0100 Subject: [PATCH] Essentially, it's a lookup for a player's input stream. Or: InputStream -> PlayerInjector -> Player. --- .../protocol/injector/player/InjectedServerConnection.java | 6 +++--- .../protocol/injector/player/NetLoginInjector.java | 6 +++--- .../injector/player/ProxyPlayerInjectionHandler.java | 6 +++--- ...jectedServerSocket.java => InputStreamPlayerLookup.java} | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) rename ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/{InjectedServerSocket.java => InputStreamPlayerLookup.java} (99%) diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java index 0c259f79..9b87c532 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/InjectedServerConnection.java @@ -27,7 +27,7 @@ import net.sf.cglib.proxy.Factory; import org.bukkit.Server; import com.comphenix.protocol.error.ErrorReporter; -import com.comphenix.protocol.injector.server.InjectedServerSocket; +import com.comphenix.protocol.injector.server.InputStreamPlayerLookup; import com.comphenix.protocol.reflect.FieldUtils; import com.comphenix.protocol.reflect.FuzzyReflection; import com.comphenix.protocol.reflect.ObjectWriter; @@ -55,7 +55,7 @@ class InjectedServerConnection { private NetLoginInjector netLoginInjector; // Inject server connections - private InjectedServerSocket socketInjector; + private InputStreamPlayerLookup socketInjector; private Server server; private ErrorReporter reporter; @@ -64,7 +64,7 @@ class InjectedServerConnection { private Object minecraftServer = null; - public InjectedServerConnection(ErrorReporter reporter, InjectedServerSocket socketInjector, Server server, NetLoginInjector netLoginInjector) { + public InjectedServerConnection(ErrorReporter reporter, InputStreamPlayerLookup socketInjector, Server server, NetLoginInjector netLoginInjector) { this.listFields = new ArrayList(); this.replacedLists = new ArrayList>(); this.reporter = reporter; diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java index 9632be59..4a4b806f 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/NetLoginInjector.java @@ -25,7 +25,7 @@ import org.bukkit.entity.Player; import com.comphenix.protocol.error.ErrorReporter; import com.comphenix.protocol.injector.GamePhase; -import com.comphenix.protocol.injector.server.InjectedServerSocket; +import com.comphenix.protocol.injector.server.InputStreamPlayerLookup; import com.comphenix.protocol.injector.server.SocketInjector; import com.comphenix.protocol.reflect.FuzzyReflection; import com.comphenix.protocol.utility.MinecraftReflection; @@ -45,12 +45,12 @@ class NetLoginInjector { private ProxyPlayerInjectionHandler injectionHandler; // Associate input streams and injectors - private InjectedServerSocket serverSocket; + private InputStreamPlayerLookup serverSocket; // The current error rerporter private ErrorReporter reporter; - public NetLoginInjector(ErrorReporter reporter, ProxyPlayerInjectionHandler injectionHandler, InjectedServerSocket serverSocket) { + public NetLoginInjector(ErrorReporter reporter, ProxyPlayerInjectionHandler injectionHandler, InputStreamPlayerLookup serverSocket) { this.reporter = reporter; this.injectionHandler = injectionHandler; this.serverSocket = serverSocket; diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java index 908a1ac9..a713a9d0 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/player/ProxyPlayerInjectionHandler.java @@ -36,7 +36,7 @@ import com.comphenix.protocol.injector.GamePhase; import com.comphenix.protocol.injector.ListenerInvoker; import com.comphenix.protocol.injector.PlayerLoggedOutException; import com.comphenix.protocol.injector.PacketFilterManager.PlayerInjectHooks; -import com.comphenix.protocol.injector.server.InjectedServerSocket; +import com.comphenix.protocol.injector.server.InputStreamPlayerLookup; import com.comphenix.protocol.injector.server.SocketInjector; import com.comphenix.protocol.injector.server.TemporaryPlayerFactory; import com.google.common.base.Predicate; @@ -52,7 +52,7 @@ class ProxyPlayerInjectionHandler implements PlayerInjectionHandler { private InjectedServerConnection serverInjection; // Server socket injection - private InjectedServerSocket serverSocket; + private InputStreamPlayerLookup serverSocket; // NetLogin injector private NetLoginInjector netLoginInjector; @@ -96,7 +96,7 @@ class ProxyPlayerInjectionHandler implements PlayerInjectionHandler { this.invoker = invoker; this.injectionFilter = injectionFilter; this.packetListeners = packetListeners; - this.serverSocket = new InjectedServerSocket(reporter, server); + this.serverSocket = new InputStreamPlayerLookup(reporter, server); this.netLoginInjector = new NetLoginInjector(reporter, this, serverSocket); this.serverInjection = new InjectedServerConnection(reporter, serverSocket, server, netLoginInjector); serverInjection.injectList(); diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InjectedServerSocket.java b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamPlayerLookup.java similarity index 99% rename from ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InjectedServerSocket.java rename to ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamPlayerLookup.java index 058a1663..5fb38abd 100644 --- a/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InjectedServerSocket.java +++ b/ProtocolLib/src/main/java/com/comphenix/protocol/injector/server/InputStreamPlayerLookup.java @@ -34,7 +34,7 @@ import com.google.common.collect.MapMaker; * * @author Kristian */ -public class InjectedServerSocket { +public class InputStreamPlayerLookup { /** * The read and connect timeout for our built-in MOTD reader. */ @@ -162,7 +162,7 @@ public class InjectedServerSocket { // Used to create fake players private TemporaryPlayerFactory tempPlayerFactory = new TemporaryPlayerFactory(); - public InjectedServerSocket(ErrorReporter reporter, Server server) { + public InputStreamPlayerLookup(ErrorReporter reporter, Server server) { this.reporter = reporter; this.server = server; }