Started work on simple multiplayer functionality

.classpath

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

.gitignore

@@ -1,2 +1,4 @@
 /bin/
 /target/
+/.classpath
+/.project

.project

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Tankernn Game Server</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

pom.xml

@@ -1,45 +1,45 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>eu.tankernn.game</groupId>
-	<artifactId>tankernn-game-server</artifactId>
-	<version>0.0.1</version>
-	<name>Tankernn Game Server</name>
-
-	<repositories>
-		<repository>
-			<id>tankernn</id>
-			<name>Tankernn Maven Repository</name>
-			<url>http://repo.maven.tankernn.eu</url>
-		</repository>
-
-	</repositories>
-
-	<dependencies>
-		<dependency>
-			<groupId>eu.tankernn.gameEngine</groupId>
-			<artifactId>tankernn-game-engine</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
-		<dependency>
-			<groupId>io.netty</groupId>
-			<artifactId>netty-all</artifactId>
-			<version>4.0.4.Final</version>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.5.1</version>
-				<configuration>
-					<source />
-					<target />
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>eu.tankernn.game</groupId>
+	<artifactId>tankernn-game-server</artifactId>
+	<version>0.0.1</version>
+	<name>Tankernn Game Server</name>
+
+	<repositories>
+		<repository>
+			<id>tankernn</id>
+			<name>Tankernn Maven Repository</name>
+			<url>http://repo.maven.tankernn.eu</url>
+		</repository>
+
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>eu.tankernn.gameEngine</groupId>
+			<artifactId>tankernn-game-engine</artifactId>
+			<version>1.2</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/io.netty/netty-all -->
+		<dependency>
+			<groupId>io.netty</groupId>
+			<artifactId>netty-all</artifactId>
+			<version>4.0.4.Final</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.5.1</version>
+				<configuration>
+					<source />
+					<target />
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 </project>

src/main/java/eu/tankernn/game/server/GameServer.java

@@ -1,48 +1,67 @@
-package eu.tankernn.game.server;
-
-import io.netty.bootstrap.ServerBootstrap;
-import io.netty.channel.ChannelFuture;
-import io.netty.channel.ChannelInitializer;
-import io.netty.channel.ChannelOption;
-import io.netty.channel.EventLoopGroup;
-import io.netty.channel.nio.NioEventLoopGroup;
-import io.netty.channel.socket.SocketChannel;
-import io.netty.channel.socket.nio.NioServerSocketChannel;
-
-public class GameServer {
-	private int port;
-	
-	public GameServer(int port) {
-        this.port = port;
-    }
-	
-	public void run() throws Exception {
-        EventLoopGroup bossGroup = new NioEventLoopGroup(); // (1)
-        EventLoopGroup workerGroup = new NioEventLoopGroup();
-        try {
-            ServerBootstrap b = new ServerBootstrap(); // (2)
-            b.group(bossGroup, workerGroup)
-             .channel(NioServerSocketChannel.class) // (3)
-             .childHandler(new ChannelInitializer<SocketChannel>() { // (4)
-                 @Override
-                 public void initChannel(SocketChannel ch) throws Exception {
-                     ch.pipeline().addLast(new GameServerHandler());
-                 }
-             })
-             .option(ChannelOption.SO_BACKLOG, 128)          // (5)
-             .childOption(ChannelOption.SO_KEEPALIVE, true); // (6)
-
-            // Bind and start to accept incoming connections.
-            ChannelFuture f = b.bind(port).sync(); // (7)
-
-            // Wait until the server socket is closed.
-            // In this example, this does not happen, but you can do that to gracefully
-            // shut down your server.
-            f.channel().closeFuture().sync();
-        } finally {
-            workerGroup.shutdownGracefully();
-            bossGroup.shutdownGracefully();
-        }
-    }
-
-}
+package eu.tankernn.game.server;
+
+import java.util.ArrayList;
+
+import eu.tankernn.gameEngine.entities.Entity3D;
+import eu.tankernn.gameEngine.entities.Light;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import io.netty.handler.codec.serialization.ClassResolvers;
+import io.netty.handler.codec.serialization.ObjectDecoder;
+import io.netty.handler.codec.serialization.ObjectEncoder;
+import io.netty.handler.timeout.IdleStateHandler;
+import io.netty.handler.timeout.ReadTimeoutHandler;
+
+public class GameServer {
+	private int port;
+	private World world;
+
+	public GameServer(int port) {
+		this.port = port;
+		this.world = new World(1337, new ArrayList<Light>(), new ArrayList<Entity3D>());
+	}
+
+	public void run() throws Exception {
+		EventLoopGroup bossGroup = new NioEventLoopGroup();
+		EventLoopGroup workerGroup = new NioEventLoopGroup();
+		ServerBootstrap b = new ServerBootstrap();
+		b.group(bossGroup, workerGroup).channel(NioServerSocketChannel.class)
+				.childHandler(new ChannelInitializer<SocketChannel>() {
+					@Override
+					public void initChannel(SocketChannel ch) throws Exception {
+						
+						ch.pipeline().addLast("objectDecoder", new ObjectDecoder(ClassResolvers.cacheDisabled(null)));
+						ch.pipeline().addLast("objectEncoder", new ObjectEncoder());
+						ch.pipeline().addLast("timeouthandler", new ReadTimeoutHandler(30));
+						ch.pipeline().addLast(new IdleStateHandler(0, 0, 29));
+
+						ch.pipeline().addLast(new GameServerHandler(world));
+					}
+				}).option(ChannelOption.SO_BACKLOG, 128).childOption(ChannelOption.SO_KEEPALIVE, true);
+
+		// Bind and start to accept incoming connections.
+		b.bind(port).sync();
+		
+		System.out.println("Server started.");
+	}
+
+	public static void main(String[] args) {
+		int port;
+		if (args.length > 0) {
+			port = Integer.parseInt(args[0]);
+		} else {
+			port = 25566;
+		}
+		try {
+			new GameServer(port).run();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}

src/main/java/eu/tankernn/game/server/GameServerHandler.java

@@ -1,19 +1,44 @@
-package eu.tankernn.game.server;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-public class GameServerHandler extends ChannelInboundHandlerAdapter {
-
-	@Override
-	public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
-		ctx.write(msg);
-		ctx.flush();
-	}
-
-	@Override
-	public void exceptionCaught(ChannelHandlerContext ctx, Throwable e) throws Exception {
-		e.printStackTrace();
-		ctx.close();
-	}
-}
+package eu.tankernn.game.server;
+
+import org.lwjgl.util.vector.ReadableVector3f;
+import org.lwjgl.util.vector.Vector3f;
+
+import eu.tankernn.game.server.entities.player.ServerPlayer;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.timeout.IdleStateEvent;
+
+public class GameServerHandler extends ChannelInboundHandlerAdapter {
+
+	private ServerPlayer player;
+	private final World world;
+
+	public GameServerHandler(World world) {
+		this.world = world;
+	}
+
+	@Override
+	public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+		if (player == null && msg instanceof String) {
+			player = new ServerPlayer((String) msg);
+			world.players.add(player);
+			System.out.println("Player connected with username: " + player.getUsername());
+			ctx.writeAndFlush(Integer.valueOf(world.seed));
+		} else if (msg instanceof Vector3f) {
+			player.getPosition().set((ReadableVector3f) msg);
+		}
+	}
+
+	@Override
+	public void userEventTriggered(ChannelHandlerContext ctx, Object evt) throws Exception {
+		if (evt instanceof IdleStateEvent) {
+			ctx.writeAndFlush(new Object());
+		}
+	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable e) throws Exception {
+		e.printStackTrace();
+		ctx.close();
+	}
+}

