Browse Source

Merge branch 'master' of git@github.com:Tankernn/TankernnGameServer.git

Conflicts:
	.gitignore
Tankernn 7 years ago
parent
commit
bf6ebc7217

+ 2 - 0
.gitignore

@@ -1,3 +1,5 @@
 /bin/
 /target/
 /.classpath
+/.project
+/.settings/

+ 0 - 23
.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>

+ 0 - 5
.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5

+ 0 - 4
.settings/org.eclipse.m2e.core.prefs

@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1

+ 201 - 0
LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

+ 44 - 44
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>

+ 130 - 48
src/main/java/eu/tankernn/game/server/GameServer.java

@@ -1,48 +1,130 @@
-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.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.lwjgl.util.vector.Vector3f;
+
+import eu.tankernn.gameEngine.entities.EntityState;
+import eu.tankernn.gameEngine.entities.GameContext;
+import eu.tankernn.gameEngine.entities.Light;
+import eu.tankernn.gameEngine.loader.models.AABB;
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.EventLoopGroup;
+import io.netty.channel.group.ChannelGroup;
+import io.netty.channel.group.DefaultChannelGroup;
+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.ReadTimeoutHandler;
+import io.netty.util.concurrent.GlobalEventExecutor;
+
+public class GameServer {
+	private ScheduledExecutorService executor;
+
+	private int port;
+	private World world;
+	private ChannelGroup channelGroup = new DefaultChannelGroup(GlobalEventExecutor.INSTANCE);
+
+	private long lastTickTimeStampNano;
+
+	public GameServer(int port) {
+		this.port = port;
+
+		executor = Executors.newSingleThreadScheduledExecutor();
+
+		this.world = new World(1337);
+		world.addLight(new Light(new Vector3f(1000, 1000, 0), new Vector3f(1, 1, 1)));
+		startListening();
+		executor.scheduleAtFixedRate(this::update, 0, 1000 / 16, TimeUnit.MILLISECONDS); // 64
+																							// tick
+																							// XD
+	}
+
+	private void update() {
+		try {
+			double tickLengthSeconds = (System.nanoTime() - lastTickTimeStampNano) / 1000000000.0;
+			lastTickTimeStampNano = System.nanoTime();
+			GameContext ctx = new GameContext(false, (float) tickLengthSeconds, world.getState().getEntities()) {
+
+				@Override
+				public float getTerrainHeight(float x, float z) {
+					return world.getTerrainHeight(x, z);
+				}
+
+				@Override
+				public float getHeight(int entityId) {
+					// TODO Auto-generated method stub
+					return 1;
+				}
+
+				@Override
+				public AABB getBoundingBox(int entityId) {
+					// TODO Auto-generated method stub
+					return new AABB(new Vector3f(0, 0, 0), new Vector3f(1, 1, 1)).updatePosition(world.getEntities().get(entityId).getState().getPosition());
+				}
+
+				@Override
+				public EntityState getEntity(int id) {
+					System.out.println("Request: " + id + ". Available: " + world.getEntities().values().toString());
+					return world.getEntities().get(id).getState();
+				}
+			};
+			world.update(ctx);
+			channelGroup.flushAndWrite(world.getState()).sync();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		} catch (Throwable t) {
+			t.printStackTrace();
+			throw t;
+		}
+	}
+
+	public void startListening() {
+		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(10));
+
+						ch.pipeline().addLast(new GameServerHandler(channelGroup, world));
+					}
+				}).option(ChannelOption.SO_BACKLOG, 128).childOption(ChannelOption.SO_KEEPALIVE, true);
+
+		// Bind and start to accept incoming connections.
+		try {
+			b.bind(port).sync();
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+
+		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);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+}

+ 61 - 19
src/main/java/eu/tankernn/game/server/GameServerHandler.java

