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

…talt's (#137)
Terasology · Dec 8, 2021 · a92feaa · a92feaa
1 parent 7963363
commit a92feaa
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/main/java/org/terasology/equipment/event/EquipItemEvent.java b/src/main/java/org/terasology/equipment/event/EquipItemEvent.java
@@ -16,9 +16,9 @@
 package org.terasology.equipment.event;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
 import org.terasology.equipment.component.EquipmentSlot;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * This event is sent to indicate that an entity is about to equip an item.

diff --git a/src/main/java/org/terasology/equipment/event/OnPlayerWithEquipSpawnedEvent.java b/src/main/java/org/terasology/equipment/event/OnPlayerWithEquipSpawnedEvent.java
@@ -15,8 +15,8 @@
  */
 package org.terasology.equipment.event;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 @OwnerEvent
 public class OnPlayerWithEquipSpawnedEvent implements Event {

diff --git a/src/main/java/org/terasology/equipment/event/UnequipItemEvent.java b/src/main/java/org/terasology/equipment/event/UnequipItemEvent.java
@@ -16,9 +16,9 @@
 package org.terasology.equipment.event;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.network.OwnerEvent;
 import org.terasology.equipment.component.EquipmentSlot;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * This event is sent to indicate that an entity is about to unequip an item.

diff --git a/src/main/java/org/terasology/equipment/system/CharacterScreenClientSystem.java b/src/main/java/org/terasology/equipment/system/CharacterScreenClientSystem.java
@@ -17,7 +17,6 @@
 
 import org.terasology.engine.audio.AudioManager;
 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;
@@ -27,6 +26,7 @@
 import org.terasology.engine.rendering.nui.NUIManager;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.equipment.event.CharacterScreenButton;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.input.ButtonState;
 
 /**

diff --git a/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentEffectsSystem.java
@@ -38,10 +38,8 @@
 import org.terasology.climateConditions.alterationEffects.BodyTemperatureAlterationEffect;
 import org.terasology.engine.context.Context;
 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.health.events.BeforeDamagedEvent;
 import org.terasology.engine.registry.In;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentEffectComponent;
@@ -63,6 +61,8 @@
 import org.terasology.equipment.component.effects.WalkSpeedEffectComponent;
 import org.terasology.equipment.event.EquipItemEvent;
 import org.terasology.equipment.event.UnequipItemEvent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/src/main/java/org/terasology/equipment/system/EquipmentSystem.java b/src/main/java/org/terasology/equipment/system/EquipmentSystem.java
@@ -6,26 +6,17 @@
 import org.terasology.engine.audio.AudioManager;
 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.RegisterSystem;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.common.DisplayNameComponent;
 import org.terasology.engine.logic.health.DoDestroyEvent;
-import org.terasology.module.health.events.BeforeDamagedEvent;
-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.BeforeItemPutInInventory;
-import org.terasology.module.inventory.events.BeforeItemRemovedFromInventory;
-import org.terasology.module.inventory.events.DropItemRequest;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
 import org.terasology.engine.registry.CoreRegistry;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.nui.NUIManager;
-import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.equipment.component.EquipmentComponent;
 import org.terasology.equipment.component.EquipmentInventoryComponent;
@@ -35,6 +26,15 @@
 import org.terasology.equipment.event.OnPlayerWithEquipSpawnedEvent;
 import org.terasology.equipment.event.UnequipItemEvent;
 import org.terasology.equipment.ui.CharacterScreenWindow;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+import org.terasology.module.health.events.BeforeDamagedEvent;
+import org.terasology.module.inventory.components.InventoryComponent;
+import org.terasology.module.inventory.events.BeforeItemPutInInventory;
+import org.terasology.module.inventory.events.BeforeItemRemovedFromInventory;
+import org.terasology.module.inventory.events.DropItemRequest;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.systems.InventoryUtils;
+import org.terasology.module.inventory.ui.GetItemTooltip;
 import org.terasology.nui.widgets.TooltipLine;
 import org.terasology.physicalstats.component.PhysicalStatsModifierComponent;
 import org.terasology.physicalstats.component.PhysicalStatsModifiersListComponent;