From e04dd65ef320149b078730f089fb95ce8477dcf3 Mon Sep 17 00:00:00 2001
From: guezoloic <loicguezo@gmail.com>
Date: Wed, 22 May 2024 12:43:38 +0200
Subject: [PATCH] changement de l'ordre des fichiers

---
 src/Connexion/Reseau.java                     |  2 +-
 src/Environnements/Map.java                   | 14 +++---
 src/Main.java                                 | 19 ++++----
 src/Personnages/Personnage.java               |  4 +-
 src/Personnages/Player.java                   |  4 +-
 src/Personnages/Robot.java                    |  2 +-
 src/display/Display.java                      | 12 +++---
 src/{display => game}/Terminal.java           | 23 +++++-----
 src/{Objets => object}/Effects.java           |  2 +-
 src/{Objets => object}/Items.java             |  2 +-
 src/{Personnages => object}/Mouvements.java   |  7 ++-
 src/{Personnages => object}/Snake.java        |  4 +-
 src/tests/MapTest.java                        | 38 ++++++++++++++++
 src/{Tests.java => tests/PersonnageTest.java} | 43 ++++---------------
 14 files changed, 92 insertions(+), 84 deletions(-)
 rename src/{display => game}/Terminal.java (88%)
 rename src/{Objets => object}/Effects.java (96%)
 rename src/{Objets => object}/Items.java (98%)
 rename src/{Personnages => object}/Mouvements.java (92%)
 rename src/{Personnages => object}/Snake.java (94%)
 create mode 100644 src/tests/MapTest.java
 rename src/{Tests.java => tests/PersonnageTest.java} (50%)

diff --git a/src/Connexion/Reseau.java b/src/Connexion/Reseau.java
index 6d4d397..8b30758 100644
--- a/src/Connexion/Reseau.java
+++ b/src/Connexion/Reseau.java
@@ -1,4 +1,4 @@
-package Connexion;
+package connexion;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/Environnements/Map.java b/src/Environnements/Map.java
index f88edfe..55061fd 100644
--- a/src/Environnements/Map.java
+++ b/src/Environnements/Map.java
@@ -1,12 +1,11 @@
-package Environnements;
+package environnements;
 
 import java.util.ArrayList;
 import java.util.Random;
 
