fix: namespace bugs

Author: CedaryCat

src/OTAPI.UnifiedServerProcess/Core/Patching/PatchingCommon.cs

@@ -15,77 +15,6 @@ namespace OTAPI.UnifiedServerProcess.Core.Patching
 {
     public static class PatchingCommon
     {
-        public static Mono.Cecil.Cil.MethodBody? Clone(this Mono.Cecil.Cil.MethodBody? bo, MethodDefinition m) {
-            Mono.Cecil.Cil.MethodBody bo2 = bo;
-            Helpers.ThrowIfArgumentNull(m, "m");
-            if (bo2 == null) {
-                return null;
-            }
-            Mono.Cecil.Cil.MethodBody bc = new Mono.Cecil.Cil.MethodBody(m);
-            bc.MaxStackSize = bo2.MaxStackSize;
-            bc.InitLocals = bo2.InitLocals;
-            bc.LocalVarToken = bo2.LocalVarToken;
-            bc.Instructions.AddRange(bo2.Instructions.Select(delegate (Instruction o) {
-                Instruction instruction = Instruction.Create(Mono.Cecil.Cil.OpCodes.Nop);
-                instruction.OpCode = o.OpCode;
-                instruction.Operand = o.Operand;
-                instruction.Offset = o.Offset;
-                return instruction;
-            }));
-            bc.ExceptionHandlers.AddRange(bo2.ExceptionHandlers.Select((ExceptionHandler o) => new ExceptionHandler(o.HandlerType) {
-                TryStart = ((o.TryStart == null) ? null : bc.Instructions[bo2.Instructions.IndexOf(o.TryStart)]),
-                TryEnd = ((o.TryEnd == null) ? null : bc.Instructions[bo2.Instructions.IndexOf(o.TryEnd)]),
-                FilterStart = ((o.FilterStart == null) ? null : bc.Instructions[bo2.Instructions.IndexOf(o.FilterStart)]),
-                HandlerStart = ((o.HandlerStart == null) ? null : bc.Instructions[bo2.Instructions.IndexOf(o.HandlerStart)]),
-                HandlerEnd = ((o.HandlerEnd == null) ? null : bc.Instructions[bo2.Instructions.IndexOf(o.HandlerEnd)]),
-                CatchType = o.CatchType
-            }));
-            bc.Variables.AddRange(bo2.Variables.Select((VariableDefinition o) => new VariableDefinition(o.VariableType)));
-            m.CustomDebugInformations.AddRange(bo2.Method.CustomDebugInformations.Select(delegate (CustomDebugInformation o) {
-                if (o is AsyncMethodBodyDebugInformation asyncMethodBodyDebugInformation) {
-                    AsyncMethodBodyDebugInformation asyncMethodBodyDebugInformation2 = new AsyncMethodBodyDebugInformation();
-                    if (asyncMethodBodyDebugInformation.CatchHandler.Offset >= 0) {
-                        asyncMethodBodyDebugInformation2.CatchHandler = (asyncMethodBodyDebugInformation.CatchHandler.IsEndOfMethod ? default(InstructionOffset) : new InstructionOffset(ResolveInstrOff(asyncMethodBodyDebugInformation.CatchHandler.Offset)));
-                    }
-                    asyncMethodBodyDebugInformation2.Yields.AddRange(asyncMethodBodyDebugInformation.Yields.Select((InstructionOffset off) => (!off.IsEndOfMethod) ? new InstructionOffset(ResolveInstrOff(off.Offset)) : default(InstructionOffset)));
-                    asyncMethodBodyDebugInformation2.Resumes.AddRange(asyncMethodBodyDebugInformation.Resumes.Select((InstructionOffset off) => (!off.IsEndOfMethod) ? new InstructionOffset(ResolveInstrOff(off.Offset)) : default(InstructionOffset)));
-                    asyncMethodBodyDebugInformation2.ResumeMethods.AddRange(asyncMethodBodyDebugInformation.ResumeMethods);
-                    return asyncMethodBodyDebugInformation2;
-                }
-                if (o is StateMachineScopeDebugInformation stateMachineScopeDebugInformation) {
-                    StateMachineScopeDebugInformation stateMachineScopeDebugInformation2 = new StateMachineScopeDebugInformation();
-                    stateMachineScopeDebugInformation2.Scopes.AddRange(stateMachineScopeDebugInformation.Scopes.Select((StateMachineScope s) => new StateMachineScope(ResolveInstrOff(s.Start.Offset), s.End.IsEndOfMethod ? null : ResolveInstrOff(s.End.Offset))));
-                    return stateMachineScopeDebugInformation2;
-                }
-                return o;
-            }));
-            m.DebugInformation.SequencePoints.AddRange(bo2.Method.DebugInformation.SequencePoints.Select((SequencePoint o) => new SequencePoint(ResolveInstrOff(o.Offset), o.Document) {
-                StartLine = o.StartLine,
-                StartColumn = o.StartColumn,
-                EndLine = o.EndLine,
-                EndColumn = o.EndColumn
-            }));
-            foreach (Instruction instruction2 in bc.Instructions) {
-                if (instruction2.Operand is Instruction item) {
-                    instruction2.Operand = bc.Instructions[bo2.Instructions.IndexOf(item)];
-                }
-                else if (instruction2.Operand is Instruction[] source) {
-                    instruction2.Operand = source.Select((Instruction i) => bc.Instructions[bo2.Instructions.IndexOf(i)]).ToArray();
-                }
-                else if (instruction2.Operand is VariableDefinition variableDefinition) {
-                    instruction2.Operand = bc.Variables[variableDefinition.Index];
-                }
-            }
-            return bc;
-            Instruction ResolveInstrOff(int off) {
-                for (int j = 0; j < bo2.Instructions.Count; j++) {
-                    if (bo2.Instructions[j].Offset == off) {
-                        return bc.Instructions[j];
-                    }
-                }
-                throw new ArgumentException($"Invalid instruction offset {off}");
-            }
-        }
         public static MethodDefinition CreateInstanceConvdMethod(MethodDefinition staticMethod, ContextTypeData instanceConvdType, ImmutableDictionary<string, FieldDefinition> instanceConvdFieldOrgiMap) {
             if (!staticMethod.IsStatic) {
                 throw new ArgumentException("Method must be static", nameof(staticMethod));

src/TrProtocol.Shared/Attributes/ExplicitImportTypeAttribute.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace TrProtocol.Attributes
+{
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
+    public class ExplicitImportTypeAttribute(Type type) : Attribute
+    {
+        public Type Type = type;
+    }
+}

src/TrProtocol.Shared/TrProtocol.Shared.projitems

@@ -6,7 +6,7 @@
     <SharedGUID>768417b4-d342-4006-b196-5f7178582209</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>TrProtocol.Shared</Import_RootNamespace>
+    <Import_RootNamespace>TrProtocol</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ArraySizeAttribute.cs" />
@@ -20,6 +20,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ConditionLessThanAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ConditionLookupMatchAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ConditionNotEqualAttribute.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Attributes\ExplicitImportTypeAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ExternalMemberAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\ExternalMemberValueSetterAttribute.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Attributes\IgnoreSerializeAttribute.cs" />

src/TrProtocol/Models/SectionData.cs

@@ -1,10 +1,12 @@
-using System.IO.Compression;
+using System.Buffers;
+using System.IO.Compression;
 using TrProtocol.Attributes;
 using TrProtocol.Interfaces;
 using TrProtocol.Models.TileEntities;
 
 namespace TrProtocol.Models;
 
+[ExplicitImportType(typeof(ArrayPool<byte>))]
 [Compress(CompressionLevel.SmallestSize, 1024 * 128)]
 public partial struct SectionData : IAutoSerializable, ILengthAware
 {
@@ -13,7 +15,7 @@ public partial struct SectionData : IAutoSerializable, ILengthAware
     public short Width;
     public short Height;
 
-    public int ComplexTileCount => Width * Height;
+    public readonly int ComplexTileCount => Width * Height;
 
     [ArraySize(nameof(ComplexTileCount))]
     public ComplexTileData[] Tiles;