feat: More precise selection of context-related variables

Author: CedaryCat

src/OTAPI.UnifiedServerProcess.GlobalNetwork/Network/NetworkPatcher.cs

@@ -23,12 +23,10 @@ private static void Modified_StartServer(On.Terraria.NetplaySystemContext.orig_S
 
             var Main = server.Main;
 
-            Main.rand ??= new UnifiedRandom((int)DateTime.Now.Ticks);
-            Main.myPlayer = 255;
+            Terraria.Main.rand ??= new UnifiedRandom((int)DateTime.Now.Ticks);
             self.ServerIP = IPAddress.Any;
             Main.menuMode = 14;
             Main.statusText = Lang.menu[8].Value;
-            Main.netMode = 2;
             self.Disconnect = false;
 
             self.Clients = Router.globalClients;

src/OTAPI.UnifiedServerProcess.GlobalNetwork/Program.cs

@@ -26,6 +26,7 @@ static void Main(string[] args) {
                 AppDomain.CurrentDomain.AssemblyResolve += ResolveHelpers.ResolveAssembly;
                 Terraria.Program.SavePath = Platform.Get<IPathService>().GetStoragePath("Terraria");
                 Terraria.Main.SkipAssemblyLoad = true;
+                Terraria.Main.rand = new((int)DateTime.Now.Ticks);
                 GlobalInitializer.Initialize();
             });
 

src/OTAPI.UnifiedServerProcess.GlobalNetwork/SynchronizedGuard.cs

@@ -7,8 +7,8 @@ public static class SynchronizedGuard
 
         static SynchronizedGuard() {
             On.Terraria.Localization.LanguageManager.LoadFilesForCulture
-                += (orig, self, root, culture)
-                => { lock (cultureFileLock) { orig(self, root, culture); } };
+                += (orig, self, culture)
+                => { lock (cultureFileLock) { orig(self, culture); } };
             On.Terraria.GameContent.Creative.CreativeItemSacrificesCatalog.Initialize
                 += (orig, self) => { lock (creativeSacrificesLock) { orig(self); } };
         }

src/OTAPI.UnifiedServerProcess/Commons/IL.cs

@@ -11,7 +11,7 @@ public static partial class MonoModCommon
         public static class IL
         {
             /// <summary>
-            /// The name of the "this" TrackingParameter is an empty string rather than "this".
+            /// The name of the "this" Parameter is an empty string rather than "this".
             /// </summary>
             public const string ThisParameterName = "";
             public static Instruction BuildParameterLoad(MethodDefinition method, MethodBody body, ParameterDefinition parameter) {
@@ -32,7 +32,7 @@ public static Instruction BuildParameterLoad(MethodDefinition method, MethodBody
             }
             public static Instruction BuildParameterSet(MethodDefinition method, MethodBody body, ParameterDefinition parameter) {
                 if (method.HasThis && ((body is not null && body.ThisParameter == parameter) || parameter.Name == "")) {
-                    throw new ArgumentException("Cannot set \"this\" TrackingParameter", nameof(parameter));
+                    throw new ArgumentException("Cannot set \"this\" TracingParameter", nameof(parameter));
                 }
                 else {
                     var index = method.Parameters.IndexOf(parameter) + (method.HasThis ? 1 : 0);
@@ -107,7 +107,7 @@ Code.Starg_S or
                 }
                 var param = method.Parameters[paramIndex];
                 if (tmpCheck is not null && tmpCheck.Name != param.Name) {
-                    throw new InvalidOperationException("Operand TrackingParameter is invalid");
+                    throw new InvalidOperationException("Operand TracingParameter is invalid");
                 }
                 return param;
             }
@@ -143,7 +143,7 @@ Code.Starg_S or
                     var paramIndex = paramInnerIndex - (method.HasThis ? 1 : 0);
                     parameter = method.Parameters[paramIndex];
                     if (tmpCheck is not null && tmpCheck.Name != parameter.Name) {
-                        throw new InvalidOperationException("Operand TrackingParameter is invalid");
+                        throw new InvalidOperationException("Operand TracingParameter is invalid");
                     }
                 }
                 return true;

src/OTAPI.UnifiedServerProcess/Commons/Stack.cs

@@ -173,7 +173,7 @@ private static IEnumerable<Instruction> GetNextInstructions(Instruction current)
                         }
                     }
 
