updated gradle config with shadow for jar

build.gradle

 
 plugins {
+    id("com.github.johnrengelman.shadow") version "8.1.1"
     id 'application'
-    id "org.openjfx.javafxplugin" version "0.0.14"
-    id 'com.github.johnrengelman.shadow' version '8.1.1'
+    id 'java'
+    id "org.openjfx.javafxplugin" version "0.1.0"
 }
 
 javafx {
     version = "21"
-    modules = [ 'javafx.controls', 'javafx.fxml' ]
+    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.graphics']
 }
 
 
@@ -29,13 +30,11 @@ test {
 }
 
 application {
-    mainClass.set("FirefighterApplication")
+    mainClass.set("firefighter.app.SimulatorMain")
 }
 
-jar {
-    manifest {
-        attributes("Implementation-Title": project.name,
-                "Implementation-Version": version,
-                "Main-Class": application.mainClass)
+tasks {
+    shadowJar {
+        exclude("module-info.class")
     }
-}
\ No newline at end of file
+}

settings.gradle

 rootProject.name = 'firefighter'
+include 'src:main:aapp'
+findProject(':src:main:aapp')?.name = 'aapp'
 

src/main/java/FirefighterApplication.java → src/main/java/firefighter/app/SimulatorApplication.java

-import controller.Controller;
-import javafx.application.Application;
+package firefighter.app;
+
+import firefighter.controller.Controller;
 import javafx.application.Platform;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -9,8 +10,8 @@ import javafx.stage.Stage;
 import java.io.IOException;
 import java.net.URL;
 
-public class FirefighterApplication extends Application {
-  private static final String VIEW_RESOURCE_PATH = "/view/view.fxml";
+public class SimulatorApplication extends javafx.application.Application {
+  private static final String VIEW_RESOURCE_PATH = "/firefighter/view/view.fxml";
   private static final String APP_NAME = "Firefighter simulator";
   private static final int ROW_COUNT = 20;
   private static final int COLUMN_COUNT = 20;
@@ -38,7 +39,7 @@ public class FirefighterApplication extends Application {
 
   private void initializeView() throws IOException {
     FXMLLoader loader = new FXMLLoader();
-    URL location = FirefighterApplication.class.getResource(VIEW_RESOURCE_PATH);
+    URL location = SimulatorApplication.class.getResource(VIEW_RESOURCE_PATH);
     loader.setLocation(location);
     view = loader.load();
     Controller controller = loader.getController();
@@ -51,4 +52,8 @@ public class FirefighterApplication extends Application {
     primaryStage.setScene(scene);
     primaryStage.show();
   }
+
+  public static void main(String[] args) {
+    launch(args);
+  }
 }

src/main/java/firefighter/app/SimulatorMain.java

+package firefighter.app;
+
+public class SimulatorMain {
+  public static void main(String[] args){
+    SimulatorApplication.main(args);
+  }
+}

src/main/java/controller/Controller.java → src/main/java/firefighter/controller/Controller.java

-package controller;
+package firefighter.controller;
 
 import javafx.animation.Animation;
 import javafx.animation.KeyFrame;
@@ -11,12 +11,12 @@ import javafx.scene.control.ToggleButton;
 import javafx.scene.control.ToggleGroup;
 import javafx.util.Duration;
 import javafx.util.Pair;
-import model.Board;
-import model.ModelElement;
-import model.FirefighterBoard;
-import model.Position;
-import view.FirefighterGrid;
-import view.ViewElement;
+import firefighter.model.Board;
+import firefighter.model.ModelElement;
+import firefighter.model.FirefighterBoard;
+import firefighter.model.Position;
+import firefighter.view.FirefighterGrid;
+import firefighter.view.ViewElement;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,7 +52,7 @@ public class Controller {
   }
 
   private void setModel(FirefighterBoard firefighterBoard) {
-    this.board = requireNonNull(firefighterBoard, "model is null");
+    this.board = requireNonNull(firefighterBoard, "firefighter.model is null");
   }
 
   private void updateBoard(){

src/main/java/controller/PersistentToggleGroup.java → src/main/java/firefighter/controller/PersistentToggleGroup.java

-package controller;
+package firefighter.controller;
 
 import javafx.collections.ListChangeListener.Change;
 import javafx.scene.control.Toggle;

src/main/java/model/Board.java → src/main/java/firefighter/model/Board.java

-package model;
+package firefighter.model;
 
 import java.util.List;
 

src/main/java/model/FirefighterBoard.java → src/main/java/firefighter/model/FirefighterBoard.java

-package model;
+package firefighter.model;
 
 import java.util.*;
 

src/main/java/model/ModelElement.java → src/main/java/firefighter/model/ModelElement.java

-package model;
+package firefighter.model;
 
 public enum ModelElement {
   FIREFIGHTER, FIRE

src/main/java/model/Position.java → src/main/java/firefighter/model/Position.java

-package model;
+package firefighter.model;
 
 public record Position(int row, int column) {
 

src/main/java/view/FirefighterGrid.java → src/main/java/firefighter/view/FirefighterGrid.java

-package view;
+package firefighter.view;
 
 import javafx.scene.canvas.Canvas;
 import javafx.scene.paint.Color;
 import javafx.util.Pair;
-import model.Position;
+import firefighter.model.Position;
 
 import java.util.List;
 

src/main/java/view/Grid.java → src/main/java/firefighter/view/Grid.java

-package view;
+package firefighter.view;
 
-import javafx.scene.paint.Color;
 import javafx.util.Pair;
-import model.Position;
+import firefighter.model.Position;
 
 import java.util.List;
 

src/main/java/view/ViewElement.java → src/main/java/firefighter/view/ViewElement.java

-package view;
+package firefighter.view;
 
 import javafx.scene.paint.Color;
 

src/main/java/module-info.java

+module firefighter {
+  requires javafx.controls;
+  requires javafx.fxml;
+  requires javafx.graphics;
+  opens firefighter.controller to javafx.fxml;
+  exports firefighter.app;
+  opens firefighter.app to javafx.fxml;
+}
\ No newline at end of file

src/main/resources/view/view.fxml → src/main/resources/firefighter/view/view.fxml

@@ -3,12 +3,12 @@
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import view.FirefighterGrid?>
+<?import firefighter.view.FirefighterGrid?>
 
 <?import javafx.scene.control.ToggleButton?>
 <HBox styleClass="background" stylesheets="@DarkTheme.css"
       xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
-      fx:controller="controller.Controller">
+      fx:controller="firefighter.controller.Controller">
   <VBox>
     <Button fx:id="restartButton" maxHeight="-Infinity" maxWidth="-Infinity"
             mnemonicParsing="false" onAction="#restartButtonAction" prefHeight="24.0" prefWidth="200.0"