wip ConVar manager

Kxnrl · Kxnrl · commit 333305aa3c7c · 2023-06-05T20:18:23.000+08:00
diff --git a/.editorconfig b/.editorconfig
@@ -7,11 +7,37 @@ charset = "utf-8"
 [*.cs]
 csharp_style_namespace_declarations = file_scoped:error
 csharp_using_directive_placement = outside_namespace:error
-dotnet_diagnostic.CS4014.severity = error
+dotnet_diagnostic.cs4014.severity = error
 indent_size = 4
 
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_between_query_expression_clauses = true
+
+# ReSharper properties
+resharper_csharp_wrap_arguments_style = chop_if_long
+resharper_csharp_wrap_before_binary_opsign = true
+resharper_csharp_wrap_extends_list_style = chop_if_long
+resharper_csharp_wrap_multiple_declaration_style = chop_always
+resharper_csharp_wrap_parameters_style = chop_if_long
+resharper_keep_existing_embedded_arrangement = false
+resharper_keep_existing_expr_member_arrangement = false
+resharper_keep_existing_switch_expression_arrangement = false
+resharper_nested_ternary_style = expanded
+resharper_new_line_before_while = true
+resharper_place_accessorholder_attribute_on_same_line = false
+resharper_place_field_attribute_on_same_line = false
+resharper_place_simple_embedded_statement_on_same_line = false
+resharper_space_within_single_line_array_initializer_braces = true
+resharper_wrap_array_initializer_style = chop_if_long
+resharper_wrap_chained_binary_expressions = chop_if_long
+resharper_wrap_chained_binary_patterns = chop_if_long
+resharper_wrap_chained_method_calls = chop_if_long
+resharper_wrap_linq_expressions = chop_always
+resharper_wrap_list_pattern = chop_if_long
+
 [*.json]
 indent_size = 2
 
 [*.{xml,config}]
-indent_size = 2
+indent_size = 2
diff --git a/BindingGenerator/CoreLibrary.cs b/BindingGenerator/CoreLibrary.cs
@@ -26,6 +26,7 @@ public void Setup(Driver driver)
         var projectFolder = Environment.GetEnvironmentVariable("SOURCESHARP")!;
 
         var options = driver.Options;
+        options.Verbose = true;
         options.GeneratorKind = GeneratorKind.CSharp;
         options.OutputDir = Path.Combine(projectFolder, "runtime", "Core", "Bridges");
 
@@ -46,7 +47,8 @@ public void Setup(Driver driver)
 
     public void SetupPasses(Driver driver)
     {
-
+        driver.Context.TranslationUnitPasses.AddPass(new CppSharp.Passes.FunctionToInstanceMethodPass());
+        driver.Context.TranslationUnitPasses.AddPass(new CppSharp.Passes.FunctionToStaticMethodPass());
     }
 
 }
