Added name typing and second player image

src/model/NetworkConnection.java

@@ -11,7 +11,7 @@ import model.state.PlayState;
 
 public class NetworkConnection {
 	private static final int port = 1234;
-	private static final String address = "jancokock.me";
+	private static final String address = "localhost";
 	private DataOutputStream dout;
 	private DataInputStream din;
 	private Thread receivethread;

src/model/state/MenuState.java

@@ -1,15 +1,19 @@
 package model.state;
 
+import java.awt.Color;
 import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
+import java.util.Arrays;
 
-import main.Window;
 import model.GameStateManager;
 import resources.image.Images;
 import resources.image.Images.ImageType;
 
 public class MenuState extends State {
+	
+	public static String name = "Guest" + Math.round((Math.random()*1000));
+	private static int[] not_allowed = {KeyEvent.VK_COMMA, KeyEvent.VK_SEMICOLON, KeyEvent.VK_PERIOD, KeyEvent.VK_QUOTE, KeyEvent.VK_QUOTEDBL, KeyEvent.VK_SHIFT};
 
 	public MenuState(GameStateManager gsm) {
 		super("menu", gsm);
@@ -18,6 +22,7 @@ public class MenuState extends State {
 	/* INIT AND EXIT */
 	@Override
 	public void init() {
+		
 	}
 
 	@Override
@@ -33,10 +38,20 @@ public class MenuState extends State {
 	@Override
 	public void paint(Graphics2D g2) {
 		g2.drawImage(Images.getImage(ImageType.BACKGROUND_MENU), 0,0,null);
-		g2.drawString("Fill in your name and press ENTER to start the game", Window.WIDTH / 2, Window.HEIGHT / 2);
+		g2.drawImage(Images.getImage(ImageType.PLAYER1).getSubimage(38, 0, 40, 54), 610, 550, null);
+		g2.drawImage(Images.getImage(ImageType.PLAYER2).getSubimage(38, 0, 40, 54), 670, 550, null);
+		
+		g2.setColor(Color.WHITE);
+		
+		g2.setFont(new Font("Segoe UI", Font.PLAIN, 20));
+		g2.drawString("Type your name and press ENTER to start the game", 20, 690);
+		
+		g2.setFont(new Font("Segoe UI", Font.BOLD, 30));
+		g2.drawString(name.toString(), 20, 730);
+		g2.drawRect(15, 702, 380, 36);
 		
 		g2.setFont(new Font("Segoe UI", Font.BOLD, 80));
-		g2.drawString("Bubble Trouble", 100, 100);
+		g2.drawString("Bubble Trouble", 100, 150);
 	}
 
 	/* EVENTS */
@@ -45,14 +60,21 @@ public class MenuState extends State {
 		if (e.getKeyCode() == KeyEvent.VK_ENTER) {
 			gsm.setState("play");
 		}
+		
+		if(e.getKeyCode() == KeyEvent.VK_BACK_SPACE && name.length() > 0)
+		{
+			name = name.substring(0, name.length()-1);
+		}
 	}
 
 	@Override
 	public void keyReleased(KeyEvent e) {
-
+		if(name.length() <= 15 && e.getKeyCode() != KeyEvent.VK_BACK_SPACE && !Arrays.asList(not_allowed).contains(e.getKeyCode()))
+		{
+			name += e.getKeyChar();
+		}
 	}
 
 	@Override
-	public void keyTyped(KeyEvent e) {
-	}
+	public void keyTyped(KeyEvent e) {}
 }

src/model/state/PlayState.java

@@ -28,7 +28,7 @@ public class PlayState extends State {
 	public PlayState(GameStateManager gsm) {
 		super("play", gsm);
 		player1 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, "");
-		player2 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, "");
+		player2 = new Player(Images.getImage(ImageType.PLAYER2), 40, 550, "");
 		infopanel = new InfoPanel(this);
 		balls = new ArrayList<Ball>();
 	}
@@ -36,7 +36,7 @@ public class PlayState extends State {
 	/* NETWORK CONTROL */
 	public void newMatch(String p1, String p2) {
 		player1 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, p1);
-		player2 = new Player(Images.getImage(ImageType.PLAYER1), 40, 550, p2);
+		player2 = new Player(Images.getImage(ImageType.PLAYER2), 40, 550, p2);
 		infopanel = new InfoPanel(this);
 		balls = new ArrayList<Ball>();
 	}
@@ -46,7 +46,7 @@ public class PlayState extends State {
 	public void init() {
 		nwc = new NetworkConnection(this);
 		try {
-			nwc.connect("Janco");
+			nwc.connect(MenuState.name);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

src/resources/image/Images.java

@@ -18,7 +18,7 @@ public class Images {
 	static {
 		try {
 			images.add(ImageIO.read(Main.class.getResource("/resources/image/player1_sprite.png")));
-			images.add(ImageIO.read(Main.class.getResource("/resources/image/player2.png")));
+			images.add(ImageIO.read(Main.class.getResource("/resources/image/player2_sprite.png")));
 			images.add(ImageIO.read(Main.class.getResource("/resources/image/background.png")));
 			images.add(ImageIO.read(Main.class.getResource("/resources/image/background_menu.png")));
 			images.add(ImageIO.read(Main.class.getResource("/resources/image/hearth.png")));