diff --git a/client/build.gradle b/client/build.gradle index 35d194e..bc48cb6 100644 --- a/client/build.gradle +++ b/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' } diff --git a/client/src/main/java/fr/lnl/game/client/graphics/GameScrenn.java b/client/src/main/java/fr/lnl/game/client/graphics/GameScrenn.java deleted file mode 100644 index d91c4cf..0000000 --- a/client/src/main/java/fr/lnl/game/client/graphics/GameScrenn.java +++ /dev/null @@ -1,4 +0,0 @@ -package fr.unicaen.graphics; - -public class GameScrenn{ -} diff --git a/client/src/main/java/fr/lnl/game/client/graphics/MainMenuScrenn.java b/client/src/main/java/fr/lnl/game/client/graphics/MainMenuScrenn.java deleted file mode 100644 index f12bc3e..0000000 --- a/client/src/main/java/fr/lnl/game/client/graphics/MainMenuScrenn.java +++ /dev/null @@ -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 { - - } -} diff --git a/client/src/main/java/module-info.java b/client/src/main/java/module-info.java index ff5b1c9..a4ffc7a 100644 --- a/client/src/main/java/module-info.java +++ b/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; -} \ No newline at end of file +} diff --git a/server/src/main/java/fr/lnl/game/server/games/action/Action.java b/server/src/main/java/fr/lnl/game/server/games/action/Action.java index 42dfcdb..366d30a 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/Action.java +++ b/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 { diff --git a/server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java b/server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java index c3cd9ce..a5130c8 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/DeployShield.java +++ b/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 diff --git a/server/src/main/java/fr/lnl/game/server/games/action/DropBomb.java b/server/src/main/java/fr/lnl/game/server/games/action/DropBomb.java index 2a45c18..ea790b2 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/DropBomb.java +++ b/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{ } diff --git a/server/src/main/java/fr/lnl/game/server/games/action/DropMine.java b/server/src/main/java/fr/lnl/game/server/games/action/DropMine.java index fe905d0..67dc200 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/DropMine.java +++ b/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{ } diff --git a/server/src/main/java/fr/lnl/game/server/games/action/DropObject.java b/server/src/main/java/fr/lnl/game/server/games/action/DropObject.java index 104b4de..9c83bba 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/DropObject.java +++ b/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 diff --git a/server/src/main/java/fr/lnl/game/server/games/action/Move.java b/server/src/main/java/fr/lnl/game/server/games/action/Move.java index 8a7a054..cc98ae3 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/Move.java +++ b/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 diff --git a/server/src/main/java/fr/lnl/game/server/games/action/Nothing.java b/server/src/main/java/fr/lnl/game/server/games/action/Nothing.java index 959cd11..e76f783 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/Nothing.java +++ b/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 diff --git a/server/src/main/java/fr/lnl/game/server/games/action/Shot.java b/server/src/main/java/fr/lnl/game/server/games/action/Shot.java index 870058a..d5a0894 100644 --- a/server/src/main/java/fr/lnl/game/server/games/action/Shot.java +++ b/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 diff --git a/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java b/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java index 8e931ed..5ab2d3e 100644 --- a/server/src/main/java/fr/lnl/game/server/games/grid/Grid.java +++ b/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.unicaen.utils.Tuple; +import fr.lnl.game.server.utils.Point; +import fr.lnl.game.server.utils.Tuple; import java.util.HashMap; diff --git a/server/src/main/java/fr/lnl/game/server/games/player/AbstractPlayer.java b/server/src/main/java/fr/lnl/game/server/games/player/AbstractPlayer.java index b2d7903..8bd527f 100644 --- a/server/src/main/java/fr/lnl/game/server/games/player/AbstractPlayer.java +++ b/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 { diff --git a/server/src/main/java/fr/lnl/game/server/games/player/ComputerPlayer.java b/server/src/main/java/fr/lnl/game/server/games/player/ComputerPlayer.java index 7c79b50..8432d6d 100644 --- a/server/src/main/java/fr/lnl/game/server/games/player/ComputerPlayer.java +++ b/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) { diff --git a/server/src/main/java/fr/lnl/game/server/games/player/HumanPlayer.java b/server/src/main/java/fr/lnl/game/server/games/player/HumanPlayer.java index cb46f4b..69aae98 100644 --- a/server/src/main/java/fr/lnl/game/server/games/player/HumanPlayer.java +++ b/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) { diff --git a/server/src/main/java/fr/lnl/game/server/utils/Point.java b/server/src/main/java/fr/lnl/game/server/utils/Point.java index bde6ca1..ebb35d3 100644 --- a/server/src/main/java/fr/lnl/game/server/utils/Point.java +++ b/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; diff --git a/server/src/main/java/fr/lnl/game/server/utils/Tuple.java b/server/src/main/java/fr/lnl/game/server/utils/Tuple.java index 0cb5fcd..6e392ce 100644 --- a/server/src/main/java/fr/lnl/game/server/utils/Tuple.java +++ b/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; diff --git a/server/src/main/java/module-info.java b/server/src/main/java/module-info.java index 02af5c5..b823752 100644 --- a/server/src/main/java/module-info.java +++ b/server/src/main/java/module-info.java @@ -1,3 +1,3 @@ -module legot.neveu.lucas.server { +module server { exports fr.lnl.game.server; } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index f35122c..886ec9f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,4 @@ */ rootProject.name = 'legot-neveu-lucas' -include('client', 'server') +include(':client', ':server')