diff --git a/Core/Bootstrap.cs b/Core/Bootstrap.cs
@@ -86,7 +86,7 @@ private static void ConfigureServices(IServiceCollection services, IConfiguratio
 
         services.AddSingleton<IAdminManager, AdminManager>();
         services.AddSingleton<ICommandListener, CommandListener>();
-        //services.AddSingleton<IConVarManager, ConVarManager>();
+        services.AddSingleton<IConVarManager, ConVarManager>();
         //services.AddSingleton<IGameEventListener, GameEventListener>();
         services.AddSingleton<IPlayerListener, PlayerListener>();
         services.AddSingleton<IPlayerManagerBase, PlayerManager>();
diff --git a/Core/Bridges/ConVar.cs b/Core/Bridges/ConVar.cs
@@ -14,12 +14,86 @@
 
 namespace SourceSharp.Core.Bridges
 {
+    public unsafe partial class ConVar
+    {
+        public partial struct __Internal
+        {
+        }
+
+        public __IntPtr __Instance { get; protected set; }
+
+        internal static readonly new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::SourceSharp.Core.Bridges.ConVar> NativeToManagedMap =
+            new global::System.Collections.Concurrent.ConcurrentDictionary<IntPtr, global::SourceSharp.Core.Bridges.ConVar>();
+
+        internal static void __RecordNativeToManagedMapping(IntPtr native, global::SourceSharp.Core.Bridges.ConVar managed)
+        {
+            NativeToManagedMap[native] = managed;
+        }
+
+        internal static bool __TryGetNativeToManagedMapping(IntPtr native, out global::SourceSharp.Core.Bridges.ConVar managed)
+        {
+    
+            return NativeToManagedMap.TryGetValue(native, out managed);
+        }
+
+        protected bool __ownsNativeInstance;
+
+        internal static ConVar __CreateInstance(__IntPtr native, bool skipVTables = false)
+        {
+            if (native == __IntPtr.Zero)
+                return null;
+            return new ConVar(native.ToPointer(), skipVTables);
+        }
+
+        internal static ConVar __GetOrCreateInstance(__IntPtr native, bool saveInstance = false, bool skipVTables = false)
+        {
+            if (native == __IntPtr.Zero)
+                return null;
+            if (__TryGetNativeToManagedMapping(native, out var managed))
+                return (ConVar)managed;
+            var result = __CreateInstance(native, skipVTables);
+            if (saveInstance)
+                __RecordNativeToManagedMapping(native, result);
+            return result;
+        }
+
+        internal static ConVar __CreateInstance(__Internal native, bool skipVTables = false)
+        {
+            return new ConVar(native, skipVTables);
+        }
+
+        private static void* __CopyValue(__Internal native)
+        {
+            var ret = Marshal.AllocHGlobal(sizeof(__Internal));
+            *(__Internal*) ret = native;
+            return ret.ToPointer();
+        }
+
+        private ConVar(__Internal native, bool skipVTables = false)
+            : this(__CopyValue(native), skipVTables)
+        {
+            __ownsNativeInstance = true;
+            __RecordNativeToManagedMapping(__Instance, this);
+        }
+
+        protected ConVar(void* native, bool skipVTables = false)
+        {
+            if (native == null)
+                return;
+            __Instance = new __IntPtr(native);
+        }
+    }
+
     public unsafe partial class SSConVar : IDisposable
     {
-        [StructLayout(LayoutKind.Sequential, Size = 8)]
+        [StructLayout(LayoutKind.Sequential, Size = 16)]
         public partial struct __Internal
         {
             internal __IntPtr m_pConVar;
+            internal byte m_bRegister;
+
+            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "??0SSConVar@@QEAA@PEAVConVar@@_N@Z", CallingConvention = __CallingConvention.Cdecl)]
+            internal static extern __IntPtr ctor(__IntPtr __instance, __IntPtr pVar, bool bRegister);
 
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "??0SSConVar@@QEAA@AEBV0@@Z", CallingConvention = __CallingConvention.Cdecl)]
             internal static extern __IntPtr cctor(__IntPtr __instance, __IntPtr _0);
@@ -28,12 +102,6 @@ public partial struct __Internal
             [return: MarshalAs(UnmanagedType.I1)]
             internal static extern bool ReplicateToPlayers(__IntPtr __instance, int[] pPlayers, int nPlayers);
 
-            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "?GetName@SSConVar@@QEAAPEBDXZ", CallingConvention = __CallingConvention.Cdecl)]
-            internal static extern __IntPtr GetName(__IntPtr __instance);
-
-            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "?GetDefault@SSConVar@@QEAAPEBDXZ", CallingConvention = __CallingConvention.Cdecl)]
-            internal static extern __IntPtr GetDefault(__IntPtr __instance);
-
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "?GetDescription@SSConVar@@QEAAPEBDXZ", CallingConvention = __CallingConvention.Cdecl)]
             internal static extern __IntPtr GetDescription(__IntPtr __instance);
 
@@ -93,6 +161,9 @@ public partial struct __Internal
 
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "?SetHasMax@SSConVar@@QEAAX_N@Z", CallingConvention = __CallingConvention.Cdecl)]
             internal static extern void SetHasMax(__IntPtr __instance, bool has);
+
+            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "?GetBase@SSConVar@@QEAAPEAVConVar@@XZ", CallingConvention = __CallingConvention.Cdecl)]
+            internal static extern __IntPtr GetBase(__IntPtr __instance);
         }
 
         public __IntPtr __Instance { get; protected set; }
@@ -158,11 +229,13 @@ protected SSConVar(void* native, bool skipVTables = false)
             __Instance = new __IntPtr(native);
         }
 
-        public SSConVar()
+        public SSConVar(global::SourceSharp.Core.Bridges.ConVar pVar, bool bRegister)
         {
             __Instance = Marshal.AllocHGlobal(sizeof(global::SourceSharp.Core.Bridges.SSConVar.__Internal));
             __ownsNativeInstance = true;
             __RecordNativeToManagedMapping(__Instance, this);
+            var __arg0 = pVar is null ? __IntPtr.Zero : pVar.__Instance;
+            __Internal.ctor(__Instance, __arg0, bRegister);
         }
 
         public SSConVar(global::SourceSharp.Core.Bridges.SSConVar _0)
