rework

README.md

@@ -1,4 +1,4 @@
-# Morpeh.Events [![Github license](https://img.shields.io/github/license/codewriter-packages/Morpeh.Events.svg?style=flat-square)](#) [![Unity 2020.1](https://img.shields.io/badge/Unity-2020.1+-2296F3.svg?style=flat-square)](#) ![GitHub package.json version](https://img.shields.io/github/package-json/v/codewriter-packages/Morpeh.Events?style=flat-square)
+# Morpeh.Events [![Github license](https://img.shields.io/github/license/codewriter-packages/Morpeh.Events.svg?style=flat-square)](#) [![Unity 2020.1](https://img.shields.io/badge/Unity-2020.3+-2296F3.svg?style=flat-square)](#) ![GitHub package.json version](https://img.shields.io/github/package-json/v/codewriter-packages/Morpeh.Events?style=flat-square)
 _Events for Morpeh ECS_
 
 ## How to use?

Scellecs.Morpeh/Event.cs

@@ -1,9 +1,19 @@
+#if !MORPEH_DEBUG
+#define MORPEH_DEBUG_DISABLED
+#endif
+
 using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
 using JetBrains.Annotations;
 using Scellecs.Morpeh.Collections;
+using Unity.IL2CPP.CompilerServices;
 
 namespace Scellecs.Morpeh
 {
+    [Il2CppSetOption(Option.NullChecks, false)]
+    [Il2CppSetOption(Option.ArrayBoundsChecks, false)]
+    [Il2CppSetOption(Option.DivideByZeroChecks, false)]
     public class Event<TData> : IEventInternal where TData : struct, IEventData
     {
         private readonly EventRegistry _registry;
@@ -59,11 +69,15 @@ public void Dispose()
             }
         }
 
-        public void OnFrameEnd()
+        void IEventInternal.OnFrameEnd()
         {
             if (IsPublished)
             {
-                Callback?.Invoke(BatchedChanges);
+                if (Callback != null)
+                {
+                    TryCatchInvokeCallback();
+                    ForwardInvokeCallback();
+                }
 
                 IsPublished = false;
                 BatchedChanges.Clear();
@@ -79,6 +93,28 @@ public void OnFrameEnd()
                 _registry.DispatchedEvents.Add(this);
             }
         }
+
+        [Conditional("MORPEH_DEBUG_DISABLED")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void ForwardInvokeCallback()
+        {
+            Callback?.Invoke(BatchedChanges);
+        }
+
+        [Conditional("MORPEH_DEBUG")]
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        private void TryCatchInvokeCallback()
+        {
+            try
+            {
+                Callback?.Invoke(BatchedChanges);
+            }
+            catch (Exception ex)
+            {
+                MLogger.LogError($"Can not invoke callback Event<{typeof(TData)}>");
+                MLogger.LogException(ex);
+            }
+        }
     }
 
     public interface IEventInternal

Scellecs.Morpeh/EventWorldExtensions.cs

@@ -7,30 +7,28 @@ public static class EventWorldExtensions
     {
         private static readonly IntHashMap<EventRegistry> Registries = new IntHashMap<EventRegistry>();
 
-        internal static void CleanupEventRegistry(World world)
+        internal static void SetupEventRegistry(World world)
         {
-            var worldIdentifier = world.identifier;
+            var registry = new EventRegistry();
+
+            var eventSystemGroup = world.CreateSystemsGroup();
+            eventSystemGroup.AddSystem(new ProcessEventsSystem(registry));
+            world.AddPluginSystemsGroup(eventSystemGroup);
+
+            Registries.Add(world.identifier, registry, out _);
+        }
 
-            Registries.Remove(worldIdentifier, out _);
+        internal static void CleanupEventRegistry(World world)
+        {
+            Registries.Remove(world.identifier, out _);
         }
 
         [PublicAPI]
         public static Event<TData> GetEvent<TData>(this World world)
             where TData : struct, IEventData
         {
-            var worldIdentifier = world.identifier;
             var eventIdentifier = EventIdentifier<TData>.identifier;
-
-            if (!Registries.TryGetValue(worldIdentifier, out var registry))
-            {
-                registry = new EventRegistry();
-
-                var eventSystemGroup = world.CreateSystemsGroup();
-                eventSystemGroup.AddSystem(new ProcessEventsSystem(registry));
-                world.AddSystemsGroup(9999, eventSystemGroup);
-
-                Registries.Add(worldIdentifier, registry, out _);
-            }
+            var registry = Registries.GetValueByKey(world.identifier);
 
             if (!registry.RegisteredEvents.TryGetValue(eventIdentifier, out var registeredEvent))
             {

Scellecs.Morpeh/EventWorldPlugin.cs

@@ -0,0 +1,19 @@
+using UnityEngine.Scripting;
+
+namespace Scellecs.Morpeh
+{
+    [Preserve]
+    internal class EventWorldPlugin : IWorldPlugin
+    {
+        [Preserve]
+        public EventWorldPlugin()
+        {
+        }
+
+        [Preserve]
+        public void Initialize(World world)
+        {
+            EventWorldExtensions.SetupEventRegistry(world);
+        }
+    }
+}

Scellecs.Morpeh/ProcessEventsSystem.cs

@@ -1,7 +1,11 @@
 using Scellecs.Morpeh.Collections;
+using Unity.IL2CPP.CompilerServices;
 
 namespace Scellecs.Morpeh
 {
+    [Il2CppSetOption(Option.NullChecks, false)]
+    [Il2CppSetOption(Option.ArrayBoundsChecks, false)]
+    [Il2CppSetOption(Option.DivideByZeroChecks, false)]
     internal sealed class ProcessEventsSystem : ICleanupSystem
     {
         private readonly EventRegistry _registry;

package.json

@@ -3,7 +3,7 @@
   "displayName": "Morpeh.Events",
   "description": "Events for Morpeh ECS",
   "version": "1.0.0",
-  "unity": "2020.1",
+  "unity": "2020.3",
   "license": "MIT",
   "author": "CodeWriter (https://github.com/orgs/codewriter-packages)",
   "dependencies": {}