Merge commit '3914bc4f0935b9385c7fcd32a44e04f5fcaa9bcc' into Devaside

Author: redomar

src/com/redomar/game/Game.java

@@ -29,6 +29,7 @@ public class Game extends Canvas implements Runnable {
 	public static final int HEIGHT = (WIDTH / 3 * 2);
 	public static final int SCALE = 3;
 	public static final String NAME = "Game";
+	public static Game game;
 
 	private JFrame frame;
 
@@ -67,6 +68,7 @@ public Game() {
 	}
 
 	public void init() {
+		game = this;
 		int index = 0;
 		for (int r = 0; r < 6; r++) {
 			for (int g = 0; g < 6; g++) {

src/com/redomar/game/entities/Player.java

@@ -1,10 +1,12 @@
 package com.redomar.game.entities;
 
+import com.redomar.game.Game;
 import com.redomar.game.InputHandler;
 import com.redomar.game.gfx.Colours;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.LevelHandler;
 import com.redomar.game.lib.Font;
+import com.redomar.game.net.packets.Packet02Move;
 
 public class Player extends Mob {
 
@@ -42,6 +44,10 @@ public void tick() {
 		if (xa != 0 || ya != 0) {
 			move(xa, ya);
 			isMoving = true;
+			
+			Packet02Move packet = new Packet02Move(this.getUsername(), this.x, this.y);
+			packet.writeData(Game.game.getSocketClient());
+			
 		} else {
 			isMoving = false;
 		}

src/com/redomar/game/level/LevelHandler.java

@@ -156,5 +156,22 @@ public void removeEntity(String username) {
 		}
 		this.entities.remove(index);
 	}
+	
+	private int getPlayerMPIndex(String username){
+		int index = 0;
+		for(Entity e : entities){
+			if(e instanceof PlayerMP && ((PlayerMP)e).getUsername().equalsIgnoreCase(username)){
+				break;
+			}
+			index++;
+		}
+		return index;
+	}
+	
+	public void movePlayer(String username, int x, int y){
+		int index = getPlayerMPIndex(username);
+		this.entities.get(index).x = x;
+		this.entities.get(index).y = y;
+	}
 
 }

src/com/redomar/game/net/GameClient.java

@@ -13,6 +13,7 @@
 import com.redomar.game.net.packets.Packet00Login;
 import com.redomar.game.net.packets.Packet01Disconnect;
 import com.redomar.game.net.packets.Packet.PacketTypes;
+import com.redomar.game.net.packets.Packet02Move;
 
 public class GameClient extends Thread {
 
@@ -71,9 +72,17 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 					+ " has disconnected...");
 			game.getLevel().removeEntity(((Packet01Disconnect)packet).getUsername());
 			break;
+		case MOVE:
+			packet = new Packet02Move(data);
+			this.handlePacket((Packet02Move)packet);
+			break;
 		}
 	}
 
+	private void handlePacket(Packet02Move packet) {
+		this.game.level.movePlayer(packet.getUsername(), packet.getX(), packet.getY());
+	}
+
 	public void sendData(byte[] data) {
 		DatagramPacket packet = new DatagramPacket(data, data.length,
 				ipAddress, 1331);

src/com/redomar/game/net/GameServer.java

@@ -14,6 +14,7 @@
 import com.redomar.game.net.packets.Packet00Login;
 import com.redomar.game.net.packets.Packet.PacketTypes;
 import com.redomar.game.net.packets.Packet01Disconnect;
+import com.redomar.game.net.packets.Packet02Move;
 
 public class GameServer extends Thread {
 
@@ -76,6 +77,21 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 					+ " has disconnected...");
 			this.removeConnection((Packet01Disconnect) packet);
 			break;
+		case MOVE:
+			packet = new Packet02Move(data);
+			System.out.println(((Packet02Move) packet).getUsername()
+					+ " has moved to " + ((Packet02Move) packet).getX() + ", "
+					+ ((Packet02Move) packet).getY());
+			this.handleMove(((Packet02Move)packet));
+		}
+	}
+
+	private void handleMove(Packet02Move packet) {
+		if(getPlayerMP(packet.getUsername()) != null){
+			int index = getPlayerMPIndex(packet.getUsername());
+			this.connectedPlayers.get(index).x = packet.getX();
+			this.connectedPlayers.get(index).y = packet.getY();
+			packet.writeData(this);
 		}
 	}
 

src/com/redomar/game/net/packets/Packet.java

@@ -6,7 +6,7 @@
 public abstract class Packet {
 
 	public static enum PacketTypes {
-		INVALID(-1), LOGIN(00), DISCONNECT(01);
+		INVALID(-1), LOGIN(00), DISCONNECT(01), MOVE(02);
 
 		private int packetId;
 

src/com/redomar/game/net/packets/Packet02Move.java

@@ -0,0 +1,52 @@
+package com.redomar.game.net.packets;
+
+import com.redomar.game.net.GameClient;
+import com.redomar.game.net.GameServer;
+
+public class Packet02Move extends Packet {
+
+	private String username;
+	private int x, y;
+
+	public Packet02Move(byte[] data) {
+		super(02);
+		String[] dataArray = readData(data).split(",");
+		this.username = dataArray[0];
+		this.x = Integer.parseInt(dataArray[1]);
+		this.y = Integer.parseInt(dataArray[2]);
+	}
+
+	public Packet02Move(String username, int x, int y) {
+		super(02);
+		this.username = username;
+		this.x = x;
+		this.y = y;
+	}
+
+	@Override
+	public byte[] getData() {
+		return ("02" + this.username + "," + this.x + "," + this.y).getBytes();
+	}
+
+	@Override
+	public void writeData(GameClient client) {
+		client.sendData(getData());
+	}
+
+	@Override
+	public void writeData(GameServer server) {
+		server.sendDataToAllClients(getData());
+	}
+
+	public String getUsername() {
+		return username;
+	}
+	
+	public int getX(){
+		return this.x;
+	}
+	
+	public int getY(){
+		return this.y;
+	}
+}