Merge pull request #28 from swiftly-solution/beta

Author: samyycX

managed/SwiftlyS2.PluginTemplate/SwiftlyS2.CS2.PluginTemplate.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <PackageId>SwiftlyS2.CS2.PluginTemplate</PackageId>
     <Authors>SwiftlyS2 Team</Authors>
-    <Version>0.0.7</Version>
+    <Version>0.0.9</Version>
     <Description>This is a template for creating a SwiftlyS2 plugin.</Description>
     <PackageType>Template</PackageType>
     <PackageIcon>icon.png</PackageIcon>

managed/SwiftlyS2.PluginTemplate/nupkgs/SwiftlyS2.CS2.PluginTemplate.0.0.7.nupkg

@@ -9,7 +9,7 @@
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>PluginId</AssemblyName>
     <OutputPath>$(MSBuildThisFileDirectory)build/</OutputPath>
-    <PublishDir>$(OutputPath)publish/name</PublishDir>
+    <PublishDir>$(OutputPath)publish/PluginId</PublishDir>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" ExcludeAssets="runtime" PrivateAssets="all" />
-    <PackageReference Include="SwiftlyS2.CS2" Version="0.2.18" ExcludeAssets="runtime" PrivateAssets="all" />
+    <PackageReference Include="SwiftlyS2.CS2" Version="0.2.19" ExcludeAssets="runtime" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>

managed/SwiftlyS2.PluginTemplate/nupkgs/SwiftlyS2.CS2.PluginTemplate.0.0.8.nupkg

@@ -74,6 +74,14 @@ public IEnumerable<T> GetAllEntitiesByDesignerName<T>(string designerName) where
       .Select(entity => T.From(entity.Address));
   }
 
+  public T? GetEntityByIndex<T>(uint index) where T : class, ISchemaClass<T> {
+    var handle = NativeEntitySystem.GetEntityByIndex(index);
+    if (handle == nint.Zero) {
+      return null;
+    }
+    return T.From(handle);
+  }
+
   Guid IEntitySystemService.HookEntityOutput<T>(string outputName, IEntitySystemService.EntityOutputHandler callback)
   {
     var hook = new EntityOutputHookCallback(GetEntityDesignerName<T>() ?? "", outputName, callback, _loggerFactory, _profiler);

managed/SwiftlyS2.PluginTemplate/nupkgs/SwiftlyS2.CS2.PluginTemplate.0.0.9.nupkg

@@ -323,4 +323,9 @@ public unsafe static ulong HookEntityOutput(string className, string outputName,
   public unsafe static void UnhookEntityOutput(ulong hookid) {
     _UnhookEntityOutput(hookid);
   }
+  private unsafe static delegate* unmanaged<uint, nint> _GetEntityByIndex;
+  public unsafe static nint GetEntityByIndex(uint index) {
+    var ret = _GetEntityByIndex(index);
+    return ret;
+  }
 }

managed/SwiftlyS2.PluginTemplate/templates/PluginId.csproj

@@ -60,6 +60,14 @@ public interface IEntitySystemService {
   /// <returns>All entities by designer name.</returns>
   public IEnumerable<T> GetAllEntitiesByDesignerName<T>(string designerName) where T : class, ISchemaClass<T>;
 
+  /// <summary>
+  /// Get an entity by index.
+  /// </summary>
+  /// <typeparam name="T">Entity type.</typeparam>
+  /// <param name="index">Entity index.</param>
+  /// <returns>Entity by index. Nullable.</returns>
+  public T? GetEntityByIndex<T>(uint index) where T : class, ISchemaClass<T>;
+  
   /// <summary>
   /// Represents a method that handles an entity output event, allowing custom logic to be executed when an entity
   /// triggers an output.

managed/src/SwiftlyS2.Core/Modules/EntitySystem/EntitySystem.cs

@@ -62,17 +62,14 @@ public override void Load(bool hotReload) {
       .InitializeJsonWithModel<TestConfig>("test.jsonc", "Main")
       .Configure((builder) => {
         builder.AddJsonFile("test.jsonc", optional: false, reloadOnChange: true);
-        // builder.AddYamlFile("test.yaml", optional: false, reloadOnChange: true);
       });
 
     ServiceCollection services = new();
 
     services
       .AddSwiftly(Core)
-      .AddSingleton<TestService>()
+      .AddSingleton<TestService>();
 
-      .AddOptionsWithValidateOnStart<TestConfig>()
-      .BindConfiguration("Main");
 
     var provider = services.BuildServiceProvider();
 
@@ -242,10 +239,16 @@ public void TestCommand(ICommandContext context) {
   [Command("h1")]
   public void TestCommand2(ICommandContext context)
   {
-    var dispatchspawn = Core.GameData.GetSignature("CBaseEntity::DispatchSpawn");
-    _dispatchspawn = Core.Memory.GetUnmanagedFunctionByAddress<DispatchSpawnDelegate>(dispatchspawn);
+    var token = Core.Scheduler.DelayAndRepeat(500, 1000, () => {
+      
+    });
 
-    _dispatchspawn.AddHook((next) => {
+    Core.Scheduler.StopOnMapChange(token);
+
+    var addres = Core.GameData.GetSignature("CBaseEntity::DispatchSpawn");
+    var func = Core.Memory.GetUnmanagedFunctionByAddress<DispatchSpawnDelegate>(addres);
+
+    var guid = func.AddHook((next) => {
       return (pEntity, pKV) => {
         Console.WriteLine("TestPlugin DispatchSpawn " + order++);
         return next()(pEntity, pKV);
@@ -280,8 +283,6 @@ public void TestCommand3(ICommandContext context)
   [Command("tt3")]
   public void TestCommand33(ICommandContext context)
   {
-    var ent = Core.EntitySystem.CreateEntity<CPointWorldText>();
-    _dispatchspawn.CallOriginal(ent.Address, 0);
   }
 
   [Command("tt4")]

managed/src/SwiftlyS2.Generated/Natives/EntitySystem.cs

@@ -27,4 +27,5 @@ ptr EntityHandleGet = uint32 handle
 uint32 GetEntityHandleFromEntity = ptr entity
 ptr GetFirstActiveEntity = void
 uint64 HookEntityOutput = string className, string outputName, ptr callback // CEntityIOOutput*, string outputName, CEntityInstance* activator, CEntityInstance* caller, float delay -> int (HookResult)
-void UnhookEntityOutput = uint64 hookid
+void UnhookEntityOutput = uint64 hookid
+ptr GetEntityByIndex = uint32 index