Fix package names

client/build.gradle

@@ -3,10 +3,15 @@
  */
 
 plugins {
+    id 'application'
     id 'fr.lnl.game.java-application-conventions'
     id 'org.openjfx.javafxplugin' version '0.0.10'
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
     implementation project(':server')
 }
@@ -18,5 +23,5 @@ javafx {
 
 application {
     // Define the main class for the application.
-    mainClass = 'fr.lnl.game.client.App'
+    mainClassName = 'fr.lnl.game.client.App'
 }

client/src/main/java/fr/lnl/game/client/graphics/GameScrenn.java

@@ -1,4 +0,0 @@
-package fr.unicaen.graphics;
-
-public class GameScrenn{
-}

client/src/main/java/fr/lnl/game/client/graphics/MainMenuScrenn.java

@@ -1,11 +0,0 @@
-package fr.unicaen.graphics;
-
-import javafx.application.Application;
-import javafx.stage.Stage;
-
-public class MainMenuScrenn extends Application {
-    @Override
-    public void start(Stage stage) throws Exception {
-
-    }
-}

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

@@ -1,6 +1,6 @@
 module client {
-    requires javafx.graphics;
     requires javafx.controls;
-    requires legot.neveu.lucas.server;
+    requires transitive javafx.graphics;
+    requires server;
     exports fr.lnl.game.client;
-}
+}

server/src/main/java/fr/lnl/game/server/games/action/Action.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public interface Action {
 

server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class DeployShield implements Action{
     @Override

server/src/main/java/fr/lnl/game/server/games/action/DropBomb.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class DropBomb extends DropObject{
 }

server/src/main/java/fr/lnl/game/server/games/action/DropMine.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class DropMine extends DropObject{
 }

server/src/main/java/fr/lnl/game/server/games/action/DropObject.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class DropObject implements Action{
     @Override

server/src/main/java/fr/lnl/game/server/games/action/Move.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class Move implements Action{
     @Override

server/src/main/java/fr/lnl/game/server/games/action/Nothing.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class Nothing implements Action {
     @Override

server/src/main/java/fr/lnl/game/server/games/action/Shot.java

@@ -1,4 +1,4 @@
-package fr.unicaen.games.action;
+package fr.lnl.game.server.games.action;
 
 public class Shot implements Action{
     @Override

server/src/main/java/fr/lnl/game/server/games/grid/Grid.java

@@ -1,7 +1,7 @@
 package fr.lnl.game.server.games.grid;
 
-import fr.unicaen.utils.Point;
+import fr.lnl.game.server.utils.Point;
-import fr.unicaen.utils.Tuple;
+import fr.lnl.game.server.utils.Tuple;
 
 import java.util.HashMap;
 

server/src/main/java/fr/lnl/game/server/games/player/AbstractPlayer.java

@@ -1,7 +1,7 @@
 package fr.lnl.game.server.games.player;
 
 import fr.lnl.game.server.games.weapon.Weapon;
-import fr.unicaen.utils.Point;
+import fr.lnl.game.server.utils.Point;
 
 public abstract class AbstractPlayer {
 

server/src/main/java/fr/lnl/game/server/games/player/ComputerPlayer.java

@@ -1,7 +1,7 @@
 package fr.lnl.game.server.games.player;
 
 import fr.lnl.game.server.games.weapon.Weapon;
-import fr.unicaen.utils.Point;
+import fr.lnl.game.server.utils.Point;
 
 public class ComputerPlayer extends AbstractPlayer{
     public ComputerPlayer(int id, Point position, int ernergy, Weapon weapon, boolean shieldDeploy) {

server/src/main/java/fr/lnl/game/server/games/player/HumanPlayer.java

@@ -1,7 +1,7 @@
 package fr.lnl.game.server.games.player;
 
 import fr.lnl.game.server.games.weapon.Weapon;
-import fr.unicaen.utils.Point;
+import fr.lnl.game.server.utils.Point;
 
 public class HumanPlayer extends AbstractPlayer{
     public HumanPlayer(int id, Point position, int ernergy, Weapon weapon, boolean shieldDeploy) {

server/src/main/java/fr/lnl/game/server/utils/Point.java

@@ -1,4 +1,4 @@
-package fr.unicaen.utils;
+package fr.lnl.game.server.utils;
 
 import java.util.Objects;
 

server/src/main/java/fr/lnl/game/server/utils/Tuple.java

@@ -1,4 +1,4 @@
-package fr.unicaen.utils;
+package fr.lnl.game.server.utils;
 
 import java.util.Objects;
 

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

@@ -1,3 +1,3 @@
-module legot.neveu.lucas.server {
+module server {
     exports fr.lnl.game.server;
 }

settings.gradle

@@ -8,4 +8,4 @@
  */
 
 rootProject.name = 'legot-neveu-lucas'
-include('client', 'server')
+include(':client', ':server')