style: rename files

CedaryCat · CedaryCat · commit 26990b2af5bb · 2025-06-25T23:27:42.000+08:00
diff --git a/src/OTAPI.UnifiedServerProcess.GlobalNetwork/Program.cs b/src/OTAPI.UnifiedServerProcess.GlobalNetwork/Program.cs
@@ -19,7 +19,7 @@ static void Main(string[] args) {
             Console.WriteLine("                       Demonstration For Terraria v{0} & OTAPI v{1}                         ", version.TerrariaVersion, version.OTAPIVersion);
             Console.WriteLine("---------------------------------------------------------------------------------------------------");
 
-            Console.Write("[USP|Info] Waiting for servers instances creation... ");
+            Console.Write("[USP|Info] Initializing... ");
             var spinner = new ConsoleSpinner(100);
             spinner.Start();
 
@@ -28,7 +28,13 @@ static void Main(string[] args) {
             AppDomain.CurrentDomain.AssemblyResolve += ResolveHelpers.ResolveAssembly;
             Terraria.Program.SavePath = Platform.Get<IPathService>().GetStoragePath("Terraria");
             Terraria.Main.SkipAssemblyLoad = true;
-            GlobalInitializer.InitializeEntryPoint();
+            GlobalInitializer.Initialize();
+            spinner.Stop();
+            Console.WriteLine("- done.");
+
+            Console.Write("[USP|Info] Waiting for servers instances creation... ");
+            spinner = new ConsoleSpinner(100);
+            spinner.Start();
 
             int port = 7777;
 
diff --git a/src/OTAPI.UnifiedServerProcess.Test/Program.cs b/src/OTAPI.UnifiedServerProcess.Test/Program.cs
@@ -11,16 +11,13 @@ static void Main(string[] args) {
             Terraria.Program.SavePath = Platform.Get<IPathService>().GetStoragePath("Terraria");
             Terraria.Main.SkipAssemblyLoad = true;
 
-            RootContext test;
-            for (int i = 0; i < 1200; i++) {
-                test = new RootContext("Test");
-            }
+            RootContext test = new RootContext("Test");
 
-            //test.Hooks.NetMessage.PlayerAnnounce += (sender, e) => {
-            //    Console.WriteLine("[USP] Player joined: " + test.Main.player[e.Plr].name);
-            //};
+            test.Hooks.NetMessage.PlayerAnnounce += (sender, e) => {
+                Console.WriteLine("[USP] Player joined: " + test.Main.player[e.Plr].name);
+            };
 
-            //test.Program.LaunchGame(args);
+            test.Program.LaunchGame(args);
         }
     }
 }
diff --git a/src/OTAPI.UnifiedServerProcess/Constants.cs b/src/OTAPI.UnifiedServerProcess/Constants.cs
@@ -13,7 +13,7 @@ public static class Constants
         public const string RootContextFullName = "UnifiedServerProcess.RootContext";
         public const string GlobalInitializerTypeName = "UnifiedServerProcess.GlobalInitializer";
         public const string InitializerAttributeTypeName = "UnifiedServerProcess.InitializerExtractFromAttribute";
