totaly rework the app logic by removing the callback principe

implement entityinfo

RustPlusApi/Examples/GetEntityChanges/Program.cs

@@ -5,23 +5,34 @@
 using static __Constants.ExamplesConst;
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
-var entityId = 0;
+uint entityId = 0;
 
 rustPlus.Connected += async (_, _) =>
 {
-    await rustPlus.GetEntityInfoAsync(entityId, message =>
-    {
-        Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-        return true;
-    });
+    // The message would be SmartSwitchInfo, AlarmInfo, or StorageMonitorInfo
+    // If you want to do your own parsing you can set the useRawObject parameter to true
+    var message = await rustPlus.GetEntityInfoAsync(entityId);
+
+    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 };
 
-rustPlus.MessageReceived += (_, message) =>
+rustPlus.OnSmartSwitchTriggered += (_, message) =>
 {
-    if (message.Broadcast is not { EntityChanged: not null }) return;
+    Console.WriteLine($"SmartSwitch:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+};
 
-    var entityChanged = message.Broadcast.EntityChanged;
-    Console.WriteLine($"Message:\n{JsonConvert.SerializeObject(entityChanged, JsonSettings)}");
+rustPlus.OnStorageMonitorTriggered += (_, message) =>
+{
+    Console.WriteLine($"StorageMonitor:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
 };
 
+// If you want to get the raw message for the notification you can use the MessageReceived event
+//rustPlus.MessageReceived += (_, message) =>
+//{
+//    if (message.Broadcast is not { EntityChanged: not null }) return;
+
+//    var entityChanged = message.Broadcast.EntityChanged;
+//    Console.WriteLine($"Message:\n{JsonConvert.SerializeObject(entityChanged, JsonSettings)}");
+//};
+
 await rustPlus.ConnectAsync();

RustPlusApi/Examples/GetEntityInfo/Program.cs

@@ -5,16 +5,17 @@
 using static __Constants.ExamplesConst;
 
 var rustPlus = new RustPlus(Ip, Port, PlayerId, PlayerToken);
-var entityId = 0;
+uint entityId = 0;
 
 rustPlus.Connected += async (_, _) =>
 {
-    await rustPlus.GetEntityInfoAsync(entityId, message =>
-    {
-        Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
-        rustPlus.Dispose();
-        return true;
-    });
+    // The message would be SmartSwitchInfo, AlarmInfo, or StorageMonitorInfo
+    // If you want to do your own parsing you can set the useRawObject parameter to true
+    var message = await rustPlus.GetEntityInfoAsync(entityId);
+
+    Console.WriteLine($"Infos:\n{JsonConvert.SerializeObject(message, JsonSettings)}");
+
+    rustPlus.Dispose();
 };
 
 await rustPlus.ConnectAsync();

RustPlusApi/RustPlusApi/Data/AlarmInfo.cs

@@ -0,0 +1,7 @@
+namespace RustPlusApi.Data
+{
+    public class AlarmInfo
+    {
+        public bool Value { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Data/Events/SmartSwitchEventArg.cs

@@ -0,0 +1,7 @@
+namespace RustPlusApi.Data.Events
+{
+    public class SmartSwitchEventArg : SmartSwitchInfo
+    {
+        public uint Id { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Data/Events/StorageMonitorEventArg.cs

@@ -0,0 +1,7 @@
+namespace RustPlusApi.Data.Events
+{
+    public class StorageMonitorEventArg : StorageMonitorInfo
+    {
+        public uint Id { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Data/SmartSwitchInfo.cs

@@ -0,0 +1,7 @@
+namespace RustPlusApi.Data
+{
+    public class SmartSwitchInfo
+    {
+        public bool Value { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Data/StorageMonitorInfo.cs

@@ -0,0 +1,10 @@
+namespace RustPlusApi.Data
+{
+    public class StorageMonitorInfo
+    {
+        public int? Capacity { get; set; }
+        public bool? HasProtection { get; set; }
+        public uint? ProtectionExpiry { get; set; }
+        public List<StorageMonitorItemInfo>? Items { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Data/StorageMonitorItemInfo.cs

@@ -0,0 +1,9 @@
+namespace RustPlusApi.Data
+{
+    public class StorageMonitorItemInfo
+    {
+        public int Id { get; set; }
+        public int? Quantity { get; set; }
+        public bool? IsItemBlueprint { get; set; }
+    }
+}

RustPlusApi/RustPlusApi/Extensions/AppEntityInfoToModel.cs

@@ -0,0 +1,62 @@
+using RustPlusApi.Data;
+
+using RustPlusContracts;
+
+namespace RustPlusApi.Extensions
+{
+    public static class AppEntityInfoToModel
+    {
+        public static object ToEntityInfo(this AppEntityInfo entity)
+        {
+            return entity.Type switch
+            {
+                AppEntityType.Switch => entity.ToSmartSwitchInfo(),
+                AppEntityType.Alarm => entity.ToAlarmInfo(),
+                AppEntityType.StorageMonitor => entity.ToStorageMonitorInfo(),
+                _ => throw new ArgumentException($"The given type is not possible: {entity.Type}")
+            };
+        }
+
+        public static SmartSwitchInfo ToSmartSwitchInfo(this AppEntityInfo entity)
+        {
+            return new SmartSwitchInfo
+            {
+                Value = entity.Payload.Value
+            };
+        }
+
+        public static AlarmInfo ToAlarmInfo(this AppEntityInfo entity)
+        {
+            return new AlarmInfo
+            {
+                Value = entity.Payload.Value
+            };
+        }
+
+        public static StorageMonitorInfo ToStorageMonitorInfo(this AppEntityInfo entity)
+        {
+            return new StorageMonitorInfo
+            {
+                Capacity = entity.Payload.Capacity,
+                HasProtection = entity.Payload.HasProtection,
+                ProtectionExpiry = entity.Payload.ProtectionExpiry,
+                Items = entity.Payload.Items.ToStorageMonitorItemsInfo().ToList()
+            };
+        }
+
+        public static StorageMonitorItemInfo ToStorageMonitorItemInfo(this AppEntityPayload.Types.Item item)
+        {
+            return new StorageMonitorItemInfo
+            {
+                Id = item.ItemId,
+                Quantity = item.Quantity,
+                IsItemBlueprint = item.ItemIsBlueprint,
+            };
+        }
+
+        public static IEnumerable<StorageMonitorItemInfo> ToStorageMonitorItemsInfo(this IEnumerable<AppEntityPayload.Types.Item> items)
+        {
+            return items.Select(ToStorageMonitorItemInfo);
+        }
+    }
+}

RustPlusApi/RustPlusApi/Extensions/EntityChangedToModel.cs

@@ -0,0 +1,30 @@
+using RustPlusApi.Data.Events;
+
+using RustPlusContracts;
+
+namespace RustPlusApi.Extensions
+{
+    public static class EntityChangedToModel
+    {
+        public static SmartSwitchEventArg ToSmartSwitchEvent(this AppEntityChanged entityChanged)
+        {
+            return new SmartSwitchEventArg
+            {
+                Id = entityChanged.EntityId,
+                Value = entityChanged.Payload.Value
+            };
+        }
+
+        public static StorageMonitorEventArg ToStorageMonitorEvent(this AppEntityChanged entityChanged)
+        {
+            return new StorageMonitorEventArg
+            {
+                Id = entityChanged.EntityId,
+                Capacity = entityChanged.Payload.Capacity,
+                HasProtection = entityChanged.Payload.HasProtection,
+                ProtectionExpiry = entityChanged.Payload.ProtectionExpiry,
+                Items = entityChanged.Payload.Items.ToStorageMonitorItemsInfo().ToList()
+            };
+        }
+    }
+}