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 #25

Merged
merged 5 commits into from
Dec 7, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c665528
feature(gestaltv7-events): replace TS's Event to gestaltv7's Event
DarkWeird Sep 7, 2021
2acd157
feature(gestaltv7-events): extract priorities from ReceiveEvent
DarkWeird Sep 9, 2021
975c195
feature(gestaltv7-events): replace ReceiveEvent with gestaltv7's Rece…
DarkWeird Sep 9, 2021
58dbda2
Merge branch 'develop' of https://github.com/Terasology/Economy into …
pollend Dec 5, 2021
d863c0d
fix: event migration in newly added classes
jdrueckert Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/main/java/org/terasology/economy/ShopManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,27 @@
import org.terasology.economy.events.PurchaseItemEvent;
import org.terasology.economy.events.WalletTransactionEvent;
import org.terasology.economy.systems.WalletAuthoritySystem;
import org.terasology.engine.entitySystem.ComponentContainer;
import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.engine.entitySystem.event.ReceiveEvent;
import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
import org.terasology.engine.entitySystem.systems.NetFilterEvent;
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.logic.inventory.events.GiveItemEvent;
import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.engine.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.engine.world.block.Block;
import org.terasology.engine.world.block.BlockExplorer;
import org.terasology.engine.world.block.BlockManager;
import org.terasology.engine.world.block.BlockUri;
import org.terasology.engine.world.block.family.BlockFamily;
import org.terasology.engine.world.block.items.BlockItemFactory;
import org.terasology.gestalt.assets.management.AssetManager;
import org.terasology.engine.entitySystem.ComponentContainer;
import org.terasology.engine.entitySystem.entity.EntityRef;
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.inventory.ItemComponent;
import org.terasology.engine.logic.players.LocalPlayer;
import org.terasology.engine.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.module.inventory.systems.InventoryAuthoritySystem;

import java.util.HashSet;
Expand Down Expand Up @@ -135,7 +136,8 @@ void performTransaction(EntityRef entity, EntityRef item) {
}
}

@ReceiveEvent(netFilter = RegisterMode.AUTHORITY)
@NetFilterEvent(netFilter = RegisterMode.AUTHORITY)
@ReceiveEvent
public void onPurchaseItem(PurchaseItemEvent event, EntityRef entity) {
if (event.getTargetPrefab() != null && event.getTargetPrefab().hasComponent(ValueComponent.class)) {
EntityRef item = entityManager.create(event.getTargetPrefab());
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ConditionedProductionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/MarketInfoClientRequestEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.economy.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.network.ServerEvent;
import org.terasology.gestalt.entitysystem.event.Event;

/**
* A client-to-server request for info about a market's available resources. Response arrives
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/MarketInfoClientResponseEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.economy.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.network.OwnerEvent;
import org.terasology.gestalt.entitysystem.event.Event;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/PurchaseItemEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import com.google.common.base.MoreObjects;
import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.entitySystem.prefab.Prefab;
import org.terasology.engine.network.ServerEvent;
import org.terasology.gestalt.entitysystem.event.Event;

/**
* A trigger event to start a purchase transaction on the authority for the specified item or block.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ResourceCreationEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package org.terasology.economy.events;


import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

public class ResourceCreationEvent implements Event {
private String resource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ResourceDestructionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package org.terasology.economy.events;


import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

public class ResourceDestructionEvent implements Event {
private String resource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ResourceDrawEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

public class ResourceDrawEvent implements Event {
private String resource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ResourceInfoRequestEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.economy.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

import java.util.Map;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/ResourceStoreEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

public class ResourceStoreEvent implements Event {
private String resource;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/SubscriberRegistrationEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package org.terasology.economy.events;


import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;

public class SubscriberRegistrationEvent implements Event {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/WalletTransactionEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.economy.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.gestalt.entitysystem.event.Event;
import org.terasology.engine.network.ServerEvent;

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/events/WalletUpdatedEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// SPDX-License-Identifier: Apache-2.0
package org.terasology.economy.events;

import org.terasology.engine.entitySystem.event.Event;
import org.terasology.engine.network.OwnerEvent;
import org.terasology.gestalt.entitysystem.event.Event;

/**
* A server-to-client event that updates all player wallet UIs with currency information.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/systems/MarketLogisticSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
import org.terasology.economy.handler.StorageComponentHandler;
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.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.gestalt.entitysystem.component.Component;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;

import java.util.HashMap;
import java.util.Map;
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/terasology/economy/systems/MarketUpdaterSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@
import org.terasology.economy.events.ConditionedProductionEvent;
import org.terasology.economy.events.SubscriberRegistrationEvent;
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.entitySystem.systems.UpdateSubscriberSystem;
import org.terasology.engine.registry.Share;
import org.terasology.gestalt.assets.management.AssetManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;

import java.util.Collection;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/systems/WalletAuthoritySystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.terasology.economy.events.WalletUpdatedEvent;
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;
Expand All @@ -18,6 +17,7 @@
import org.terasology.engine.registry.In;
import org.terasology.engine.registry.Share;
import org.terasology.engine.world.time.WorldTimeEvent;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;

/**
* Deals with all server-side wallet operations, such as transactions and initial wallet creation.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/economy/systems/WalletClientSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import org.terasology.economy.events.WalletUpdatedEvent;
import org.terasology.economy.ui.WalletHud;
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.players.LocalPlayer;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.nui.databinding.Binding;
import org.terasology.nui.databinding.DefaultBinding;

Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/terasology/economy/ui/MarketUiClientSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@
import org.terasology.economy.components.AllowShopScreenComponent;
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.network.ClientComponent;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.input.ButtonState;
import org.terasology.module.inventory.input.InventoryButton;

Expand All @@ -33,7 +34,8 @@ public class MarketUiClientSystem extends BaseComponentSystem {
* @param event the input event to open the inventory screen
* @param entity the client entity requesting to open the inventory screen
*/
@ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class}, priority = EventPriority.PRIORITY_HIGH)
@Priority(EventPriority.PRIORITY_HIGH)
@ReceiveEvent(components = {ClientComponent.class, AllowShopScreenComponent.class})
public void onToggleInventory(InventoryButton event, EntityRef entity) {
if (event.getState() == ButtonState.DOWN) {
nuiManager.toggleScreen("Economy:shopScreen");
Expand Down