Master safety

.gitignore

@@ -2,6 +2,7 @@ target/
 !.mvn/wrapper/maven-wrapper.jar
 !**/src/main/**/target/
 !**/src/test/**/target/
+mods-mvn/
 
 ### IntelliJ IDEA ###
 .idea/modules.xml

CommonAsteroids/src/main/java/dk/sdu/mmmi/cbse/common/asteroids/Asteroid.java → Asteroids/src/main/java/dk/sdu/mmmi/cbse/asteriods/Asteroid.java

@@ -1,4 +1,4 @@
-package dk.sdu.mmmi.cbse.common.asteroids;
+package dk.sdu.mmmi.cbse.asteriods;
 
 import dk.sdu.mmmi.cbse.common.data.Entity;
 

Asteroids/src/main/java/dk/sdu/mmmi/cbse/asteriods/AsteroidPlugin.java

@@ -1,6 +1,5 @@
 package dk.sdu.mmmi.cbse.asteriods;
 
-import dk.sdu.mmmi.cbse.common.asteroids.Asteroid;
 import dk.sdu.mmmi.cbse.common.data.Entity;
 import dk.sdu.mmmi.cbse.common.data.GameData;
 import dk.sdu.mmmi.cbse.common.data.World;

Asteroids/src/main/java/dk/sdu/mmmi/cbse/asteriods/AsteroidProcessor.java

@@ -1,6 +1,5 @@
 package dk.sdu.mmmi.cbse.asteriods;
 
-import dk.sdu.mmmi.cbse.common.asteroids.Asteroid;
 import dk.sdu.mmmi.cbse.common.data.Entity;
 import dk.sdu.mmmi.cbse.common.data.GameData;
 import dk.sdu.mmmi.cbse.common.data.World;

Asteroids/src/main/java/dk/sdu/mmmi/cbse/asteriods/AsteroidSplitterImpl.java

@@ -1,12 +1,9 @@
 package dk.sdu.mmmi.cbse.asteriods;
 
-import dk.sdu.mmmi.cbse.common.asteroids.Asteroid;
-import dk.sdu.mmmi.cbse.common.asteroids.IAsteroidSplitter;
 import dk.sdu.mmmi.cbse.common.data.Entity;
 import dk.sdu.mmmi.cbse.common.data.World;
 
-public class AsteroidSplitterImpl implements IAsteroidSplitter {
-    @Override
+public class AsteroidSplitterImpl{
     public void createSplitAsteroid(Entity e, World world) {
         if(e.getRadius() <= 5) {
             for (Entity entity : world.getEntities()) {

Asteroids/src/main/java/module-info.java

@@ -3,7 +3,6 @@
 
 module Asteroid{
     requires Common;
-    requires CommonAsteroids;
     provides IGamePluginService with dk.sdu.mmmi.cbse.asteriods.AsteroidPlugin;
     provides IEntityProcessingService with dk.sdu.mmmi.cbse.asteriods.AsteroidProcessor;
 }

Bullet/src/main/java/module-info.java

@@ -5,7 +5,6 @@
 module Bullet {
     requires CommonBullet;
     requires Common;
-    provides IGamePluginService with dk.sdu.mmmi.cbse.bulletsystem.BulletPlugin;
     provides BulletSPI with dk.sdu.mmmi.cbse.bulletsystem.BulletControlSystem;
     provides IEntityProcessingService with dk.sdu.mmmi.cbse.bulletsystem.BulletControlSystem;
 }

Common/src/main/java/dk/sdu/mmmi/cbse/common/data/Entity.java

@@ -6,7 +6,7 @@
 public class Entity implements Serializable {
     private final UUID ID = UUID.randomUUID();
 
-    private double[] polygonCoorinates;
+    private double[] polygonCoordinates;
     private double x;
     private double y;
     private double rotation;
@@ -16,10 +16,10 @@ public class Entity implements Serializable {
     private int destroyedAsteroids;
 
     public String getID(){return ID.toString();}
-    public double[] getPolygonCoordinates(){return polygonCoorinates;}
+    public double[] getPolygonCoordinates(){return polygonCoordinates;}
 
     public void setPolygonCoordinates(double... coorinates) {
-        this.polygonCoorinates = coorinates;
+        this.polygonCoordinates = coorinates;
     }
 
     public void setX(double x) {

Common/src/main/java/dk/sdu/mmmi/cbse/common/data/World.java

@@ -1,6 +1,5 @@
 package dk.sdu.mmmi.cbse.common.data;
 
-import java.lang.invoke.TypeDescriptor;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 

CommonBullet/src/main/java/module-info.java

@@ -1,4 +1,4 @@
 module CommonBullet {
     requires Common;
     exports dk.sdu.mmmi.cbse.common.bullet;
-}
+}

Core/pom.xml

@@ -10,7 +10,6 @@
     <name>Archetype - Core</name>
     <url>http://maven.apache.org</url>
     <dependencies>
-
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
@@ -26,7 +25,30 @@
             <artifactId>javafx-base</artifactId>
             <version>21.0.2</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jcl</artifactId>
+        </dependency>
         <dependency>
             <groupId>dk.sdu.cbse</groupId>
             <artifactId>Common</artifactId>
@@ -37,6 +59,16 @@
             <artifactId>CommonBullet</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <version>2.0.17</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -62,7 +94,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>javafx-controls,javafx-graphics,javafx-base</includeArtifactIds>
+                            <includeArtifactIds>javafx-controls,javafx-graphics,javafx-base,spring-context,spring-core,spring-beans,spring-aop,spring-expression,spring-jcl, spring-web</includeArtifactIds>
                             <outputDirectory>../mods-mvn</outputDirectory>
                         </configuration>
                     </execution>