-                    // linear backtracking
+                    // linear backtracing
                     if (current.Previous != null) {
                         if (!IsTerminatorInstruction(current.Previous)) {
                             workStack.Push((current.Previous, newerBalance, visited));
@@ -240,7 +240,7 @@ public static StackTopTypePath[] AnalyzeStackTopTypeAllPaths(MethodDefinition ca
                         }
                     }
 
-                    // linear backtracking
+                    // linear backtracing
                     if (current.Previous != null) {
                         if (!IsTerminatorInstruction(current.Previous)) {
                             workStack.Push((new(path), current.Previous, newerBalance, visited));
@@ -724,11 +724,11 @@ public class InstructionArgsSource(int index) : ArgumentSource
                 public override string ToString() => $"[{Index}] (inst: {Instructions.Length})";
             }
             /// <summary>
-            /// Analyzes TrackingParameter sources considering control flow and multiple execution paths
+            /// Analyzes Parameter sources considering control flow and multiple execution paths
             /// </summary>
             /// <param name="caller">Containing method</param>
             /// <param name="target">Method call/newobj instruction</param>
-            /// <returns>Array of possible TrackingParameter flow paths</returns>
+            /// <returns>Array of possible Parameter flow paths</returns>
             public static FlowPath<ParameterSource>[] AnalyzeParametersSources(MethodDefinition caller, Instruction target, Dictionary<Instruction, List<Instruction>>? cachedJumpSitess = null) {
 
                 cachedJumpSitess ??= BuildJumpSitesMap(caller);
@@ -753,7 +753,7 @@ public static FlowPath<ParameterSource>[] AnalyzeParametersSources(MethodDefinit
                 ));
 
                 List<FlowPath<ParameterSource>> paths = new();
-                // var visited = new HashSet<(Instruction, int)>(); // Track visited (offset, stackBalance)
+                // var visited = new HashSet<(Instruction, int)>(); // Trace visited (offset, stackBalance)
 
                 while (workStack.Count > 0) {
                     var ctx = workStack.Pop();
@@ -802,7 +802,7 @@ public static FlowPath<ParameterSource>[] AnalyzeParametersSources(MethodDefinit
                         }
                     }
 
-                    // Linear backtracking
+                    // Linear backtracing
                     if (ctx.Previous != null) {
                         if (!IsTerminatorInstruction(ctx.Previous)) {
                             workStack.Push(new ReverseAnalysisContext(
@@ -923,7 +923,7 @@ public static FlowPath<InstructionArgsSource>[] AnalyzeInstructionArgsSources(Me
                         }
                     }
 
-                    // Linear backtracking
+                    // Linear backtracing
                     if (ctx.Previous != null) {
                         if (!IsTerminatorInstruction(ctx.Previous)) {
                             workStack.Push(new ReverseAnalysisContext(

src/OTAPI.UnifiedServerProcess/Commons/Structure.cs

@@ -34,7 +34,7 @@ static string GenerateKeyForGenericParameter(GenericParameter param) {
                     return param.DeclaringType.Resolve().FullName + ":" + param.Position;
                 }
                 else {
-                    throw new InvalidOperationException("Unknown generic TrackingParameter");
+                    throw new InvalidOperationException("Unknown generic TracingParameter");
                 }
             }
             public readonly struct MapOption
@@ -127,7 +127,7 @@ public static TypeReference DeepMapGenericParameter(GenericParameter param, MapO
                     copiedGenericParam = elementTypeRef.GenericParameters[param.Position];
                 }
                 else {
-                    throw new InvalidOperationException("Unknown generic TrackingParameter");
+                    throw new InvalidOperationException("Unknown generic TracingParameter");
                 }
                 return copiedGenericParam;
             }

src/OTAPI.UnifiedServerProcess/Core/Analysis/DelegateInvocationAnalysis/DelegateInvocationData.cs

@@ -45,7 +45,7 @@ public bool AddCombinedFrom(DelegateInvocationData other) {
             var datasFromOther = combinedFromMap[other.invocations];
 
             // Make sure the invocations are pointing to the same dictionary instance
-            // so that modifications to one will naturally affect the other
+            // so that Mutations to one will naturally affect the other
             foreach (var oldData in datasFromMe) {
 
                 if (datasFromOther.Add(oldData)) {

src/OTAPI.UnifiedServerProcess/Core/Analysis/DelegateInvocationAnalysis/DelegateInvocationGraph.cs

@@ -315,7 +315,7 @@ private void ProcessMethod(ModuleDefinition module, MethodInheritanceGraph metho
                                     for (var i = 0; i < length; i++) {
                                         var paramIndex = i;
 
-                                        // skip 'this' TrackingParameter load
+                                        // skip 'this' Parameter load
                                         if (!callingMethod.IsStatic && !isNewObj) {
                                             paramIndex -= 1;
                                         }