Updated to latest EcsRx version 4.0.0

.gitignore

@@ -58,3 +58,5 @@ sysinfo.txt
 # Crashlytics generated file
 crashlytics-build.properties
 
+
+.idea/

Assets/EcsRx/Unity/Extensions/ISystemExtensions.cs

@@ -1,4 +1,5 @@
 using System;
+using SystemsRx.Systems;
 using EcsRx.Systems;
 using UniRx;
 

Assets/EcsRx/Unity/Modules/UnityOverrideModule.cs

@@ -1,6 +1,6 @@
-using EcsRx.Infrastructure.Dependencies;
-using EcsRx.Infrastructure.Extensions;
-using EcsRx.Scheduling;
+using SystemsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Extensions;
+using SystemsRx.Scheduling;
 using EcsRx.Unity.Scheduling;
 
 namespace EcsRx.Unity.Modules

Assets/EcsRx/Unity/MonoBehaviours/InjectableMonoBehaviour.cs

@@ -1,4 +1,5 @@
-using EcsRx.Events;
+using SystemsRx.Events;
+using EcsRx.Events;
 using EcsRx.Unity.Dependencies;
 using UnityEngine;
 using Zenject;

Assets/EcsRx/Unity/Scheduling/UnityUpdateScheduler.cs

@@ -1,5 +1,5 @@
 using System;
-using EcsRx.Scheduling;
+using SystemsRx.Scheduling;
 using UniRx;
 using UnityEngine;
 

Assets/EcsRx/Unity/Systems/DynamicViewResolverSystem.cs

@@ -1,8 +1,7 @@
-using EcsRx.Unity.Dependencies;
-using EcsRx.Collections;
+using SystemsRx.Events;
+using EcsRx.Unity.Dependencies;
 using EcsRx.Collections.Database;
 using EcsRx.Entities;
-using EcsRx.Events;
 using EcsRx.Extensions;
 using EcsRx.Groups;
 using EcsRx.Plugins.ReactiveSystems.Systems;

Assets/EcsRx/Unity/Systems/PooledPrefabViewResolverSystem.cs

@@ -1,7 +1,6 @@
-using EcsRx.Collections;
+using SystemsRx.Events;
 using EcsRx.Collections.Database;
 using EcsRx.Entities;
-using EcsRx.Events;
 using EcsRx.Extensions;
 using EcsRx.Plugins.Views.Pooling;
 using EcsRx.Plugins.Views.Systems;

Assets/EcsRx/Unity/Systems/PrefabViewResolverSystem.cs

@@ -1,7 +1,6 @@
-using EcsRx.Collections;
+using SystemsRx.Events;
 using EcsRx.Collections.Database;
 using EcsRx.Entities;
-using EcsRx.Events;
 using EcsRx.Extensions;
 using EcsRx.Unity.Dependencies;
 using EcsRx.Unity.Handlers;

Assets/EcsRx/Unity/UnityEcsRxApplicationBehaviour.cs

@@ -1,20 +1,21 @@
 using System.Collections.Generic;
 using System.Linq;
+using SystemsRx.Events;
+using SystemsRx.Executor;
+using SystemsRx.Extensions;
+using SystemsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Extensions;
+using SystemsRx.Infrastructure.Modules;
+using SystemsRx.Infrastructure.Plugins;
+using SystemsRx.Systems;
 using EcsRx.Collections;
 using EcsRx.Collections.Database;
-using EcsRx.Events;
-using EcsRx.Executor;
-using EcsRx.Extensions;
 using EcsRx.Infrastructure;
-using EcsRx.Infrastructure.Dependencies;
-using EcsRx.Infrastructure.Extensions;
 using EcsRx.Infrastructure.Modules;
-using EcsRx.Infrastructure.Plugins;
 using EcsRx.Plugins.Batching;
 using EcsRx.Plugins.Computeds;
 using EcsRx.Plugins.ReactiveSystems;
 using EcsRx.Plugins.Views;
-using EcsRx.Systems;
 using EcsRx.Unity.Modules;
 using UnityEngine;
 
@@ -29,9 +30,9 @@ public abstract class UnityEcsRxApplicationBehaviour : MonoBehaviour, IEcsRxAppl
         public IEventSystem EventSystem { get; private set; }
         public IEntityDatabase EntityDatabase { get; private set; }
         public IObservableGroupManager ObservableGroupManager { get; private set; }
-        public IEnumerable<IEcsRxPlugin> Plugins => _plugins;
+        public IEnumerable<ISystemsRxPlugin> Plugins => _plugins;
 
-        protected List<IEcsRxPlugin> _plugins { get; } = new List<IEcsRxPlugin>();
+        protected List<ISystemsRxPlugin> _plugins { get; } = new List<ISystemsRxPlugin>();
 
         protected abstract void ApplicationStarted();
 
@@ -72,6 +73,7 @@ protected virtual void LoadPlugins()
         protected virtual void LoadModules()
         {
             Container.LoadModule<FrameworkModule>();
+            Container.LoadModule<EcsRxInfrastructureModule>();
             Container.LoadModule<UnityOverrideModule>();
         }
 
@@ -117,7 +119,7 @@ protected virtual void StartPluginSystems()
                 .ForEachRun(x => SystemExecutor.AddSystem(x));
         }
 
-        protected void RegisterPlugin(IEcsRxPlugin plugin)
+        protected void RegisterPlugin(ISystemsRxPlugin plugin)
         { _plugins.Add(plugin); }
     }
 }

Assets/EcsRx/UnityEditor/MonoBehaviours/ActiveSystemsViewer.cs

