Skip to content
Merged
4 changes: 0 additions & 4 deletions managed/src/SwiftlyS2.Core/Bootstrap.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
using Microsoft.Extensions.Hosting;
using SwiftlyS2.Core.Misc;
using Microsoft.Extensions.Configuration;
using SwiftlyS2.Core.Modules.Engine;
using SwiftlyS2.Shared.Memory;
using SwiftlyS2.Shared.Services;
namespace SwiftlyS2.Core;
Expand Down Expand Up @@ -60,13 +59,10 @@ public static void Start(IntPtr nativeTable, int nativeTableSize, string basePat
.AddPlayerManagerService()
.AddPluginManager()
.AddHookManager()
.AddEngineService()
.AddTraceManagerService()
.AddCoreCommandService()
.AddPermissionManager()
.AddCoreHookService()
.AddMenuService()
.AddSingleton<CommandTracked>()
.AddSwiftlyCore(basePath);
})
.Build();
Expand Down
13 changes: 0 additions & 13 deletions managed/src/SwiftlyS2.Core/Hosting/EngineServiceInjection.cs

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,8 @@ namespace SwiftlyS2.Core.ConsoleOutput;

internal class ConsoleOutputService : IConsoleOutputService, IDisposable
{
private List<ConsoleOutputCallbackBase> _callbacks = new();
private ILogger<ConsoleOutputService> _logger { get; init; }
private ILoggerFactory _loggerFactory { get; init; }
private IContextedProfilerService _profiler { get; init; }

private object _lock = new();

public ConsoleOutputService(ILogger<ConsoleOutputService> logger, ILoggerFactory loggerFactory, IContextedProfilerService profiler)
{
_logger = logger;
_loggerFactory = loggerFactory;
_profiler = profiler;
}

public Guid RegisterConsoleOutputListener(IConsoleOutputService.ConsoleOutputHandler handler)
{
var callback = new ConsoleOutputListenerCallback(handler, _loggerFactory, _profiler);
lock (_lock)
{
_callbacks.Add(callback);
}

return callback.Guid;
}

public void UnregisterConsoleOutputListener(Guid guid)
public ConsoleOutputService()
{
lock (_lock)
{
_callbacks.RemoveAll(callback =>
{
if (callback.Guid == guid)
{
callback.Dispose();
return true;
}
return false;
});
}
}

public bool IsFilterEnabled()
Expand Down Expand Up @@ -80,14 +43,6 @@ public void WriteToServerConsole(string message)

public void Dispose()
{
lock (_lock)
{
foreach (var callback in _callbacks)
{
callback.Dispose();
}
_callbacks.Clear();
}
GC.SuppressFinalize(this);
}
}
Loading
Loading