Manually register all features to support trimming

ButterscotchV · ButterscotchV · commit 9b35bb29c95a · 2023-01-01T08:13:09.000-05:00
diff --git a/MultiAdmin/Features/Attributes/FeatureAttribute.cs b/MultiAdmin/Features/Attributes/FeatureAttribute.cs
diff --git a/MultiAdmin/Features/ConfigGenerator.cs b/MultiAdmin/Features/ConfigGenerator.cs
@@ -3,12 +3,10 @@
 using System.IO;
 using MultiAdmin.Config;
 using MultiAdmin.Config.ConfigHandler;
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class ConfigGenerator : Feature, ICommand
 	{
 
diff --git a/MultiAdmin/Features/ConfigReload.cs b/MultiAdmin/Features/ConfigReload.cs
@@ -1,9 +1,7 @@
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class ConfigReload : Feature, ICommand
 	{
 		public ConfigReload(Server server) : base(server)
diff --git a/MultiAdmin/Features/ExitCommand.cs b/MultiAdmin/Features/ExitCommand.cs
@@ -1,8 +1,5 @@
-using MultiAdmin.Features.Attributes;
-
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class ExitCommand : Feature, ICommand
 	{
 		public ExitCommand(Server server) : base(server)
diff --git a/MultiAdmin/Features/FileCopyRoundQueue.cs b/MultiAdmin/Features/FileCopyRoundQueue.cs
@@ -1,10 +1,8 @@
 using System;
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class FileCopyRoundQueue : Feature, IEventRoundEnd
 	{
 		private string[] queue = Array.Empty<string>();
@@ -93,7 +91,7 @@ public override string GetFeatureDescription()
 
 		public override string GetFeatureName()
 		{
-			return "Folder Copy Round Queue";
+			return "File Copy Round Queue";
 		}
 	}
 }
diff --git a/MultiAdmin/Features/GithubGenerator.cs b/MultiAdmin/Features/GithubGenerator.cs
@@ -4,13 +4,11 @@
 using System.Text;
 using MultiAdmin.Config;
 using MultiAdmin.Config.ConfigHandler;
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.ServerIO;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class GithubGenerator : Feature, ICommand
 	{
 		public const string EmptyIndicator = "**Empty**";
diff --git a/MultiAdmin/Features/HelpCommand.cs b/MultiAdmin/Features/HelpCommand.cs
@@ -1,12 +1,10 @@
 using System;
 using System.Collections.Generic;
 using MultiAdmin.ConsoleTools;
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	public class HelpCommand : Feature, ICommand
 	{
 		private static readonly ColoredMessage helpPrefix = new("Commands from MultiAdmin:\n", ConsoleColor.Yellow);
diff --git a/MultiAdmin/Features/MemoryChecker.cs b/MultiAdmin/Features/MemoryChecker.cs
@@ -1,9 +1,7 @@
 using System;
-using MultiAdmin.Features.Attributes;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class MemoryChecker : Feature, IEventTick, IEventRoundEnd
 	{
 		private const decimal BytesInMegabyte = 1048576;
diff --git a/MultiAdmin/Features/MultiAdminInfo.cs b/MultiAdmin/Features/MultiAdminInfo.cs
@@ -1,9 +1,7 @@
 using System;
-using MultiAdmin.Features.Attributes;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class MultiAdminInfo : Feature, IEventServerPreStart, ICommand
 	{
 		public MultiAdminInfo(Server server) : base(server)
diff --git a/MultiAdmin/Features/NewCommand.cs b/MultiAdmin/Features/NewCommand.cs
@@ -1,10 +1,8 @@
 using System.Diagnostics;
-using MultiAdmin.Features.Attributes;
 using MultiAdmin.Utility;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class NewCommand : Feature, ICommand, IEventServerFull
 	{
 		private string? onFullServerId;
diff --git a/MultiAdmin/Features/Restart.cs b/MultiAdmin/Features/Restart.cs
@@ -1,8 +1,5 @@
-using MultiAdmin.Features.Attributes;
-
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class Restart : Feature, ICommand
 	{
 		public Restart(Server server) : base(server)
diff --git a/MultiAdmin/Features/RestartRoundCounter.cs b/MultiAdmin/Features/RestartRoundCounter.cs
@@ -1,8 +1,5 @@
-using MultiAdmin.Features.Attributes;
-
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class RestartRoundCounter : Feature, IEventRoundEnd
 	{
 		private int count;
diff --git a/MultiAdmin/Features/TitleBar.cs b/MultiAdmin/Features/TitleBar.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using MultiAdmin.Features.Attributes;
 
 namespace MultiAdmin.Features
 {
-	[Feature]
 	internal class Titlebar : Feature, IEventServerStart
 	{
 		private int ServerProcessId
diff --git a/MultiAdmin/Server.cs b/MultiAdmin/Server.cs
@@ -2,13 +2,11 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using MultiAdmin.Config;
 using MultiAdmin.ConsoleTools;
-using MultiAdmin.Features.Attributes;
+using MultiAdmin.Features;
 using MultiAdmin.ServerIO;
 using MultiAdmin.Utility;
 
@@ -593,33 +591,20 @@ private void RegisterFeature(Feature feature)
 			features.Add(feature);
 		}
 
-		private static IEnumerable<Type> GetTypesWithAttribute(Type attribute)
-		{
-			foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
-			{
-				foreach (Type type in assembly.GetTypes())
-				{
-					object[] attributes = type.GetCustomAttributes(attribute, true);
-					if (!attributes.IsEmpty()) yield return type;
-				}
-			}
-		}
-
 		private void RegisterFeatures()
 		{
-			Type[] assembly = GetTypesWithAttribute(typeof(FeatureAttribute)).ToArray();
-			foreach (Type type in assembly)
-			{
-				try
-				{
-					object? featureInstance = Activator.CreateInstance(type, this);
-					if (featureInstance is Feature feature) RegisterFeature(feature);
-				}
-				catch (Exception e)
-				{
-					Program.LogDebugException(nameof(RegisterFeatures), e);
-				}
-			}
+			RegisterFeature(new ConfigGenerator(this));
+			RegisterFeature(new ConfigReload(this));
+			RegisterFeature(new ExitCommand(this));
+			RegisterFeature(new FileCopyRoundQueue(this));
+			RegisterFeature(new GithubGenerator(this));
+			RegisterFeature(new HelpCommand(this));
+			RegisterFeature(new MemoryChecker(this));
+			RegisterFeature(new MultiAdminInfo(this));
+			RegisterFeature(new NewCommand(this));
+			RegisterFeature(new Restart(this));
+			RegisterFeature(new RestartRoundCounter(this));
+			RegisterFeature(new Titlebar(this));
 		}
 
 		private void InitFeatures()

Original file line number	Diff line number	Diff line change
`@@ -3,12 +3,10 @@`
`3`	`3`	`using System.IO;`
`4`	`4`	`using MultiAdmin.Config;`
`5`	`5`	`using MultiAdmin.Config.ConfigHandler;`
`6`		`-using MultiAdmin.Features.Attributes;`
`7`	`6`	`using MultiAdmin.Utility;`
`8`	`7`
`9`	`8`	`namespace MultiAdmin.Features`
`10`	`9`	`{`
`11`		`- [Feature]`
`12`	`10`	`internal class ConfigGenerator : Feature, ICommand`
`13`	`11`	`{`
`14`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`		`-using MultiAdmin.Features.Attributes;`
`2`	`1`	`using MultiAdmin.Utility;`
`3`	`2`
`4`	`3`	`namespace MultiAdmin.Features`
`5`	`4`	`{`
`6`		`- [Feature]`
`7`	`5`	`internal class ConfigReload : Feature, ICommand`
`8`	`6`	`{`
`9`	`7`	`public ConfigReload(Server server) : base(server)`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`		`-using MultiAdmin.Features.Attributes;`
`2`		`-`
`3`	`1`	`namespace MultiAdmin.Features`
`4`	`2`	`{`
`5`		`- [Feature]`
`6`	`3`	`internal class ExitCommand : Feature, ICommand`
`7`	`4`	`{`
`8`	`5`	`public ExitCommand(Server server) : base(server)`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`using System;`
`2`		`-using MultiAdmin.Features.Attributes;`
`3`	`2`	`using MultiAdmin.Utility;`
`4`	`3`
`5`	`4`	`namespace MultiAdmin.Features`
`6`	`5`	`{`
`7`		`- [Feature]`
`8`	`6`	`internal class FileCopyRoundQueue : Feature, IEventRoundEnd`
`9`	`7`	`{`
`10`	`8`	`private string[] queue = Array.Empty<string>();`
`@@ -93,7 +91,7 @@ public override string GetFeatureDescription()`
`93`	`91`
`94`	`92`	`public override string GetFeatureName()`
`95`	`93`	`{`
`96`		`- return "Folder Copy Round Queue";`
	`94`	`+ return "File Copy Round Queue";`
`97`	`95`	`}`
`98`	`96`	`}`
`99`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,11 @@`
`4`	`4`	`using System.Text;`
`5`	`5`	`using MultiAdmin.Config;`
`6`	`6`	`using MultiAdmin.Config.ConfigHandler;`
`7`		`-using MultiAdmin.Features.Attributes;`
`8`	`7`	`using MultiAdmin.ServerIO;`
`9`	`8`	`using MultiAdmin.Utility;`
`10`	`9`
`11`	`10`	`namespace MultiAdmin.Features`
`12`	`11`	`{`
`13`		`- [Feature]`
`14`	`12`	`internal class GithubGenerator : Feature, ICommand`
`15`	`13`	`{`
`16`	`14`	`public const string EmptyIndicator = "Empty";`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using MultiAdmin.ConsoleTools;`
`4`		`-using MultiAdmin.Features.Attributes;`
`5`	`4`	`using MultiAdmin.Utility;`
`6`	`5`
`7`	`6`	`namespace MultiAdmin.Features`
`8`	`7`	`{`
`9`		`- [Feature]`
`10`	`8`	`public class HelpCommand : Feature, ICommand`
`11`	`9`	`{`
`12`	`10`	`private static readonly ColoredMessage helpPrefix = new("Commands from MultiAdmin:\n", ConsoleColor.Yellow);`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,8 @@`
`1`	`1`	`using System.Diagnostics;`
`2`		`-using MultiAdmin.Features.Attributes;`
`3`	`2`	`using MultiAdmin.Utility;`
`4`	`3`
`5`	`4`	`namespace MultiAdmin.Features`
`6`	`5`	`{`
`7`		`- [Feature]`
`8`	`6`	`internal class NewCommand : Feature, ICommand, IEventServerFull`
`9`	`7`	`{`
`10`	`8`	`private string? onFullServerId;`