diff --git a/src/main/META-INF/MANIFEST.MF b/src/main/META-INF/MANIFEST.MF new file mode 100644 index 0000000..e4f8918 --- /dev/null +++ b/src/main/META-INF/MANIFEST.MF @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Main-Class: main.Main +Class-Path: mariadb.jar diff --git a/src/main/Main.jar b/src/main/Main.jar new file mode 100644 index 0000000..7a64e6a Binary files /dev/null and b/src/main/Main.jar differ diff --git a/src/main/Makefile b/src/main/Makefile index 1ba8311..09ed97d 100644 --- a/src/main/Makefile +++ b/src/main/Makefile @@ -99,12 +99,17 @@ java/controller/GameEndListener.class: java/controller/GameEndListener.java java/view/App.class: java/view/App.java $(JC) $(JCFLAGS) java/view/App.java -java/view/ScoreView.class: java/view/ScoreView.java java/view/App.class java/controller/AllScore.class java/view/BtnPerso.class +java/view/ScoreView.class: java/view/ScoreView.java java/view/App.class java/controller/AllScore.class java/view/BtnPerso.class java/controller/BackButtonMouseListener.class $(JC) $(JCFLAGS) java/view/ScoreView.java + java/controller/AllScore.class: java/controller/AllScore.java $(JC) $(JCFLAGS) java/controller/AllScore.java +java/controller/BackButtonMouseListener.class: java/controller/BackButtonMouseListener.java + $(JC) $(JCFLAGS) java/controller/BackButtonMouseListener.java + + ### RÈGLE POUR COPIER LES IMAGES ### Music: diff --git a/src/main/classes/controller/AllScore.class b/src/main/classes/controller/AllScore.class deleted file mode 100644 index 690daf6..0000000 Binary files a/src/main/classes/controller/AllScore.class and /dev/null differ diff --git a/src/main/classes/controller/CameraController.class b/src/main/classes/controller/CameraController.class deleted file mode 100644 index 4202e78..0000000 Binary files a/src/main/classes/controller/CameraController.class and /dev/null differ diff --git a/src/main/classes/controller/CameraControllerListener.class b/src/main/classes/controller/CameraControllerListener.class deleted file mode 100644 index 96543c6..0000000 Binary files a/src/main/classes/controller/CameraControllerListener.class and /dev/null differ diff --git a/src/main/classes/controller/GameContext.class b/src/main/classes/controller/GameContext.class deleted file mode 100644 index ff319ea..0000000 Binary files a/src/main/classes/controller/GameContext.class and /dev/null differ diff --git a/src/main/classes/controller/GameController.class b/src/main/classes/controller/GameController.class deleted file mode 100644 index d34f2d1..0000000 Binary files a/src/main/classes/controller/GameController.class and /dev/null differ diff --git a/src/main/classes/controller/GameEndListener.class b/src/main/classes/controller/GameEndListener.class deleted file mode 100644 index ff8be49..0000000 Binary files a/src/main/classes/controller/GameEndListener.class and /dev/null differ diff --git a/src/main/classes/controller/HexagonMouseListener.class b/src/main/classes/controller/HexagonMouseListener.class deleted file mode 100644 index 07f2012..0000000 Binary files a/src/main/classes/controller/HexagonMouseListener.class and /dev/null differ diff --git a/src/main/classes/controller/MouseDragHandler.class b/src/main/classes/controller/MouseDragHandler.class deleted file mode 100644 index 796a003..0000000 Binary files a/src/main/classes/controller/MouseDragHandler.class and /dev/null differ diff --git a/src/main/classes/controller/MousePressHandler.class b/src/main/classes/controller/MousePressHandler.class deleted file mode 100644 index cad00d3..0000000 Binary files a/src/main/classes/controller/MousePressHandler.class and /dev/null differ diff --git a/src/main/classes/controller/MouseWheelController.class b/src/main/classes/controller/MouseWheelController.class deleted file mode 100644 index c30c887..0000000 Binary files a/src/main/classes/controller/MouseWheelController.class and /dev/null differ diff --git a/src/main/classes/controller/ScoreGameContext.class b/src/main/classes/controller/ScoreGameContext.class deleted file mode 100644 index d6755a3..0000000 Binary files a/src/main/classes/controller/ScoreGameContext.class and /dev/null differ diff --git a/src/main/classes/controller/SendScore.class b/src/main/classes/controller/SendScore.class deleted file mode 100644 index f6b8ed5..0000000 Binary files a/src/main/classes/controller/SendScore.class and /dev/null differ diff --git a/src/main/classes/controller/SeriesSelector.class b/src/main/classes/controller/SeriesSelector.class deleted file mode 100644 index 18e6c01..0000000 Binary files a/src/main/classes/controller/SeriesSelector.class and /dev/null differ diff --git a/src/main/classes/controller/TilePlacer.class b/src/main/classes/controller/TilePlacer.class deleted file mode 100644 index 19c6fde..0000000 Binary files a/src/main/classes/controller/TilePlacer.class and /dev/null differ diff --git a/src/main/classes/java/view/img/D.png b/src/main/classes/java/view/img/D.png deleted file mode 100644 index 7dc4b96..0000000 Binary files a/src/main/classes/java/view/img/D.png and /dev/null differ diff --git a/src/main/classes/java/view/img/bg.png b/src/main/classes/java/view/img/bg.png deleted file mode 100644 index e3621e8..0000000 Binary files a/src/main/classes/java/view/img/bg.png and /dev/null differ diff --git a/src/main/classes/java/view/img/quit.png b/src/main/classes/java/view/img/quit.png deleted file mode 100644 index aa7b154..0000000 Binary files a/src/main/classes/java/view/img/quit.png and /dev/null differ diff --git a/src/main/classes/main/Main.class b/src/main/classes/main/Main.class deleted file mode 100644 index 9f335c1..0000000 Binary files a/src/main/classes/main/Main.class and /dev/null differ diff --git a/src/main/classes/model/Pocket.class b/src/main/classes/model/Pocket.class deleted file mode 100644 index 315513c..0000000 Binary files a/src/main/classes/model/Pocket.class and /dev/null differ diff --git a/src/main/classes/model/TerrainType.class b/src/main/classes/model/TerrainType.class deleted file mode 100644 index 4b79784..0000000 Binary files a/src/main/classes/model/TerrainType.class and /dev/null differ diff --git a/src/main/classes/model/Tile.class b/src/main/classes/model/Tile.class deleted file mode 100644 index 96b6852..0000000 Binary files a/src/main/classes/model/Tile.class and /dev/null differ diff --git a/src/main/classes/model/TileDatabaseManager.class b/src/main/classes/model/TileDatabaseManager.class deleted file mode 100644 index ec77795..0000000 Binary files a/src/main/classes/model/TileDatabaseManager.class and /dev/null differ diff --git a/src/main/classes/view/App.class b/src/main/classes/view/App.class deleted file mode 100644 index dae9ce6..0000000 Binary files a/src/main/classes/view/App.class and /dev/null differ diff --git a/src/main/classes/view/BtnPerso.class b/src/main/classes/view/BtnPerso.class deleted file mode 100644 index 6ed3ce4..0000000 Binary files a/src/main/classes/view/BtnPerso.class and /dev/null differ diff --git a/src/main/classes/view/ButtonHoverListener.class b/src/main/classes/view/ButtonHoverListener.class deleted file mode 100644 index dfb1b19..0000000 Binary files a/src/main/classes/view/ButtonHoverListener.class and /dev/null differ diff --git a/src/main/classes/view/GameView.class b/src/main/classes/view/GameView.class deleted file mode 100644 index cf2b6e7..0000000 Binary files a/src/main/classes/view/GameView.class and /dev/null differ diff --git a/src/main/classes/view/HexagonTile$1.class b/src/main/classes/view/HexagonTile$1.class deleted file mode 100644 index f9a859f..0000000 Binary files a/src/main/classes/view/HexagonTile$1.class and /dev/null differ diff --git a/src/main/classes/view/HexagonTile.class b/src/main/classes/view/HexagonTile.class deleted file mode 100644 index b8009f4..0000000 Binary files a/src/main/classes/view/HexagonTile.class and /dev/null differ diff --git a/src/main/classes/view/MenuView.class b/src/main/classes/view/MenuView.class deleted file mode 100644 index b0a17f5..0000000 Binary files a/src/main/classes/view/MenuView.class and /dev/null differ diff --git a/src/main/classes/view/ScoreView$1.class b/src/main/classes/view/ScoreView$1.class deleted file mode 100644 index d25997d..0000000 Binary files a/src/main/classes/view/ScoreView$1.class and /dev/null differ diff --git a/src/main/classes/view/ScoreView.class b/src/main/classes/view/ScoreView.class deleted file mode 100644 index 6b3abd8..0000000 Binary files a/src/main/classes/view/ScoreView.class and /dev/null differ diff --git a/src/main/java/controller/NewGameButtonListener.java b/src/main/java/controller/NewGameButtonListener.java deleted file mode 100644 index 80d9ce9..0000000 --- a/src/main/java/controller/NewGameButtonListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package controller; - -import view.MenuView; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * Listener pour le bouton Nouveaux Jeu dans le menu principal. - */ -public class NewGameButtonListener implements ActionListener { - private final MenuView menuView; - - public NewGameButtonListener(MenuView menuView) { - this.menuView = menuView; - } - - @Override - public void actionPerformed(ActionEvent e) { - menuView.toggleHowToPlay(); - } -} diff --git a/src/main/java/controller/QuitButtonListener.java b/src/main/java/controller/QuitButtonListener.java deleted file mode 100644 index 21c248d..0000000 --- a/src/main/java/controller/QuitButtonListener.java +++ /dev/null @@ -1,16 +0,0 @@ -package controller; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * Listener pour le bouton Quitter dans le menu principal. - * Ferme l'application lorsqu'il est activé. - */ -public class QuitButtonListener implements ActionListener { - - @Override - public void actionPerformed(ActionEvent e) { - System.exit(0); // Ferme l'application - } -} diff --git a/src/main/java/controller/ResumeButtonListener.java b/src/main/java/controller/ResumeButtonListener.java deleted file mode 100644 index 1610bb4..0000000 --- a/src/main/java/controller/ResumeButtonListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package controller; - -import view.MenuView; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * Listener pour le bouton Reprendre la partie dans le menu principal. - */ -public class ResumeButtonListener implements ActionListener { - private final MenuView menuView; - - public ResumeButtonListener(MenuView menuView) { - this.menuView = menuView; - } - - @Override - public void actionPerformed(ActionEvent e) { - menuView.showSeriesButtons(); - } -} diff --git a/src/main/java/controller/SeriesButtonListener.java b/src/main/java/controller/SeriesButtonListener.java deleted file mode 100644 index bcf7848..0000000 --- a/src/main/java/controller/SeriesButtonListener.java +++ /dev/null @@ -1,30 +0,0 @@ -package controller; - -import view.App; -import view.GameView; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -/** - * Listener pour les boutons de sélection de séries dans le menu principal. - */ -public class SeriesButtonListener implements ActionListener { - private final int seriesId; - private final SeriesSelector seriesSelector; - - public SeriesButtonListener(int seriesId, SeriesSelector seriesSelector) { - this.seriesId = seriesId; - this.seriesSelector = seriesSelector; - } - - @Override - public void actionPerformed(ActionEvent e) { - GameView gameView = new GameView(seriesId); - App.addView(gameView, App.GAME_VIEW); - App.showView(App.GAME_VIEW); - if (seriesSelector != null) { - seriesSelector.startGameWithSeries(seriesId); - } - } -} diff --git a/src/main/java/view/MenuView.java b/src/main/java/view/MenuView.java index 265a417..f9a9d97 100644 --- a/src/main/java/view/MenuView.java +++ b/src/main/java/view/MenuView.java @@ -1,10 +1,6 @@ package view; import controller.SeriesSelector; -import controller.ResumeButtonListener; -import controller.NewGameButtonListener; -import controller.SeriesButtonListener; -import controller.QuitButtonListener; import javax.swing.*; import java.awt.*; @@ -63,7 +59,7 @@ public class MenuView extends JPanel { /** * Affiche ou masque le panneau "Comment jouer". */ - public void toggleHowToPlay() { + private void toggleHowToPlay() { seriesPanel.setVisible(false); howToPlayPanel.setVisible(!howToPlayPanel.isVisible()); centeredPanel.removeAll(); @@ -106,10 +102,9 @@ public class MenuView extends JPanel { quitButton.setOpaque(true); quitButton.setFocusPainted(false); - // Utilisation des listeners dans des fichiers séparés - resumeButton.addActionListener(new ResumeButtonListener(this)); - newGameButton.addActionListener(new NewGameButtonListener(this)); - quitButton.addActionListener(new QuitButtonListener()); // Ajout du listener pour le bouton Quitter + resumeButton.addActionListener(e -> showSeriesButtons()); + newGameButton.addActionListener(e -> toggleHowToPlay()); + quitButton.addActionListener(e -> System.exit(0)); // Quitte l'application howToPlayPanel = createHowToPlayPanel(); howToPlayPanel.setVisible(false); @@ -189,7 +184,14 @@ public class MenuView extends JPanel { for (int i = 1; i <= 4; i++) { int seriesId = i; BtnPerso seriesButton = new BtnPerso("Série " + seriesId); - seriesButton.addActionListener(new SeriesButtonListener(seriesId, seriesSelector)); + seriesButton.addActionListener(e -> { + GameView gameView = new GameView(seriesId); + App.addView(gameView, App.GAME_VIEW); + App.showView(App.GAME_VIEW); + if (seriesSelector != null) { + seriesSelector.startGameWithSeries(seriesId); + } + }); seriesButton.addMouseListener(new ButtonHoverListener()); panel.add(seriesButton);