aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/fr/umlv/java/wallj/context
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/fr/umlv/java/wallj/context')
-rw-r--r--src/main/java/fr/umlv/java/wallj/context/Game.java2
-rw-r--r--src/main/java/fr/umlv/java/wallj/context/Stage.java16
-rw-r--r--src/main/java/fr/umlv/java/wallj/context/Updateables.java8
3 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/fr/umlv/java/wallj/context/Game.java b/src/main/java/fr/umlv/java/wallj/context/Game.java
index 7d09b26..46fee8a 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Game.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Game.java
@@ -17,9 +17,9 @@ import java.util.stream.Stream;
17 * @author Adam NAILI 17 * @author Adam NAILI
18 */ 18 */
19public final class Game implements Updateable { 19public final class Game implements Updateable {
20 private final List<Board> boards;
20 private Stage currentStage; 21 private Stage currentStage;
21 private int indexBoard; 22 private int indexBoard;
22 private final List<Board> boards;
23 private boolean over; 23 private boolean over;
24 24
25 /** 25 /**
diff --git a/src/main/java/fr/umlv/java/wallj/context/Stage.java b/src/main/java/fr/umlv/java/wallj/context/Stage.java
index 9b66e03..903b5de 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Stage.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Stage.java
@@ -36,6 +36,14 @@ public class Stage implements Updateable {
36 blocks.forEach(block -> block.link(world)); 36 blocks.forEach(block -> block.link(world));
37 } 37 }
38 38
39 private static TileVec2 findAnyFreeTile(Board board) {
40 return board.stream()
41 .filter(entry -> entry.getValue() == BlockType.FREE)
42 .findAny()
43 .map(Map.Entry::getKey)
44 .orElseThrow(IllegalArgumentException::new);
45 }
46
39 /** 47 /**
40 * @return the JBox2D world 48 * @return the JBox2D world
41 */ 49 */
@@ -126,12 +134,4 @@ public class Stage implements Updateable {
126 .filter(block -> block.getType() == BlockType.BOMB) 134 .filter(block -> block.getType() == BlockType.BOMB)
127 .count() == BOMB_PLACEMENTS; 135 .count() == BOMB_PLACEMENTS;
128 } 136 }
129
130 private static TileVec2 findAnyFreeTile(Board board) {
131 return board.stream()
132 .filter(entry -> entry.getValue() == BlockType.FREE)
133 .findAny()
134 .map(Map.Entry::getKey)
135 .orElseThrow(IllegalArgumentException::new);
136 }
137} 137}
diff --git a/src/main/java/fr/umlv/java/wallj/context/Updateables.java b/src/main/java/fr/umlv/java/wallj/context/Updateables.java
index f2aae6a..8f66c93 100644
--- a/src/main/java/fr/umlv/java/wallj/context/Updateables.java
+++ b/src/main/java/fr/umlv/java/wallj/context/Updateables.java
@@ -12,6 +12,10 @@ import java.util.stream.Stream;
12 * @author Pacien TRAN-GIRARD 12 * @author Pacien TRAN-GIRARD
13 */ 13 */
14public final class Updateables { 14public final class Updateables {
15 private Updateables() {
16 // static class
17 }
18
15 /** 19 /**
16 * @param <T> the updateable type 20 * @param <T> the updateable type
17 * @param context an update context 21 * @param context an update context
@@ -33,8 +37,4 @@ public final class Updateables {
33 public static <T extends Updateable> Stream<Event> updateAll(Context context, T... updateables) { 37 public static <T extends Updateable> Stream<Event> updateAll(Context context, T... updateables) {
34 return updateAll(context, Arrays.asList(updateables)); 38 return updateAll(context, Arrays.asList(updateables));
35 } 39 }
36
37 private Updateables() {
38 // static class
39 }
40} 40}