move shit around

Author: itsAudioo

.editorconfig

@@ -116,7 +116,7 @@ dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_s
 dotnet_naming_symbols.instance_fields.applicable_kinds = field
 
 dotnet_naming_style.instance_field_style.capitalization = camel_case
-dotnet_naming_style.instance_field_style.required_prefix = _
+dotnet_naming_style.instance_field_style.required_prefix =
 
 # Locals and parameters are camelCase
 dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion

examples/TestPlugin/Plugin.cs

@@ -86,7 +86,7 @@ internal sealed class MessagesSection
     }
 
     private void Greet(ICommandContext context) =>
-        context.Sender?.SendChat(this.Localizer.ForPlayer(context.Sender, "hello"));
+        context.Sender?.SendChat(this.Localizer.Localize(context.Sender, "hello"));
 
     private void ReloadConfigs(ICommandContext context)
     {

examples/TestPlugin/TestService.cs

@@ -6,12 +6,12 @@ namespace TestPlugin;
 using SwiftlyS2.Shared.Players;
 
 public sealed class TestService(
-	ISwiftlyCore core,
-	IPluginLogger logger,
-	ITranslate localizer)
+    ISwiftlyCore core,
+    IPluginLogger logger,
+    ITranslate localizer)
 {
-	public void Run() => logger.Info("SwDevtools DI smoke test for {0}", core.GetType().Name);
+    public void Run() => logger.Info("SwDevtools DI smoke test for {0}", core.GetType().Name);
 
-	public void Greet(IPlayer player) =>
-		player.SendChat(localizer.ForPlayer(player, "hello"));
+    public void Greet(IPlayer player) =>
+        player.SendChat(localizer.Localize(player, "hello"));
 }

src/Injection/ServiceCollectionExtensions.cs

@@ -29,37 +29,37 @@ public static IServiceCollection AddSwDevtoolsKit(this IServiceCollection self,
                 .Services;
         }
 
-        public static Is2PluginBuilder AddSwDevtoolsCore(this IServiceCollection services, ISwiftlyCore core,
+        public static ISwDevtoolsBuilder AddSwDevtoolsCore(this IServiceCollection services, ISwiftlyCore core,
             object pluginInstance, string? pluginName = null)
         {
             var (assembly, name) = ResolvePlugin(pluginInstance, pluginName);
             return services.AddSwDevtoolsCore(core, assembly, name);
         }
 
-        public static Is2PluginBuilder AddSwDevtoolsCore(this IServiceCollection self, ISwiftlyCore core,
+        public static ISwDevtoolsBuilder AddSwDevtoolsCore(this IServiceCollection self, ISwiftlyCore core,
             Assembly pluginAssembly, string? pluginName = null)
         {
             var resolvedName = pluginName ?? SwDevtoolsFactory.ResolvePluginName(pluginAssembly);
             self.TryAddSingleton(core);
             self.TryAddSingleton(new PluginIdentity(resolvedName, pluginAssembly));
 
-            return new S2PluginBuilder(self, core, pluginAssembly, resolvedName);
+            return new SwDevtoolsBuilder(self, core, pluginAssembly, resolvedName);
         }
 
-        public static Is2PluginBuilder AddSwDevtoolsConfig(this Is2PluginBuilder builder)
+        public static ISwDevtoolsBuilder AddSwDevtoolsConfig(this ISwDevtoolsBuilder builder)
         {
             builder.Services.TryAddSingleton<IJsonConfig>(_ => JsonConfig.Shared(builder.Core));
             return builder;
         }
 
-        public static Is2PluginBuilder AddSwDevtoolsTranslation(this Is2PluginBuilder builder)
+        public static ISwDevtoolsBuilder AddSwDevtoolsTranslation(this ISwDevtoolsBuilder builder)
         {
             builder.Services.TryAddSingleton<TranslateService>();
             builder.Services.TryAddSingleton<ITranslate>(sp => sp.GetRequiredService<TranslateService>());
             return builder;
         }
 
-        public static Is2PluginBuilder AddSwDevtoolsLogging(this Is2PluginBuilder builder)
+        public static ISwDevtoolsBuilder AddSwDevtoolsLogging(this ISwDevtoolsBuilder builder)
         {
             builder.Services.TryAddSingleton(_ => SwDevtoolsFactory.GetLoggerFactory(builder.Core));
             builder.Services.TryAddSingleton(_ => SwDevtoolsFactory.GetLogger(builder.Core, builder.PluginName));

src/Injection/S2PluginBuilder.cs src/Injection/SwDevtools.cssrc/Injection/S2PluginBuilder.cs renamed to src/Injection/SwDevtools.cs

@@ -4,19 +4,19 @@ namespace SwDevtools.Injection;
 using Microsoft.Extensions.DependencyInjection;
 using SwiftlyS2.Shared;
 
-public interface Is2PluginBuilder
+public interface ISwDevtoolsBuilder
 {
 	IServiceCollection Services { get; }
 	ISwiftlyCore Core { get; }
 	Assembly PluginAssembly { get; }
 	string PluginName { get; }
 }
 
-internal sealed class S2PluginBuilder(
+internal sealed class SwDevtoolsBuilder(
 	IServiceCollection services,
 	ISwiftlyCore core,
 	Assembly pluginAssembly,
-	string pluginName) : Is2PluginBuilder
+	string pluginName) : ISwDevtoolsBuilder
 {
 	public IServiceCollection Services => services;
 	public ISwiftlyCore Core => core;