@@ -1,4 +1,4 @@
-using EcsRx.Executor;
+using SystemsRx.Executor;
 using UnityEngine;
 using Zenject;
 

Assets/EcsRx/Zenject/Dependencies/ZenjectDependencyContainer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections;
 using System.Linq;
-using EcsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Dependencies;
 using EcsRx.Unity.Dependencies;
 using EcsRx.Zenject.Extensions;
 using UnityEngine;

Assets/EcsRx/Zenject/EcsRxApplicationBehaviour.cs

@@ -1,23 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using EcsRx.Collections;
-using EcsRx.Collections.Database;
-using EcsRx.Events;
-using EcsRx.Executor;
-using EcsRx.Extensions;
-using EcsRx.Infrastructure;
-using EcsRx.Infrastructure.Dependencies;
-using EcsRx.Infrastructure.Extensions;
-using EcsRx.Infrastructure.Modules;
-using EcsRx.Infrastructure.Plugins;
-using EcsRx.Plugins.Batching;
-using EcsRx.Plugins.Computeds;
-using EcsRx.Plugins.ReactiveSystems;
-using EcsRx.Plugins.Views;
-using EcsRx.Systems;
 using EcsRx.Unity;
-using EcsRx.Unity.Modules;
 using EcsRx.Zenject.Dependencies;
 using UnityEngine;
 using Zenject;

Assets/EcsRx/Zenject/Helpers/BindSystemsInNamespace.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using EcsRx.Systems;
+using SystemsRx.Systems;
 using ModestTree;
 using Zenject;
 

Assets/Game/Application.cs

@@ -1,9 +1,7 @@
 using System;
-using EcsRx.Collections;
+using SystemsRx.Infrastructure.Extensions;
 using EcsRx.Collections.Entity;
 using EcsRx.Extensions;
-using EcsRx.Unity.Extensions;
-using EcsRx.Infrastructure.Extensions;
 using EcsRx.Plugins.Views.Components;
 using EcsRx.Zenject;
 using Game.Blueprints;

Assets/Game/Modules/ComputedModule.cs

@@ -1,8 +1,8 @@
-using EcsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Extensions;
 using EcsRx.Infrastructure.Extensions;
 using Game.Components;
 using Game.Computeds;
-using Game.Configuration;
 
 namespace Game.Installers
 {

Assets/Game/Modules/GameModule.cs

@@ -1,6 +1,5 @@
-using EcsRx.Infrastructure.Dependencies;
-using EcsRx.Infrastructure.Extensions;
-
+using SystemsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Extensions;
 using Game.Configuration;
 
 namespace Game.Installers

Assets/Game/Modules/SceneCollectionsModule.cs

@@ -1,7 +1,6 @@
-using EcsRx.Infrastructure.Dependencies;
-using EcsRx.Infrastructure.Extensions;
+using SystemsRx.Infrastructure.Dependencies;
+using SystemsRx.Infrastructure.Extensions;
 using Game.SceneCollections;
-using Zenject;
 
 namespace Game.Installers
 {

Assets/Game/Systems/EnemyAttackedSystem.cs

@@ -1,23 +1,21 @@
-using EcsRx.Collections;
+using SystemsRx.Systems.Conventional;
 using EcsRx.Collections.Database;
-using EcsRx.Events;
 using EcsRx.Extensions;
-using EcsRx.Plugins.ReactiveSystems.Custom;
 using EcsRx.Unity.Extensions;
 using Game.Components;
 using Game.Events;
 using UnityEngine;
 
 namespace Game.Systems
 {
-    public class EnemyAttackedSystem : EventReactionSystem<EnemyHitEvent>
+    public class EnemyAttackedSystem : IReactToEventSystem<EnemyHitEvent>
     {
         private readonly IEntityDatabase _entityDatabase;
 
-        public EnemyAttackedSystem(IEventSystem eventSystem, IEntityDatabase entityDatabase) : base(eventSystem)
+        public EnemyAttackedSystem(IEntityDatabase entityDatabase)
         { _entityDatabase = entityDatabase; }
 
-        public override void EventTriggered(EnemyHitEvent eventData)
+        public void Process(EnemyHitEvent eventData)
         {
             var enemyComponent = eventData.Enemy.GetComponent<EnemyComponent>();
             enemyComponent.Health.Value--;

Assets/Game/Systems/EnemyMovementSystem.cs

@@ -1,6 +1,5 @@
-using EcsRx.Events;
+using SystemsRx.Systems.Conventional;
 using EcsRx.Extensions;
-using EcsRx.Plugins.ReactiveSystems.Custom;
 using EcsRx.Unity.Extensions;
 using Game.Components;
 using Game.Computeds;
@@ -9,17 +8,16 @@
 
 namespace Game.Systems
 {
-    public class EnemyMovementSystem : EventReactionSystem<EnemyTurnEvent>
+    public class EnemyMovementSystem : IReactToEventSystem<EnemyTurnEvent>
     {
         private readonly IComputedPlayerPosition _computedPlayerPosition;
 
-        public EnemyMovementSystem(IEventSystem eventSystem, IComputedPlayerPosition computedPlayerPosition) 
-            : base(eventSystem)
+        public EnemyMovementSystem(IComputedPlayerPosition computedPlayerPosition)
         {
             _computedPlayerPosition = computedPlayerPosition;
         }
 
-        public override void EventTriggered(EnemyTurnEvent eventData)
+        public void Process(EnemyTurnEvent eventData)
         {
             var movementComponent = eventData.Enemy.GetComponent<MovementComponent>();
             if(movementComponent.Movement.Value != Vector2.zero) { return; }