Split project to submodules

app/src/main/java/com/bartlomiejpluta/base/game/world/tileset/manager/TileSetManager.java

@@ -1,7 +0,0 @@
-package com.bartlomiejpluta.base.game.world.tileset.manager;
-
-import com.bartlomiejpluta.base.game.world.tileset.model.TileSet;
-
-public interface TileSetManager {
-   TileSet createTileSet(String tileSetFileName, int rows, int columns);
-}

engine/build.gradle

@@ -9,7 +9,6 @@
 plugins {
     id 'org.springframework.boot' version "$springBootVersion"
     id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
-    id 'application'
     id 'java'
 }
 
@@ -30,6 +29,7 @@ switch (OperatingSystem.current()) {
         break
 }
 
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor
@@ -41,6 +41,14 @@ repositories {
     jcenter()
 }
 
+bootJar {
+    enabled = false
+}
+
+jar {
+    enabled = true
+}
+
 dependencies {
     implementation platform("org.lwjgl:lwjgl-bom:$lwjglVersion")
 
@@ -78,9 +86,4 @@ dependencies {
     // This dependency is used by the application.
     implementation "com.google.guava:guava:${guavaVersion}"
     implementation "org.joml:joml:${jomlVersion}"
-}
+}
-
-application {
-    // Define the main class for the application.
-    mainClass = 'com.bartlomiejpluta.base.App'
-}

engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/AnimationableObject.java

@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.animation;
+package com.bartlomiejpluta.base.core.world.animation;
 
 import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;

engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/Animator.java

@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.animation;
+package com.bartlomiejpluta.base.core.world.animation;
 
 public interface Animator {
    void animate(AnimationableObject[] objects);

engine/src/main/java/com/bartlomiejpluta/base/core/world/animation/DefaultAnimator.java

@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.animation;
+package com.bartlomiejpluta.base.core.world.animation;
 
 import org.springframework.stereotype.Component;
 

engine/src/main/java/com/bartlomiejpluta/base/core/world/map/GameMap.java

@@ -1,6 +1,6 @@
-package com.bartlomiejpluta.base.game.world.map;
+package com.bartlomiejpluta.base.core.world.map;
 
-import com.bartlomiejpluta.base.game.world.tileset.model.Tile;
+import com.bartlomiejpluta.base.core.world.tileset.model.Tile;
 import lombok.Getter;
 
 import java.util.Arrays;

engine/src/main/java/com/bartlomiejpluta/base/core/world/scene/Scene.java

@@ -6,7 +6,7 @@ import com.bartlomiejpluta.base.core.gl.shader.manager.ShaderManager;
 import com.bartlomiejpluta.base.core.ui.Window;
 import com.bartlomiejpluta.base.core.world.camera.Camera;
 import com.bartlomiejpluta.base.core.world.object.RenderableObject;
-import com.bartlomiejpluta.base.game.world.map.GameMap;
+import com.bartlomiejpluta.base.core.world.map.GameMap;
 import lombok.AllArgsConstructor;
 import lombok.Setter;
 

engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/DefaultTileSetManager.java

@@ -1,7 +1,7 @@
-package com.bartlomiejpluta.base.game.world.tileset.manager;
+package com.bartlomiejpluta.base.core.world.tileset.manager;
 
 import com.bartlomiejpluta.base.core.gl.object.texture.TextureManager;
-import com.bartlomiejpluta.base.game.world.tileset.model.TileSet;
+import com.bartlomiejpluta.base.core.world.tileset.model.TileSet;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/manager/TileSetManager.java

@@ -0,0 +1,7 @@
+package com.bartlomiejpluta.base.core.world.tileset.manager;
+
+import com.bartlomiejpluta.base.core.world.tileset.model.TileSet;
+
+public interface TileSetManager {
+   TileSet createTileSet(String tileSetFileName, int rows, int columns);
+}

engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/Tile.java

@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.world.tileset.model;
+package com.bartlomiejpluta.base.core.world.tileset.model;
 
 import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;

engine/src/main/java/com/bartlomiejpluta/base/core/world/tileset/model/TileSet.java

@@ -1,4 +1,4 @@
-package com.bartlomiejpluta.base.game.world.tileset.model;
+package com.bartlomiejpluta.base.core.world.tileset.model;
 
 import com.bartlomiejpluta.base.core.gl.object.material.Material;
 import com.bartlomiejpluta.base.core.gl.object.mesh.Mesh;

game/build.gradle

@@ -0,0 +1,39 @@
+plugins {
+    id 'org.springframework.boot' version "$springBootVersion"
+    id 'io.spring.dependency-management' version "$springDependencyManagementVersion"
+    id 'java'
+    id 'application'
+}
+
+group 'com.bartlomiejpluta.base'
+version 'unspecified'
+
+configurations {
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
+}
+
+repositories {
+    mavenCentral()
+    jcenter()
+}
+
+dependencies {
+    implementation project(":engine")
+
+    // Spring
+    implementation 'org.springframework.boot:spring-boot-starter'
+    compileOnly 'org.projectlombok:lombok'
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    // This dependency is used by the application.
+    implementation "com.google.guava:guava:${guavaVersion}"
+    implementation "org.joml:joml:${jomlVersion}"
+}
+
+application {
+    // Define the main class for the application.
+    mainClass = 'com.bartlomiejpluta.base.game.App'
+}

game/src/main/java/com/bartlomiejpluta/base/game/App.java

@@ -1,7 +1,7 @@
 /*
  * This Java source file was generated by the Gradle 'init' task.
  */
-package com.bartlomiejpluta.base;
+package com.bartlomiejpluta.base.game;
 
 import com.bartlomiejpluta.base.core.engine.GameEngine;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +13,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @Slf4j
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = "com.bartlomiejpluta.base")
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class App implements ApplicationRunner {
     private final GameEngine gameEngine;

game/src/main/java/com/bartlomiejpluta/base/game/logic/DefaultGameLogic.java

@@ -5,8 +5,8 @@ import com.bartlomiejpluta.base.core.logic.GameLogic;
 import com.bartlomiejpluta.base.core.ui.Window;
 import com.bartlomiejpluta.base.core.world.camera.Camera;
 import com.bartlomiejpluta.base.core.world.scene.Scene;
-import com.bartlomiejpluta.base.game.world.map.GameMap;
+import com.bartlomiejpluta.base.core.world.map.GameMap;
-import com.bartlomiejpluta.base.game.world.tileset.manager.TileSetManager;
+import com.bartlomiejpluta.base.core.world.tileset.manager.TileSetManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

settings.gradle

@@ -8,4 +8,6 @@
  */
 
 rootProject.name = 'BASE'
-include('app')
+include('engine')
+include('game')
+