From 0bb327abb25c58b98471db900f3da69709175e73 Mon Sep 17 00:00:00 2001 From: Anthony Debucquoy Date: Fri, 19 May 2023 16:44:45 +0200 Subject: [PATCH] restructuration des fichiers --- app/src/main/java/school_project/Controller.java | 3 ++- .../java/school_project/{ => Scenes}/GameUI.java | 8 ++++++-- .../{Menu => Scenes}/MenuAccueil.java | 3 +-- .../school_project/{Menu => Scenes}/MenuLevel.java | 3 +-- .../{Menu => Scenes}/ScreenLevelFinish.java | 3 +-- .../main/java/school_project/Utils/MatrixShape.java | 1 + .../{Menu => Scenes}/BackGround-LvlFinish.jpg | Bin .../{Menu => Scenes}/BackGround-menu.jpg | Bin .../{Menu => Scenes}/Background-select-level.jpg | Bin .../{Menu => Scenes}/StyleMenuAcceuil.css | 0 10 files changed, 12 insertions(+), 9 deletions(-) rename app/src/main/java/school_project/{ => Scenes}/GameUI.java (95%) rename app/src/main/java/school_project/{Menu => Scenes}/MenuAccueil.java (98%) rename app/src/main/java/school_project/{Menu => Scenes}/MenuLevel.java (98%) rename app/src/main/java/school_project/{Menu => Scenes}/ScreenLevelFinish.java (96%) rename app/src/main/resources/school_project/{Menu => Scenes}/BackGround-LvlFinish.jpg (100%) rename app/src/main/resources/school_project/{Menu => Scenes}/BackGround-menu.jpg (100%) rename app/src/main/resources/school_project/{Menu => Scenes}/Background-select-level.jpg (100%) rename app/src/main/resources/school_project/{Menu => Scenes}/StyleMenuAcceuil.css (100%) diff --git a/app/src/main/java/school_project/Controller.java b/app/src/main/java/school_project/Controller.java index 5d4956f..19ba9fb 100644 --- a/app/src/main/java/school_project/Controller.java +++ b/app/src/main/java/school_project/Controller.java @@ -8,7 +8,8 @@ import javafx.scene.input.KeyCode; import javafx.scene.input.KeyCombination; import javafx.stage.Screen; import javafx.stage.Stage; -import school_project.Menu.MenuAccueil; +import school_project.Scenes.GameUI; +import school_project.Scenes.MenuAccueil; import school_project.Parsers.FileParserFactory; import java.io.File; diff --git a/app/src/main/java/school_project/GameUI.java b/app/src/main/java/school_project/Scenes/GameUI.java similarity index 95% rename from app/src/main/java/school_project/GameUI.java rename to app/src/main/java/school_project/Scenes/GameUI.java index e6cfe0d..a7b6d7b 100644 --- a/app/src/main/java/school_project/GameUI.java +++ b/app/src/main/java/school_project/Scenes/GameUI.java @@ -1,10 +1,14 @@ -package school_project; +package school_project.Scenes; import javafx.scene.Group; import javafx.scene.input.MouseButton; -import school_project.Menu.ScreenLevelFinish; +import school_project.Controller; +import school_project.Map; +import school_project.Piece; +import school_project.Scenes.ScreenLevelFinish; import school_project.Utils.MatrixShape; +import school_project.Vec2; import java.io.FileNotFoundException; diff --git a/app/src/main/java/school_project/Menu/MenuAccueil.java b/app/src/main/java/school_project/Scenes/MenuAccueil.java similarity index 98% rename from app/src/main/java/school_project/Menu/MenuAccueil.java rename to app/src/main/java/school_project/Scenes/MenuAccueil.java index a7a5467..ad270ba 100644 --- a/app/src/main/java/school_project/Menu/MenuAccueil.java +++ b/app/src/main/java/school_project/Scenes/MenuAccueil.java @@ -1,4 +1,4 @@ -package school_project.Menu; +package school_project.Scenes; import javafx.geometry.Insets; import javafx.geometry.Pos; import javafx.scene.control.Button; @@ -8,7 +8,6 @@ import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.scene.text.Font; import school_project.Controller; -import school_project.GameUI; import school_project.MapGenerator; import school_project.Parsers.FileParserFactory; diff --git a/app/src/main/java/school_project/Menu/MenuLevel.java b/app/src/main/java/school_project/Scenes/MenuLevel.java similarity index 98% rename from app/src/main/java/school_project/Menu/MenuLevel.java rename to app/src/main/java/school_project/Scenes/MenuLevel.java index ad8cbea..d87ccb1 100644 --- a/app/src/main/java/school_project/Menu/MenuLevel.java +++ b/app/src/main/java/school_project/Scenes/MenuLevel.java @@ -1,4 +1,4 @@ -package school_project.Menu; +package school_project.Scenes; import javafx.geometry.HPos; import javafx.geometry.Insets; @@ -7,7 +7,6 @@ import javafx.scene.layout.ColumnConstraints; import javafx.scene.layout.GridPane; import javafx.scene.layout.RowConstraints; import school_project.Controller; -import school_project.GameUI; import school_project.Parsers.FileParserFactory; import java.io.File; diff --git a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java b/app/src/main/java/school_project/Scenes/ScreenLevelFinish.java similarity index 96% rename from app/src/main/java/school_project/Menu/ScreenLevelFinish.java rename to app/src/main/java/school_project/Scenes/ScreenLevelFinish.java index afab164..3fe240d 100644 --- a/app/src/main/java/school_project/Menu/ScreenLevelFinish.java +++ b/app/src/main/java/school_project/Scenes/ScreenLevelFinish.java @@ -1,4 +1,4 @@ -package school_project.Menu; +package school_project.Scenes; import javafx.geometry.Insets; @@ -9,7 +9,6 @@ import javafx.scene.control.Label; import javafx.scene.layout.StackPane; import javafx.scene.text.Font; import school_project.Controller; -import school_project.GameUI; import school_project.Map; import java.io.FileNotFoundException; diff --git a/app/src/main/java/school_project/Utils/MatrixShape.java b/app/src/main/java/school_project/Utils/MatrixShape.java index 5ed0f34..1274a37 100644 --- a/app/src/main/java/school_project/Utils/MatrixShape.java +++ b/app/src/main/java/school_project/Utils/MatrixShape.java @@ -8,6 +8,7 @@ import javafx.scene.layout.Pane; import javafx.scene.paint.Paint; import javafx.scene.shape.Rectangle; import school_project.*; +import school_project.Scenes.GameUI; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/app/src/main/resources/school_project/Menu/BackGround-LvlFinish.jpg b/app/src/main/resources/school_project/Scenes/BackGround-LvlFinish.jpg similarity index 100% rename from app/src/main/resources/school_project/Menu/BackGround-LvlFinish.jpg rename to app/src/main/resources/school_project/Scenes/BackGround-LvlFinish.jpg diff --git a/app/src/main/resources/school_project/Menu/BackGround-menu.jpg b/app/src/main/resources/school_project/Scenes/BackGround-menu.jpg similarity index 100% rename from app/src/main/resources/school_project/Menu/BackGround-menu.jpg rename to app/src/main/resources/school_project/Scenes/BackGround-menu.jpg diff --git a/app/src/main/resources/school_project/Menu/Background-select-level.jpg b/app/src/main/resources/school_project/Scenes/Background-select-level.jpg similarity index 100% rename from app/src/main/resources/school_project/Menu/Background-select-level.jpg rename to app/src/main/resources/school_project/Scenes/Background-select-level.jpg diff --git a/app/src/main/resources/school_project/Menu/StyleMenuAcceuil.css b/app/src/main/resources/school_project/Scenes/StyleMenuAcceuil.css similarity index 100% rename from app/src/main/resources/school_project/Menu/StyleMenuAcceuil.css rename to app/src/main/resources/school_project/Scenes/StyleMenuAcceuil.css