@@ -1,19 +1,61 @@
-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 eu.tankernn.game.server.entities.player.ServerPlayer;
+import eu.tankernn.gameEngine.entities.EntityState;
+import eu.tankernn.gameEngine.multiplayer.LoginRequest;
+import eu.tankernn.gameEngine.multiplayer.LoginResponse;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.channel.group.ChannelGroup;
+
+public class GameServerHandler extends ChannelInboundHandlerAdapter {
+
+	private ServerPlayer player;
+	private final World world;
+	private final ChannelGroup group;
+
+	public GameServerHandler(ChannelGroup group, World world) {
+		this.group = group;
+		this.world = world;
+	}
+
+	@Override
+	public void channelActive(ChannelHandlerContext ctx) throws Exception {
+		player = new ServerPlayer(ctx.channel());
+	}
+
+	@Override
+	public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+		if (msg instanceof LoginRequest) {
+			LoginRequest request = (LoginRequest) msg;
+			player.setUsername(request.username);
+			world.addPlayer(player);
+			group.add(ctx.channel());
+			System.out.println("Player connected with username: " + player.getUsername());
+			ctx.writeAndFlush(new LoginResponse(true, player.getState())).sync();
+		} else if (msg instanceof EntityState) {
+			EntityState state = (EntityState) msg;
+			if (state.getId() == player.getId())
+				player.setState(state);
+			else {
+				// Spawn new entity
+				state.resetId();
+				world.setEntityState(state);
+			}
+		} else {
+			System.err.println("Unknown message: " + msg.toString());
+		}
+	}
+
+	@Override
+	public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+		world.removePlayer(player);
+		group.remove(ctx.channel());
+	}
+
+	@Override
+	public void exceptionCaught(ChannelHandlerContext ctx, Throwable e) throws Exception {
+		e.printStackTrace();
+		ctx.close();
+	}
+}

+ 0 - 17
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();
-		}
-	}
-}

+ 63 - 23
src/main/java/eu/tankernn/game/server/World.java

@@ -1,23 +1,63 @@
-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 java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import eu.tankernn.game.server.entities.ServerEntity;
+import eu.tankernn.game.server.entities.player.ServerPlayer;
+import eu.tankernn.gameEngine.entities.EntityState;
+import eu.tankernn.gameEngine.entities.GameContext;
+import eu.tankernn.gameEngine.entities.ILight;
+import eu.tankernn.gameEngine.multiplayer.WorldState;
+
+public class World {
+	private final int seed;
+	private final List<ILight> lights = new ArrayList<>();
+	private final Map<Integer, ServerEntity> entities = new ConcurrentHashMap<>();
+
+	public World(int seed) {
+		this.seed = seed;
+	}
+
+	public void update(GameContext ctx) {
+		entities.values().forEach(e -> e.update(ctx));
+		entities.values().removeIf(e -> e.getState().isDead());
+	}
+
+	public WorldState getState() {
+		return new WorldState(seed, lights,
+				entities.values().stream().map(ServerEntity::getState).collect(Collectors.toList()));
+	}
+
+	public Map<Integer, ServerEntity> getEntities() {
+		return entities;
+	}
+
+	public void addPlayer(ServerPlayer player) {
+		entities.put(player.getId(), player);
+	}
+
+	public void removePlayer(ServerPlayer player) {
+		entities.remove(player.getId());
+	}
+
+	public void setEntityState(EntityState state) {
+		if (entities.containsKey(state.getId()))
+			entities.get(state.getId()).setState(state);
+		else
+			entities.put(state.getId(), new ServerEntity(state));
+	}
+
+	public float getTerrainHeight(float x, float z) {
+		// TODO
+		return 0;
+	}
+
+	public void addLight(ILight light) {
+		lights.add(light);
+	}
+
+}

+ 27 - 0
src/main/java/eu/tankernn/game/server/entities/ServerEntity.java

@@ -0,0 +1,27 @@
+package eu.tankernn.game.server.entities;
+
+import eu.tankernn.gameEngine.entities.EntityState;
+import eu.tankernn.gameEngine.entities.GameContext;
+
+public class ServerEntity {
+	protected EntityState state;
+
+	public ServerEntity(EntityState state) {
+		this.state = state;
+	}
+
+	public EntityState getState() {
+		return state;
+	}
+
+	public void setState(EntityState state) {
+		//this.state = state;
+		this.state.getVelocity().set(state.getVelocity());
+		this.state.getRotation().set(state.getRotation());
+		this.state.setBehaviors(state.getBehaviors());
+	}
+	
+	public void update(GameContext ctx) {
+		state.update(ctx);
+	}
+}

+ 33 - 13
src/main/java/eu/tankernn/game/server/entities/player/ServerPlayer.java

@@ -1,13 +1,33 @@
-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 eu.tankernn.game.server.entities.ServerEntity;
+import eu.tankernn.gameEngine.entities.EntityState;
+import io.netty.channel.Channel;
+
+public class ServerPlayer extends ServerEntity {
+	
+	private final Channel channel;
+	private String username;
+	
+	public ServerPlayer(Channel channel) {
+		super(new EntityState());
+		state.setModelId(0);
+		this.channel = channel;
+	}
+	
+	public String getUsername() {
+		return username;
+	}
+	
+	public void setUsername(String username) {
+		this.username = username;
+	}
+	
+	public Channel getChannel() {
+		return channel;
+	}
+
+	public int getId() {
+		return state.getId();
+	}
+}