Moved around

src/main/java/se/urmo/game/entities/collectibles/Fruit.java

@@ -4,7 +4,7 @@ import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.FruitType;
+import se.urmo.game.util.FruitType;
 
 import java.awt.Graphics;
 import java.awt.Point;

src/main/java/se/urmo/game/entities/ghost/Ghost.java

@@ -10,9 +10,9 @@ import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.graphics.SpriteLocation;
 import se.urmo.game.graphics.SpriteSheetManager;
 import se.urmo.game.main.Game;
+import se.urmo.game.main.GhostManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.GhostManager;
-import se.urmo.game.state.LevelManager;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.MyPoint;
 

src/main/java/se/urmo/game/entities/pacman/PacMan.java

@@ -7,8 +7,8 @@ import se.urmo.game.collision.CollisionChecker;
 import se.urmo.game.entities.BaseAnimated;
 import se.urmo.game.graphics.SpriteLocation;
 import se.urmo.game.graphics.SpriteSheetManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
-import se.urmo.game.state.LevelManager;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.LoadSave;
 import se.urmo.game.util.MyPoint;

src/main/java/se/urmo/game/input/KeyHandler.java

@@ -1,6 +1,6 @@
 package se.urmo.game.input;
 
-import se.urmo.game.state.GameStateManager;
+import se.urmo.game.main.GameStateManager;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;

src/main/java/se/urmo/game/main/AnimationManager.java

@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import se.urmo.game.entities.Animated;
 

src/main/java/se/urmo/game/main/FruitManager.java

@@ -1,8 +1,10 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.entities.collectibles.Fruit;
 import se.urmo.game.entities.pacman.PacMan;
+import se.urmo.game.state.PlayingState;
+import se.urmo.game.util.FruitType;
 
 import java.awt.Graphics;
 

src/main/java/se/urmo/game/main/Game.java

@@ -2,7 +2,6 @@ package se.urmo.game.main;
 
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
-import se.urmo.game.state.GameStateManager;
 
 import javax.swing.JFrame;
 

src/main/java/se/urmo/game/main/GamePanel.java

@@ -1,10 +1,12 @@
 package se.urmo.game.main;
 
 import se.urmo.game.input.KeyHandler;
-import se.urmo.game.state.GameStateManager;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
 
 public class GamePanel extends JPanel {
     public static final int ORIGINAL_TILE_SIZE = 8;

src/main/java/se/urmo/game/main/GameStateManager.java

@@ -1,6 +1,10 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
+import se.urmo.game.state.GameOverState;
+import se.urmo.game.state.GameState;
+import se.urmo.game.state.PlayingState;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Graphics2D;
 import java.util.HashMap;

src/main/java/se/urmo/game/main/GhostManager.java

@@ -1,20 +1,19 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
-import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
 import se.urmo.game.collision.GhostCollisionChecker;
-import se.urmo.game.entities.ghost.strategy.BlinkyStrategy;
-import se.urmo.game.entities.ghost.strategy.ClydeStrategy;
 import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.GhostMode;
+import se.urmo.game.entities.ghost.strategy.BlinkyStrategy;
+import se.urmo.game.entities.ghost.strategy.ClydeStrategy;
 import se.urmo.game.entities.ghost.strategy.InkyStrategy;
-import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.entities.ghost.strategy.PinkyStrategy;
 import se.urmo.game.entities.ghost.strategy.ScatterToBottomLeft;
 import se.urmo.game.entities.ghost.strategy.ScatterToBottomRight;
 import se.urmo.game.entities.ghost.strategy.ScatterToTopLeft;
 import se.urmo.game.entities.ghost.strategy.ScatterToTopRight;
+import se.urmo.game.entities.pacman.PacMan;
 import se.urmo.game.map.GameMap;
 
 import java.awt.Graphics2D;

src/main/java/se/urmo/game/main/HighScoreManager.java

@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

src/main/java/se/urmo/game/main/LevelManager.java

@@ -1,6 +1,7 @@
-package se.urmo.game.state;
+package se.urmo.game.main;
 
 import lombok.Getter;
+import se.urmo.game.util.FruitType;
 
 public class LevelManager {
 

src/main/java/se/urmo/game/state/GameOverState.java

@@ -1,7 +1,10 @@
 package se.urmo.game.state;
 
 import se.urmo.game.main.GamePanel;
+import se.urmo.game.main.GameStateManager;
+import se.urmo.game.main.HighScoreManager;
 import se.urmo.game.util.GameFonts;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

src/main/java/se/urmo/game/state/PlayingState.java

@@ -7,11 +7,17 @@ import se.urmo.game.collision.GhostCollisionChecker;
 import se.urmo.game.entities.ghost.Ghost;
 import se.urmo.game.entities.ghost.GhostMode;
 import se.urmo.game.entities.pacman.PacMan;
+import se.urmo.game.main.AnimationManager;
+import se.urmo.game.main.FruitManager;
+import se.urmo.game.main.GameStateManager;
+import se.urmo.game.main.GhostManager;
+import se.urmo.game.main.LevelManager;
 import se.urmo.game.map.GameMap;
 import se.urmo.game.map.MapTile;
 import se.urmo.game.map.TileType;
 import se.urmo.game.util.Direction;
 import se.urmo.game.util.GameFonts;
+import se.urmo.game.util.GameStateType;
 
 import java.awt.Color;
 import java.awt.Graphics2D;

src/main/java/se/urmo/game/util/FruitType.java

@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.util;
 
 import lombok.Getter;
 import se.urmo.game.graphics.SpriteLocation;

src/main/java/se/urmo/game/util/GameStateType.java

@@ -1,4 +1,4 @@
-package se.urmo.game.state;
+package se.urmo.game.util;
 
 public enum GameStateType {
     PLAYING, GAME_OVER,