@@ -197,24 +270,6 @@ public bool ReplicateToPlayers(int[] pPlayers, int nPlayers)
             return ___ret;
         }
 
-        public string Name
-        {
-            get
-            {
-                var ___ret = __Internal.GetName(__Instance);
-                return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ___ret);
-            }
-        }
-
-        public string Default
-        {
-            get
-            {
-                var ___ret = __Internal.GetDefault(__Instance);
-                return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ___ret);
-            }
-        }
-
         public string Description
         {
             get
@@ -349,20 +404,51 @@ public bool HasMax
                 __Internal.SetHasMax(__Instance, value);
             }
         }
+
+        public global::SourceSharp.Core.Bridges.ConVar Base
+        {
+            get
+            {
+                var ___ret = __Internal.GetBase(__Instance);
+                var __result0 = global::SourceSharp.Core.Bridges.ConVar.__GetOrCreateInstance(___ret, false);
+                return __result0;
+            }
+        }
     }
 
     public unsafe partial class ConVar
     {
         public partial struct __Internal
         {
+            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "GetSSConVarName", CallingConvention = __CallingConvention.Cdecl)]
+            internal static extern __IntPtr GetSSConVarName(__IntPtr pVar);
+
+            [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "GetSSConVarDefault", CallingConvention = __CallingConvention.Cdecl)]
+            internal static extern __IntPtr GetSSConVarDefault(__IntPtr pVar);
+
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "CreateConVar", CallingConvention = __CallingConvention.Cdecl)]
             internal static extern __IntPtr CreateConVar([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pName, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pDefValue, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pDescription, int nFlags, bool bHasMin, float flMin, bool bHasMax, float flMax);
 
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "FindConVar", CallingConvention = __CallingConvention.Cdecl)]
             internal static extern __IntPtr FindConVar([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pName);
 
             [SuppressUnmanagedCodeSecurity, DllImport("sourcesharp", EntryPoint = "RegisterConVarHook", CallingConvention = __CallingConvention.Cdecl)]
-            internal static extern void RegisterConVarHook([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pName);
+            [return: MarshalAs(UnmanagedType.I1)]
+            internal static extern bool RegisterConVarHook([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef = typeof(CppSharp.Runtime.UTF8Marshaller))] string pName);
+        }
+
+        public static string GetSSConVarName(global::SourceSharp.Core.Bridges.SSConVar pVar)
+        {
+            var __arg0 = pVar is null ? __IntPtr.Zero : pVar.__Instance;
+            var ___ret = __Internal.GetSSConVarName(__arg0);
+            return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ___ret);
+        }
+
+        public static string GetSSConVarDefault(global::SourceSharp.Core.Bridges.SSConVar pVar)
+        {
+            var __arg0 = pVar is null ? __IntPtr.Zero : pVar.__Instance;
+            var ___ret = __Internal.GetSSConVarDefault(__arg0);
+            return CppSharp.Runtime.MarshalUtil.GetString(global::System.Text.Encoding.UTF8, ___ret);
         }
 
         public static global::SourceSharp.Core.Bridges.SSConVar CreateConVar(string pName, string pDefValue, string pDescription, int nFlags, bool bHasMin, float flMin, bool bHasMax, float flMax)
@@ -379,9 +465,10 @@ public partial struct __Internal
             return __result0;
         }
 
-        public static void RegisterConVarHook(string pName)
+        public static bool RegisterConVarHook(string pName)
         {
-            __Internal.RegisterConVarHook(pName);
+            var ___ret = __Internal.RegisterConVarHook(pName);
+            return ___ret;
         }
     }
 }
diff --git a/Core/Invoker.cs b/Core/Invoker.cs
@@ -31,7 +31,7 @@ internal static void Initialize(IServiceProvider services)
         _playerManager = services.GetRequiredService<IPlayerManagerBase>();
         _playerListener = services.GetRequiredService<IPlayerListener>();
         //_gameEventListener = services.GetRequiredService<IGameEventListener>();
