feat: Patch Collision to pass check results through reference

Author: CedaryCat

src/OTAPI.UnifiedServerProcess/Core/PatchCollision.cs

@@ -331,7 +331,6 @@ void ProcessMethod(
             if (arguments.ContextTypes.TryGetValue(method.DeclaringType.FullName, out var predefined) && predefined.IsPredefined) {
                 return;
             }
-
             var methodId = method.GetIdentifier();
 
             if (arguments.OriginalToContextType.TryGetValue(method.DeclaringType.FullName, out var contextType)

src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/StaticRedirectPatcher.cs

@@ -14,6 +14,7 @@ public static class PatchingLogic
     {
         public static void Patch(ILogger logger, ModuleDefinition module) {
 
+            PatchLogic.PatchCollision(module);
             new NetworkLogicPruner(module).Prune();
 
             var analyzers = new AnalyzerGroups(logger, module);

src/OTAPI.UnifiedServerProcess/Core/PatchingLogic.cs

@@ -301,7 +301,12 @@ static void SetModTypePlaceholder(ModuleDefinition module, Dictionary<string, Ty
                     SetMemberReplace(module, modType.CustomAttributes, true);
                 }
                 foreach (var field in modType.Fields) {
-                    SetMemberReplace(module, field.CustomAttributes, modType.IsEnum);
+                    if (modType.IsEnum && !field.IsStatic) {
+                        SetMemberReplace(module, field.CustomAttributes, false);
+                    }
+                    else {
+                        SetMemberReplace(module, field.CustomAttributes, modType.IsEnum);
+                    }
                 }
             }
             foreach (var nested in modType.NestedTypes) {

src/OTAPI.UnifiedServerProcess/ModAssemblyMerger.cs

@@ -25,7 +25,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\TrProtocol\TrProtocol.csproj" />
+		<ProjectReference Include="..\TrProtocol\TrProtocol.csproj" />
 	</ItemGroup>
 
 	<Target Name="PreBuild" BeforeTargets="PreBuildEvent">

src/OTAPI.UnifiedServerProcess/OTAPI.UnifiedServerProcess.csproj

@@ -6,19 +6,21 @@ namespace TrProtocol.SerializerGenerator.Internal.Models
 {
     public class ProtocolTypeData
     {
-        public ProtocolTypeData(TypeDeclarationSyntax classDeclaration, INamedTypeSymbol symbol, string name, string nameSpace, string[] imports, SerializationExpandContext[] members) {
+        public ProtocolTypeData(TypeDeclarationSyntax classDeclaration, INamedTypeSymbol symbol, string name, string nameSpace, string[] imports, string[] staticImports, SerializationExpandContext[] members) {
             DefSyntax = classDeclaration;
             DefSymbol = symbol;
             TypeName = name;
             Members = members;
             Namespace = nameSpace;
-            Imports = new HashSet<string>(imports);
+            Imports = [.. imports];
+            StaticImports = [.. staticImports];
         }
         public readonly INamedTypeSymbol DefSymbol;
         public readonly TypeDeclarationSyntax DefSyntax;
 
         public string Namespace;
         public HashSet<string> Imports;
+        public HashSet<string> StaticImports;
 
         public List<(INamedTypeSymbol EnumType, string DiscriminatorName, MemberAccessExpressionSyntax value)> AutoDiscriminators = new();
 

src/TrProtocol.SerializerGenerator/Internal/Models/ProtocolTypeData.cs

@@ -1,5 +1,6 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
 using TrProtocol.Attributes;
 using TrProtocol.Interfaces;
 using TrProtocol.SerializerGenerator.Internal.Diagnostics;
@@ -38,12 +39,19 @@ public static ProtocolTypeData BuildProtocolTypeInfo(CompilationContext context,
 
             var Namespace = fullNamespace;
             var imports = unit!.Usings
+                .Where(u => u.StaticKeyword == default && u.GlobalKeyword == default)
+                .Select(u => u.Name?.ToString())
+                .Where(u => u is not null)
+                .OfType<string>()
+                .ToArray();
+            var staticImports = unit.Usings
+                .Where(u => u.StaticKeyword != default && u.GlobalKeyword == default)
                 .Select(u => u.Name?.ToString())
                 .Where(u => u is not null)
                 .OfType<string>()
                 .ToArray();
 
-            if (!context.TryGetTypeSymbol(typeName, out var modelSym, fullNamespace, Array.Empty<string>())) {
+            if (!context.TryGetTypeSymbol(typeName, out var modelSym, fullNamespace, [])) {
                 throw new DiagnosticException(
                     Diagnostic.Create(
                         new DiagnosticDescriptor(
@@ -56,7 +64,7 @@ public static ProtocolTypeData BuildProtocolTypeInfo(CompilationContext context,
                         defSyntax.GetLocation(),
                         typeName));
             }
-            var model = new ProtocolTypeData(defSyntax, modelSym, typeName, Namespace, imports, info.Members);
+            var model = new ProtocolTypeData(defSyntax, modelSym, typeName, Namespace, imports, staticImports, info.Members);
 
             if (modelSym.IsOrInheritFrom(nameof(INetPacket))) {
                 model.IsNetPacket = true;

src/TrProtocol.SerializerGenerator/Internal/Serialization/ProtocolModelBuilder.cs

@@ -25,6 +25,9 @@ private static bool FilterTypes(SyntaxNode syntaxNode, CancellationToken token)
             if (syntaxNode is not TypeDeclarationSyntax td/* && td.Keyword.ToString() is not "interface" && td.Keyword.ToString() is not "record" && td.BaseList is not null*/) {
                 return false;
             }
+            if (td.BaseList is null || td.BaseList.Types.Count == 0) {
+                return false;
+            }
             td.GetNamespace(out _, out var nameSpace, out _);
             if (nameSpace is null) {
                 return false;
@@ -1663,6 +1666,9 @@ param[0].Type is PointerTypeSyntax pointerType &&
                     foreach (var us in model.Imports.Concat(NeccessaryUsings).Distinct()) {
                         usingTarget.NewLineAfter($"using {us};");
                     }
+                    foreach (var staticUsing in model.StaticImports) {
+                        usingTarget.NewLineAfter($"using static {staticUsing};");
+                    }
                     #endregion
 
                     context.AddSource($"{modelSym.GetFullName()}.seri.g.cs", SourceText.From(file.ToString(), Encoding.UTF8));

src/TrProtocol.SerializerGenerator/SerializeGenerator.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Terraria.GameContent.UI
+{
+    public class WiresUI
+    {
+        public class Settings
+        {
+            public enum MultiToolMode : byte
+            {
+                Red = 1,
+                Green = 2,
+                Blue = 4,
+                Yellow = 8,
+                Actuator = 16,
+                Cutter = 32
+            }
+        }
+    }
+}