Skip to content

Commit

Permalink
feat(gestaltv7-eventsystem): Migration Event and @ReceiveEvent to ges…
Browse files Browse the repository at this point in the history 
…talt's (#29)
  • Loading branch information
@DarkWeird
DarkWeird committed Dec 7, 2021
1 parent 7ed0134 commit 13d2546
Show file tree
Hide file tree
Showing 11 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/heat/HeatTriggeringSystem.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.terasology.engine.entitySystem.entity.EntityManager;
import org.terasology.engine.entitySystem.entity.EntityRef;
import org.terasology.engine.entitySystem.entity.lifecycleEvents.BeforeRemoveComponent;
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 @@ -31,6 +30,7 @@
import org.terasology.engine.world.BlockEntityRegistry;
import org.terasology.engine.world.block.BlockComponent;
import org.terasology.engine.world.block.regions.BlockRegionComponent;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.heat.component.HeatConsumerComponent;
import org.terasology.heat.component.HeatProducerComponent;
import org.terasology.workstation.event.WorkstationStateChanged;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/terasology/heat/processPart/HeatFuelingProcessPartCommonSystem.java
View file
Expand Up @@ -17,14 +17,14 @@

import org.terasology.engine.core.Time;
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.inventory.systems.InventoryManager;
import org.terasology.module.inventory.systems.InventoryUtils;
import org.terasology.engine.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.heat.component.HeatFuelComponent;
import org.terasology.heat.component.HeatProducerComponent;
import org.terasology.module.inventory.systems.InventoryManager;
import org.terasology.module.inventory.systems.InventoryUtils;
import org.terasology.workstation.component.SpecificInputSlotComponent;
import org.terasology.workstation.component.WorkstationInventoryComponent;
import org.terasology.workstation.event.WorkstationStateChanged;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/terasology/heat/processPart/HeatProcessingProcessPartCommonSystem.java
View file
Expand Up @@ -17,21 +17,21 @@

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.prefab.PrefabManager;
import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
import org.terasology.engine.entitySystem.systems.RegisterSystem;
import org.terasology.module.inventory.systems.InventoryManager;
import org.terasology.module.inventory.systems.InventoryUtils;
import org.terasology.engine.logic.inventory.ItemComponent;
import org.terasology.engine.registry.In;
import org.terasology.engine.world.BlockEntityRegistry;
import org.terasology.engine.world.block.BlockManager;
import org.terasology.engine.world.block.family.BlockFamily;
import org.terasology.engine.world.block.items.BlockItemFactory;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.heat.HeatUtils;
import org.terasology.heat.component.HeatProcessedComponent;
import org.terasology.module.inventory.systems.InventoryManager;
import org.terasology.module.inventory.systems.InventoryUtils;
import org.terasology.workstation.component.OutputTypeComponent;
import org.terasology.workstation.component.SpecificInputSlotComponent;
import org.terasology.workstation.component.WorkstationInventoryComponent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/processing/system/HoeUseSystem.java
View file
Expand Up @@ -19,7 +19,6 @@
import org.joml.Vector3i;
import org.terasology.durability.events.ReduceDurabilityEvent;
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 @@ -29,6 +28,7 @@
import org.terasology.engine.world.WorldProvider;
import org.terasology.engine.world.block.Block;
import org.terasology.engine.world.block.BlockManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.processing.component.HoeComponent;
import org.terasology.processing.component.TillableComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/processing/system/LitTorchSystem.java
View file
Expand Up @@ -20,7 +20,6 @@
import org.terasology.durability.components.OverTimeDurabilityReduceComponent;
import org.terasology.durability.events.DurabilityExhaustedEvent;
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;
Expand All @@ -29,6 +28,7 @@
import org.terasology.engine.world.block.BlockManager;
import org.terasology.engine.world.block.items.OnBlockItemPlaced;
import org.terasology.engine.world.block.items.OnBlockToItem;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;

