Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to gestalt's #69

Merged
merged 4 commits into from Dec 8, 2021
Merged

feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to gestalt's #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da7f0f5
feature(gestaltv7-events): replace TS's Event to gestaltv7's Event
DarkWeird Sep 7, 2021
adc3c9e
feature(gestaltv7-events): extract priorities from ReceiveEvent
DarkWeird Sep 9, 2021
46402f4
feature(gestaltv7-events): replace ReceiveEvent with gestaltv7's Rece…
DarkWeird Sep 9, 2021
ccae5cd
Merge remote-tracking branch 'origin/develop' into feat/migrate-event…
jdrueckert Dec 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/java/org/terasology/gooeyDefence/DefenceWorldManager.java
View file
Open in desktop
Expand Up @@ -18,11 +18,10 @@
import org.joml.Vector2i;
import org.joml.Vector3f;
import org.joml.Vector3i;
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.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.RegisterSystem;
Expand All @@ -41,6 +40,8 @@
import org.terasology.engine.world.block.entity.CreateBlockDropsEvent;
import org.terasology.engine.world.block.items.BlockItemFactory;
import org.terasology.engine.world.sun.CelestialSystem;
import org.terasology.gestalt.assets.management.AssetManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.components.DestructibleBlockComponent;
import org.terasology.gooeyDefence.components.FieldConfigComponent;
import org.terasology.gooeyDefence.events.OnFieldActivated;
Expand Down Expand Up @@ -109,7 +110,8 @@ public void preBegin() {
/**
* Make blocks destroy instantly
*/
@ReceiveEvent(priority = EventPriority.PRIORITY_HIGH)
@Priority(EventPriority.PRIORITY_HIGH)
@ReceiveEvent
public void onAttackEntity(AttackEvent event, EntityRef targetEntity) {
event.consume();
if (targetEntity.hasComponent(DestructibleBlockComponent.class)) {
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/terasology/gooeyDefence/EnemyManager.java
View file
Open in desktop
Expand Up @@ -26,14 +26,15 @@
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.systems.BaseComponentSystem;
import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.engine.logic.delay.DelayManager;
import org.terasology.engine.logic.inventory.events.DropItemEvent;
import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.engine.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.components.GooeyComponent;
import org.terasology.gooeyDefence.events.OnEntrancePathCalculated;
import org.terasology.gooeyDefence.events.OnFieldActivated;
Expand Down Expand Up @@ -138,7 +139,8 @@ public void onPathChanged(OnEntrancePathCalculated event, EntityRef shrineEntity
*
* @see EntityDeathEvent
*/
@ReceiveEvent(priority = EventPriority.PRIORITY_TRIVIAL)
@Priority(EventPriority.PRIORITY_TRIVIAL)
@ReceiveEvent
public void onEntityDeath(EntityDeathEvent event, EntityRef entity, GooeyComponent component) {
dropMoney(entity);
destroyEnemy(entity);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/terasology/gooeyDefence/StatSystem.java
View file
Open in desktop
Expand Up @@ -15,15 +15,15 @@
*/
package org.terasology.gooeyDefence;

import org.terasology.gestalt.assets.management.AssetManager;
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.engine.logic.players.LocalPlayer;
import org.terasology.engine.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.gestalt.assets.management.AssetManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.events.OnFieldActivated;
import org.terasology.gooeyDefence.health.HealthComponent;

Expand Down
28 changes: 15 additions & 13 deletions src/main/java/org/terasology/gooeyDefence/economy/ShopManager.java
View file
Open in desktop
Expand Up @@ -7,27 +7,27 @@
import org.terasology.economy.events.WalletUpdatedEvent;
import org.terasology.economy.ui.MarketUiClientSystem;
import org.terasology.engine.core.SimpleUri;
import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
import org.terasology.engine.entitySystem.event.EventPriority;
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.RegisterSystem;
import org.terasology.engine.input.InputSystem;
import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
import org.terasology.engine.network.ClientComponent;
import org.terasology.engine.network.events.ConnectedEvent;
import org.terasology.engine.registry.In;
import org.terasology.engine.unicode.EnclosedAlphanumerics;
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.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.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.events.OnFieldReset;
import org.terasology.input.ButtonState;
import org.terasology.input.Input;
import org.terasology.module.inventory.components.InventoryComponent;
import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.engine.registry.In;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.events.OnFieldReset;
import org.terasology.module.inventory.input.InventoryButton;
import org.terasology.notifications.events.ExpireNotificationEvent;
import org.terasology.notifications.events.ShowNotificationEvent;
Expand All @@ -53,7 +53,8 @@ public class ShopManager extends BaseComponentSystem {
@In
private EntityManager entityManager;

@ReceiveEvent(priority = EventPriority.PRIORITY_LOW)
@Priority(EventPriority.PRIORITY_LOW)
@ReceiveEvent
public void onPlayerJoin(OnPlayerSpawnedEvent onPlayerSpawnedEvent, EntityRef player, CurrencyStorageComponent currencyStorageComponent) {
// Fill player's wallet
CurrencyStorageComponent component = assetManager.getAsset(DefenceUris.PLAYER, Prefab.class)
Expand Down Expand Up @@ -108,7 +109,8 @@ private void cleanUpMoney() {
* @param event the help button event.
* @param entity the entity to display the help screen to.
*/
@ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class}, priority = EventPriority.PRIORITY_CRITICAL)
@Priority(EventPriority.PRIORITY_CRITICAL)
@ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class})
public void onInGameShopButton(InventoryButton event, EntityRef entity) {
if (event.getState() == ButtonState.DOWN) {
entity.send(new ExpireNotificationEvent(NOTIFICATION_ID));
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/events/OnEntrancePathCalculated.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package org.terasology.gooeyDefence.events;

import org.joml.Vector3i;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.movement.PathfindingManager;

import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/events/OnFieldActivated.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.components.SavedGameFlagComponent;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/events/OnFieldReset.java
View file
Open in desktop
Expand Up @@ -15,8 +15,8 @@
*/
package org.terasology.gooeyDefence.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.logic.common.ActivateEvent;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.ui.DeathScreenSystem;

/**
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/terasology/gooeyDefence/health/HealthSystem.java
View file
Open in desktop
Expand Up @@ -17,9 +17,10 @@

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.RegisterSystem;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.events.OnFieldActivated;
import org.terasology.gooeyDefence.events.OnFieldReset;
import org.terasology.gooeyDefence.health.events.DamageEntityEvent;
Expand Down Expand Up @@ -59,7 +60,8 @@ public void onDamageEntity(DamageEntityEvent event, EntityRef entity, HealthComp
*
* @see OnFieldActivated
*/
@ReceiveEvent(priority = EventPriority.PRIORITY_LOW)
@Priority(EventPriority.PRIORITY_LOW)
@ReceiveEvent
public void onFieldActivated(OnFieldActivated event, EntityRef entity, HealthComponent component) {
if (component.health <= 0) {
entity.send(new EntityDeathEvent());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/health/events/DamageEntityEvent.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.health.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.health.HealthComponent;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/health/events/EntityDeathEvent.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.health.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.health.HealthSystem;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/movement/PathfindingManager.java
View file
Open in desktop
Expand Up @@ -19,7 +19,6 @@
import org.joml.Vector3f;
import org.joml.Vector3i;
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.location.LocationComponent;
Expand All @@ -30,6 +29,7 @@
import org.terasology.engine.world.block.entity.placement.PlaceBlocks;
import org.terasology.flexiblepathfinding.JPSConfig;
import org.terasology.flexiblepathfinding.PathfinderSystem;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceField;
import org.terasology.gooeyDefence.EnemyManager;
import org.terasology.gooeyDefence.events.OnEntrancePathCalculated;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/movement/events/RepathEnemyRequest.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.movement.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.movement.PathfindingManager;
import org.terasology.gooeyDefence.movement.components.CustomPathComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/TowerBuildSystem.java
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@
import org.joml.Vector3ic;
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.health.DoDestroyEvent;
Expand All @@ -31,6 +30,7 @@
import org.terasology.engine.registry.In;
import org.terasology.engine.world.BlockEntityRegistry;
import org.terasology.engine.world.block.items.OnBlockItemPlaced;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceField;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.events.OnFieldActivated;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/TowerManager.java
View file
Open in desktop
Expand Up @@ -18,12 +18,12 @@
import com.google.common.collect.Sets;
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.delay.DelayManager;
import org.terasology.engine.logic.delay.PeriodicActionTriggeredEvent;
import org.terasology.engine.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceField;
import org.terasology.gooeyDefence.events.OnFieldReset;
import org.terasology.gooeyDefence.towers.components.TowerComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/DamageEffectorSystem.java
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
package org.terasology.gooeyDefence.towers.effectors;

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.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.health.events.DamageEntityEvent;
import org.terasology.gooeyDefence.towers.TowerManager;
import org.terasology.gooeyDefence.towers.events.ApplyEffectEvent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/FireEffectorSystem.java
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@

import org.joml.Vector3f;
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.delay.DelayManager;
Expand All @@ -14,6 +13,7 @@
import org.terasology.engine.registry.In;
import org.terasology.engine.utilities.random.FastRandom;
import org.terasology.engine.utilities.random.Random;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.EnemyManager;
import org.terasology.gooeyDefence.components.GooeyComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/IceEffectorSystem.java
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@
package org.terasology.gooeyDefence.towers.effectors;

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.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.movement.components.MovementComponent;
import org.terasology.gooeyDefence.towers.TowerManager;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/PoisonEffectorSystem.java
View file
Open in desktop
Expand Up @@ -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.RegisterSystem;
import org.terasology.engine.logic.delay.DelayManager;
import org.terasology.engine.logic.delay.DelayedActionTriggeredEvent;
import org.terasology.engine.logic.delay.PeriodicActionTriggeredEvent;
import org.terasology.engine.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceField;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.components.GooeyComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/StunEffectorSystem.java
View file
Open in desktop
Expand Up @@ -4,7 +4,6 @@

import org.joml.Vector3f;
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.delay.DelayManager;
Expand All @@ -13,6 +12,7 @@
import org.terasology.engine.registry.In;
import org.terasology.engine.utilities.random.FastRandom;
import org.terasology.engine.utilities.random.Random;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.DefenceField;
import org.terasology.gooeyDefence.DefenceUris;
import org.terasology.gooeyDefence.components.GooeyComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/effectors/VisualEffectorSystem.java
View file
Open in desktop
Expand Up @@ -3,10 +3,10 @@
package org.terasology.gooeyDefence.towers.effectors;

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.rendering.logic.SkeletalMeshComponent;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.gooeyDefence.towers.TowerManager;
import org.terasology.gooeyDefence.towers.events.ApplyEffectEvent;
import org.terasology.gooeyDefence.towers.events.RemoveEffectEvent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/ApplyEffectEvent.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.components.TowerEffector;
import org.terasology.gooeyDefence.towers.components.TowerTargeter;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/OnBlocksAdded.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.TowerBuildSystem;
import org.terasology.gooeyDefence.towers.components.TowerComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/RemoveEffectEvent.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.components.TowerEffector;
import org.terasology.gooeyDefence.towers.components.TowerTargeter;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/SelectEnemiesEvent.java
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.components.TowerTargeter;

import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/TowerCreatedEvent.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.TowerBuildSystem;
import org.terasology.gooeyDefence.towers.TowerManager;
import org.terasology.gooeyDefence.towers.components.TowerComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/gooeyDefence/towers/events/TowerDestroyedEvent.java
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
*/
package org.terasology.gooeyDefence.towers.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.gooeyDefence.towers.TowerBuildSystem;
import org.terasology.gooeyDefence.towers.TowerManager;
import org.terasology.gooeyDefence.towers.components.TowerComponent;
Expand Down