Merge branch '10_graphical_interface'

Conflicts:
	src/ch/epfl/xblast/Lists.java

9 files changed, 396 insertions, 14 deletions

diff --git a/src/ch/epfl/xblast/Cell.java b/src/ch/epfl/xblast/Cell.java
index 9720281..3f41e5c 100644
--- a/src/ch/epfl/xblast/Cell.java
+++ b/src/ch/epfl/xblast/Cell.java
@@ -10,7 +10,7 @@ import java.util.List;
  * @author Pacien TRAN-GIRARD (261948)
  * @author Timothée FLOURE (257420)
  */
-public final class Cell {
+public final class Cell implements Comparable<Cell> {
 
     /**
      * The width of the board (number of columns).
@@ -194,4 +194,15 @@ public final class Cell {
         return String.format("(%d,%d)", this.x, this.y);
     }
 
+    /**
+     * Compares two Cells relatively to their row major indexes.
+     *
+     * @param cell the other Cell to compare
+     * @return the comparison result
+     */
+    @Override
+    public int compareTo(Cell cell) {
+        return Integer.compare(this.rowMajorIndex(), cell.rowMajorIndex());
+    }
+
 }
diff --git a/src/ch/epfl/xblast/Lists.java b/src/ch/epfl/xblast/Lists.java
index 526ebf4..777fab2 100644
--- a/src/ch/epfl/xblast/Lists.java
+++ b/src/ch/epfl/xblast/Lists.java
@@ -2,6 +2,7 @@ package ch.epfl.xblast;
 
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
 /**
@@ -60,6 +61,20 @@ public final class Lists {
     }
 
     /**
+     * Returns an immutable copy of the given list, sorted using the supplied comparator.
+     *
+     * @param l   the list to sort
+     * @param cmp the Comparator to use
+     * @param <T> the type of the list's elements
+     * @return the sorted list
+     */
+    public static <T> List<T> sorted(List<T> l, Comparator<T> cmp) {
+        List<T> r = new ArrayList<>(l);
+        Collections.sort(r, cmp);
+        return Collections.unmodifiableList(r);
+    }
+
+    /**
      * Returns a copy of the given list surrounded with element e.
      *
      * @param l   the list
@@ -179,4 +194,51 @@ public final class Lists {
         return r;
     }
 
+    /**
+     * Maps linearly two lists.
+     *
+     * @param kl  the keys list
+     * @param vl  the values list
+     * @param <K> the key type
+     * @param <V> the value type
+     * @return the map
+     */
+    public static <K, V> Map<K, V> linearMap(List<K> kl, List<V> vl) {
+        if (Objects.isNull(kl) || Objects.isNull(vl) || kl.size() != vl.size())
+            throw new IllegalArgumentException();
+
+        return Collections.unmodifiableMap(IntStream
+                .range(0, kl.size()).mapToObj(i -> i)
+                .filter(i -> Objects.nonNull(vl.get(i)))
+                .collect(Collectors.toMap(kl::get, vl::get)));
+    }
+
+    /**
+     * Merges two maps Map<K1, IK> and Map<IK, V> -> Map<K1, V>.
+     *
+     * @param m1   key maps
+     * @param m2   values maps
+     * @param <K>  the keys type
+     * @param <IK> the intermediate keys type
+     * @param <V>  the values type
+     * @return the traversing map
+     */
+    public static <K, IK, V> Map<K, V> traverseMaps(Map<K, IK> m1, Map<IK, V> m2) {
+        return Collections.unmodifiableMap(m1.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getKey, e -> m2.get(e.getValue()))));
+    }
+
+    /**
+     * Returns an inverted copy of a bijective map.
+     *
+     * @param m   the map to invert
+     * @param <K> the keys type
+     * @param <V> the values type
+     * @return the inverted map
+     */
+    public static <K, V> Map<K, V> invertMap(Map<V, K> m) {
+        return Collections.unmodifiableMap(m.entrySet().stream()
+                .collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey)));
+    }
+
 }
diff --git a/src/ch/epfl/xblast/PlayerAction.java b/src/ch/epfl/xblast/PlayerAction.java
new file mode 100644
index 0000000..703bc9d
--- /dev/null
+++ b/src/ch/epfl/xblast/PlayerAction.java
@@ -0,0 +1,19 @@
+package ch.epfl.xblast;
+
+/**
+ * The player action enum.
+ *
+ * @author Timothée FLOURE (257420)
+ * @author Pacien TRAN-GIRARD (261948)
+ */
+public enum PlayerAction {
+
+    JOIN_GAME,
+    MOVE_N,
+    MOVE_E,
+    MOVE_S,
+    MOVE_W,
+    STOP,
+    DROP_BOMB
+
+}
diff --git a/src/ch/epfl/xblast/SubCell.java b/src/ch/epfl/xblast/SubCell.java
index 4278fab..fd9db0b 100644
--- a/src/ch/epfl/xblast/SubCell.java
+++ b/src/ch/epfl/xblast/SubCell.java
@@ -6,7 +6,7 @@ package ch.epfl.xblast;
  * @author Pacien TRAN-GIRARD (261948)
  * @author Timothée FLOURE (257420)
  */
-public final class SubCell {
+public final class SubCell implements Comparable<SubCell> {
 
     /**
      * The number of x-subdivisions of each Cell.
@@ -165,4 +165,15 @@ public final class SubCell {
         return this.y * SUB_COLUMNS + this.x;
     }
 
+    /**
+     * Compares two SubCells relatively to their row major indexes.
+     *
+     * @param subCell the other SubCell to compare
+     * @return the comparison result
+     */
+    @Override
+    public int compareTo(SubCell subCell) {
+        return Integer.compare(this.rowMajorIndex(), subCell.rowMajorIndex());
+    }
+
 }
diff --git a/src/ch/epfl/xblast/client/GameState.java b/src/ch/epfl/xblast/client/GameState.java
index 7652cd5..480c6a1 100644
--- a/src/ch/epfl/xblast/client/GameState.java
+++ b/src/ch/epfl/xblast/client/GameState.java
@@ -8,8 +8,11 @@ import ch.epfl.xblast.client.painter.ScorePainter;
 import ch.epfl.xblast.client.painter.TimeLinePainter;
 
 import java.awt.*;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * The client representation of a game state.
@@ -41,7 +44,7 @@ public final class GameState {
             this.id = id;
             this.lives = lives;
             this.position = Objects.requireNonNull(position);
-            this.image = Objects.requireNonNull(image);
+            this.image = image;
         }
 
         /**
@@ -131,7 +134,7 @@ public final class GameState {
     }
 
     /**
-     * @return list containing all the images composing the actual score
+     * @return list containing all the images composing the score
      */
     public List<Image> scores() {
         return this.scores;
@@ -144,4 +147,12 @@ public final class GameState {
         return this.ticks;
     }
 
+    /**
+     * @return map of players' scores
+     */
+    Map<PlayerID, Integer> playerScores() {
+        return Collections.unmodifiableMap(this.players.stream()
+                .collect(Collectors.toMap(Player::id, Player::lives)));
+    }
+
 }
diff --git a/src/ch/epfl/xblast/client/GameStateDeserializer.java b/src/ch/epfl/xblast/client/GameStateDeserializer.java
index 20b44f9..8b203b1 100644
--- a/