Merge pull request #91 from SupinePandora43/libtier0_client

Use Correct tier0 on Linux || Use valid path to Tier0 on macos

Author: GlebChili

gm_dotnet_managed/GmodNET/GameConsoleWriter.cs

@@ -1,3 +1,4 @@
+using GmodNET.API;
 using System;
 using System.IO;
 using System.Runtime.InteropServices;
@@ -13,9 +14,103 @@ internal class GameConsoleWriter : TextWriter
         public override string NewLine => "\n";
         public override Encoding Encoding => Encoding.UTF8;
 
-#pragma warning disable CA2101
-        [DllImport("tier0", CallingConvention = CallingConvention.Cdecl)]
-        private static extern void Msg([MarshalAs(UnmanagedType.LPUTF8Str)] string msg);
+        public GameConsoleWriter(ILua lua)
+        {
+            if (OperatingSystem.IsWindows())
+            {
+                Msg = Msg_Tier0;
+            }
+            else if (OperatingSystem.IsLinux())
+            {
+                lua.PushSpecial(SPECIAL_TABLES.SPECIAL_GLOB);
+                lua.GetField(-1, "game");
+                lua.GetField(-1, "IsDedicated");
+                lua.MCall(0, 1);
+                bool is_dedicated = lua.GetBool(-1);
+                lua.Pop(3);
+
+                if (is_dedicated)
+                {
+                    Msg = Msg_Tier0;
+                }
+                else
+                {
+                    Msg = Msg_Tier0_Client;
+                }
+            }
+            else if (OperatingSystem.IsMacOS())
+            {
+                unsafe
+                {
+                    IntPtr lib_handle = NativeLibrary.Load(Directory.GetCurrentDirectory() + "/GarrysMod_Signed.app/Contents/MacOS/libtier0.dylib");
+                    delegate* unmanaged[Cdecl]<byte*, void> msg_func = (delegate* unmanaged[Cdecl]<byte*, void>)NativeLibrary.GetExport(lib_handle, "Msg");
+
+                    Msg = (message) =>
+                    {
+                        byte* __message_gen_native = default;
+                        //
+                        // Setup
+                        //
+                        bool message__allocated = false;
+                        try
+                        {
+                            //
+                            // Marshal
+                            //
+                            if (message != null)
+                            {
+                                int message__bytelen = (message.Length + 1) * 3 + 1;
+                                if (message__bytelen > 260)
+                                {
+                                    __message_gen_native = (byte*)System.Runtime.InteropServices.Marshal.StringToCoTaskMemUTF8(message);
+                                    message__allocated = true;
+                                }
+                                else
+                                {
+                                    byte* path__stackptr = stackalloc byte[message__bytelen];
+                                    {
+                                        message__bytelen = System.Text.Encoding.UTF8.GetBytes(message, new System.Span<byte>(path__stackptr, message__bytelen));
+                                        path__stackptr[message__bytelen] = 0;
+                                    }
+
+                                    __message_gen_native = (byte*)path__stackptr;
+                                }
+                            }
+
+                            //
+                            // Invoke
+                            //
+                            msg_func(__message_gen_native);
+                        }
+                        finally
+                        {
+                            //
+                            // Cleanup
+                            //
+                            if (message__allocated)
+                            {
+                                System.Runtime.InteropServices.Marshal.FreeCoTaskMem((System.IntPtr)__message_gen_native);
+                            }
+                        }
+                    };
+                }
+            }
+            else Msg = (string msg) => throw new PlatformNotSupportedException();
+        }
+
+#pragma warning disable CA2101 // workaround for https://github.com/dotnet/roslyn-analyzers/issues/5009
+
+        [DllImport("tier0", EntryPoint = "Msg", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Msg_Tier0([MarshalAs(UnmanagedType.LPUTF8Str)] string msg);
+
+        [DllImport("tier0_client", EntryPoint = "Msg", CallingConvention = CallingConvention.Cdecl)]
+        private static extern void Msg_Tier0_Client([MarshalAs(UnmanagedType.LPUTF8Str)] string msg);
+
+#pragma warning restore CA2101
+
+        private delegate void MsgFunc(string str);
+
+        private static MsgFunc Msg;
 
         public override void Write(string value)
         {

gm_dotnet_managed/GmodNET/Startup.cs

@@ -40,6 +40,8 @@ internal static unsafe IntPtr Main(IntPtr lua_base, IntPtr native_version_string
                         $"Native version: {native_version}");
                 }
 
+                ILua lua = new Lua(lua_base);
+
                 if (FirstRun)
                 {
                     Span<IntPtr> params_from_native_code = new Span<IntPtr>((void*)param, 55);
@@ -158,15 +160,13 @@ internal static unsafe IntPtr Main(IntPtr lua_base, IntPtr native_version_string
 
                     ManagedFunctionMetaMethods.NativeDelegateExecutor = native_delegate_executor_ptr;
 
-                    Console.SetOut(new GameConsoleWriter());
+                    Console.SetOut(new GameConsoleWriter(lua));
 
                     FirstRun = false;
                 }
 
                 *managed_delegate_executor_ptr = (IntPtr)(delegate* unmanaged<IntPtr, int>)&ManagedFunctionMetaMethods.ManagedDelegateExecutor;
 
-                ILua lua = new Lua(lua_base);
-
                 lua.PushSpecial(SPECIAL_TABLES.SPECIAL_GLOB);
                 lua.GetField(-1, "print");
                 lua.PushString(