Fix namespaces

Core/Annotations/Injectable.cs

@@ -1,4 +1,4 @@
-namespace Types.Annotations;
+namespace Core.Annotations;
 
 [AttributeUsage(AttributeTargets.Class)]
 public class Injectable(InjectionType injectionType = InjectionType.Scoped, Type? type = null) : Attribute

Core/Context/ApplicationContext.cs

@@ -1,6 +1,6 @@
-using Types.Annotations;
+using Core.Annotations;
 
-namespace Types.Context;
+namespace Core.Context;
 
 [Injectable(InjectionType.Singleton)]
 public class ApplicationContext

Core/Context/ContextVariable.cs

@@ -1,4 +1,4 @@
-namespace Types.Context;
+namespace Core.Context;
 
 public class ContextVariable(object value, ContextVariableType contextVariableType)
 {

Core/Context/ContextVariableType.cs

@@ -1,4 +1,4 @@
-namespace Types.Context;
+namespace Core.Context;
 
 public enum ContextVariableType
 {

Core/Core.csproj

@@ -5,7 +5,6 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputType>Library</OutputType>
-        <RootNamespace>Types</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>

Core/Models/Config/HttpConfig.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Config;
+namespace Core.Models.Config;
 
 public class HttpConfig
 {

Core/Models/Eft/Common/Tables/BotBase.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Types.Models.Eft.Common.Tables;
+namespace Core.Models.Eft.Common.Tables;
 
 public class BotBase
 {

Core/Models/Eft/Common/Tables/BotCore.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Eft.Common.Tables;
+namespace Core.Models.Eft.Common.Tables;
 
 public class BotCore
 {

Core/Models/Eft/Common/Tables/BotType.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Eft.Common.Tables;
+namespace Core.Models.Eft.Common.Tables;
 
 public class BotType
 {

Core/Models/Enums/ConfigTypes.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Enums;
+namespace Core.Models.Enums;
 
 public enum ConfigTypes
 {

Core/Models/Logging/LogBackgroundColor.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Logging;
+namespace Core.Models.Logging;
 
 public enum LogBackgroundColor
 {

Core/Models/Logging/LogTextColor.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Logging;
+namespace Core.Models.Logging;
 
 public enum LogTextColor
 {

Core/Models/Spt/Bots/Bots.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Types.Models.Spt.Bots;
+namespace Core.Models.Spt.Bots;
 
 public class Bots
 {

Core/Models/Spt/Server/DatabaseTables.cs

@@ -1,4 +1,4 @@
-namespace Types.Models.Spt.Server;
+namespace Core.Models.Spt.Server;
 
 public class DatabaseTables
 {

Core/Models/Utils/ILogger.cs

@@ -1,6 +1,6 @@
-using Types.Models.Logging;
+using Core.Models.Logging;
 
-namespace Types.Models.Utils;
+namespace Core.Models.Utils;
 
 public interface ILogger
 {

Core/Servers/ConfigServer.cs

@@ -1,6 +1,6 @@
-using Types.Annotations;
+using Core.Annotations;
 
-namespace Types.Servers;
+namespace Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class ConfigServer

Core/Servers/DatabaseServer.cs

@@ -1,4 +1,4 @@
-namespace Types.Servers;
+namespace Core.Servers;
 
 public class DatabaseServer
 {

Core/Servers/Http/IHttpListener.cs

@@ -1,4 +1,4 @@
-namespace Types.Servers.Http;
+namespace Core.Servers.Http;
 
 public interface IHttpListener
 {

Core/Servers/HttpServer.cs

@@ -1,13 +1,14 @@
 using System.Net.WebSockets;
+using Core.Context;
+using Core.Models.Config;
+using Core.Servers.Http;
+using Core.Services;
 using Microsoft.Extensions.Primitives;
-using Types.Annotations;
+using Core.Annotations;
-using Types.Context;
+using ILogger = Core.Models.Utils.ILogger;
-using Types.Models.Config;
+using Utils_ILogger = Core.Models.Utils.ILogger;
-using Types.Servers.Http;
-using Types.Services;
-using ILogger = Types.Models.Utils.ILogger;
 
-namespace Types.Servers;
+namespace Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class HttpServer

Core/Servers/WebSocketServer.cs

@@ -1,6 +1,6 @@
-using Types.Annotations;
+using Core.Annotations;
 
-namespace Types.Servers;
+namespace Core.Servers;
 
 [Injectable(InjectionType.Singleton)]
 public class WebSocketServer

Core/Services/I18nService.cs

@@ -1,4 +1,4 @@
-namespace Types.Services;
+namespace Core.Services;
 
 public class I18nService
 {

Core/Services/LocaleService.cs

@@ -1,8 +1,8 @@
-using Types.Annotations;
+using Core.Annotations;
-using Types.Servers;
+using Core.Servers;
-using ILogger = Types.Models.Utils.ILogger;
+using ILogger = Core.Models.Utils.ILogger;
 
-namespace Types.Services;
+namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocaleService

Core/Services/LocalisationService.cs

@@ -1,21 +1,22 @@
-using Types.Annotations;
+using Core.Utils;
-using Types.Servers;
+using Core.Annotations;
-using Types.Utils;
+using Core.Servers;
-using ILogger = Types.Models.Utils.ILogger;
+using ILogger = Core.Models.Utils.ILogger;
+using Utils_ILogger = Core.Models.Utils.ILogger;
 
-namespace Types.Services;
+namespace Core.Services;
 
 [Injectable(InjectionType.Singleton)]
 public class LocalisationService
 {
-    private readonly ILogger _logger;
+    private readonly Utils_ILogger _logger;
     private readonly RandomUtil _randomUtil;
     private readonly DatabaseServer _databaseServer;
     private readonly LocaleService _localeService;
     private readonly I18nService _i18nService;
 
     public LocalisationService(
-        ILogger logger,
+        Utils_ILogger logger,
         RandomUtil randomUtil,
         DatabaseServer databaseServer,
         LocaleService localeService

Core/Utils/HashUtil.cs

@@ -1,9 +1,9 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Security.Cryptography;
-using Types.Annotations;
+using Core.Annotations;
 
-namespace Types.Utils;
+namespace Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public partial class HashUtil

Core/Utils/Logging/SimpleTextLogger.cs

@@ -1,11 +1,12 @@
-using Types.Annotations;
+using Core.Models.Logging;
-using Types.Models.Logging;
+using Core.Annotations;
-using ILogger = Types.Models.Utils.ILogger;
+using ILogger = Core.Models.Utils.ILogger;
+using Utils_ILogger = Core.Models.Utils.ILogger;
 
-namespace Types.Utils.Logging;
+namespace Core.Utils.Logging;
 
 [Injectable(InjectionType.Singleton)]
-public class SimpleTextLogger : ILogger
+public class SimpleTextLogger : Utils_ILogger
 {
     // TODO: for now we simplify the logger into this barebones console writer
     public void WriteToLogFile(string data)

Core/Utils/RandomUtil.cs

@@ -1,4 +1,4 @@
-namespace Types.Utils;
+namespace Core.Utils;
 
 public class RandomUtil
 {

Core/Utils/TimeUtil.cs

@@ -1,6 +1,6 @@
-using Types.Annotations;
+using Core.Annotations;
 
-namespace Types.Utils;
+namespace Core.Utils;
 
 [Injectable(InjectionType.Singleton)]
 public class TimeUtil
@@ -171,7 +171,6 @@ public class TimeUtil
 	/// </summary>
 	/// <param name="number">The number to pad.</param>
 	/// <returns>The padded number as a string.</returns>
-	/// <exception cref="NotImplementedException"></exception>
 	private static string Pad(int number)
 	{
 		return number.ToString().PadLeft(2, '0');

Server/Program.cs

@@ -1,5 +1,5 @@
-using Types.Annotations;
+using Core.Annotations;
-using Types.Servers;
+using Core.Servers;
 
 namespace Server;