diff --git a/src/main/java/core/Master.java b/src/main/java/core/Master.java index 06042e7..1e23001 100644 --- a/src/main/java/core/Master.java +++ b/src/main/java/core/Master.java @@ -1,10 +1,10 @@ package core; +import core.math.Vector2D; import objects.DebugPos; import objects.ships.BattleShip; import objects.GameObject; import objects.ships.Submarine; -import objects.ships.Turret; import objects.world.Grid; import objects.world.Wall; diff --git a/src/main/java/core/ExMath.java b/src/main/java/core/math/ExMath.java similarity index 97% rename from src/main/java/core/ExMath.java rename to src/main/java/core/math/ExMath.java index 4c21516..5ad8be6 100644 --- a/src/main/java/core/ExMath.java +++ b/src/main/java/core/math/ExMath.java @@ -1,4 +1,4 @@ -package core; +package core.math; /** * Extended Math functions for the game engine diff --git a/src/main/java/core/Vector2D.java b/src/main/java/core/math/Vector2D.java similarity index 99% rename from src/main/java/core/Vector2D.java rename to src/main/java/core/math/Vector2D.java index 9dcc49d..a6ea0ef 100644 --- a/src/main/java/core/Vector2D.java +++ b/src/main/java/core/math/Vector2D.java @@ -1,4 +1,4 @@ -package core; +package core.math; /** diff --git a/src/main/java/objects/DebugPos.java b/src/main/java/objects/DebugPos.java index d423114..4591fb2 100644 --- a/src/main/java/objects/DebugPos.java +++ b/src/main/java/objects/DebugPos.java @@ -1,7 +1,7 @@ package objects; import core.Master; -import core.Vector2D; +import core.math.Vector2D; import java.awt.*; diff --git a/src/main/java/objects/GameObject.java b/src/main/java/objects/GameObject.java index 33cb6ab..6352eb9 100644 --- a/src/main/java/objects/GameObject.java +++ b/src/main/java/objects/GameObject.java @@ -1,11 +1,9 @@ package objects; import core.Master; -import core.Vector2D; +import core.math.Vector2D; import java.awt.*; -import java.util.function.Consumer; -import java.util.function.Function; /** * The GameObject class is the superclass of every GameObject that can be displayed on screen. It has the 2 diff --git a/src/main/java/objects/ships/Shell.java b/src/main/java/objects/ships/Shell.java index 938c54b..d6344c8 100644 --- a/src/main/java/objects/ships/Shell.java +++ b/src/main/java/objects/ships/Shell.java @@ -1,7 +1,7 @@ package objects.ships; import core.Master; -import core.Vector2D; +import core.math.Vector2D; import objects.GameObject; import java.awt.*; diff --git a/src/main/java/objects/ships/Submarine.java b/src/main/java/objects/ships/Submarine.java index ff913b0..01affe5 100644 --- a/src/main/java/objects/ships/Submarine.java +++ b/src/main/java/objects/ships/Submarine.java @@ -1,7 +1,7 @@ package objects.ships; import core.Master; -import core.Vector2D; +import core.math.Vector2D; import objects.GameObject; import java.awt.*; diff --git a/src/main/java/objects/ships/Turret.java b/src/main/java/objects/ships/Turret.java index 9689e57..6db9e39 100644 --- a/src/main/java/objects/ships/Turret.java +++ b/src/main/java/objects/ships/Turret.java @@ -1,8 +1,8 @@ package objects.ships; -import core.ExMath; +import core.math.ExMath; import core.Master; -import core.Vector2D; +import core.math.Vector2D; import objects.GameObject; import java.awt.*; diff --git a/src/test/java/core/Vector2DTest.java b/src/test/java/core/Vector2DTest.java index c20b23d..1bd52a0 100644 --- a/src/test/java/core/Vector2DTest.java +++ b/src/test/java/core/Vector2DTest.java @@ -1,5 +1,6 @@ package core; +import core.math.Vector2D; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.*;