-        //_conVarManager = services.GetRequiredService<IConVarManager>();
+        _conVarManager = services.GetRequiredService<IConVarManager>();
     }
 
     /*
@@ -123,6 +123,18 @@ public static int ClientConsoleCommand(
 
     #endregion
 
+    #region ConVar
+
+    [UnmanagedCallersOnly]
+    public static void OnConVarChanged([DNNE.C99Type("const char*")] IntPtr pName,
+        [DNNE.C99Type("const char*")] IntPtr pOldValue,
+        [DNNE.C99Type("const char*")] IntPtr pNewValue)
+    {
+
+    }
+
+    #endregion
+
     #region Event Listener
 
     [UnmanagedCallersOnly]
diff --git a/Core/Models/CConVar.cs b/Core/Models/CConVar.cs
@@ -13,6 +13,7 @@ internal class CConVar : ConVar
     private readonly SSConVar _conVar;
     private readonly string _name;
     private readonly string _description;
+    public override event Action<ConVar, string, string>? OnChanged;
 
     public CConVar(SSConVar conVar, string name, string description)
     {
diff --git a/Core/Modules/ConVarManager.cs b/Core/Modules/ConVarManager.cs
@@ -133,7 +133,7 @@ private void HookConVars(CPlugin plugin)
 
                 return new ConVarHookInfo(conVar);
             },
-            ConVarBridge.RegisterConVarHook);
+            name => ConVarBridge.RegisterConVarHook(name));
 
     /*
      *  IRuntime
diff --git a/PluginExample/Example.cs b/PluginExample/Example.cs
@@ -31,6 +31,10 @@ public override bool OnLoad()
     {
         _sourceSharp.LogMessage("plugin loaded");
         _shareSystem.AddInterface(this, this);
+
+        ss_plugin_example.OnChanged += (var, oldValue, newValue) =>
+            _sourceSharp.LogMessage($"ConVar [{var.Name}] -> old<{oldValue}> -> new<{newValue}");
+
         return true;
     }
 
diff --git a/Sdk/Models/ConVar.cs b/Sdk/Models/ConVar.cs
@@ -60,6 +60,11 @@ public ConVarFlags Flags
     /// <returns>True = 成功</returns>
     public abstract bool ReplicateToPlayers(GamePlayer[] players);
 
+    /// <summary>
+    /// 订阅修改事件
+    /// </summary>
+    public abstract event Action<ConVar, string, string> OnChanged;
+
     protected abstract ConVarBounds GetBounds();
     protected abstract void SetBounds(ConVarBounds bounds);
     protected abstract string GetDescription();

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public void Setup(Driver driver)`
`26`	`26`	`var projectFolder = Environment.GetEnvironmentVariable("SOURCESHARP")!;`
`27`	`27`
`28`	`28`	`var options = driver.Options;`
	`29`	`+ options.Verbose = true;`
`29`	`30`	`options.GeneratorKind = GeneratorKind.CSharp;`
`30`	`31`	`options.OutputDir = Path.Combine(projectFolder, "runtime", "Core", "Bridges");`
`31`	`32`
`@@ -46,7 +47,8 @@ public void Setup(Driver driver)`
`46`	`47`
`47`	`48`	`public void SetupPasses(Driver driver)`
`48`	`49`	`{`
`49`		`-`
	`50`	`+ driver.Context.TranslationUnitPasses.AddPass(new CppSharp.Passes.FunctionToInstanceMethodPass());`
	`51`	`+ driver.Context.TranslationUnitPasses.AddPass(new CppSharp.Passes.FunctionToStaticMethodPass());`
`50`	`52`	`}`
`51`	`53`
`52`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ internal class CConVar : ConVar`
`13`	`13`	`private readonly SSConVar _conVar;`
`14`	`14`	`private readonly string _name;`
`15`	`15`	`private readonly string _description;`
	`16`	`+ public override event Action<ConVar, string, string>? OnChanged;`
`16`	`17`
`17`	`18`	`public CConVar(SSConVar conVar, string name, string description)`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ public override bool OnLoad()`
`31`	`31`	`{`
`32`	`32`	`_sourceSharp.LogMessage("plugin loaded");`
`33`	`33`	`_shareSystem.AddInterface(this, this);`
	`34`	`+`
	`35`	`+ ss_plugin_example.OnChanged += (var, oldValue, newValue) =>`
	`36`	`+ _sourceSharp.LogMessage($"ConVar [{var.Name}] -> old<{oldValue}> -> new<{newValue}");`
	`37`	`+`
`34`	`38`	`return true;`
`35`	`39`	`}`
`36`	`40`