Improvements: entities and console printing

Properly named NPC's so that can be printed
Improved removing entities when leaving levels and prints to console as
message.
Improved console printing.

Author: redomar

src/com/redomar/game/Game.java

@@ -141,7 +141,7 @@ public void init() {
 		// socketClient.sendData("ping".getBytes());
 		loginPacket.writeData(getSocketClient());
 
-		game.setVendor(new Vendor(getLevel(), "g", 215, 215, 304, 543));
+		game.setVendor(new Vendor(getLevel(), "Vendor", 215, 215, 304, 543));
 		getLevel().addEntity(getVendor());
 	}
 
@@ -166,7 +166,7 @@ public void setMap(String Map_str) {
 
 	public static void npcSpawn() {
 		if (isNpc() == true) {
-			game.setDummy(new Dummy(Game.getLevel(), "h", 100, 150, 500, 543));
+			game.setDummy(new Dummy(Game.getLevel(), "Dummy", 100, 150, 500, 543));
 			game.level.addEntity(Game.getDummy());
 		}
 	}
@@ -300,14 +300,17 @@ public void render() {
 		}
 
 		if (changeLevel == true) {
+			print.print("Teleported into new world", PrintTypes.GAME);
 			if (getMap() == 1) {
 				setMap("/levels/water_level.png");
-				setMap(2);
+				getLevel().removeEntity(getDummy()); setNpc(false);
 				getLevel().removeEntity(getVendor());
+				setMap(2);
 			} else if (getMap() == 2) {
 				setMap("/levels/custom_level.png");
-				setMap(1);
+				getLevel().removeEntity(getDummy()); setNpc(false);
 				getLevel().addEntity(getVendor());
+				setMap(1);
 			}
 			changeLevel = false;
 		}

src/com/redomar/game/InputHandler.java

@@ -95,7 +95,6 @@ public void toggleKey(int keyCode, boolean isPressed) {
 			// }
 			if (Game.getMap() == 2) {
 				Game.setChangeLevel(true);
-				Game.getLevel().removeEntity(Game.getDummy());
 				Game.setNpc(false);
 			}
 		}

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

@@ -26,7 +26,7 @@ public class Dummy extends Mob {
 
 	public Dummy(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
-		super(level, "h", x, y, speed, collisionBoders);
+		super(level, name, x, y, speed, collisionBoders);
 		this.faceCol = faceCol;
 		this.shirtCol = shirtCol;
 		this.colour = Colours.get(-1, 111, shirtCol, faceCol);

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

@@ -6,6 +6,7 @@
 public abstract class Entity {
 
 	protected double x, y;
+	protected String name;
 	protected LevelHandler level;
 
 	public Entity(LevelHandler level) {
@@ -35,4 +36,12 @@ public double getY() {
 	public void setY(int y) {
 		this.y = y;
 	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
 }

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

@@ -13,7 +13,6 @@
 
 public abstract class Mob extends Entity {
 
-	protected String name;
 	protected Random random = new Random();
 	protected double speed;
 	protected int numSteps = 0;

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

@@ -27,7 +27,7 @@ public class Vendor extends Mob {
 
 	public Vendor(LevelHandler level, String name, int x, int y, int shirtCol,
 			int faceCol) {
-		super(level, "h", x, y, speed, collisionBoders);
+		super(level, name, x, y, speed, collisionBoders);
 		this.faceCol = faceCol;
 		this.shirtCol = shirtCol;
 		this.colour = Colours.get(-1, 111, shirtCol, faceCol);

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

@@ -19,6 +19,8 @@
 import com.redomar.game.level.tiles.Tile;
 import com.redomar.game.lib.utils.Vector2i;
 import com.redomar.game.net.packets.Packet01Disconnect;
+import com.redomar.game.script.PrintTypes;
+import com.redomar.game.script.Printing;
 
 public class LevelHandler {
 
@@ -29,6 +31,7 @@ public class LevelHandler {
 	private List<Entity> entities_p = new ArrayList<Entity>();
 	private String imagePath;
 	private BufferedImage image;
+	private Printing print;
 
 	private Comparator<Node> nodeSorter = new Comparator<Node>() {
 
@@ -51,6 +54,8 @@ public LevelHandler(String imagePath) {
 			this.height = 64;
 			this.generateLevel();
 		}
+		
+		print = new Printing();
 	}
 
 	private void loadLevelFromFile() {
@@ -179,6 +184,12 @@ public Tile getTile(int x, int y) {
 
 	public void addEntity(Entity entity) {
 		this.getEntities().add(entity);
+		print.print("Added "+entity.getName()+" Entity", PrintTypes.LEVEL);
+		try {
+			Thread.sleep(100);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
 	}
 
 	public void addProjectileEntities(Entity entity) {
@@ -187,6 +198,12 @@ public void addProjectileEntities(Entity entity) {
 
 	public void removeEntity(Entity entity) {
 		this.getEntities().remove(entity);
+		print.print("Removed "+entity.getName()+" Entity", PrintTypes.LEVEL);
+		try {
+			Thread.sleep(100);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
 	}
 
 	public void removeProjectileEntities(Entity entity) {

src/com/redomar/game/script/PrintTypes.java

@@ -3,6 +3,7 @@
 public enum PrintTypes {
 
 	GAME,
+	LEVEL,
 	MUSIC,
 	ERROR,
 	NETWORK,

src/com/redomar/game/script/Printing.java

@@ -8,6 +8,7 @@ public class Printing {
 	private PrintTypes type;
 	private Time time = new Time();
 	private String message;
+	private boolean redMode = false;
 
 	public Printing() {
 
@@ -16,13 +17,18 @@ public Printing() {
 	public void print(String message, PrintTypes type) {
 		this.type = type;
 		setMessage(message);
+		readMessageType(type);
 		printOut();		
 	}
 
 	private void printOut(){
 		String msgTime = "[" + time.getTime() + "]";
 		String msgType = "[" + type.toString() + "]";
-		System.out.println(msgType + msgTime + getMessage());
+		if(redMode == true){
+			System.err.println(msgType + msgTime + getMessage());
+		}else{
+			System.out.println(msgType + msgTime + getMessage());
+		}
 	}
 
 	public String getMessage() {
@@ -32,4 +38,12 @@ public String getMessage() {
 	public void setMessage(String message) {
 		this.message = message;
 	}
+	
+	private void readMessageType(PrintTypes type){
+		if(type == PrintTypes.LEVEL){
+			this.redMode = true;
+		} else {
+			this.redMode = false;
+		}
+	}
 }