-import Objets.Effects;
-import Objets.Items;
-import Personnages.Personnage;
-import Personnages.Snake;
+import object.*;
+import personnages.*;
+
 
 /**
  * cette classe est la classe qui cree et genere 
@@ -75,7 +74,7 @@ public class Map {
     }
 
     public boolean isGameOver(int[] coordinate) {
-        return coordinate[0] < 0 || coordinate[0] >= this.grid[coordinate[1]].length || 
+        return coordinate[0] < 0 || coordinate[0] >= this.grid[0].length || 
                coordinate[1] < 0 || coordinate[1] >= this.grid.length;
     }
 
@@ -199,7 +198,8 @@ public class Map {
      */
     public void deleteItems(int[] coordinate) {
         for(int i = 0; i<this.coordinateItems.size(); i++) {
-            if (this.coordinateItems.get(i) == coordinate) {
+            int[] itemCoordinate = this.coordinateItems.get(i);
+            if (itemCoordinate[0] == coordinate[0] && itemCoordinate[1] == coordinate[1]) {
                 this.coordinateItems.remove(i);
                 this.ObjectItems.remove(i);
             }
diff --git a/src/Main.java b/src/Main.java
index edc31a2..4eb8110 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,21 +1,20 @@
-import Display.Terminal;
-import Environnements.Map;
-import Objets.Items;
-import Personnages.Personnage;
-import Personnages.Player;
+import environnements.Map;
+import game.Terminal;
+import personnages.Personnage;
+import personnages.Player;
+import tests.*;
 
 public class Main {
     public static void main(String[] args) {
         Personnage.n = 2;
 
-        Map map = new Map(12, 30);
-
-        map.addObjects(Items.FRAISE, 5, 5);
-
         Personnage[] personnages = new Personnage[] {
-            new Player(new int[] {0, 0}, "Phillipe")
+            new Player(new int[] {0, 0}, "Philippe Etchebest"),
+            new Player(new int[] {19, 19}, "Luke Skywalker")
         };
 
+        Map map = new Map(20, 20);
+
         new Terminal(map, personnages);
     }
 }
diff --git a/src/Personnages/Personnage.java b/src/Personnages/Personnage.java
index fe635dc..6ce300d 100644
--- a/src/Personnages/Personnage.java
+++ b/src/Personnages/Personnage.java
@@ -1,8 +1,8 @@
-package Personnages;
+package personnages;
 
 import java.util.ArrayList;
 
-import Objets.Effects;
+import object.*;
 
 /**
  * Cette classe est la primitive des classes
diff --git a/src/Personnages/Player.java b/src/Personnages/Player.java
index 60be3b8..b16040a 100644
--- a/src/Personnages/Player.java
+++ b/src/Personnages/Player.java
@@ -1,4 +1,6 @@
-package Personnages;
+package personnages;
+
+import object.*;
 
 /**
  * la classe Player a comme classe parent {@link Personnage}
diff --git a/src/Personnages/Robot.java b/src/Personnages/Robot.java
index 64435a1..ca1d9b5 100644
--- a/src/Personnages/Robot.java
+++ b/src/Personnages/Robot.java
@@ -1,4 +1,4 @@
-package Personnages;
+package personnages;
 
 public class Robot extends Personnage {
     public Robot(int[] coordinate) {
diff --git a/src/display/Display.java b/src/display/Display.java
index e28dfbb..816185c 100644
--- a/src/display/Display.java
+++ b/src/display/Display.java
@@ -1,11 +1,9 @@
-package Display;
+package display;
 
 import java.util.ArrayList;
 
-import Environnements.Map;
-import Objets.Items;
-import Personnages.Personnage;
-import Personnages.Snake;
+import object.*;
+import personnages.*;
 
 public class Display {
     /**
@@ -129,8 +127,8 @@ public class Display {
 
             if (isHead[0]) {System.out.print(" \u21E9 ");return;} 
             else if (isHead[1]) {System.out.print(" \u21E7 ");return;} 
-            else if (isHead[2]) {System.out.print("\u21E8  ");return;} 
-            else if (isHead[3]) {System.out.print("  \u21E6");return;} 
+            else if (isHead[2]) {System.out.print("  \u21E8");return;} 
+            else if (isHead[3]) {System.out.print("\u21E6  ");return;} 
         }
         }
         System.out.print(" \u25CF ");
diff --git a/src/display/Terminal.java b/src/game/Terminal.java
similarity index 88%
rename from src/display/Terminal.java
rename to src/game/Terminal.java
index 13821b4..b0c2348 100644
--- a/src/display/Terminal.java
+++ b/src/game/Terminal.java
@@ -1,15 +1,11 @@
-package Display;
+package game;
+
+import display.*;
+import personnages.*;
+import environnements.*;
 
 import java.util.Scanner;
 
-import Environnements.Map;
-import Objets.Effects;
-import Objets.Items;
-import Personnages.Mouvements;
-import Personnages.Personnage;
-import Personnages.Player;
-import Personnages.Robot;
-
 public class Terminal {
     private int round = 0;
 
@@ -74,11 +70,11 @@ public class Terminal {
      * @return
      */
     private static boolean playerRound(Player player) {
-        int input = getInput(player);
-        player.moveCoordinate(input);
+        player.moveCoordinate(getInput(player));
 
         int[] coordinate = player.getHeadCoordinate();
-        if(map.isGameOver(player.getHeadCoordinate()) || player.applyEffects(map.getEffect(coordinate))) return true;
+        if(map.isGameOver(coordinate) || player.applyEffects(map.getEffect(coordinate))) return true;
+        map.deleteItems(coordinate);
 
         player.increaseRound();
         return false;
@@ -121,7 +117,7 @@ public class Terminal {
         int i = 0;
 
         while(!isGameOver) {
-            for (i = 0; i<personnages.length; i++) {
+            for (i = 0;i<personnages.length; i++) {
                 Personnage personnage = personnages[i];
                 Display.clearTerminal();
 
@@ -137,6 +133,7 @@ public class Terminal {
                 if(!isGameOver) placePersonnages(personnages);
                 else break;
 
+                System.out.println(1);
                 map.clearMap();
             }
             this.round++;
diff --git a/src/Objets/Effects.java b/src/object/Effects.java
similarity index 96%
rename from src/Objets/Effects.java
rename to src/object/Effects.java
index b0ff4a2..78067e8 100644
--- a/src/Objets/Effects.java
+++ b/src/object/Effects.java
@@ -1,4 +1,4 @@
-package Objets;
+package object;
 
 /**
  * cette enumérateur {@link Effects} contient tout les effets 
diff --git a/src/Objets/Items.java b/src/object/Items.java
similarity index 98%
rename from src/Objets/Items.java
rename to src/object/Items.java
index 7287705..b23eccf 100644
--- a/src/Objets/Items.java
+++ b/src/object/Items.java
@@ -1,4 +1,4 @@
-package Objets;
+package object;
 
 public enum Items {
     WALL("WALL", Effects.IMPASSABLE),
diff --git a/src/Personnages/Mouvements.java b/src/object/Mouvements.java
similarity index 92%
rename from src/Personnages/Mouvements.java
rename to src/object/Mouvements.java
index 1752cd3..d14eca7 100644
--- a/src/Personnages/Mouvements.java
+++ b/src/object/Mouvements.java
@@ -1,11 +1,14 @@
-package Personnages;
+package object;
+
+import java.io.Serializable;
 
 /**
  * Cet enumerateur prend en charge tout les mouvements possible
  * pour le serpent, il a uniquement la possibilité de se déplacer
  * grâce a {@link Mouvements} pour la classe Player et Robot.
  */
-public enum Mouvements {
+@SuppressWarnings("unused")
+public enum Mouvements implements Serializable {
     /**
      * HAUT prend comme coordonnée (0, -1) pour se déplacer. 
      * @param x = 0
diff --git a/src/Personnages/Snake.java b/src/object/Snake.java
similarity index 94%
rename from src/Personnages/Snake.java
rename to src/object/Snake.java
index 58a6535..1ab029d 100644
--- a/src/Personnages/Snake.java
+++ b/src/object/Snake.java
@@ -1,6 +1,4 @@
-package Personnages;
-
-import Objets.Effects;
+package object;
 
 public enum Snake {
     HEAD("TETE", Effects.IMPASSABLE),
diff --git a/src/tests/MapTest.java b/src/tests/MapTest.java
new file mode 100644
index 0000000..e613d51
--- /dev/null
+++ b/src/tests/MapTest.java
@@ -0,0 +1,38 @@
+package tests;
+
+import display.Display;
+import environnements.Map;
+import object.Items;
+import personnages.Personnage;
+import personnages.Player;
+
+public class MapTest {
+    public static void creationMap() {
+        Map map = new Map(30, 30);
+        map.addObjects(Items.FRAISE, 29, 29);
+        map.placeObjects();
+        
+        Display.printMap(map.addEdges());
+    }
+
+    public static void drawMap() {
+        Map map = new Map(30, 30);
+        Display.printMap(map.addEdges(), null);
+    }
+
+    public static void placePersonnageMap() {
+        Map map = new Map(30, 30);
+        map.placePersonnages(new Player(new int[]{1, 1}, "null"));
+
+        Display.printMap(map.addEdges(), new Personnage[] {new Player(new int[]{1, 1}, "null")});
+    }
+
+    public static void effects() {
+        Map map = new Map(5, 1);
+        Player player = new Player(new int[] {0, 0}, "null");
+        map.addObjects(Items.FRAISE, 0, 0);
+
+        player.applyEffects(map.getEffect(player.getHeadCoordinate()));
+        System.out.println(player.getSize());
+    }
+}
diff --git a/src/Tests.java b/src/tests/PersonnageTest.java
similarity index 50%
rename from src/Tests.java
rename to src/tests/PersonnageTest.java
index 4f5e8fb..9dcaa64 100644
--- a/src/Tests.java
+++ b/src/tests/PersonnageTest.java
@@ -1,12 +1,11 @@
-import Objets.Effects;
-import Objets.Items;
-import Display.Display;
-import Environnements.Map;
-import Personnages.Mouvements;
-import Personnages.Personnage;
-import Personnages.Player;
+package tests;
 
-public class Tests {
+import object.Effects;
+import object.Mouvements;
+import personnages.Personnage;
+import personnages.Player;
+
+public class PersonnageTest {
     public static void avancerPersonnage() {
         Player player = new Player(new int[]{1, 1}, "test");
 
@@ -36,30 +35,4 @@ public class Tests {
 
         System.out.println(player.getCoordinate());
     }
-
-    public static void creationMap() {
-        Map map = new Map(30, 30);
-        map.addObjects(Items.FRAISE, 29, 29);
-        map.placeObjects();
-        
-        Display.printMap(map.addEdges());
-    }
-
-    public static void drawMap() {
-        Map map = new Map(30, 30);
-        Display.printMap(map.addEdges(), null);
-    }
-
-    public static void placePersonnageMap() {
-        Map map = new Map(30, 30);
-        map.placePersonnages(new Player(new int[]{1, 1}, "null"));
-
-        Display.printMap(map.addEdges(), new Personnage[] {new Player(new int[]{1, 1}, "null")});
-    }
-
-    public static void effects() {
-        Map map = new Map(5, 1);
-        Player player = new Player(new int[] {0, 0}, "null");
-        map.addObjects(Items.FRAISE, 1, 0);
-    }
-}
\ No newline at end of file
+}