feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to ges…

…talt's (#12)
Terasology · Dec 5, 2021 · 2451eae · 2451eae
1 parent f6f89b7
commit 2451eae
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/org/terasology/mobileBlocks/client/MovingBlockClientSystem.java b/src/main/java/org/terasology/mobileBlocks/client/MovingBlockClientSystem.java
@@ -11,7 +11,6 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
@@ -22,6 +21,7 @@
 import org.terasology.engine.rendering.logic.MeshComponent;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.engine.world.block.Block;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.mobileBlocks.MovingBlockComponent;
 import org.terasology.nui.Color;
 

diff --git a/src/main/java/org/terasology/mobileBlocks/server/AfterBlockMovedEvent.java b/src/main/java/org/terasology/mobileBlocks/server/AfterBlockMovedEvent.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.mobileBlocks.server;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class AfterBlockMovedEvent implements Event {
     private boolean success;

diff --git a/src/main/java/org/terasology/mobileBlocks/server/BeforeBlockMovesEvent.java b/src/main/java/org/terasology/mobileBlocks/server/BeforeBlockMovesEvent.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.mobileBlocks.server;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class BeforeBlockMovesEvent implements Event {
 }
diff --git a/src/main/java/org/terasology/mobileBlocks/server/BlockTransitionDuringMoveEvent.java b/src/main/java/org/terasology/mobileBlocks/server/BlockTransitionDuringMoveEvent.java
@@ -16,7 +16,7 @@
 package org.terasology.mobileBlocks.server;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class BlockTransitionDuringMoveEvent implements Event {
     private boolean fromBlock;

diff --git a/src/main/java/org/terasology/mobileBlocks/server/MovingBlockServerSystem.java b/src/main/java/org/terasology/mobileBlocks/server/MovingBlockServerSystem.java
@@ -21,13 +21,11 @@
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.delay.DelayManager;
 import org.terasology.engine.logic.delay.DelayedActionTriggeredEvent;
-import org.terasology.module.health.events.BeforeDamagedEvent;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.math.Direction;
 import org.terasology.engine.registry.In;
@@ -37,7 +35,9 @@
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;
 import org.terasology.engine.world.block.entity.placement.PlaceBlocks;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.mobileBlocks.MovingBlockComponent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 
 import java.util.HashMap;
 import java.util.Map;