feat: add AcceptInput method to CEntityInstance (#228)

CMakeLists.txt

@@ -18,6 +18,7 @@ SET(SOURCE_FILES
     src/mm_plugin.h
     libraries/hl2sdk-cs2/tier1/convar.cpp
     libraries/hl2sdk-cs2/tier1/generichash.cpp
+    libraries/hl2sdk-cs2/entity2/entityidentity.cpp
     libraries/hl2sdk-cs2/entity2/entitysystem.cpp
     libraries/dotnet/hostfxr.h
     libraries/dotnet/coreclr_delegates.h

configs/addons/counterstrikesharp/gamedata/gamedata.json

@@ -113,6 +113,13 @@
         "linux": "\\x48\\x85\\xFF\\x74\\x4B\\x55\\x48\\x89\\xE5\\x41\\x56"
       }
   },
+  "CEntityInstance_AcceptInput": {
+    "signatures": {
+      "library": "server",
+      "windows": "\\x48\\x89\\x5C\\x24\\x10\\x48\\x89\\x74\\x24\\x18\\x57\\x48\\x83\\xEC\\x40\\x49\\x8B\\xF0",
+      "linux": "\\x55\\x48\\x89\\xE5\\x41\\x57\\x49\\x89\\xFF\\x41\\x56\\x48\\x8D\\x7D\\xC0"
+    }
+  },
   "LegacyGameEventListener": {
     "signatures": {
       "library": "server",

makefiles/shared.cmake

@@ -14,8 +14,11 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING
 # TODO: Use C++20 instead.
 set(CMAKE_CXX_STANDARD 17)
 
-Set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-Set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+if (LINUX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+endif()
+
 set(CMAKE_STATIC_LIBRARY_PREFIX "")
 
 set(SOURCESDK_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libraries/hl2sdk-cs2)
@@ -51,8 +54,4 @@ include_directories(
     libraries
 )
 
-include(${CMAKE_CURRENT_LIST_DIR}/metamod/configure_metamod.cmake)
-
-if (LINUX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/metamod/configure_metamod.cmake)

managed/CounterStrikeSharp.API/Core/API.cs

@@ -312,6 +312,16 @@ namespace CounterStrikeSharp.API.Core
 			}
 		}
 
+        public static int GetMaxClients(){
+			lock (ScriptContext.GlobalScriptContext.Lock) {
+			ScriptContext.GlobalScriptContext.Reset();
+			ScriptContext.GlobalScriptContext.SetIdentifier(0x5DF2E20D);
+			ScriptContext.GlobalScriptContext.Invoke();
+			ScriptContext.GlobalScriptContext.CheckErrors();
+			return (int)ScriptContext.GlobalScriptContext.GetResult(typeof(int));
+			}
+		}
+
         public static void IssueServerCommand(string command){
 			lock (ScriptContext.GlobalScriptContext.Lock) {
 			ScriptContext.GlobalScriptContext.Reset();

managed/CounterStrikeSharp.API/Core/Model/CEntityInstance.cs

@@ -58,6 +58,24 @@ public partial class CEntityInstance : IEquatable<CEntityInstance>
     {
         return !Equals(left, right);
     }
+    
+    /// <summary>
+    /// Calls a named input method on an entity.
+    /// <example>
+    /// <code>
+    /// entity.AcceptInput("Break");
+    /// </code>
+    /// </example>
+    /// </summary>
+    /// <param name="inputName">Input action name</param>
+    /// <param name="activator">Entity which initiated the action, <see langword="null"/> for no entity</param>
+    /// <param name="caller">Entity that is sending the event, <see langword="null"/> for no entity</param>
+    /// <param name="value">String variant value to send with the event</param>
+    /// <param name="outputId">Unknown, defaults to 0</param>
+    public void AcceptInput(string inputName, CEntityInstance? activator = null, CEntityInstance? caller = null, string value = "", int outputId = 0)
+    {
+        VirtualFunctions.AcceptInput(Handle, inputName, activator?.Handle ?? IntPtr.Zero, caller?.Handle ?? IntPtr.Zero, value, 0);
+    }
 }
 
 public partial class CEntityIdentity

managed/CounterStrikeSharp.API/Modules/Events/GameEvent.cs

@@ -76,8 +76,7 @@ namespace CounterStrikeSharp.API.Modules.Events
                     SetInt(name, i);
                     break;
                 case var _ when value is CCSPlayerController player:
-                    // When I was testing this, the code seems to expect a slot, even though it is called index
-                    SetEntityIndex(name, (int)player.Index - 1);
+                    NativeAPI.SetEventPlayerController(Handle, name, player.Handle);
                     break;
                 case var _ when value is string s:
                     SetString(name, s);

managed/CounterStrikeSharp.API/Modules/Memory/VirtualFunctions.cs

@@ -80,4 +80,7 @@ public static class VirtualFunctions
     public static MemoryFunctionVoid<IntPtr, IntPtr>  RemovePlayerItemFunc =
         new(GameData.GetSignature("CBasePlayerPawn_RemovePlayerItem"));
     public static Action<IntPtr, IntPtr> RemovePlayerItemVirtual = RemovePlayerItemFunc.Invoke;
+    
+    public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, string, int> AcceptInputFunc = new(GameData.GetSignature("CEntityInstance_AcceptInput"));
+    public static Action<IntPtr, string, IntPtr, IntPtr, string, int> AcceptInput = AcceptInputFunc.Invoke;
 }

managed/CounterStrikeSharp.API/Server.cs

@@ -75,7 +75,7 @@ namespace CounterStrikeSharp.API
 
         public static string GameDirectory => NativeAPI.GetGameDirectory();
 
-        public static int MaxPlayers => NativeAPI.GetCommandParamValue("-maxplayers", DataType.DATA_TYPE_INT, 64);
+        public static int MaxPlayers => NativeAPI.GetMaxClients();
 
         public static bool IsMapValid(string mapName) => NativeAPI.IsMapValid(mapName);
 

managed/CounterStrikeSharp.API/Utilities.cs

@@ -136,9 +136,9 @@ namespace CounterStrikeSharp.API
         {
             List<CCSPlayerController> players = new();
 
-            for (int i = 1; i <= Server.MaxPlayers; i++)
+            for (int i = 0; i <= Server.MaxPlayers; i++)
             {
-                var controller = GetPlayerFromIndex(i);
+                var controller = GetPlayerFromSlot(i);
 
                 if (!controller.IsValid || controller.UserId == -1)
                     continue;

managed/TestPlugin/TestPlugin.cs

@@ -83,8 +83,6 @@ namespace TestPlugin
             Logger.LogInformation(
                 $"Test Plugin has been loaded, and the hot reload flag was {hotReload}, path is {ModulePath}");
 
-            Logger.LogWarning($"Max Players: {Server.MaxPlayers}");
-            
             VirtualFunctions.SwitchTeamFunc.Hook(hook =>
             {
                 Logger.LogInformation("Switch team func called");
@@ -503,6 +501,17 @@ namespace TestPlugin
             player.Respawn();
         }
 
+        [ConsoleCommand("css_break", "Breaks the breakable entities")]
+        public void OnBreakCommand(CCSPlayerController? player, CommandInfo command)
+        {
+            var entities = Utilities.FindAllEntitiesByDesignerName<CBreakable>("prop_dynamic")
+                .Concat(Utilities.FindAllEntitiesByDesignerName<CBreakable>("func_breakable"));
+            foreach (var entity in entities)
+            {
+                entity.AcceptInput("Break");
+            }
+        }
+
         [ConsoleCommand("cssharp_attribute", "This is a custom attribute event")]
         public void OnCommand(CCSPlayerController? player, CommandInfo command)
         {

src/core/managers/entity_manager.h

@@ -25,9 +25,6 @@
 #include "entitysystem.h"
 #include "scripting/callback_manager.h"
 
-// variant.h depends on ivscript.h, lets not include the whole thing
-DECLARE_POINTER_HANDLE(HSCRIPT);
-
 #include <variant.h>
 
 namespace counterstrikesharp {

src/mm_plugin.cpp

@@ -31,9 +31,13 @@
 #include "entity2/entitysystem.h"
 #include "interfaces/cs2_interfaces.h"
 
-
 counterstrikesharp::GlobalClass* counterstrikesharp::GlobalClass::head = nullptr;
 
+CGameEntitySystem *GameEntitySystem()
+{
+    return counterstrikesharp::globals::entitySystem;
+}
+
 // TODO: Workaround for windows, we __MUST__ have COUNTERSTRIKESHARP_API to handle it.
 // like on windows it should be `extern "C" __declspec(dllexport)`, on linux it should be anything else.
 DLL_EXPORT void InvokeNative(counterstrikesharp::fxNativeContext& context)

src/scripting/natives/natives_engine.cpp

@@ -30,6 +30,7 @@
 #include "core/memory.h"
 #include "core/log.h"
 #include "core/function.h"
+#include "core/managers/player_manager.h"
 #include "core/managers/server_manager.h"
 // clang-format on
 
@@ -74,6 +75,17 @@ float GetGameFrameTime(ScriptContext& script_context)
 
 double GetEngineTime(ScriptContext& script_context) { return Plat_FloatTime(); }
 
+int GetMaxClients(ScriptContext& script_context)
+{
+    auto globalVars = globals::getGlobalVars();
+    if (globalVars == nullptr) {
+        script_context.ThrowNativeError("Global Variables not initialized yet.");
+        return -1;
+    }
+
+    return globalVars->maxClients;
+}
+
 void ServerCommand(ScriptContext& script_context)
 {
     auto command = script_context.GetArgument<const char*>(0);
@@ -294,6 +306,7 @@ REGISTER_NATIVES(engine, {
     ScriptEngine::RegisterNativeHandler("GET_CURRENT_TIME", GetCurrentTime);
     ScriptEngine::RegisterNativeHandler("GET_GAMEFRAME_TIME", GetGameFrameTime);
     ScriptEngine::RegisterNativeHandler("GET_ENGINE_TIME", GetEngineTime);
+    ScriptEngine::RegisterNativeHandler("GET_MAX_CLIENTS", GetMaxClients);
     ScriptEngine::RegisterNativeHandler("ISSUE_SERVER_COMMAND", ServerCommand);
     ScriptEngine::RegisterNativeHandler("PRECACHE_MODEL", PrecacheModel);
     ScriptEngine::RegisterNativeHandler("PRECACHE_SOUND", PrecacheSound);

src/scripting/natives/natives_engine.yaml

@@ -6,6 +6,7 @@ GET_CURRENT_TIME: -> float
 GET_TICK_COUNT: -> int
 GET_GAME_FRAME_TIME: -> float
 GET_ENGINE_TIME: -> double
+GET_MAX_CLIENTS: -> int
 ISSUE_SERVER_COMMAND: command:string -> void
 PRECACHE_MODEL: name:string -> void
 PRECACHE_SOUND: name:string, preload:bool -> bool