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

…talt's (#41)
Terasology · Dec 7, 2021 · 5573df2 · 5573df2
1 parent 276bafd
commit 5573df2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/org/terasology/itempipes/action/InventoryInsertAction.java b/src/main/java/org/terasology/itempipes/action/InventoryInsertAction.java
@@ -4,13 +4,13 @@
 
 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.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itempipes.event.PipeInsertEvent;
 import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.module.inventory.systems.InventoryManager;

diff --git a/src/main/java/org/terasology/itempipes/action/RandomMappingAction.java b/src/main/java/org/terasology/itempipes/action/RandomMappingAction.java
@@ -3,11 +3,11 @@
 package org.terasology.itempipes.action;
 
 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.math.Side;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itempipes.components.PipeRandomMappingComponent;
 import org.terasology.itempipes.event.PipeMappingEvent;
 

diff --git a/src/main/java/org/terasology/itempipes/action/SuctionAction.java b/src/main/java/org/terasology/itempipes/action/SuctionAction.java
@@ -11,7 +11,7 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.event.EventPriority;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.event.Priority;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
@@ -27,6 +27,7 @@
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.engine.world.block.items.OnBlockItemPlaced;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itempipes.components.SuctionCollisionManifold;
 import org.terasology.itempipes.components.SuctionComponent;
 import org.terasology.itempipes.controllers.PipeSystem;
@@ -82,7 +83,8 @@ public void onSuctionPlaced(OnBlockItemPlaced event, EntityRef entityRef) {
 
     }
 
-    @ReceiveEvent(components = {SuctionCollisionManifold.class}, priority = EventPriority.PRIORITY_HIGH)
+    @Priority(EventPriority.PRIORITY_HIGH)
+    @ReceiveEvent(components = {SuctionCollisionManifold.class})
     public void onBump(CollideEvent event, EntityRef entity) {
 
         EntityRef owner = entity.getOwner();