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

…talt's (#15)
Terasology · Dec 5, 2021 · b9afc57 · b9afc57
1 parent 0bc2b7d
commit b9afc57
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/org/terasology/durability/events/DurabilityReducedEvent.java b/src/main/java/org/terasology/durability/events/DurabilityReducedEvent.java
@@ -15,7 +15,7 @@
  */
 package org.terasology.durability.events;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * Event sent after the durability of an item is reduced

diff --git a/src/main/java/org/terasology/durability/events/ReduceDurabilityEvent.java b/src/main/java/org/terasology/durability/events/ReduceDurabilityEvent.java
@@ -16,7 +16,7 @@
 
 package org.terasology.durability.events;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * Event sent when the durability of an item is reduced.

diff --git a/src/main/java/org/terasology/durability/systems/DurabilityAuthoritySystem.java b/src/main/java/org/terasology/durability/systems/DurabilityAuthoritySystem.java
@@ -26,7 +26,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;
@@ -42,6 +42,7 @@
 import org.terasology.engine.world.block.entity.damage.BlockDamageModifierComponent;
 import org.terasology.engine.world.block.items.OnBlockItemPlaced;
 import org.terasology.engine.world.block.items.OnBlockToItem;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * Authority system that handles reducing durability and destroying items
@@ -80,7 +81,8 @@ public void update(float delta) {
      * @param entity         The entity that instigated it
      * @param blockComponent The block component of the entity.
      */
-    @ReceiveEvent(priority = EventPriority.PRIORITY_CRITICAL)
+    @Priority(EventPriority.PRIORITY_CRITICAL)
+    @ReceiveEvent
     public void reduceItemDurabilityOnBlockDestroyed(DestroyEvent event, EntityRef entity, BlockComponent blockComponent) {
         EntityRef tool = event.getDirectCause();
         DurabilityComponent durabilityComponent = tool.getComponent(DurabilityComponent.class);
@@ -141,7 +143,8 @@ public void checkIfDurabilityExhausted(DurabilityReducedEvent event, EntityRef e
      * @param durabilityComponent The durability component of the entity
      * @param itemComponent       The item component of the entity
      */
-    @ReceiveEvent(priority = EventPriority.PRIORITY_TRIVIAL)
+    @Priority(EventPriority.PRIORITY_TRIVIAL)
+    @ReceiveEvent
     public void destroyItemOnZeroDurability(DurabilityExhaustedEvent event, EntityRef entity, DurabilityComponent durabilityComponent, ItemComponent itemComponent) {
         entity.destroy();
         event.consume();
@@ -157,7 +160,8 @@ public void destroyItemOnZeroDurability(DurabilityExhaustedEvent event, EntityRe
      * @param durabilityComponent The durability component of the entity
      * @param blockComponent      The block component of the entity
      */
-    @ReceiveEvent(priority = EventPriority.PRIORITY_TRIVIAL)
+    @Priority(EventPriority.PRIORITY_TRIVIAL)
+    @ReceiveEvent
     public void destroyItemOnZeroDurability(DurabilityExhaustedEvent event, EntityRef entity, DurabilityComponent durabilityComponent, BlockComponent blockComponent) {
         worldProvider.setBlock(blockComponent.getPosition(new Vector3i()), blockManager.getBlock(BlockManager.AIR_ID));
         event.consume();

diff --git a/src/main/java/org/terasology/durability/systems/DurabilityClientSystem.java b/src/main/java/org/terasology/durability/systems/DurabilityClientSystem.java
@@ -3,19 +3,19 @@
 package org.terasology.durability.systems;
 
 import org.joml.Vector2i;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.durability.components.DurabilityComponent;
 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.rendering.assets.texture.Texture;
 import org.terasology.engine.rendering.assets.texture.TextureUtil;
-import org.terasology.module.inventory.ui.GetItemTooltip;
-import org.terasology.module.inventory.ui.InventoryCellRendered;
 import org.terasology.engine.utilities.Assets;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.joml.geom.Rectanglei;
+import org.terasology.module.inventory.ui.GetItemTooltip;
+import org.terasology.module.inventory.ui.InventoryCellRendered;
 import org.terasology.nui.Canvas;
 import org.terasology.nui.Color;
 import org.terasology.nui.widgets.TooltipLine;