Automatically Injecting when adding system to game

Cardshifter · Sep 19, 2014 · 3624f33 · 3624f33
1 parent 03bfcf8
commit 3624f33
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/base/ECSGame.java b/cardshifter-core/src/main/java/net/zomis/cardshifter/ecs/base/ECSGame.java
@@ -58,6 +58,7 @@ public EventExecutor getEvents() {
 
 	public void addSystem(ECSSystem system) {
 		this.systems.add(system);
+		Retrievers.inject(system, this);
 	}
 
 	public void startGame() {

diff --git a/cardshifter-core/src/test/java/net/zomis/cardshifter/ecs/InjectionTest.java b/cardshifter-core/src/test/java/net/zomis/cardshifter/ecs/InjectionTest.java
@@ -3,6 +3,7 @@
 import static org.junit.Assert.*;
 import net.zomis.cardshifter.ecs.base.ComponentRetriever;
 import net.zomis.cardshifter.ecs.base.ECSGame;
+import net.zomis.cardshifter.ecs.base.ECSSystem;
 import net.zomis.cardshifter.ecs.base.Entity;
 import net.zomis.cardshifter.ecs.base.Retriever;
 import net.zomis.cardshifter.ecs.base.RetrieverSingleton;
@@ -21,6 +22,26 @@ public class InjectionTest {
 	@Retriever
 	private ComponentRetriever<PlayerComponent> playerData;
 
+	private int test;
+
+	@Test
+	public void injectOnAdd() {
+		ECSGame game = new ECSGame();
+		game.newEntity().addComponent(new PlayerComponent(21, "Test"));
+		game.addSystem(new ECSSystem() {
+			@RetrieverSingleton
+			private PlayerComponent player;
+
+			@Override
+			public void startGame(ECSGame game) {
+				assertEquals(21, player.getIndex());
+				test++;
+			}
+		});
+		game.startGame();
+		assertEquals(1, test);
+	}
+
 	@Test
 	public void inject() {
 		ECSGame game = new ECSGame();