Improved logs, make it work for INetworkSerializable and INetworkMessage

Author: EvaisaDev

NetcodePatcher/CodeGen/ILPostProcessorFromFile.cs

@@ -20,17 +20,19 @@ public static ILPostProcessResult NetworkBehaviourProcess(ICompiledAssembly asse
             NetworkBehaviourILPP ilpp = new NetworkBehaviourILPP();
             if (ilpp.WillProcess(assembly))
             {
-                //Debug.Log("Will Process: " + assembly.Name);
 
                 // process it like Unity would
                 ILPostProcessResult result = ilpp.Process(assembly);
 
+
                 // handle the error messages like Unity would
+                
                 foreach (DiagnosticMessage message in result.Diagnostics)
                 {
                     if (message.DiagnosticType == DiagnosticType.Warning)
                     {
-                        OnWarning(message.MessageData);
+                        // console output
+                        OnWarning(message.MessageData + $"{message.File}:{message.Line}");
                     }
                     else if (message.DiagnosticType == DiagnosticType.Error)
                     {
@@ -58,7 +60,7 @@ public static ILPostProcessResult INetworkMessageProcess(ICompiledAssembly assem
                 {
                     if (message.DiagnosticType == DiagnosticType.Warning)
                     {
-                        OnWarning(message.MessageData);
+                        OnWarning(message.MessageData + $"{message.File}:{message.Line}");
                     }
                     else if (message.DiagnosticType == DiagnosticType.Error)
                     {
@@ -86,7 +88,7 @@ public static ILPostProcessResult INetworkSerializableProcess(ICompiledAssembly
                 {
                     if (message.DiagnosticType == DiagnosticType.Warning)
                     {
-                        OnWarning(message.MessageData);
+                        OnWarning(message.MessageData + $"{message.File}:{message.Line}");
                     }
                     else if (message.DiagnosticType == DiagnosticType.Error)
                     {
@@ -108,21 +110,27 @@ public static void ILPostProcessFile(string assemblyPath, string[] references, A
 
             var result = NetworkBehaviourProcess(assembly, OnWarning, OnError);
 
-            /*if (result != null)
+            if (result != null)
             {
-                assembly = new CompiledAssemblyFromInMemoryAssembly(result.InMemoryAssembly, assembly.Name);
+                var newAssembly = new CompiledAssemblyFromInMemoryAssembly(result.InMemoryAssembly, assembly.Name);
+                newAssembly.References = references;
+
+                assembly = newAssembly;
             }
 
             result = INetworkMessageProcess(assembly, OnWarning, OnError);
-            
-            
+          
+
             if (result != null)
             {
-                assembly = new CompiledAssemblyFromInMemoryAssembly(result.InMemoryAssembly, assembly.Name);
+                var newAssembly = new CompiledAssemblyFromInMemoryAssembly(result.InMemoryAssembly, assembly.Name);
+                newAssembly.References = references;
+
+                assembly = newAssembly;
             }
 
             result = INetworkSerializableProcess(assembly, OnWarning, OnError);
-            */
+            
 
             // save the weaved assembly to file.
             // some tests open it and check for certain IL code.

NetcodePatcher/Main.cs

@@ -121,26 +121,60 @@ public static void Patch(string pluginPath, string managedPath)
                 managedPath + "\\Unity.Networking.Transport.dll",
             };
 
+            List<string> blackList = new List<string>()
+            {
+                "Unity.Netcode.Runtime",
+                "UnityEngine.CoreModule",
+                "Unity.Netcode.Components",
+                "Unity.Networking.Transport",
+                "Assembly-CSharp"
+            };
+
             foreach (string text3 in Directory.GetFiles(pluginPath, "*.dll", SearchOption.AllDirectories))
             {
                 string fileName = Path.GetFileName(text3);
                 if (!fileName.ToLower().Contains("mmhook"))
                 {
+                    //Patcher.Logger.LogMessage("Checking : " + fileName);
+                    var found = false;
+
                     foreach (TypeDefinition typeDefinition in AssemblyDefinition.ReadAssembly(text3).MainModule.Types)
                     {
 
 
                         if (typeDefinition.BaseType != null)
                         {
-                            ;                           // check if subclass of NetworkBehaviour
+                            // check if subclass of NetworkBehaviour
                             if (typeDefinition.IsSubclassOf(typeof(NetworkBehaviour).FullName))
                             {
-
+                                var skip = false;
+                                // check if contains blacklisted phrases
+                                foreach (string blacklisted in blackList)
+                                {
+                                    if (fileName.ToLowerInvariant().Contains(blacklisted.ToLowerInvariant()))
+                                    {
+                                        skip = true;
+                                    }
+                                }
+
+                                if (skip)
+                                {
+                                    break;
+                                }
+
+                                found = true;
                                 hashSet.Add(text3);
+                                Patcher.Logger.LogMessage($"Found NetworkBehaviour({typeof(NetworkBehaviour).FullName}) in : " + fileName);
                                 break;
                             }
                         }
                     }
+
+                    /*if (!found)
+                    {
+                        Patcher.Logger.LogWarning("Did not find any NetworkBehaviours in : " + fileName);
+                    }
+                    */
                 }
             }
             foreach (string text4 in hashSet)
@@ -168,7 +202,7 @@ public static void Patch(string pluginPath, string managedPath)
                 catch (Exception exception)
                 {
                     // error
-                    Patcher.Logger.LogWarning($"Did not patch ({Path.GetFileName(text4)}): {exception.Message} (Already patched?)");
+                    Patcher.Logger.LogWarning($"Failed to patch ({Path.GetFileName(text4)}): {exception}");
                     success = false;
                 }