Change-Id: If81bd9f1cf2db8fd6a38752f6a36648e5e4423dc

src/main/java/com/l2jserver/GameServerModule.java

@@ -0,0 +1,11 @@
+package com.l2jserver;
+
+import com.google.inject.AbstractModule;
+
+public class GameServerModule extends AbstractModule {
+	@Override
+	protected void configure() {
+		// TODO Auto-generated method stub
+		
+	}
+}

src/main/java/com/l2jserver/L2JGameServer.java

@@ -0,0 +1,13 @@
+package com.l2jserver;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+public class L2JGameServer {
+	private final Injector injector = Guice
+			.createInjector(new GameServerModule());
+
+	public Injector getInjector() {
+		return injector;
+	}
+}

src/main/java/com/l2jserver/L2JGameServerMain.java

@@ -0,0 +1,13 @@
+package com.l2jserver;
+
+public class L2JGameServerMain {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		// TODO Auto-generated method stub
+
+	}
+
+}

src/main/java/com/l2jserver/L2JServerRuntime.java

@@ -1,9 +0,0 @@
-package com.l2jserver;
-
-import com.l2jserver.service.logging.LoggingService;
-
-public class L2JServerRuntime {
-	public LoggingService getLoggingService() {
-		return null;
-	}
-}

src/main/java/com/l2jserver/game/net/packet/PacketModule.java

@@ -5,6 +5,7 @@ import com.google.inject.AbstractModule;
 public class PacketModule extends AbstractModule {
 	@Override
 	protected void configure() {
-		
+		install(new ClientPacketModule());
+		install(new ServerPacketModule());
 	}
 }

src/main/java/com/l2jserver/game/net/packet/ServerPacketModule.java

@@ -0,0 +1,11 @@
+package com.l2jserver.game.net.packet;
+
+import com.google.inject.AbstractModule;
+import com.l2jserver.game.net.packet.client.ProtocolVersionPacket;
+
+public class ServerPacketModule extends AbstractModule {
+	@Override
+	protected void configure() {
+		bind(ProtocolVersionPacket.class);
+	}
+}

src/main/java/com/l2jserver/game/net/packet/client/ProtocolVersionPacket.java

@@ -2,28 +2,23 @@ package com.l2jserver.game.net.packet.client;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 
-import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.l2jserver.L2JConstants;
 import com.l2jserver.game.net.Lineage2Connection;
 import com.l2jserver.game.net.packet.AbstractClientPacket;
 import com.l2jserver.service.logging.Logger;
-import com.l2jserver.service.logging.LoggingService;
+import com.l2jserver.service.logging.guice.InjectLogger;
 
 public class ProtocolVersionPacket extends AbstractClientPacket {
 	public static final int OPCODE = 0x0e;
 
 	// services
-	private final Logger logger;
+	@InjectLogger
+	private final Logger logger = null;
 
 	// packet
 	private int version;
 
-	@Inject
-	protected ProtocolVersionPacket(LoggingService logging) {
-		logger = logging.getLogger(ProtocolVersionPacket.class);
-	}
-
 	@Override
 	public void read(ChannelBuffer buffer) {
 		this.version = buffer.readInt();
@@ -31,8 +26,10 @@ public class ProtocolVersionPacket extends AbstractClientPacket {
 
 	@Override
 	public void process(Lineage2Connection conn, Injector injector) {
-		if(L2JConstants.SUPPORTED_PROTOCOL != version) {
+		if (L2JConstants.SUPPORTED_PROTOCOL != version) {
-			logger.info("Incorrect protocol version: "+version);
+			logger.info(
+					"Incorrect protocol version: {0}. Only {1} is supported.",
+					version, L2JConstants.SUPPORTED_PROTOCOL);
 			conn.close();
 		}
 

src/main/java/com/l2jserver/routines/GameServerInitializationRoutine.java

@@ -0,0 +1,8 @@
+package com.l2jserver.routines;
+
+public class GameServerInitializationRoutine implements Routine<Boolean> {
+	@Override
+	public Boolean call() {
+		return false;
+	}
+}

src/main/java/com/l2jserver/routines/InitializationRoutine.java

@@ -1,9 +0,0 @@
-package com.l2jserver.routines;
-
-public class InitializationRoutine implements Routine {
-	@Override
-	public void run() {
-		// TODO Auto-generated method stub
-		
-	}
-}

src/main/java/com/l2jserver/routines/Routine.java

@@ -1,4 +0,0 @@
-package com.l2jserver.routines;
-
-public interface Routine extends Runnable {
-}