src/main/java/eu/tankernn/game/server/Launcher.java

@@ -1,17 +0,0 @@
-package eu.tankernn.game.server;
-
-public class Launcher {
-	public static void main(String[] args) {
-		int port;
-        if (args.length > 0) {
-            port = Integer.parseInt(args[0]);
-        } else {
-            port = 8080;
-        }
-        try {
-			new GameServer(port).run();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-}

src/main/java/eu/tankernn/game/server/World.java

@@ -1,23 +1,24 @@
-package eu.tankernn.game.server;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.tankernn.game.server.entities.player.ServerPlayer;
-import eu.tankernn.gameEngine.entities.Entity;
-import eu.tankernn.gameEngine.entities.Light;
-
-public class World {
-	int seed;
-	List<Light> lights;
-	List<Entity> entities;
-	List<ServerPlayer> players;
-	
-	public World(List<Light> lights, List<Entity> entities) {
-		this.lights = lights;
-		this.entities = entities;
-		this.players = new ArrayList<ServerPlayer>();
-	}
-	
-	
-}
+package eu.tankernn.game.server;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import eu.tankernn.game.server.entities.player.ServerPlayer;
+import eu.tankernn.gameEngine.entities.Entity3D;
+import eu.tankernn.gameEngine.entities.Light;
+
+public class World {
+	public final int seed;
+	List<Light> lights;
+	List<Entity3D> entities;
+	List<ServerPlayer> players;
+	
+	public World(int seed, List<Light> lights, List<Entity3D> entities) {
+		this.seed = seed;
+		this.lights = lights;
+		this.entities = entities;
+		this.players = new ArrayList<ServerPlayer>();
+	}
+	
+	
+}

src/main/java/eu/tankernn/game/server/entities/player/ServerPlayer.java

@@ -1,13 +1,21 @@
-package eu.tankernn.game.server.entities.player;
-
-import eu.tankernn.gameEngine.entities.Player;
-
-public class ServerPlayer {
-	private Player playerEntity;
-	private String username;
-	
-	public ServerPlayer(String username, Player entity) {
-		this.username = username;
-		this.playerEntity = entity;
-	}
-}
+package eu.tankernn.game.server.entities.player;
+
+import org.lwjgl.util.vector.Vector3f;
+
+public class ServerPlayer {
+	private final Vector3f position;
+	private String username;
+	
+	public ServerPlayer(String username) {
+		this.username = username;
+		this.position = new Vector3f();
+	}
+
+	public Vector3f getPosition() {
+		return position;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+}