Merge commit '8791670c'

Author: redomar

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

@@ -69,4 +69,17 @@ protected boolean isSolid(int xa, int ya, int x, int y) {
 	public String getName() {
 		return name;
 	}
+
+	public void setNumSteps(int numSteps) {
+		this.numSteps = numSteps;
+	}
+
+	public void setMoving(boolean isMoving) {
+		this.isMoving = isMoving;
+	}
+
+	public void setMovingDir(int movingDir) {
+		this.movingDir = movingDir;
+	}
+	
 }

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

@@ -45,7 +45,7 @@ public void tick() {
 			move(xa, ya);
 			isMoving = true;
 
-			Packet02Move packet = new Packet02Move(this.getUsername(), this.x, this.y);
+			Packet02Move packet = new Packet02Move(this.getUsername(), this.x, this.y, this.numSteps, this.isMoving, this.movingDir);
 			packet.writeData(Game.game.getSocketClient());
 
 		} else {

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

@@ -10,6 +10,7 @@
 import javax.imageio.ImageIO;
 
 import com.redomar.game.entities.Entity;
+import com.redomar.game.entities.Player;
 import com.redomar.game.entities.PlayerMP;
 import com.redomar.game.gfx.Screen;
 import com.redomar.game.level.tiles.Tile;
@@ -19,7 +20,7 @@ public class LevelHandler {
 	private byte[] tiles;
 	public int width;
 	public int height;
-	public List<Entity> entities = new ArrayList<Entity>();
+	private List<Entity> entities = new ArrayList<Entity>();
 	private String imagePath;
 	private BufferedImage image;
 
@@ -91,9 +92,13 @@ private void generateLevel() {
 			}
 		}
 	}
