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

…talt's (#56)
Terasology · Dec 7, 2021 · 79031eb · 79031eb
1 parent 2c8abd9
commit 79031eb
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 48 deletions.
diff --git a/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java b/src/main/java/org/terasology/entityNetwork/systems/EntityNetworkCommonSystem.java
@@ -7,13 +7,11 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
-import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 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.entity.lifecycleEvents.OnChangedComponent;
-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;
@@ -26,6 +24,8 @@
 import org.terasology.entityNetwork.NetworkNode;
 import org.terasology.entityNetwork.NetworkNodeBuilder;
 import org.terasology.entityNetwork.components.EntityNetworkComponent;
+import org.terasology.gestalt.assets.management.AssetManager;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/...asology/fluidTransport/processParts/MechanicalPowerToPressureProcessPartCommonSystem.java b/...asology/fluidTransport/processParts/MechanicalPowerToPressureProcessPartCommonSystem.java
@@ -16,11 +16,11 @@
 package org.terasology.fluidTransport.processParts;
 
 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.fluidTransport.components.FluidPumpComponent;
 import org.terasology.fluidTransport.systems.FluidTransportAuthoritySystem;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.potentialEnergyDevices.components.PotentialEnergyDeviceComponent;
 import org.terasology.workstation.process.ProcessPartDescription;
 import org.terasology.workstation.processPart.ProcessEntityGetDurationEvent;

diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTankAuthoritySystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTankAuthoritySystem.java
@@ -17,24 +17,26 @@
 
 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.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.registry.In;
 import org.terasology.fluid.component.FluidContainerItemComponent;
 import org.terasology.fluid.system.FluidUtils;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+import org.terasology.module.inventory.systems.InventoryManager;
 
 @RegisterSystem(RegisterMode.AUTHORITY)
 public class FluidTankAuthoritySystem extends BaseComponentSystem {
     @In
     InventoryManager inventoryManager;
 
     // Prioritize interacting with tanks over other things
-    @ReceiveEvent(components = {ItemComponent.class}, priority = EventPriority.PRIORITY_HIGH)
+    @Priority(EventPriority.PRIORITY_HIGH)
+    @ReceiveEvent(components = {ItemComponent.class})
     public void fillFluidContainerItem(ActivateEvent event, EntityRef item,
                                        FluidContainerItemComponent fluidContainer) {
         EntityRef targetBlockEntity = event.getTarget();

diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTankClientSystem.java
@@ -6,14 +6,12 @@
 import org.joml.Vector3f;
 import org.joml.Vector3fc;
 import org.joml.Vector3i;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityBuilder;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 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.entity.lifecycleEvents.OnChangedComponent;
-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;
@@ -25,15 +23,17 @@
 import org.terasology.engine.rendering.assets.mesh.MeshBuilder;
 import org.terasology.engine.rendering.assets.texture.Texture;
 import org.terasology.engine.rendering.logic.MeshComponent;
-import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.engine.world.block.regions.BlockRegionComponent;
 import org.terasology.fluid.component.FluidInventoryComponent;
 import org.terasology.fluid.system.FluidContainerAssetResolver;
 import org.terasology.fluid.system.FluidRegistry;
 import org.terasology.fluidTransport.components.FluidDisplayComponent;
 import org.terasology.fluidTransport.components.FluidTankDisplayComponent;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itemRendering.components.RenderItemComponent;
+import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.nui.widgets.TooltipLine;
 
 import java.util.Optional;

diff --git a/src/main/java/org/terasology/fluidTransport/systems/FluidTransportAuthoritySystem.java b/src/main/java/org/terasology/fluidTransport/systems/FluidTransportAuthoritySystem.java
@@ -26,7 +26,6 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 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.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
@@ -46,6 +45,7 @@
 import org.terasology.fluidTransport.components.FluidPipeComponent;
 import org.terasology.fluidTransport.components.FluidPumpComponent;
 import org.terasology.fluidTransport.components.FluidTankDropsFluidComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.workstation.component.WorkstationComponent;
 import org.terasology.workstation.event.WorkstationStateChanged;
 

diff --git a/src/main/java/org/terasology/itemTransport/events/ConveyorItemStuckEvent.java b/src/main/java/org/terasology/itemTransport/events/ConveyorItemStuckEvent.java
@@ -16,7 +16,7 @@
 package org.terasology.itemTransport.events;
 
 import org.joml.Vector3i;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class ConveyorItemStuckEvent implements Event {
     Vector3i targetPosition;

diff --git a/src/main/java/org/terasology/itemTransport/systems/OneWayItemConveyorAuthoritySystem.java b/src/main/java/org/terasology/itemTransport/systems/OneWayItemConveyorAuthoritySystem.java
@@ -9,29 +9,30 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.engine.entitySystem.event.Activity;
 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.delay.DelayManager;
 import org.terasology.engine.logic.delay.DelayedActionTriggeredEvent;
-import org.terasology.module.inventory.components.InventoryComponent;
-import org.terasology.module.inventory.systems.InventoryManager;
-import org.terasology.module.inventory.systems.InventoryUtils;
-import org.terasology.module.inventory.events.InventorySlotChangedEvent;
-import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
 import org.terasology.engine.math.Direction;
 import org.terasology.engine.math.Side;
 import org.terasology.engine.monitoring.PerformanceMonitor;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.world.BlockEntityRegistry;
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.BlockComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itemRendering.components.AnimatedMovingItemComponent;
 import org.terasology.itemTransport.components.PullInventoryInDirectionComponent;
 import org.terasology.itemTransport.components.PushInventoryInDirectionComponent;
 import org.terasology.machines.ExtendedInventoryManager;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.events.InventorySlotChangedEvent;
+import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryUtils;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
 import org.terasology.workstation.process.inventory.InventoryOutputProcessPartCommonSystem;
 
@@ -148,8 +149,9 @@ private void finishPushing(EntityRef entity, PushInventoryInDirectionComponent p
             }
         }
     }
-
-    @ReceiveEvent(activity = ACTIVITY)
+
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pushInventoryGotItem(InventorySlotChangedEvent event, EntityRef entity, PushInventoryInDirectionComponent pushInventory,
                                      BlockComponent block, InventoryComponent inventory) {
         Side side = getRelativeSide(entity, pushInventory.direction);
@@ -199,27 +201,31 @@ public void pushInventoryGotItem(InventorySlotChangedEvent event, EntityRef enti
     // 2. Inventory of an adjacent block has changed (maybe there is space there now?)
     // 3. New inventory was placed or loaded in an adjacent block
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pushCondition1(DelayedActionTriggeredEvent event, EntityRef entity, PushInventoryInDirectionComponent pushInventory,
                                BlockComponent blockComponent, InventoryComponent inventory) {
         if (event.getActionId().equals("FINISHED_PUSHING")) {
             pendingPushChecks.add(entity);
         }
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pushCondition2(InventorySlotChangedEvent event, EntityRef entity, InventoryComponent inventory,
                                BlockComponent block) {
         checkAdjacentBlocksForPushFinish(block);
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pushCondition2(InventorySlotStackSizeChangedEvent event, EntityRef entity, InventoryComponent inventory,
                                BlockComponent block) {
         checkAdjacentBlocksForPushFinish(block);
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pushCondition3(OnActivatedComponent event, EntityRef entity, InventoryComponent inventory,
                                BlockComponent block) {
         checkAdjacentBlocksForPushFinish(block);
@@ -249,25 +255,29 @@ private boolean entityCanAcceptItem(EntityRef targetEntity) {
     // 3. Inventory of an adjacent block has changed (maybe there is something new to pull?)
     // 4. New inventory was placed or loaded in an adjacent block
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pullCondition1(InventorySlotChangedEvent event, EntityRef entity, PullInventoryInDirectionComponent pullInventory,
                                BlockComponent blockComponent, InventoryComponent inventory) {
         tryPullingAnItem(entity);
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pullCondition2(OnAddedComponent event, EntityRef entity, PullInventoryInDirectionComponent pullInventory,
                                BlockComponent blockComponent, InventoryComponent inventory) {
         tryPullingAnItem(entity);
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pullCondition3(InventorySlotChangedEvent event, EntityRef entity, InventoryComponent inventory,
                                BlockComponent block) {
         checkAdjacentBlocksForPulling(block);
     }
 
-    @ReceiveEvent(activity = ACTIVITY)
+    @Activity(ACTIVITY)
+    @ReceiveEvent
     public void pullCondition4(OnActivatedComponent event, EntityRef entity, InventoryComponent inventory,
                                BlockComponent block) {
         checkAdjacentBlocksForPulling(block);

diff --git a/src/main/java/org/terasology/machines/AbstractResultEvent.java b/src/main/java/org/terasology/machines/AbstractResultEvent.java
@@ -15,8 +15,8 @@
  */
 package org.terasology.machines;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.NoReplicate;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public abstract class AbstractResultEvent<T> implements Event {
     @NoReplicate

diff --git a/src/main/java/org/terasology/machines/events/RequirementUsedEvent.java b/src/main/java/org/terasology/machines/events/RequirementUsedEvent.java
@@ -16,7 +16,7 @@
 package org.terasology.machines.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class RequirementUsedEvent implements Event {
     EntityRef processEntity;

diff --git a/...in/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java b/...in/java/org/terasology/machines/processParts/RequirementInputProcessPartCommonSystem.java
@@ -3,28 +3,28 @@
 package org.terasology.machines.processParts;
 
 import com.google.common.collect.Lists;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityBuilder;
 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.module.inventory.components.InventoryComponent;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
-import org.terasology.module.inventory.events.BeforeItemPutInInventory;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.utilities.Assets;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.machines.ExtendedInventoryManager;
 import org.terasology.machines.components.MachineDefinitionComponent;
 import org.terasology.machines.components.ProcessRequirementsProviderComponent;
 import org.terasology.machines.components.ProcessRequirementsProviderFromWorkstationComponent;
 import org.terasology.machines.events.RequirementUsedEvent;
 import org.terasology.machines.ui.OverlapLayout;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.events.BeforeItemPutInInventory;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.nui.UIWidget;
 import org.terasology.nui.databinding.ReadOnlyBinding;
 import org.terasology.workstation.process.ProcessPartDescription;

diff --git a/src/main/java/org/terasology/machines/systems/MachineCommonSystem.java b/src/main/java/org/terasology/machines/systems/MachineCommonSystem.java
@@ -17,18 +17,18 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
-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.logic.common.RetainComponentsComponent;
-import org.terasology.module.inventory.components.InventoryAccessComponent;
-import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.engine.math.IntegerRange;
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.fluid.component.FluidInventoryComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.machines.components.MachineDefinitionComponent;
 import org.terasology.machines.components.NestedMachineComponent;
 import org.terasology.machines.processParts.RequirementInputProcessPartCommonSystem;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
+import org.terasology.module.inventory.components.InventoryComponent;
 import org.terasology.workstation.process.fluid.FluidInputProcessPartCommonSystem;
 import org.terasology.workstation.process.fluid.FluidOutputProcessPartCommonSystem;
 import org.terasology.workstation.process.inventory.InventoryInputProcessPartCommonSystem;

diff --git a/src/main/java/org/terasology/machines/systems/RenderInventoryInCategoryClientSystem.java b/src/main/java/org/terasology/machines/systems/RenderInventoryInCategoryClientSystem.java
@@ -19,13 +19,13 @@
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeDeactivateComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 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.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.module.inventory.components.InventoryAccessComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.itemRendering.components.RenderInventorySlotsComponent;
 import org.terasology.machines.components.RenderInventoryInCategoryComponent;
+import org.terasology.module.inventory.components.InventoryAccessComponent;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
 
 import java.util.List;

diff --git a/...in/java/org/terasology/machines/systems/SameNetworkByBlockBlockFamilyAuthoritySystem.java b/...in/java/org/terasology/machines/systems/SameNetworkByBlockBlockFamilyAuthoritySystem.java
@@ -16,7 +16,6 @@
 package org.terasology.machines.systems;
 
 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;
@@ -26,6 +25,7 @@
 import org.terasology.engine.world.block.Block;
 import org.terasology.engine.world.block.family.UpdatesWithNeighboursFamily;
 import org.terasology.entityNetwork.components.EntityNetworkComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 @RegisterSystem(RegisterMode.AUTHORITY)
 public class SameNetworkByBlockBlockFamilyAuthoritySystem extends BaseComponentSystem {

diff --git a/...ava/org/terasology/machines/systems/SideActivatedInventoryInteractionAuthoritySystem.java b/...ava/org/terasology/machines/systems/SideActivatedInventoryInteractionAuthoritySystem.java
@@ -4,15 +4,12 @@
 
 import org.joml.Vector3fc;
 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.input.binds.inventory.UseItemButton;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.module.inventory.components.InventoryComponent;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.math.Direction;
 import org.terasology.engine.math.Side;
@@ -24,7 +21,10 @@
 import org.terasology.engine.world.block.BlockComponent;
 import org.terasology.engine.world.block.family.BlockFamily;
 import org.terasology.engine.world.block.family.SideDefinedBlockFamily;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.machines.components.SideActivatedInventoryInteractionComponent;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
 
 import java.util.List;