💚 Experimental net7 builder for net6

Author: decaprime

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 7.0.x
 
       - name: Install GitVersion
         uses: gittools/actions/gitversion/[email protected]

ECSExtensions.cs

@@ -1,12 +1,15 @@
 
+using System;
 using Bloodstone.API;
 using Il2CppInterop.Runtime;
 using Unity.Entities;
 
 
 /// <remarks>
 /// Copying these around is an anti-pattern - they should live in Bloodstone. I've put them here for now to uncouple things.
+/// CS8500
 /// </remarks>
+#pragma warning disable CS8500
 internal static class ECSExtensions
 {
 	internal static void With<T>(this Entity entity, VExtensions.ActionRef<T> action) where T : struct
@@ -16,24 +19,33 @@ internal static void With<T>(this Entity entity, VExtensions.ActionRef<T> action
 		VWorld.Game.EntityManager.SetComponentData(entity, item);
 	}
 
-	internal static bool Has<T>(this Entity entity)
+	internal static bool Has<T>(this Entity entity) where T : struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
 
 		return VWorld.Game.EntityManager.HasComponentRaw(entity, typeIndex);
 	}
 
-	internal unsafe static T RW<T>(this Entity entity)
+	internal unsafe static T RW<T>(this Entity entity) where T: struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
 		T* componentDataRawRW = (T*)VWorld.Game.EntityManager.GetComponentDataRawRW(entity, typeIndex);
+		if (componentDataRawRW == null)
+		{
+			throw new InvalidOperationException($"Failure to access ReadWrite <{typeof(T).Name}> typeIndex({typeIndex}) on entity({entity}).");
+		}
 		return *componentDataRawRW;
 	}
 
-	internal unsafe static T Read<T>(this Entity entity)
+	internal unsafe static T Read<T>(this Entity entity) where T : struct
 	{
 		int typeIndex = TypeManager.GetTypeIndex(Il2CppType.Of<T>());
 		T* componentDataRawRO = (T*)VWorld.Game.EntityManager.GetComponentDataRawRO(entity, typeIndex);
+		if(componentDataRawRO == null)
+		{
+			throw new InvalidOperationException($"Failure to access ReadOnly <{typeof(T).Name}> typeIndex({typeIndex}) on entity({entity}).");
+		}
 		return *componentDataRawRO;
 	}
 }
+#pragma warning restore CS8500