package structure

.idea/misc.xml

@@ -8,7 +8,7 @@
       </list>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_14" project-jdk-name="14" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_15" default="false" project-jdk-name="15" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

pom.xml

@@ -9,8 +9,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>14</maven.compiler.source>
-        <maven.compiler.target>14</maven.compiler.target>
+        <maven.compiler.source>15</maven.compiler.source>
+        <maven.compiler.target>15</maven.compiler.target>
     </properties>
     <dependencies>
         <dependency>

src/main/java/Main.java

@@ -5,12 +5,12 @@ import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-class BasicEx extends JFrame {
+class Main extends JFrame {
 
     Master master;
     Timer timer;
 
-    public BasicEx() {
+    public Main() {
         initUI();
         timer = new Timer(1000/60, e -> {
             master.refresh();
@@ -40,7 +40,7 @@ class BasicEx extends JFrame {
 
         EventQueue.invokeLater(() -> {
 
-            BasicEx ex = new BasicEx();
+            Main ex = new Main();
             ex.setVisible(true);
         });
     }

src/main/java/core/Master.java

@@ -3,9 +3,9 @@ package core;
 import core.math.Vector2D;
 import core.physics.Collidable;
 import core.physics.Collision;
-import objects.DebugPos;
+import core.objects.base.DebugPos;
 import objects.ships.BattleShip;
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 import objects.ships.Submarine;
 import objects.world.Grid;
 import objects.world.Wall;

src/main/java/core/objects/base/DebugPos.java

@@ -1,7 +1,7 @@
-package objects;
+package core.objects.base;
 
 import core.math.Vector2D;
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 
 import java.awt.*;
 

src/main/java/core/objects/core/CollGameObject.java

@@ -1,6 +1,7 @@
-package objects.core;
+package core.objects.core;
 
 import core.math.Vector2D;
+import core.objects.core.GameObject;
 import core.physics.Collidable;
 import core.physics.hitboxes.Hitbox;
 

src/main/java/core/objects/core/GameObject.java

@@ -1,4 +1,4 @@
-package objects.core;
+package core.objects.core;
 
 import core.math.Coords;
 import core.Drawable;

src/main/java/objects/ships/BattleShip.java

@@ -1,6 +1,6 @@
 package objects.ships;
 
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 
 import java.awt.*;
 import java.util.ArrayList;

src/main/java/objects/ships/Shell.java

@@ -1,9 +1,7 @@
 package objects.ships;
 
 import core.math.Vector2D;
-import core.physics.hitboxes.RectHitBox;
-import objects.core.CollGameObject;
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 
 import java.awt.*;
 

src/main/java/objects/ships/Submarine.java

@@ -3,7 +3,7 @@ package objects.ships;
 import core.math.Coords;
 import core.math.Vector2D;
 import core.physics.hitboxes.RectHitBox;
-import objects.core.CollGameObject;
+import core.objects.core.CollGameObject;
 
 import java.awt.*;
 

src/main/java/objects/ships/Turret.java

@@ -3,7 +3,7 @@ package objects.ships;
 import core.math.Coords;
 import core.math.ExMath;
 import core.math.Vector2D;
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 
 import java.awt.*;
 
@@ -83,7 +83,6 @@ public class Turret extends GameObject {
 
         //TODO getCenter uses the wrong size
         Vector2D center = battleShip.getMapCoords(getCenterPosition(position));
-        System.out.println(getCenterPosition(position));
         master.debugPos(battleShip.getMapCoords(position));
         master.debugPos(center);
         double targetRotation = -Math.atan2(center.x - mouseRel.x, center.y - mouseRel.y);

src/main/java/objects/world/Grid.java

@@ -1,6 +1,6 @@
 package objects.world;
 
-import objects.core.GameObject;
+import core.objects.core.GameObject;
 
 import java.awt.*;
 

src/main/java/objects/world/Wall.java

@@ -3,7 +3,7 @@ package objects.world;
 import core.math.Vector2D;
 import core.physics.hitboxes.Hitbox;
 import core.physics.hitboxes.RectHitBox;
-import objects.core.CollGameObject;
+import core.objects.core.CollGameObject;
 
 import java.awt.*;