+	
+	public synchronized List<Entity>getEntities(){
+		return this.entities;
+	}
 
 	public void tick() {
-		for (Entity e : entities) {
+		for (Entity e : getEntities()) {
 			e.tick();
 		}
 
@@ -130,7 +135,7 @@ public void renderTiles(Screen screen, int xOffset, int yOffset) {
 	}
 
 	public void renderEntities(Screen screen) {
-		for (Entity e : entities) {
+		for (Entity e : getEntities()) {
 			e.render(screen);
 		}
 	}
@@ -143,23 +148,23 @@ public Tile getTile(int x, int y) {
 	}
 
 	public void addEntity(Entity entity) {
-		this.entities.add(entity);
+		this.getEntities().add(entity);
 	}
 
 	public void removeEntity(String username) {
 		int index = 0;
-		for(Entity e : entities){
+		for(Entity e : getEntities()){
 			if(e instanceof PlayerMP && ((PlayerMP)e).getUsername().equalsIgnoreCase(username)){
 				break;
 			}
 			index++;
 		}
-		this.entities.remove(index);
+		this.getEntities().remove(index);
 	}
 
 	private int getPlayerMPIndex(String username){
 		int index = 0;
-		for(Entity e : entities){
+		for(Entity e : getEntities()){
 			if(e instanceof PlayerMP && ((PlayerMP)e).getUsername().equalsIgnoreCase(username)){
 				break;
 			}
@@ -168,10 +173,14 @@ private int getPlayerMPIndex(String username){
 		return index;
 	}
 
-	public void movePlayer(String username, int x, int y){
+	public void movePlayer(String username, int x, int y, int numSteps, boolean isMoving, int movingDir){
 		int index = getPlayerMPIndex(username);
-		this.entities.get(index).x = x;
-		this.entities.get(index).y = y;
+		PlayerMP player = (PlayerMP)this.getEntities().get(index);
+		player.x = x;
+		player.y = y;
+		player.setNumSteps(numSteps);
+		player.setMoving(isMoving);
+		player.setMovingDir(movingDir);
 	}
 
 }

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

@@ -58,32 +58,35 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			break;
 		case LOGIN:
 			packet = new Packet00Login(data);
-			handleLogin((Packet00Login)packet, address, port);
+			handleLogin((Packet00Login) packet, address, port);
 			break;
 		case DISCONNECT:
 			packet = new Packet01Disconnect(data);
 			System.out.println("[" + address.getHostAddress() + ":" + port
 					+ "] " + ((Packet01Disconnect) packet).getUsername()
 					+ " has disconnected...");
-			game.getLevel().removeEntity(((Packet01Disconnect)packet).getUsername());
+			game.getLevel().removeEntity(
+					((Packet01Disconnect) packet).getUsername());
 			break;
 		case MOVE:
 			packet = new Packet02Move(data);
-			this.handleMove((Packet02Move)packet);
+			this.handleMove((Packet02Move) packet);
 			break;
 		}
 	}
 
 	private void handleLogin(Packet00Login packet, InetAddress address, int port) {
 		System.out.println("[" + address.getHostAddress() + ":" + port + "] "
 				+ packet.getUsername() + " has joined...");
-		PlayerMP player = new PlayerMP(game.getLevel(), packet.getX(), packet.getY(),
-				packet.getUsername(), address, port);
+		PlayerMP player = new PlayerMP(game.getLevel(), packet.getX(),
+				packet.getY(), packet.getUsername(), address, port);
 		game.getLevel().addEntity(player);
 	}
 
 	private void handleMove(Packet02Move packet) {
-		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(), packet.getY());
+		this.game.getLevel().movePlayer(packet.getUsername(), packet.getX(),
+				packet.getY(), packet.getNumSteps(), packet.isMoving(),
+				packet.getMovingDir());
 	}
 
 	public void sendData(byte[] data) {

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

@@ -79,18 +79,19 @@ private void parsePacket(byte[] data, InetAddress address, int port) {
 			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();
+			PlayerMP player = this.connectedPlayers.get(index);
+			player.x = packet.getX();
+			player.y = packet.getY();
+			player.setNumSteps(packet.getNumSteps());
+			player.setMoving(packet.isMoving());
+			player.setMovingDir(packet.getMovingDir());
 			packet.writeData(this);
 		}
 	}

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

@@ -7,25 +7,37 @@ public class Packet02Move extends Packet {
 
 	private String username;
 	private int x, y;
+	private int numSteps = 0;
+	private boolean isMoving;
+	private int movingDir = 1;
 
 	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]);
+		this.numSteps = Integer.parseInt(dataArray[3]);
+		this.isMoving = Integer.parseInt(dataArray[4]) == 1;
+		this.movingDir = Integer.parseInt(dataArray[5]);
 	}
 
-	public Packet02Move(String username, int x, int y) {
+	public Packet02Move(String username, int x, int y, int numSteps,
+			boolean isMoving, int movingDir) {
 		super(02);
 		this.username = username;
 		this.x = x;
 		this.y = y;
+		this.numSteps = numSteps;
+		this.isMoving = isMoving;
+		this.movingDir = movingDir;
 	}
 
 	@Override
 	public byte[] getData() {
-		return ("02" + this.username + "," + getX() + "," + getY()).getBytes();
+		return ("02" + this.username + "," + this.x + "," + this.y + ","
+				+ this.getNumSteps() + "," + (this.isMoving ? 1 : 0) + "," + this
+					.getMovingDir()).getBytes();
 	}
 
 	@Override
@@ -41,12 +53,24 @@ public void writeData(GameServer server) {
 	public String getUsername() {
 		return username;
 	}
-	
-	public int getX(){
+
+	public int getX() {
 		return this.x;
 	}
-	
-	public int getY(){
+
+	public int getY() {
 		return this.y;
 	}
+
+	public int getNumSteps() {
+		return numSteps;
+	}
+
+	public boolean isMoving() {
+		return isMoving;
+	}
+
+	public int getMovingDir() {
+		return movingDir;
+	}
 }