Merge branch 'master' of https://github.com/pacien/upem-java-wallj

10 files changed, 166 insertions, 113 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
index ac63a87..4f310eb 100644
--- a/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/BombBlock.java
@@ -3,6 +3,7 @@ package fr.umlv.java.wallj.block;
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.context.GraphicsContext;
+import fr.umlv.java.wallj.context.Updateables;
 import fr.umlv.java.wallj.event.*;
 import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
@@ -10,10 +11,8 @@ import org.jbox2d.dynamics.BodyType;
 
 import java.awt.*;
 import java.time.Duration;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * A bomb block.
@@ -42,32 +41,35 @@ public class BombBlock extends JBoxBlock {
   }
 
   @Override
-  public List<Event> update(Context context) {
-    handleBombConfiguration(context.getEvents());
-    paint(context.getGraphicsContext());
-    return consume(context.getTimeDelta());
+  public Stream<Event> update(Context context) {
+    return Updateables.updateAll(context,
+    this::handleBombConfiguration,
+    this::consume,
+    this::paint);
   }
 
-  private void handleBombConfiguration(List<Event> events) {
-    Events.findFirst(events, BombTimerIncrEvent.class)
+  private Stream<Event> handleBombConfiguration(Context context) {
+    Events.findFirst(context.getEvents(), BombTimerIncrEvent.class)
     .filter(event -> Objects.equals(event.getPos(), TileVec2.of(getPos())))
     .ifPresent(event -> incrementTimer());
+    return Stream.empty();
   }
 
-  private List<Event> consume(Duration timeDelta) {
-    decrementTimer(timeDelta);
-
-    if (timer.isNegative())
-      return Arrays.asList(new BombExplosionEvent(TileVec2.of(getPos())), new BlockDestroyEvent(this));
-    else
-      return Collections.emptyList();
+  private Stream<Event> consume(Context context) {
+    decrementTimer(context.getTimeDelta());
+    return timer.isNegative() ?
+           Stream.of(new BombExplosionEvent(TileVec2.of(getPos())), new BlockDestroyEvent(this)) :
+           Stream.empty();
   }
 
-  private void paint(GraphicsContext graphicsContext) {
+  private Stream<Event> paint(Context context) {
+    GraphicsContext graphicsContext = context.getGraphicsContext();
     graphicsContext.paintCircle(Color.BLACK, getPos(), TileVec2.TILE_DIM);
     Vec2 textPosition = getPos();
     textPosition.x += TileVec2.TILE_DIM / 4.0f;
     textPosition.y += 3 * TileVec2.TILE_DIM / 4.0f;
     graphicsContext.paintString(Color.RED, textPosition, Long.toString(timer.getSeconds()));
+
+    return Stream.empty();
   }
 }
diff --git a/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java b/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java
index 9338888..362e680 100644
--- a/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/GarbageBlock.java
@@ -2,19 +2,17 @@ package fr.umlv.java.wallj.block;
 
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
-import fr.umlv.java.wallj.context.GraphicsContext;
+import fr.umlv.java.wallj.context.Updateables;
 import fr.umlv.java.wallj.event.BombExplosionEvent;
 import fr.umlv.java.wallj.event.Event;
 import fr.umlv.java.wallj.event.Events;
 import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.BodyType;
 import org.jbox2d.dynamics.Fixture;
-import org.jbox2d.dynamics.World;
 
 import java.awt.*;
-import java.util.Collections;
-import java.util.List;
 import java.util.Objects;
+import java.util.stream.Stream;
 
 /**
  * A garbage block.
@@ -31,24 +29,26 @@ public class GarbageBlock extends JBoxBlock {
   }
 
   @Override
-  public List<Event> update(Context context) {
-    handleExplosionBlasts(context.getEvents(), context.getGame().getCurrentStage().getWorld());
-    paint(context.getGraphicsContext());
-    return Collections.emptyList();
+  public Stream<Event> update(Context context) {
+    return Updateables.updateAll(context,
+    this::handleExplosionBlasts,
+    this::paint);
   }
 
-  private void handleExplosionBlasts(List<Event> events, World world) {
-    Events.filter(events, BombExplosionEvent.class).forEach(explosion -> {
+  private Stream<Event> handleExplosionBlasts(Context context) {
+    Events.filter(context.getEvents(), BombExplosionEvent.class).forEach(explosion -> {
       Vec2 source = explosion.getSource().toVec2();
-      world.raycast((fixture, point, normal, fraction) -> {
+      context.getGame().getCurrentStage().getWorld().raycast((fixture, point, normal, fraction) -> {
         if (isSelf(fixture)) getBody().applyForceToCenter(computeBlastForce(source));
         return STOP_RAYCAST;
       }, source, getPos());
     });
+    return Stream.empty();
   }
 
-  private void paint(GraphicsContext graphicsContext) {
-    graphicsContext.paintCircle(COLOR, getPos(), TileVec2.TILE_DIM);
+  private Stream<Event> paint(Context context) {
+    context.getGraphicsContext().paintCircle(COLOR, getPos(), TileVec2.TILE_DIM);
+    return Stream.empty();
   }
 
   private boolean isSelf(Fixture fixture) {
diff --git a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
index f81f423..11cf25f 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -4,17 +4,16 @@ import fr.umlv.java.wallj.board.Board;
 import fr.umlv.java.wallj.board.PathFinder;
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
-import fr.umlv.java.wallj.context.GraphicsContext;
 import fr.umlv.java.wallj.context.Stage;
+import fr.umlv.java.wallj.context.Updateables;
 import fr.umlv.java.wallj.event.*;
 import fr.umlv.java.wallj.event.Event;
 import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.World;
 
 import java.awt.*;
-import java.time.Duration;
 import java.util.*;
-import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * A robot block.
@@ -50,47 +49,55 @@ public class RobotBlock extends Block {
   }
 
   @Override
-  public List<Event> update(Context context) {
-    Events.findFirst(context.getEvents(), MoveRobotOrder.class)
-    .ifPresent(event -> updatePath(context.getGame().getCurrentStage().getBoard(), event.getTarget()));
-
+  public Stream<Event> update(Context context) {
+    return Updateables.updateAll(context,
+    this::updatePath,
+    this::move,