/**
* This system defines the workings of torches in the game.
Expand Down
12 changes: 7 additions & 5 deletions src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java
View file
Expand Up @@ -18,14 +18,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.characters.CharacterComponent;
import org.terasology.module.inventory.components.InventoryComponent;
import org.terasology.module.inventory.systems.InventoryManager;
import org.terasology.engine.logic.players.event.OnPlayerSpawnedEvent;
import org.terasology.engine.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.module.inventory.components.InventoryComponent;
import org.terasology.module.inventory.systems.InventoryManager;

/**
* @author Marcin Sciesinski <marcins78@gmail.com>

Check warning on line 32 in src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java

View check run for this annotation

Terasology Jenkins.io / CheckStyle

RegexpSinglelineCheck 

NORMAL:
Author tags are not allowed
Raw output 
<p>Since Checkstyle 5.0</p><p> A check for detecting single lines that match a supplied regular expression. Works with any file type. </p><p> Rationale: This check can be used to prototype checks and to find common bad practice such as calling <code>ex.printStacktrace()</code>, <code> System.out.println()</code>, <code>System.exit()</code>, etc. </p>

Check warning on line 32 in src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java

View check run for this annotation

Terasology Jenkins.io / CheckStyle

MissingDeprecatedCheck 

NORMAL:
Javadoc comment at column 40 has parse error. Details: no viable alternative at input '
Raw output 
<p>Since Checkstyle 5.0</p><p> Verifies that both the java.lang.Deprecated annotation is present and the @deprecated Javadoc tag is present when either is present.</p>
Expand All @@ -41,8 +42,9 @@ public class ResetStartingInventorySystem extends BaseComponentSystem {
@In

Check warning on line 42 in src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java

View check run for this annotation

Terasology Jenkins.io / CheckStyle

DeclarationOrderCheck 

NORMAL:
Variable access definition in wrong order.
Raw output 
<p>Since Checkstyle 3.2</p><p> According to <a href="https://www.oracle.com/technetwork/java/javase/documentation/codeconventions-141855.html#1852"> Code Conventions for the Java Programming Language</a> , the parts of a class or interface declaration should appear in the following order: </p><ol><li> Class (static) variables. First the public class variables, then protected, then package level (no access modifier), and then private. </li><li> Instance variables. First the public class variables, then protected, then package level (no access modifier), and then private. </li><li> Constructors </li><li> Methods </li></ol><p> Purpose of <b>ignore*</b> option is to ignore related violations, however it still impacts on other class members. </p><p> ATTENTION: the check skips class fields which have <a href="https://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.3.3"> forward references</a> from validation due to the fact that we have Checkstyle's limitations to clearly detect user intention of fields location and grouping. For example, <pre><code> public class A { private double x = 1.0; private double y = 2.0; public double slope = x / y; // will be skipped from validation due to forward reference } </code></pre></p>
public EntityRef player;

@ReceiveEvent(components = {InventoryComponent.class, CharacterComponent.class}, priority = EventPriority.PRIORITY_TRIVIAL)
//@ReceiveEvent()
@Priority(EventPriority.PRIORITY_TRIVIAL)
@ReceiveEvent(components = {InventoryComponent.class, CharacterComponent.class})
//@ReceiveEvent
public void resetStartingInventory(OnPlayerSpawnedEvent event, EntityRef character) {
for (int i = 0; i < manager.getNumSlots(character); i++) {

Check warning on line 49 in src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java

View check run for this annotation

Terasology Jenkins.io / CheckStyle

EmptyBlockCheck 

NORMAL:
Must have at least one statement.
Raw output 
<p>Since Checkstyle 3.0</p><p> Checks for empty blocks. This check does not validate sequential blocks. </p><p> Sequential blocks won't be checked. Also, no violations for fallthrough: </p><pre><code> switch (a) { case 1: // no violation case 2: // no violation case 3: someMethod(); { } // no violation default: break; } </code></pre><p> This check processes LITERAL_CASE and LITERAL_DEFAULT separately. So, if tokens=LITERAL_DEFAULT, following code will not trigger any violation, as the empty block belongs to LITERAL_CASE: </p><p> Configuration: </p><pre><code> &lt;module name="EmptyBlock"&gt; &lt;property name="tokens" value="LITERAL_DEFAULT"/&gt; &lt;/module&gt; </code></pre><p> Result: </p><pre><code> switch (a) { default: // no violation for "default:" as empty block belong to "case 1:" case 1: { } } </code></pre>
// TODO: Temporarily removed.

Check warning on line 50 in src/main/java/org/terasology/processing/system/ResetStartingInventorySystem.java

View check run for this annotation

Terasology Jenkins.io / Open Tasks Scanner

TODO 

NORMAL:
Temporarily removed.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/workstationCrafting/event/CraftingStationUpgraded.java
View file
Expand Up @@ -16,7 +16,7 @@
package org.terasology.workstationCrafting.event;

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

public class CraftingStationUpgraded implements Event {
private EntityRef craftingStation;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/workstationCrafting/event/UserCraftInHandRequest.java
View file
Expand Up @@ -15,8 +15,8 @@
*/
package org.terasology.workstationCrafting.event;

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

import java.util.List;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/terasology/workstationCrafting/system/CraftInHandAuthoritySystem.java
View file
Expand Up @@ -18,14 +18,14 @@
import org.joml.Vector3f;
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.module.inventory.systems.InventoryManager;
import org.terasology.engine.logic.inventory.events.DropItemEvent;
import org.terasology.engine.logic.location.LocationComponent;
import org.terasology.engine.registry.In;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.module.inventory.systems.InventoryManager;
import org.terasology.workstationCrafting.event.UserCraftInHandRequest;
import org.terasology.workstationCrafting.system.recipe.hand.CraftInHandRecipe;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/terasology/workstationCrafting/system/CraftInHandClientSystem.java
View file
Expand Up @@ -16,13 +16,13 @@
package org.terasology.workstationCrafting.system;

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.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.workstationCrafting.event.NatureCraftingButton;

Expand Down
6 changes: 3 additions & 3 deletions ...n/java/org/terasology/workstationCrafting/ui/workstation/CraftingStationWindowSystem.java
View file
Expand Up @@ -17,14 +17,14 @@

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.registry.In;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
import org.terasology.module.inventory.events.BeforeItemPutInInventory;
import org.terasology.module.inventory.events.BeforeItemRemovedFromInventory;
import org.terasology.module.inventory.events.InventorySlotStackSizeChangedEvent;
import org.terasology.engine.registry.In;
import org.terasology.engine.rendering.nui.NUIManager;
import org.terasology.workstation.component.WorkstationInventoryComponent;
import org.terasology.workstationCrafting.event.CraftingStationUpgraded;

Expand Down

0 comments on commit 13d2546

Please sign in to comment.