-        public const string GlobalInitializerEntryPointName = "InitializeEntryPoint";
+        public const string GlobalInitializerEntryPointName = "Initialize";
 
         public static class Modifiers
         {
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/MethodCallAnalysis/MethodCallGraph.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/MethodCallAnalysis/MethodCallGraph.cs
@@ -14,7 +14,7 @@
 
 namespace OTAPI.UnifiedServerProcess.Core.Analysis.MethodCallAnalysis
 {
-    public class MethodCallGraph : Analyzer, IMethodBehaivorFeature
+    public class MethodCallGraph : Analyzer, IMethodImplementationFeature
     {
         public override string Name => "MethodCallGraph";
 
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParamModificationAnalysis/ParamModificationAnalyzer.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParamModificationAnalysis/ParamModificationAnalyzer.cs
@@ -16,7 +16,7 @@
 
 namespace OTAPI.UnifiedServerProcess.Core.Analysis.ParamModificationAnalysis
 {
-    public class ParamModificationAnalyzer : Analyzer, IMethodBehaivorFeature
+    public class ParamModificationAnalyzer : Analyzer, IMethodImplementationFeature
     {
         public sealed override string Name => "ParamModificationAnalyzer";
         public readonly ImmutableDictionary<string, ImmutableDictionary<int, ParamModifications>> ModifiedParameters;
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParameterFlowAnalysis/ParameterFlowAnalyzer.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/ParameterFlowAnalysis/ParameterFlowAnalyzer.cs
@@ -17,7 +17,7 @@
 namespace OTAPI.UnifiedServerProcess.Core.Analysis.ParameterFlowAnalysis
 {
 
-    public sealed class ParameterFlowAnalyzer : Analyzer, IMethodBehaivorFeature
+    public sealed class ParameterFlowAnalyzer : Analyzer, IMethodImplementationFeature
     {
         public readonly ImmutableDictionary<string, ParameterReferenceData> AnalyzedMethods;
         public sealed override string Name => "ParamFlowAnalyzer";
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/StaticFieldModificationAnalysis/StaticFieldModificationAnalyzer.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/StaticFieldModificationAnalysis/StaticFieldModificationAnalyzer.cs
@@ -28,7 +28,7 @@ public class StaticFieldModificationAnalyzer(ILogger logger,
         MethodCallGraph callGraph,
         DelegateInvocationGraph invocationGraph,
         MethodInheritanceGraph inheritanceGraph,
-        TypeInheritanceGraph typeInheritanceGraph) : Analyzer(logger), IMethodBehaivorFeature, IMethodCheckCacheFeature
+        TypeInheritanceGraph typeInheritanceGraph) : Analyzer(logger), IMethodImplementationFeature, IMethodCheckCacheFeature
     {
         public DelegateInvocationGraph DelegateInvocationGraph => invocationGraph;
         public MethodInheritanceGraph MethodInheritanceGraph => inheritanceGraph;
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Analysis/StaticFieldReferenceAnalysis/StaticFieldReferenceAnalyzer.cs b/src/OTAPI.UnifiedServerProcess/Core/Analysis/StaticFieldReferenceAnalysis/StaticFieldReferenceAnalyzer.cs
@@ -16,7 +16,7 @@
 
 namespace OTAPI.UnifiedServerProcess.Core.Analysis.StaticFieldReferenceAnalysis
 {
-    public sealed class StaticFieldReferenceAnalyzer : Analyzer, IMethodBehaivorFeature
+    public sealed class StaticFieldReferenceAnalyzer : Analyzer, IMethodImplementationFeature
     {
         public readonly ImmutableDictionary<string, StaticFieldReferenceData> AnalyzedMethods;
         public sealed override string Name => "StaticFieldReferenceAnalyzer";
diff --git a/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IMethodImplementationFeature.cs b/src/OTAPI.UnifiedServerProcess/Core/FunctionalFeatures/IMethodImplementationFeature.cs
@@ -11,7 +11,7 @@
 
 namespace OTAPI.UnifiedServerProcess.Core.FunctionalFeatures
 {
-    public interface IMethodBehaivorFeature : ILoggedComponent
+    public interface IMethodImplementationFeature : ILoggedComponent
     {
         DelegateInvocationGraph DelegateInvocationGraph { get; }
         MethodInheritanceGraph MethodInheritanceGraph { get; }
@@ -24,7 +24,7 @@ public static MethodDefinition[] GetMethodImplementations<TFeature>(this TFeatur
             Dictionary<Instruction, List<Instruction>> jumpSites,
             out bool isDelegateInvocation,
             bool noWarings = false)
-            where TFeature : LoggedComponent, IMethodBehaivorFeature {
+            where TFeature : LoggedComponent, IMethodImplementationFeature {
 
             if (callInstruction.OpCode != OpCodes.Callvirt && callInstruction.OpCode != OpCodes.Call && callInstruction.OpCode != OpCodes.Newobj) {
                 throw new Exception("Expected callvirt or call");
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/InitialFieldModificationProcessor.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/FieldFilterPatching/InitialFieldModificationProcessor.cs
@@ -17,7 +17,7 @@
 
 namespace OTAPI.UnifiedServerProcess.Core.Patching.FieldFilterPatching
 {
-    public class InitialFieldModificationProcessor(ILogger logger, AnalyzerGroups analyzers) : LoggedComponent(logger), IFieldFilterArgProcessor, IJumpSitesCacheFeature, IMethodBehaivorFeature, IMethodCheckCacheFeature
+    public class InitialFieldModificationProcessor(ILogger logger, AnalyzerGroups analyzers) : LoggedComponent(logger), IFieldFilterArgProcessor, IJumpSitesCacheFeature, IMethodImplementationFeature, IMethodCheckCacheFeature
     {
         public DelegateInvocationGraph DelegateInvocationGraph => analyzers.DelegateInvocationGraph;
         public MethodInheritanceGraph MethodInheritanceGraph => analyzers.MethodInheritanceGraph;
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/InvocationCtxAdaptPatcher.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/InvocationCtxAdaptPatcher.cs
@@ -837,9 +837,7 @@ static bool IsNoCaptureAnonymousMethod(
             nextInstruction = null;
             compilerGeneratedMethodOrig = null;
             delegateCtor = null;
-            if (checkBegin.Offset == 245) {
 
-            }
             if (IsNormal(checkBegin, out origBlockInstructions, out nextInstruction, out compilerGeneratedMethodOrig, out delegateCtor)) {
                 return true;
             }
@@ -973,10 +971,6 @@ static bool IsNormal(Instruction checkBegin,
                 return null;
             }
 
-            if (userMethod.Name == "mfwh_Initialize") {
-
-            }
-
             if (!IsNoCaptureAnonymousMethod(instruction, out var origBlockInstructions, out var nextInstruction, out var compilerGeneratedMethodOrig, out var delegateCtor)) {
                 return null;
             }
diff --git a/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/StaticRedirectPatcher.cs b/src/OTAPI.UnifiedServerProcess/Core/Patching/GeneralPatching/StaticRedirectPatcher.cs
@@ -28,7 +28,7 @@ namespace OTAPI.UnifiedServerProcess.Core.Patching.GeneralPatching
     public class StaticRedirectPatcher(ILogger logger,
         DelegateInvocationGraph delegateInvocationGraph,
         MethodInheritanceGraph methodInheritanceGraph,
-        MethodCallGraph callGraph) : GeneralPatcher(logger), IContextInjectFeature, IMethodBehaivorFeature, IJumpSitesCacheFeature, IMethodCheckCacheFeature
+        MethodCallGraph callGraph) : GeneralPatcher(logger), IContextInjectFeature, IMethodImplementationFeature, IJumpSitesCacheFeature, IMethodCheckCacheFeature
     {
 
         public override string Name => nameof(StaticRedirectPatcher);
diff --git a/src/OTAPI.UnifiedServerProcess/Mods/GlobalInitializer.cs b/src/OTAPI.UnifiedServerProcess/Mods/GlobalInitializer.cs
@@ -13,7 +13,7 @@ namespace UnifiedServerProcess
 {
     public static class GlobalInitializer
     {
-        public static void InitializeEntryPoint() { }
+        public static void Initialize() { }
     }
     public class InitializerExtractFromAttribute(Type type, string method) : Attribute
     {

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,13 @@ static void Main(string[] args) {`
`11`	`11`	`Terraria.Program.SavePath = Platform.Get<IPathService>().GetStoragePath("Terraria");`
`12`	`12`	`Terraria.Main.SkipAssemblyLoad = true;`
`13`	`13`
`14`		`- RootContext test;`
`15`		`- for (int i = 0; i < 1200; i++) {`
`16`		`- test = new RootContext("Test");`
`17`		`- }`
	`14`	`+ RootContext test = new RootContext("Test");`
`18`	`15`
`19`		`- //test.Hooks.NetMessage.PlayerAnnounce += (sender, e) => {`
`20`		`- // Console.WriteLine("[USP] Player joined: " + test.Main.player[e.Plr].name);`
`21`		`- //};`
	`16`	`+ test.Hooks.NetMessage.PlayerAnnounce += (sender, e) => {`
	`17`	`+ Console.WriteLine("[USP] Player joined: " + test.Main.player[e.Plr].name);`
	`18`	`+ };`
`22`	`19`
`23`		`- //test.Program.LaunchGame(args);`
	`20`	`+ test.Program.LaunchGame(args);`
`24`	`21`	`}`
`25`	`22`	`}`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public static class Constants`
`13`	`13`	`public const string RootContextFullName = "UnifiedServerProcess.RootContext";`
`14`	`14`	`public const string GlobalInitializerTypeName = "UnifiedServerProcess.GlobalInitializer";`
`15`	`15`	`public const string InitializerAttributeTypeName = "UnifiedServerProcess.InitializerExtractFromAttribute";`
`16`		`- public const string GlobalInitializerEntryPointName = "InitializeEntryPoint";`
	`16`	`+ public const string GlobalInitializerEntryPointName = "Initialize";`
`17`	`17`
`18`	`18`	`public static class Modifiers`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace OTAPI.UnifiedServerProcess.Core.Analysis.MethodCallAnalysis`
`16`	`16`	`{`
`17`		`- public class MethodCallGraph : Analyzer, IMethodBehaivorFeature`
	`17`	`+ public class MethodCallGraph : Analyzer, IMethodImplementationFeature`
`18`	`18`	`{`
`19`	`19`	`public override string Name => "MethodCallGraph";`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace OTAPI.UnifiedServerProcess.Core.Analysis.ParamModificationAnalysis`
`18`	`18`	`{`
`19`		`- public class ParamModificationAnalyzer : Analyzer, IMethodBehaivorFeature`
	`19`	`+ public class ParamModificationAnalyzer : Analyzer, IMethodImplementationFeature`
`20`	`20`	`{`
`21`	`21`	`public sealed override string Name => "ParamModificationAnalyzer";`
`22`	`22`	`public readonly ImmutableDictionary<string, ImmutableDictionary<int, ParamModifications>> ModifiedParameters;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`namespace OTAPI.UnifiedServerProcess.Core.Analysis.ParameterFlowAnalysis`
`18`	`18`	`{`
`19`	`19`
`20`		`- public sealed class ParameterFlowAnalyzer : Analyzer, IMethodBehaivorFeature`
	`20`	`+ public sealed class ParameterFlowAnalyzer : Analyzer, IMethodImplementationFeature`
`21`	`21`	`{`
`22`	`22`	`public readonly ImmutableDictionary<string, ParameterReferenceData> AnalyzedMethods;`
`23`	`23`	`public sealed override string Name => "ParamFlowAnalyzer";`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class StaticFieldModificationAnalyzer(ILogger logger,`
`28`	`28`	`MethodCallGraph callGraph,`
`29`	`29`	`DelegateInvocationGraph invocationGraph,`
`30`	`30`	`MethodInheritanceGraph inheritanceGraph,`
`31`		`- TypeInheritanceGraph typeInheritanceGraph) : Analyzer(logger), IMethodBehaivorFeature, IMethodCheckCacheFeature`
	`31`	`+ TypeInheritanceGraph typeInheritanceGraph) : Analyzer(logger), IMethodImplementationFeature, IMethodCheckCacheFeature`
`32`	`32`	`{`
`33`	`33`	`public DelegateInvocationGraph DelegateInvocationGraph => invocationGraph;`
`34`	`34`	`public MethodInheritanceGraph MethodInheritanceGraph => inheritanceGraph;`