style: clean up

CedaryCat · CedaryCat · commit 132c3fc0d66a · 2025-06-25T22:54:31.000+08:00
diff --git a/src/OTAPI.UnifiedServerProcess/Commons/IL.cs b/src/OTAPI.UnifiedServerProcess/Commons/IL.cs
@@ -251,7 +251,7 @@ Code.Ldloca_S or
                 variable = method.Body.Variables[localIndex];
                 return true;
             }
-            public static bool MatchLoadVariable(MethodDefinition method, Instruction instruction, [NotNullWhen(true)] out VariableDefinition? variable) { 
+            public static bool MatchLoadVariable(MethodDefinition method, Instruction instruction, [NotNullWhen(true)] out VariableDefinition? variable) {
                 VariableDefinition? tmpCheck = null;
 
                 var localIndex = instruction.OpCode.Code switch {
diff --git a/src/OTAPI.UnifiedServerProcess/Commons/Stack.cs b/src/OTAPI.UnifiedServerProcess/Commons/Stack.cs
@@ -1,8 +1,6 @@
 ﻿using Mono.Cecil;
 using Mono.Cecil.Cil;
 using MonoMod.Cil;
-using OTAPI.UnifiedServerProcess.Extensions;
-using OTAPI.UnifiedServerProcess.Optimize.FastCollections;
 using OTAPI.UnifiedServerProcess.Optimize.LinkObjects;
 using System;
 using System.Collections.Generic;
@@ -360,7 +358,7 @@ static void FindEndpoints(IEnumerable<Instruction> nodes, out Instruction min, o
 
                 Instruction leftCursor = start;
                 HashSet<Instruction> leftCollected = [];
-                Instruction rightCursor = start; 
+                Instruction rightCursor = start;
                 HashSet<Instruction> rightCollected = [];
 
                 while (nodeSet.Count > 0) {
@@ -380,7 +378,7 @@ static void FindEndpoints(IEnumerable<Instruction> nodes, out Instruction min, o
                     if (nodeSet.Count == 0) break;
 
                     if (rightCursor.Next != null) {
-                        rightCursor = rightCursor.Next; 
+                        rightCursor = rightCursor.Next;
 
                         rightCollected.Add(rightCursor);
 
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParameterFlowAnalysis/ParameterFlowAnalyzer.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParameterFlowAnalysis/ParameterFlowAnalyzer.cs
@@ -609,7 +609,7 @@ void HandleStoreCollectionElements(Instruction instruction) {
                         .First();
                     if (instancePath.StackTopType is null)
                         return;
-                    var instanceInstr = instancePath.RealPushValueInstruction; 
+                    var instanceInstr = instancePath.RealPushValueInstruction;
                     var valuesPath = MonoModCommon.Stack.AnalyzeStackTopTypeAllPaths(method, path.ParametersSources[1].Instructions.Last(), jumpSites)
                         .First();
                     if (valuesPath.StackTopType is null)
diff --git a/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IMethodCheckCacheFeature.cs b/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IMethodCheckCacheFeature.cs
@@ -95,7 +95,7 @@ public static bool CheckUsedContextBoundField<TFeature>(
                         if (methodRef.Name.OrdinalStartsWith("add_")) {
                             autoDeleFieldName = methodRef.Name[4..];
                         }
-                        else if (methodRef.Name.OrdinalStartsWith("remove_")) { 
+                        else if (methodRef.Name.OrdinalStartsWith("remove_")) {
                             autoDeleFieldName = methodRef.Name[7..];
                         }
                         if (autoDeleFieldName is null) {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IStaticModificationCheckFeature.cs b/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IStaticModificationCheckFeature.cs
@@ -19,9 +19,9 @@ public interface IStaticModificationCheckFeature : IJumpSitesCacheFeature
     }
     public static class StaticModificationCheckFeatureExtensions
     {
-        public static bool IsAboutStaticFieldModification(this IStaticModificationCheckFeature point, 
+        public static bool IsAboutStaticFieldModification(this IStaticModificationCheckFeature point,
             MethodDefinition method,
-            Instruction inst, 
+            Instruction inst,
             [NotNullWhen(true)] out HashSet<FieldDefinition>? modifiedFields, [NotNullWhen(true)] out HashSet<Instruction>? modificationOperations) {
 
             modifiedFields = [];
@@ -63,7 +63,7 @@ public static bool IsAboutStaticFieldModification(this IStaticModificationCheckF
             return true;
         }
         public static bool IsReferencedStaticFieldModified(this IStaticModificationCheckFeature point,
-            MethodDefinition method, 
+            MethodDefinition method,
             Instruction pushedFieldReference,
             [NotNullWhen(true)] out Dictionary<string, SingleStaticFieldTrace>? modified,
             [NotNullWhen(true)] out HashSet<Instruction>? modificationOperations) {
@@ -93,7 +93,7 @@ public static bool IsReferencedStaticFieldModified(this IStaticModificationCheck
                             !path.ParametersSources[paramIndex].Instructions.Contains(pushedFieldReference)) {
                             continue;
                         }
-                        
+
                         modificationOperations.Add(usage);
 
                         foreach (var referencedFieldTracing in trace.TrackedStaticFields.Values) {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Infrastructure/CacheManager.cs b/src/OTAPI.UnifiedServerProcess/Core/Infrastructure/CacheManager.cs
@@ -1,7 +1,6 @@
 ﻿using Mono.Cecil;
 using OTAPI.UnifiedServerProcess.Loggers;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
diff --git a/src/OTAPI.UnifiedServerProcess/Core/NetworkLogicPruner.cs b/src/OTAPI.UnifiedServerProcess/Core/NetworkLogicPruner.cs
@@ -6,11 +6,8 @@
 using MonoMod.Utils;
 using OTAPI.UnifiedServerProcess.Commons;
 using OTAPI.UnifiedServerProcess.Extensions;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OTAPI.UnifiedServerProcess.Core
 {
@@ -90,8 +87,8 @@ public void Prune() {
                                 checking = checking.Next;
                             }
 
-                            if (blockEnd.OpCode != OpCodes.Ret 
-                                && blockEnd.OpCode != OpCodes.Br 
+                            if (blockEnd.OpCode != OpCodes.Ret
+                                && blockEnd.OpCode != OpCodes.Br
                                 && blockEnd.OpCode != OpCodes.Br_S
                                 && blockEnd != switchEnd) {
 
@@ -123,7 +120,7 @@ public void Prune() {
 
                     var data = (-1, -1);
 
-                    for (int i = 0; i < method.Body.Instructions.Count; ) {
+                    for (int i = 0; i < method.Body.Instructions.Count;) {
                         var reachableInst = method.Body.Instructions[i];
                         CanReachCurrentInstruction(method.Body, jumpSites, switchBlockEnd, reachableInst, removes, indexMap, ref i, ref data);
                         reachableInstructions.Add(reachableInst);
@@ -141,16 +138,16 @@ public void Prune() {
 
         void CanReachCurrentInstruction(
 
-            MethodBody body, 
+            MethodBody body,
             Dictionary<Instruction, List<Instruction>> jumpSites,
-            Dictionary<Instruction, Instruction> switchBlockToEnd, 
-            Instruction instruction, 
-            List<Instruction> rm, 
+            Dictionary<Instruction, Instruction> switchBlockToEnd,
+            Instruction instruction,
+            List<Instruction> rm,
             Dictionary<Instruction, int> indexMap,
 
             ref int index, ref (int end_dedServIsTrueBlock, int end_skipMenuIsFalseBlock) data) {
 
-            
+
             if (index > data.end_dedServIsTrueBlock) {
                 data.end_dedServIsTrueBlock = -1;
             }
@@ -259,7 +256,7 @@ void CanReachCurrentInstruction(
             return;
 
             static bool CheckIsJumpOutOfBlock(MethodBody body, Instruction instruction, Dictionary<Instruction, Instruction> switchBlockToEnd, List<Instruction> rm, Dictionary<Instruction, int> indexMap, ref int index, int endOfBlock) {
-                
+
                 if (endOfBlock >= 0) {
 
                     if (instruction.OpCode == OpCodes.Br || instruction.OpCode == OpCodes.Br_S) {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/FilterArgumentSource.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/FilterArgumentSource.cs
@@ -1,12 +1,10 @@
 ﻿using Mono.Cecil;
 using OTAPI.UnifiedServerProcess.Core.Patching.Framework;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 
 namespace OTAPI.UnifiedServerProcess.Core.Patching.FieldFilterPatching
 {
-    
+
     public class FilterArgumentSource(ModuleDefinition module, MethodDefinition[] initialMethods) : Argument, IArgumentSource<FilterArgumentSource, FilterArgument>
     {
         public ModuleDefinition MainModule = module;
@@ -15,8 +13,8 @@ public class FilterArgumentSource(ModuleDefinition module, MethodDefinition[] in
         public Dictionary<string, FieldDefinition> ModifiedStaticFields = [];
         public Dictionary<string, FieldDefinition> InitialStaticFields = [];
         public FilterArgument Build() => new(
-            MainModule, 
-            [.. UnmodifiedStaticFields.Values], 
+            MainModule,
+            [.. UnmodifiedStaticFields.Values],
             [.. ModifiedStaticFields.Values],
             [.. InitialStaticFields.Values]);
     }
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/ForceInstanceProcessor.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/ForceInstanceProcessor.cs
@@ -1,9 +1,5 @@
 ﻿using OTAPI.UnifiedServerProcess.Loggers;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OTAPI.UnifiedServerProcess.Core.Patching.FieldFilterPatching
 {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/ForceStaticProcessor.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/ForceStaticProcessor.cs
@@ -1,5 +1,4 @@
-﻿using OTAPI.UnifiedServerProcess.Extensions;
-using OTAPI.UnifiedServerProcess.Loggers;
+﻿using OTAPI.UnifiedServerProcess.Loggers;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -27,8 +26,6 @@ public class ForceStaticProcessor() : IFieldFilterArgProcessor
             "Terraria.Localization.GameCulture",
             // ignore hit tile, it should not run on server
             "Terraria.HitTile",
-
-            "Terraria.ObjectData.TileObjectData._baseObject"
         ];
         public void Apply(LoggedComponent logger, ref FilterArgumentSource source) {
             foreach (var modified in source.ModifiedStaticFields.ToArray()) {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/InitialFieldModificationProcessor.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/InitialFieldModificationProcessor.cs
@@ -933,7 +933,7 @@ static Instruction CloneAndUpdateMap(Dictionary<Instruction, Instruction> instMa
         private void ExpandBranchSourcesUntilStable(MethodDefinition method,
             FieldDefinition staticField,
             HashSet<Instruction> modifications,
-            Dictionary<Instruction, HashSet<Instruction>> branchBlockMapToConditions, 
+            Dictionary<Instruction, HashSet<Instruction>> branchBlockMapToConditions,
             Dictionary<VariableDefinition, (VariableDefinition local, Dictionary<string, FieldDefinition> fields)> localMap,
             HashSet<VariableDefinition> ignoreExtractLocalModifications) {
 
@@ -1052,13 +1052,14 @@ private bool IsExtractableStaticPart(FilterArgumentSource source, FieldDefinitio
         /// <param name="LoopCond"></param>
         /// <param name="FilteredLoopBody">key is field identifier</param>
         /// <param name="OrigiLoopBody"></param>
-        record LoopBlockData(VariableDefinition OriginalLocal, VariableDefinition Local, 
-            Instruction[] InitLoopVariable, 
+        record LoopBlockData(VariableDefinition OriginalLocal, VariableDefinition Local,
+            Instruction[] InitLoopVariable,
             Instruction JumpToLoopHead,
-            Instruction[] PostLoop, 
+            Instruction[] PostLoop,
             Instruction[] LoopCond,
             Instruction[] OrigiLoopBody,
-            Dictionary<string, HashSet<Instruction>> FilteredLoopBody) {
+            Dictionary<string, HashSet<Instruction>> FilteredLoopBody)
+        {
 
             public IEnumerable<Instruction> AllInsts() => InitLoopVariable.Concat(PostLoop).Concat(LoopCond).Concat(FilteredLoopBody.Values.SelectMany(x => x));
             public IEnumerable<Instruction> SortedAllInsts() => AllInsts().OrderBy(x => x.Offset);
@@ -1148,9 +1149,9 @@ private Dictionary<VariableDefinition, LoopBlockData> ExtractLoopBlock(MethodDef
                     current = current.Next;
                 }
 
-                loopBlocks.Add(loopVariable, 
+                loopBlocks.Add(loopVariable,
                     new LoopBlockData(
-                        loopVariable, 
+                        loopVariable,
                         new VariableDefinition(loopVariable.VariableType),
                         [.. extractedLoopVariableInit.OrderBy(x => x.Offset)],
                         initLoopVariable.Next,
@@ -1240,9 +1241,9 @@ static void TrackUsage(IJumpSitesCacheFeature feature,
                 }
             }
         }
-        static void ExtractSources(IJumpSitesCacheFeature feature, 
-            MethodDefinition caller, 
-            FieldDefinition referenceField, 
+        static void ExtractSources(IJumpSitesCacheFeature feature,
+            MethodDefinition caller,
+            FieldDefinition referenceField,
             HashSet<Instruction> transformInsts,
             Dictionary<VariableDefinition, (VariableDefinition local, Dictionary<string, FieldDefinition> fields)> localMap,
             IEnumerable<Instruction> extractSources,
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/AdjustPropertiesPatcher.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/AdjustPropertiesPatcher.cs
@@ -67,7 +67,7 @@ public override void Patch(PatcherArguments arguments) {
                     var propName = method.Name[4..];
                     var prop = type.Properties.FirstOrDefault(x => x.Name == propName);
 
-                    if (arguments.ContextTypes.TryGetValue(type.FullName, out var contextTypeData) 
+                    if (arguments.ContextTypes.TryGetValue(type.FullName, out var contextTypeData)
                         && contextTypeData.originalType.FullName != type.FullName
                         && contextTypeData.originalType.Module == type.Module) {
 
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/PatchingCommon.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/PatchingCommon.cs
@@ -25,8 +25,7 @@ public static class PatchingCommon
             bc.MaxStackSize = bo2.MaxStackSize;
             bc.InitLocals = bo2.InitLocals;
             bc.LocalVarToken = bo2.LocalVarToken;
-            bc.Instructions.AddRange(bo2.Instructions.Select(delegate (Instruction o)
-            {
+            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;
@@ -42,8 +41,7 @@ public static class PatchingCommon
                 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)
-            {
+            m.CustomDebugInformations.AddRange(bo2.Method.CustomDebugInformations.Select(delegate (CustomDebugInformation o) {
                 if (o is AsyncMethodBodyDebugInformation asyncMethodBodyDebugInformation) {
                     AsyncMethodBodyDebugInformation asyncMethodBodyDebugInformation2 = new AsyncMethodBodyDebugInformation();
                     if (asyncMethodBodyDebugInformation.CatchHandler.Offset >= 0) {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/SimplePatching/RemoveUnusedCodePatcherAtBegin.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/SimplePatching/RemoveUnusedCodePatcherAtBegin.cs
@@ -3,7 +3,6 @@
 using Mono.Cecil.Cil;
 using OTAPI.UnifiedServerProcess.Core.Patching.Framework;
 using OTAPI.UnifiedServerProcess.Loggers;
-using System.Linq;
 
 namespace OTAPI.UnifiedServerProcess.Core.Patching.SimplePatching
 {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/PatchingLogic.cs b/src/OTAPI.UnifiedServerProcess/Core/PatchingLogic.cs
@@ -1,6 +1,5 @@
 ﻿using ModFramework;
 using Mono.Cecil;
-using OTAPI.UnifiedServerProcess.Core.Infrastructure;
 using OTAPI.UnifiedServerProcess.Core.Patching.FieldFilterPatching;
 using OTAPI.UnifiedServerProcess.Core.Patching.Framework;
 using OTAPI.UnifiedServerProcess.Core.Patching.GeneralPatching;
@@ -26,7 +25,7 @@ public static void Patch(ILogger logger, ModuleDefinition module) {
             MethodDefinition[] initialMethods = [main.Method("Initialize"), main.Method("Initialize_AlmostEverything"), main.Method("PostContentLoadInitialize")];
 
             analyzers.StaticFieldModificationAnalyzer.FetchModifiedFields(
-                entryPoints, initialMethods, 
+                entryPoints, initialMethods,
                 out var rawModifiedStaticFields, out var initialStaticFields);
 
             List<FieldDefinition> modifiedStaticFields = [];
diff --git a/src/OTAPI.UnifiedServerProcess/Extensions/CollectionExt.cs b/src/OTAPI.UnifiedServerProcess/Extensions/CollectionExt.cs
@@ -1,16 +1,13 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OTAPI.UnifiedServerProcess.Extensions
 {
     public static class CollectionExt
     {
         public static List<T> CopyWithCapacity<T>(this List<T> list) {
             var copy = new List<T>(Math.Max(list.Capacity, list.Count));
-            foreach (var item in list) { 
+            foreach (var item in list) {
                 copy.Add(item);
             }
             return copy;
diff --git a/src/OTAPI.UnifiedServerProcess/Extensions/StringExt.cs b/src/OTAPI.UnifiedServerProcess/Extensions/StringExt.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OTAPI.UnifiedServerProcess.Extensions
 {
diff --git a/src/OTAPI.UnifiedServerProcess/Mods/GlobalInitializer.cs b/src/OTAPI.UnifiedServerProcess/Mods/GlobalInitializer.cs
@@ -15,7 +15,8 @@ public static class GlobalInitializer
     {
         public static void InitializeEntryPoint() { }
     }
-    public class InitializerExtractFromAttribute(Type type, string method) : Attribute { 
+    public class InitializerExtractFromAttribute(Type type, string method) : Attribute
+    {
         public readonly Type originalType = type;
         public readonly string MethodName = method;
     }
diff --git a/src/OTAPI.UnifiedServerProcess/Optimize/FastCollections/FastList.cs b/src/OTAPI.UnifiedServerProcess/Optimize/FastCollections/FastList.cs
@@ -1,11 +1,5 @@
 ﻿using System;
-using System.Buffers;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OTAPI.UnifiedServerProcess.Optimize.FastCollections
 {
diff --git a/src/OTAPI.UnifiedServerProcess/Optimize/LinkObjects/ReversibleLinkedList.cs b/src/OTAPI.UnifiedServerProcess/Optimize/LinkObjects/ReversibleLinkedList.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OTAPI.UnifiedServerProcess.Optimize.LinkObjects
+﻿namespace OTAPI.UnifiedServerProcess.Optimize.LinkObjects
 {
     public class ReversibleLinkedList<TItem>
     {
@@ -16,7 +10,7 @@ public ReversibleLinkedList(ReversibleLinkedList<TItem> copy) {
         public void Add(TItem item) {
             tail = new Node(tail, item);
         }
-        public TItem[] ReverseToArray() { 
+        public TItem[] ReverseToArray() {
             if (tail is null) {
                 return [];
             }

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ Code.Ldloca_S or`
`251`	`251`	`variable = method.Body.Variables[localIndex];`
`252`	`252`	`return true;`
`253`	`253`	`}`
`254`		`- public static bool MatchLoadVariable(MethodDefinition method, Instruction instruction, [NotNullWhen(true)] out VariableDefinition? variable) {`
	`254`	`+ public static bool MatchLoadVariable(MethodDefinition method, Instruction instruction, [NotNullWhen(true)] out VariableDefinition? variable) {`
`255`	`255`	`VariableDefinition? tmpCheck = null;`
`256`	`256`
`257`	`257`	`var localIndex = instruction.OpCode.Code switch {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public static bool CheckUsedContextBoundField<TFeature>(`
`95`	`95`	`if (methodRef.Name.OrdinalStartsWith("add_")) {`
`96`	`96`	`autoDeleFieldName = methodRef.Name[4..];`
`97`	`97`	`}`
`98`		`- else if (methodRef.Name.OrdinalStartsWith("remove_")) {`
	`98`	`+ else if (methodRef.Name.OrdinalStartsWith("remove_")) {`
`99`	`99`	`autoDeleFieldName = methodRef.Name[7..];`
`100`	`100`	`}`
`101`	`101`	`if (autoDeleFieldName is null) {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`using OTAPI.UnifiedServerProcess.Loggers;`
`2`		`-using System;`
`3`		`-using System.Collections.Generic;`
`4`	`2`	`using System.Linq;`
`5`		`-using System.Text;`
`6`		`-using System.Threading.Tasks;`
`7`	`3`
`8`	`4`	`namespace OTAPI.UnifiedServerProcess.Core.Patching.FieldFilterPatching`
`9`	`5`	`{`