Merge branch 'develop' into feature/implement-skinnedMesh-1

engine-tests/src/main/resources/org/terasology/unittest/module.txt

@@ -1,6 +1,6 @@
 {
     "id" : "unittest",
-    "version" : "5.2.0-SNAPSHOT",
+    "version" : "5.3.0-SNAPSHOT",
     "displayName" : "Terasology Engine Test",
     "description" : "Engine unit test content"
 }

engine-tests/src/test/java/org/terasology/engine/entitySystem/PojoEventSystemTests.java

@@ -7,24 +7,25 @@
 import org.junit.jupiter.api.Test;
 import org.reflections.Reflections;
 import org.terasology.engine.context.internal.ContextImpl;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
 import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.engine.entitySystem.event.Event;
 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.event.internal.EventReceiver;
 import org.terasology.engine.entitySystem.event.internal.EventSystemImpl;
 import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
 import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
 import org.terasology.engine.entitySystem.prefab.internal.PojoPrefabManager;
-import org.terasology.unittest.stubs.IntegerComponent;
-import org.terasology.unittest.stubs.StringComponent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
 import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
+import org.terasology.unittest.stubs.IntegerComponent;
+import org.terasology.unittest.stubs.StringComponent;
 
 import java.util.List;
 
@@ -250,15 +251,17 @@ public static class TestHighPriorityEventHandler extends BaseComponentSystem {
 
         List<Received> receivedList = Lists.newArrayList();
 
-        @ReceiveEvent(components = StringComponent.class, priority = EventPriority.PRIORITY_HIGH)
+        @Priority(EventPriority.PRIORITY_HIGH)
+        @ReceiveEvent(components = StringComponent.class)
         public void handleStringEvent(TestEvent event, EntityRef entity) {
             receivedList.add(new Received(event, entity));
             if (cancel) {
                 event.consume();
             }
         }
 
-        @ReceiveEvent(components = IntegerComponent.class, priority = EventPriority.PRIORITY_HIGH)
+        @Priority(EventPriority.PRIORITY_HIGH)
+        @ReceiveEvent(components = IntegerComponent.class)
         public void handleIntegerEvent(TestEvent event, EntityRef entity) {
             receivedList.add(new Received(event, entity));
         }

engine-tests/src/test/java/org/terasology/engine/logic/characters/VisualCharacterSystemTest.java

@@ -14,10 +14,10 @@
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.logic.characters.events.CreateVisualCharacterEvent;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.registry.InjectionHelper;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.ArrayList;
 import java.util.Arrays;

engine-tests/src/test/java/org/terasology/engine/logic/delay/DelayedActionSystemTest.java

@@ -8,7 +8,7 @@
 import org.terasology.engine.TerasologyTestingEnvironment;
 import org.terasology.engine.core.Time;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 import java.util.ArrayList;
 import java.util.Arrays;

engine-tests/src/test/java/org/terasology/engine/persistence/typeHandling/event/VectorEventSerializer.java

@@ -11,23 +11,23 @@
 import org.joml.Vector4fc;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.terasology.engine.core.module.ModuleManager;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.context.internal.ContextImpl;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.engine.core.module.ModuleManager;
 import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
 import org.terasology.engine.entitySystem.metadata.EventMetadata;
 import org.terasology.engine.persistence.serializers.EventSerializer;
 import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
 import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.engine.testUtil.ModuleManagerFactory;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.Event;
 import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
 import org.terasology.protobuf.EntityData;
 import org.terasology.reflection.ModuleTypeRegistry;
 import org.terasology.reflection.copy.CopyStrategyLibrary;
 import org.terasology.reflection.metadata.FieldMetadata;
 import org.terasology.reflection.reflect.ReflectFactory;
 import org.terasology.reflection.reflect.ReflectionReflectFactory;
-import org.terasology.engine.testUtil.ModuleManagerFactory;
 
 import java.io.IOException;
 import java.util.HashMap;

engine-tests/src/test/java/org/terasology/engine/recording/EventSystemReplayImplTest.java

@@ -13,8 +13,6 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
 import org.terasology.engine.entitySystem.event.AbstractConsumableEvent;
-import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.event.internal.EventSystem;
 import org.terasology.engine.entitySystem.metadata.EntitySystemLibrary;
 import org.terasology.engine.entitySystem.prefab.internal.PojoPrefabManager;
@@ -25,6 +23,8 @@
 import org.terasology.engine.network.NetworkSystem;
 import org.terasology.engine.persistence.typeHandling.TypeHandlerLibraryImpl;
 import org.terasology.engine.registry.CoreRegistry;
+import org.terasology.gestalt.entitysystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.gestalt.module.ModuleEnvironment;
 import org.terasology.persistence.typeHandling.TypeHandlerLibrary;
 import org.terasology.reflection.TypeRegistry;

engine-tests/src/test/java/org/terasology/engine/world/EntityAwareWorldProviderTest.java

@@ -18,8 +18,6 @@
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnAddedComponent;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnChangedComponent;
-import org.terasology.engine.entitySystem.event.Event;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.event.internal.EventReceiver;
 import org.terasology.engine.entitySystem.event.internal.EventSystem;
 import org.terasology.engine.entitySystem.prefab.Prefab;
@@ -39,6 +37,8 @@
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.assets.management.AssetManager;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.unittest.stubs.ForceBlockActiveComponent;
 import org.terasology.unittest.stubs.IntegerComponent;
 import org.terasology.unittest.stubs.RetainedOnBlockChangeComponent;

engine-tests/src/test/java/org/terasology/engine/world/chunks/localChunkProvider/LocalChunkProviderTest.java

@@ -12,7 +12,6 @@
 import org.mockito.ArgumentCaptor;
 import org.terasology.engine.entitySystem.entity.EntityManager;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.world.BlockEntityRegistry;
 import org.terasology.engine.world.block.BeforeDeactivateBlocks;
 import org.terasology.engine.world.block.Block;
@@ -30,6 +29,7 @@
 import org.terasology.fixtures.TestChunkStore;
 import org.terasology.fixtures.TestStorageManager;
 import org.terasology.fixtures.TestWorldGenerator;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;

engine-tests/src/test/java/org/terasology/input/InputSystemTests.java

@@ -15,7 +15,6 @@
 import org.terasology.engine.core.subsystem.config.BindsManager;
 import org.terasology.engine.core.subsystem.headless.device.TimeSystem;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.systems.internal.DoNotAutoRegister;
 import org.terasology.engine.input.BindButtonEvent;
 import org.terasology.engine.input.BindableButton;
@@ -30,6 +29,7 @@
 import org.terasology.engine.recording.DirectionAndOriginPosRecorderList;
 import org.terasology.engine.recording.RecordAndReplayCurrentStatus;
 import org.terasology.engine.registry.InjectionHelper;
+import org.terasology.gestalt.entitysystem.event.Event;
 import org.terasology.input.Keyboard.Key;
 import org.terasology.input.Keyboard.KeyId;
 import org.terasology.input.device.CharKeyboardAction;

engine/src/main/java/org/terasology/engine/audio/system/AudioSystem.java

@@ -11,7 +11,6 @@
 import org.terasology.engine.audio.events.PlaySoundEvent;
 import org.terasology.engine.audio.events.PlaySoundForOwnerEvent;
 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.entitySystem.systems.UpdateSubscriberSystem;
@@ -25,6 +24,7 @@
 import org.terasology.engine.network.NetworkSystem;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.utilities.Assets;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * This system handles receiving the PlaySound events and activating the AudioManager to play them

engine/src/main/java/org/terasology/engine/core/bootstrap/EntitySystemSetupUtil.java

@@ -10,7 +10,6 @@
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.internal.EngineEntityManager;
 import org.terasology.engine.entitySystem.entity.internal.PojoEntityManager;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.event.internal.EventSystem;
 import org.terasology.engine.entitySystem.event.internal.EventSystemImpl;
 import org.terasology.engine.entitySystem.metadata.ComponentLibrary;
@@ -39,6 +38,7 @@
 import org.terasology.engine.recording.RecordingEventSystemDecorator;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
 import org.terasology.gestalt.module.ModuleEnvironment;
 import org.terasology.gestalt.naming.Name;
 import org.terasology.nui.properties.OneOfProviderFactory;

engine/src/main/java/org/terasology/engine/core/bootstrap/eventSystem/AbstractEventSystemDecorator.java

@@ -4,12 +4,12 @@
 package org.terasology.engine.core.bootstrap.eventSystem;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.event.internal.EventReceiver;
 import org.terasology.engine.entitySystem.event.internal.EventSystem;
 import org.terasology.engine.entitySystem.systems.ComponentSystem;
 import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public abstract class AbstractEventSystemDecorator implements EventSystem {
     private final EventSystem eventSystem;

engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/AwaitedLocalCharacterSpawnEvent.java

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.core.modes.loadProcesses;
 
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
+import org.terasology.gestalt.entitysystem.event.Event;
 import org.terasology.gestalt.module.sandbox.API;
 
 /**

engine/src/main/java/org/terasology/engine/core/modes/loadProcesses/LoadingChunkEventSystem.java

@@ -6,12 +6,12 @@
 import org.terasology.engine.core.GameEngine;
 import org.terasology.engine.core.modes.GameState;
 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.world.WorldComponent;
 import org.terasology.engine.world.chunks.event.OnChunkLoaded;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 
 /**
  * A system to send new chunk events to the current game state, which can be

engine/src/main/java/org/terasology/engine/core/module/ExternalApiWhitelist.java

@@ -50,6 +50,7 @@ public final class ExternalApiWhitelist {
 
     private static final Set<String> GESTALT_ECS_PACKAGES = new ImmutableSet.Builder<String>()
             .add("org.terasology.gestalt.entitysystem.component")
+            .add("org.terasology.gestalt.entitysystem.event")
             .build();
 
     public static final Set<String> PACKAGES = new ImmutableSet.Builder<String>()

engine/src/main/java/org/terasology/engine/entitySystem/entity/EntityRef.java

@@ -6,9 +6,9 @@
 import org.terasology.engine.entitySystem.MutableComponentContainer;
 import org.terasology.engine.entitySystem.entity.internal.EntityScope;
 import org.terasology.engine.entitySystem.entity.internal.NullEntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.sectors.SectorSimulationComponent;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * A wrapper around an entity id providing access to common functionality

engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/BaseEntityRef.java

@@ -6,13 +6,13 @@
 import org.slf4j.LoggerFactory;
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.LowLevelEntityManager;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.engine.entitySystem.sectors.SectorSimulationComponent;
 import org.terasology.engine.network.NetworkComponent;
 import org.terasology.engine.persistence.serializers.EntityDataJSONFormat;
 import org.terasology.engine.persistence.serializers.EntitySerializer;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;

engine/src/main/java/org/terasology/engine/entitySystem/entity/internal/NullEntityRef.java

@@ -3,9 +3,9 @@
 package org.terasology.engine.entitySystem.entity.internal;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Collections;
 import java.util.List;

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeDeactivateComponent.java

@@ -3,7 +3,7 @@
 
 package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * When a component is about to leave the active state, either due to being removed, the entity it is attached to being destroyed,

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeEntityCreated.java

@@ -4,9 +4,9 @@
 
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import org.terasology.engine.entitySystem.event.Event;
 import org.terasology.engine.entitySystem.prefab.Prefab;
 import org.terasology.gestalt.entitysystem.component.Component;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 import java.util.Iterator;
 import java.util.Map;

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/BeforeRemoveComponent.java

@@ -3,7 +3,7 @@
 
 package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * When a component is about to be removed from an entity, or an entity is about to be destroyed, this event is sent.

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnActivatedComponent.java

@@ -3,7 +3,7 @@
 
 package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * This event occurs after an entity is created, an entity is loaded or a component is added to an entity. This occurs

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnAddedComponent.java

@@ -3,7 +3,7 @@
 
 package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * This event is sent when an entity is created or a component added to an existing entity.

engine/src/main/java/org/terasology/engine/entitySystem/entity/lifecycleEvents/OnChangedComponent.java

@@ -3,7 +3,7 @@
 
 package org.terasology.engine.entitySystem.entity.lifecycleEvents;
 
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * This event occurs whenever a component is changed and saved.

engine/src/main/java/org/terasology/engine/entitySystem/event/AbstractValueModifiableEvent.java

@@ -5,6 +5,7 @@
 import gnu.trove.iterator.TFloatIterator;
 import gnu.trove.list.TFloatList;
 import gnu.trove.list.array.TFloatArrayList;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 /**
  * A generic event for getting a value for a property.

engine/src/main/java/org/terasology/engine/entitySystem/event/Activity.java

@@ -0,0 +1,14 @@
+// Copyright 2021 The Terasology Foundation
+// SPDX-License-Identifier: Apache-2.0
+
+package org.terasology.engine.entitySystem.event;
+
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
+
+/**
+ * Additional for {@link ReceiveEvent}.
+ * Activate performance monitoring for Event Handler.
+ */
+public @interface Activity {
+    String value();
+}

engine/src/main/java/org/terasology/engine/entitySystem/event/BeforeAfterEvent.java

@@ -3,6 +3,8 @@
 
 package org.terasology.engine.entitySystem.event;
 
+import org.terasology.gestalt.entitysystem.event.Event;
+
 /**
  * Immutable event to notify a change in a certain value.
  * <p>

engine/src/main/java/org/terasology/engine/entitySystem/event/ConsumableEvent.java

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 package org.terasology.engine.entitySystem.event;
 
+import org.terasology.gestalt.entitysystem.event.Event;
+
 /**
  * A consumable event is an event that can be prevented from continuing through remaining event receivers. This is
  * primarily useful for input event.