Jump flyttad till player + cleanup

src/states/PlayState.java

 package states;
 
-import testing.Tester;
-
-import testing.Tester.Point;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.paint.Color;
-import javafx.scene.shape.Line;
 import javafx.scene.text.Font;
 
-import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
@@ -43,14 +37,10 @@ public class PlayState extends GameState {
 	private String informationText;
 	private Color bgColor;
 	private Color fontColor;
-	private Double playerPosX = Constants.screenWidth/2 - (Constants.playerWidth/2);
-	private Double playerPosY = 265.00;
-	//	private Image player;
 	private Image obstacle;
 	private Double enemyPosX = -100.00;
 	private Double enemyPosY = 250.00;
 	private boolean up = false;
-	private boolean down = false;
 	private Player player;
 
 
@@ -106,15 +96,8 @@ public class PlayState extends GameState {
 
 			model.switchState(new MenuState(model));
 		} else if (key.getCode() == KeyCode.UP) {
-
-			//			if (player.getPlayerY() != 265.00) {
-			//				return;
-			//			}
-
 			up = true;
-
-
-
+			
 		}
 
 
@@ -125,59 +108,15 @@ public class PlayState extends GameState {
 
 		enemyPosX -= 10;
 
-
 		if (up) {
 
-			player.moveUp();
-
+			player.jump();
 		}
-
-
-		//		if (up) {
-		//			
-		////			 up = false;
-		//		
-		//
-		//				player.setPlayerY(player.getPlayerY()-10);
-		//
-		//			if (player.getPlayerY() <= 110) {
-		//
-		//				up = false;
-		//				down = true;
-		//
-		//			}
-		//
-		//		} else if (down) {
-		//
-		//			playerPosY += 10;
-		//			player.setPlayerY(player.getPlayerY()+10);
-		//
-		//			if (player.getPlayerY() == 265) {
-		//
-		//				down = false;
-		//
-		//			}
-		//
-		//		}
-
-		//		if (up) {
-		//			
-		//			player.move();
-		//
-		//
-		//		} else if (down) {
-		//
-		//			playerPosY += 10;
-		//
-		//			if (playerPosY == 265) {
-		//
-		//				down = false;
-		//
-		//			}
-		//
-		//		}
-
-
+		
+		if (player.getPlayerY() == 265) {
+			up = false;
+		}
+		
 	}
 
 

src/states/Player.java

 package states;
 
 import java.io.FileInputStream;
+
 import java.io.FileNotFoundException;
 
 import constants.Constants;
 import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 
 public class Player {
 
@@ -16,6 +17,7 @@ public class Player {
 	private int lives = 3;
 	private Image image;
 	private boolean down = false;
+	private boolean up = false;
 
 
 	public Player(String playerImg) {
@@ -53,22 +55,32 @@ public class Player {
 		return playerY;
 	}
 
-	public void moveUp() {
-
-
-//		if (playerY > 110) {
-
-			playerY -= 10;
-
-
-			if (playerY <= 110) {
-
-				down = true;
-
-			}
-
-//		} 
+	
+	
+	public void move(KeyEvent key) {
+		
+		if (key.getCode() == KeyCode.UP) {
+			this.jump();
+			up = true;
+		}
+		
+	}
+	
+		
+	public void jump() {
+				
+	if (!down) {
+		
+		playerY -= 10;
+		
+		if (playerY <= 110) {
+
+			down = true;
+			
+		}
 
+	}
+	
 		if (down) {
 
 			playerY += 10;
@@ -79,8 +91,8 @@ public class Player {
 
 		}
 
-
 	}
+	
 
 	public void setPlayerX(double playerX) {
 		this.playerX = playerX;
@@ -92,11 +104,4 @@ public class Player {
 	}
 
 
-	public boolean moveDown(boolean down) {
-		return down;
-
-	}
-
-
-
 }