moved some classes for simplification
This commit is contained in:
@@ -1,5 +1,10 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.enums.GameState;
|
||||||
|
import de.miaurizius.jgame2d.core.handlers.AssetSetter;
|
||||||
|
import de.miaurizius.jgame2d.core.handlers.CollisionHandler;
|
||||||
|
import de.miaurizius.jgame2d.core.handlers.KeyHandler;
|
||||||
|
import de.miaurizius.jgame2d.core.handlers.Sound;
|
||||||
import de.miaurizius.jgame2d.entity.Player;
|
import de.miaurizius.jgame2d.entity.Player;
|
||||||
import de.miaurizius.jgame2d.object.SuperObject;
|
import de.miaurizius.jgame2d.object.SuperObject;
|
||||||
import de.miaurizius.jgame2d.tile.TileManager;
|
import de.miaurizius.jgame2d.tile.TileManager;
|
||||||
@@ -30,7 +35,7 @@ public class GamePanel extends JPanel implements Runnable {
|
|||||||
int FPS = 60;
|
int FPS = 60;
|
||||||
|
|
||||||
// SYSTEM
|
// SYSTEM
|
||||||
TileManager tileM = new TileManager(this);
|
public TileManager tileM = new TileManager(this);
|
||||||
KeyHandler keyH = new KeyHandler(this);
|
KeyHandler keyH = new KeyHandler(this);
|
||||||
Sound se = new Sound();
|
Sound se = new Sound();
|
||||||
Sound music = new Sound();
|
Sound music = new Sound();
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.enums.GameState;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
|
||||||
public class UI {
|
public class UI {
|
||||||
@@ -20,10 +22,10 @@ public class UI {
|
|||||||
graphics2d.setColor(Color.white);
|
graphics2d.setColor(Color.white);
|
||||||
|
|
||||||
switch (panel.gameState) {
|
switch (panel.gameState) {
|
||||||
case PLAY:
|
case GameState.PLAY:
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case PAUSE:
|
case GameState.PAUSE:
|
||||||
drawPauseScreen();
|
drawPauseScreen();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.enums;
|
||||||
|
|
||||||
public enum Direction {
|
public enum Direction {
|
||||||
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.enums;
|
||||||
|
|
||||||
public enum GameState {
|
public enum GameState {
|
||||||
|
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.handlers;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.GamePanel;
|
||||||
|
|
||||||
public class AssetSetter {
|
public class AssetSetter {
|
||||||
|
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.handlers;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.GamePanel;
|
||||||
import de.miaurizius.jgame2d.entity.Entity;
|
import de.miaurizius.jgame2d.entity.Entity;
|
||||||
import de.miaurizius.jgame2d.object.SuperObject;
|
import de.miaurizius.jgame2d.object.SuperObject;
|
||||||
|
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.handlers;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.GamePanel;
|
||||||
|
import de.miaurizius.jgame2d.core.enums.GameState;
|
||||||
|
|
||||||
import java.awt.event.KeyEvent;
|
import java.awt.event.KeyEvent;
|
||||||
import java.awt.event.KeyListener;
|
import java.awt.event.KeyListener;
|
||||||
@@ -1,4 +1,6 @@
|
|||||||
package de.miaurizius.jgame2d.core;
|
package de.miaurizius.jgame2d.core.handlers;
|
||||||
|
|
||||||
|
import de.miaurizius.jgame2d.core.Boot;
|
||||||
|
|
||||||
import javax.sound.sampled.AudioInputStream;
|
import javax.sound.sampled.AudioInputStream;
|
||||||
import javax.sound.sampled.AudioSystem;
|
import javax.sound.sampled.AudioSystem;
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
package de.miaurizius.jgame2d.entity;
|
package de.miaurizius.jgame2d.entity;
|
||||||
|
|
||||||
import de.miaurizius.jgame2d.core.Boot;
|
import de.miaurizius.jgame2d.core.Boot;
|
||||||
import de.miaurizius.jgame2d.core.Direction;
|
import de.miaurizius.jgame2d.core.enums.Direction;
|
||||||
import de.miaurizius.jgame2d.core.GamePanel;
|
import de.miaurizius.jgame2d.core.GamePanel;
|
||||||
import de.miaurizius.jgame2d.core.Utility;
|
import de.miaurizius.jgame2d.core.Utility;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package de.miaurizius.jgame2d.entity;
|
package de.miaurizius.jgame2d.entity;
|
||||||
|
|
||||||
import de.miaurizius.jgame2d.core.Direction;
|
import de.miaurizius.jgame2d.core.enums.Direction;
|
||||||
import de.miaurizius.jgame2d.core.GamePanel;
|
import de.miaurizius.jgame2d.core.GamePanel;
|
||||||
|
|
||||||
public class OldManNPC extends Entity {
|
public class OldManNPC extends Entity {
|
||||||
@@ -10,9 +10,10 @@ public class OldManNPC extends Entity {
|
|||||||
|
|
||||||
direction = Direction.DOWN;
|
direction = Direction.DOWN;
|
||||||
speed = 1;
|
speed = 1;
|
||||||
|
getImage();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getPlayerImage() {
|
public void getImage() {
|
||||||
up1 = initEntitySprites("npc/oldman_up_1");
|
up1 = initEntitySprites("npc/oldman_up_1");
|
||||||
up2 = initEntitySprites("npc/oldman_up_2");
|
up2 = initEntitySprites("npc/oldman_up_2");
|
||||||
down1 = initEntitySprites("npc/oldman_down_1");
|
down1 = initEntitySprites("npc/oldman_down_1");
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
package de.miaurizius.jgame2d.entity;
|
package de.miaurizius.jgame2d.entity;
|
||||||
|
|
||||||
import de.miaurizius.jgame2d.core.*;
|
import de.miaurizius.jgame2d.core.*;
|
||||||
|
import de.miaurizius.jgame2d.core.enums.Direction;
|
||||||
|
import de.miaurizius.jgame2d.core.handlers.KeyHandler;
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
import java.io.*;
|
|
||||||
|
|
||||||
public class Player extends Entity {
|
public class Player extends Entity {
|
||||||
|
|
||||||
@@ -51,7 +52,7 @@ public class Player extends Entity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void update() {
|
public void update() {
|
||||||
//Move player
|
// MOVEMENT
|
||||||
if(keyH.upPressed || keyH.downPressed || keyH.leftPressed || keyH.rightPressed) {
|
if(keyH.upPressed || keyH.downPressed || keyH.leftPressed || keyH.rightPressed) {
|
||||||
if(keyH.upPressed) direction = Direction.UP;
|
if(keyH.upPressed) direction = Direction.UP;
|
||||||
else if(keyH.downPressed) direction = Direction.DOWN;
|
else if(keyH.downPressed) direction = Direction.DOWN;
|
||||||
|
|||||||
Reference in New Issue
Block a user