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

…talt's (#80)
Terasology · Dec 7, 2021 · c988702 · c988702
1 parent 33560b2
commit c988702
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/terasology/behaviors/system/BehaviorsEventSystem.java b/src/main/java/org/terasology/behaviors/system/BehaviorsEventSystem.java
@@ -8,12 +8,12 @@
 import org.terasology.behaviors.components.FollowComponent;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-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;
 import org.terasology.engine.logic.characters.CharacterMovementComponent;
 import org.terasology.engine.registry.In;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.module.health.events.OnDamagedEvent;
 
 /*
@@ -28,7 +28,7 @@ public class BehaviorsEventSystem extends BaseComponentSystem {
     /**
      * Make an entity with the a {@link FleeOnHitComponent} flee from the instigator when being damaged.
      *
-     * @param event the {@link OnDamageEvent} notifying about the entity having taken damage
+     * @param event the {@link OnDamagedEvent} notifying about the entity having taken damage
      * @param entity the entity being damaged
      * @param fleeOnHitComponent only entities with this component flee if they take damage
      * @param characterMovementComponent a fleeing entity needs a character movement component to allow it to actually flee from the

diff --git a/src/main/java/org/terasology/behaviors/system/NightTrackerSystem.java b/src/main/java/org/terasology/behaviors/system/NightTrackerSystem.java
@@ -3,13 +3,13 @@
 package org.terasology.behaviors.system;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-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;
 import org.terasology.engine.registry.Share;
 import org.terasology.engine.world.sun.OnDawnEvent;
 import org.terasology.engine.world.sun.OnDuskEvent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * Tracks the current night status for time-based behavior trees.

diff --git a/src/main/java/org/terasology/behaviors/system/TerritorialBehaviourSystem.java b/src/main/java/org/terasology/behaviors/system/TerritorialBehaviourSystem.java
@@ -9,13 +9,13 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 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;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.registry.In;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/org/terasology/grid/GridRenderSystem.java b/src/main/java/org/terasology/grid/GridRenderSystem.java
@@ -3,12 +3,12 @@
 package org.terasology.grid;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.network.ClientComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.input.ButtonState;
 
 @RegisterSystem

diff --git a/src/main/java/org/terasology/minion/SampleSystem.java b/src/main/java/org/terasology/minion/SampleSystem.java
@@ -4,16 +4,16 @@
 
 import org.joml.Vector3ic;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
 import org.terasology.engine.logic.selection.ApplyBlockSelectionEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.WorldProvider;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+import org.terasology.module.inventory.components.InventoryComponent;
 
 @RegisterSystem
 public class SampleSystem extends BaseComponentSystem {

diff --git a/src/main/java/org/terasology/minion/move/JumpNode.java b/src/main/java/org/terasology/minion/move/JumpNode.java
@@ -3,13 +3,13 @@
 package org.terasology.minion.move;
 
 import org.joml.Vector3f;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.logic.behavior.BehaviorAction;
 import org.terasology.engine.logic.behavior.core.Actor;
 import org.terasology.engine.logic.behavior.core.BaseAction;
 import org.terasology.engine.logic.behavior.core.BehaviorState;
 import org.terasology.engine.logic.characters.CharacterMoveInputEvent;
 import org.terasology.engine.logic.characters.CharacterMovementComponent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * Trigger a single jump into the air.<br/>

diff --git a/src/main/java/org/terasology/minion/move/MinionMoveSystem.java b/src/main/java/org/terasology/minion/move/MinionMoveSystem.java
@@ -7,14 +7,14 @@
 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;
 import org.terasology.engine.logic.characters.events.HorizontalCollisionEvent;
 import org.terasology.engine.logic.characters.events.OnEnterBlockEvent;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.registry.In;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.navgraph.NavGraphChanged;
 import org.terasology.navgraph.WalkableBlock;
 import org.terasology.pathfinding.componentSystem.PathfinderSystem;

diff --git a/src/main/java/org/terasology/minion/work/WorkBoard.java b/src/main/java/org/terasology/minion/work/WorkBoard.java
@@ -13,7 +13,6 @@
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.UpdateSubscriberSystem;
@@ -26,6 +25,7 @@
 import org.terasology.engine.utilities.concurrency.TaskMaster;
 import org.terasology.engine.world.BlockEntityRegistry;
 import org.terasology.engine.world.block.BlockRegion;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.minion.move.MinionMoveComponent;
 import org.terasology.minion.work.kmeans.Cluster;
 import org.terasology.navgraph.NavGraphChanged;