Resolve conflicts when merging from dev

Kaioru · Oct 11, 2023 · bcf5fa9 · bcf5fa9
2 parents 577def4 + d240364
commit bcf5fa9
Show file tree

Hide file tree

Showing 102 changed files with 936 additions and 1,193 deletions.
diff --git a/Edelstein.sln b/Edelstein.sln
@@ -53,10 +53,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Protocol.Gameplay
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Common.Gameplay.Login", "src\common\Edelstein.Common.Gameplay.Login\Edelstein.Common.Gameplay.Login.csproj", "{BB78E48F-1B59-4AD2-8863-1C8354260B56}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Protocol.Data", "src\protocol\Edelstein.Protocol.Data\Edelstein.Protocol.Data.csproj", "{7C9711DD-B358-49D8-88F4-416362AA0CF3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Common.Data.NX", "src\common\Edelstein.Common.Data.NX\Edelstein.Common.Data.NX.csproj", "{42EC73E4-8B41-4753-8F36-DCA17F9C0992}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Protocol.Gameplay.Game", "src\protocol\Edelstein.Protocol.Gameplay.Game\Edelstein.Protocol.Gameplay.Game.csproj", "{E5001CBD-3BC5-49CD-B254-257B74A4B427}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edelstein.Common.Gameplay.Game", "src\common\Edelstein.Common.Gameplay.Game\Edelstein.Common.Gameplay.Game.csproj", "{C124BBAE-A5BE-491E-AF7B-C55396F5EC1A}"
@@ -123,8 +119,6 @@ Global
 		{5796C1BE-FB3C-48C6-8AEC-DE1573EED8DA} = {52AE6DEF-E54C-47DC-85F3-8AF3C6FCD504}
 		{02E88548-2855-4264-9A90-1C0BE49B22A6} = {7F8DD283-A64C-40EC-98F2-84FA38716C28}
 		{BB78E48F-1B59-4AD2-8863-1C8354260B56} = {52AE6DEF-E54C-47DC-85F3-8AF3C6FCD504}
-		{7C9711DD-B358-49D8-88F4-416362AA0CF3} = {7F8DD283-A64C-40EC-98F2-84FA38716C28}
-		{42EC73E4-8B41-4753-8F36-DCA17F9C0992} = {52AE6DEF-E54C-47DC-85F3-8AF3C6FCD504}
 		{E5001CBD-3BC5-49CD-B254-257B74A4B427} = {7F8DD283-A64C-40EC-98F2-84FA38716C28}
 		{C124BBAE-A5BE-491E-AF7B-C55396F5EC1A} = {52AE6DEF-E54C-47DC-85F3-8AF3C6FCD504}
 		{9A544A78-841F-4259-9088-0AE637FBA25A} = {7F8DD283-A64C-40EC-98F2-84FA38716C28}
@@ -205,14 +199,6 @@ Global
 		{BB78E48F-1B59-4AD2-8863-1C8354260B56}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB78E48F-1B59-4AD2-8863-1C8354260B56}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB78E48F-1B59-4AD2-8863-1C8354260B56}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C9711DD-B358-49D8-88F4-416362AA0CF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C9711DD-B358-49D8-88F4-416362AA0CF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C9711DD-B358-49D8-88F4-416362AA0CF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C9711DD-B358-49D8-88F4-416362AA0CF3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{42EC73E4-8B41-4753-8F36-DCA17F9C0992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{42EC73E4-8B41-4753-8F36-DCA17F9C0992}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{42EC73E4-8B41-4753-8F36-DCA17F9C0992}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{42EC73E4-8B41-4753-8F36-DCA17F9C0992}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E5001CBD-3BC5-49CD-B254-257B74A4B427}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E5001CBD-3BC5-49CD-B254-257B74A4B427}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5001CBD-3BC5-49CD-B254-257B74A4B427}.Release|Any CPU.ActiveCfg = Release|Any CPU

diff --git a/src/app/Edelstein.Application.Server/Bootstraps/StartServerUpdateBootstrap.cs b/src/app/Edelstein.Application.Server/Bootstraps/StartServerUpdateBootstrap.cs
@@ -1,5 +1,4 @@
-using AutoMapper;
-using Edelstein.Application.Server.Configs;
+using Edelstein.Application.Server.Configs;
 using Edelstein.Protocol.Gameplay.Game;
 using Edelstein.Protocol.Gameplay.Login;
 using Edelstein.Protocol.Gameplay.Shop;

diff --git a/src/app/Edelstein.Application.Server/Edelstein.Application.Server.csproj b/src/app/Edelstein.Application.Server/Edelstein.Application.Server.csproj
@@ -10,6 +10,8 @@
     <PackageReference Include="Autofac" Version="7.1.0" />
     <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+    <PackageReference Include="Duey.Provider.NX" Version="2.0.0" />
+    <PackageReference Include="Duey.Provider.WZ" Version="2.0.0" />
     <PackageReference Include="Foundatio.JsonNet" Version="10.6.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0-rc.1.23419.4" />
@@ -23,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\common\Edelstein.Common.Data.NX\Edelstein.Common.Data.NX.csproj" />
     <ProjectReference Include="..\..\common\Edelstein.Common.Database\Edelstein.Common.Database.csproj" />
     <ProjectReference Include="..\..\common\Edelstein.Common.Gameplay.Game\Edelstein.Common.Gameplay.Game.csproj" />
     <ProjectReference Include="..\..\common\Edelstein.Common.Gameplay.Login\Edelstein.Common.Gameplay.Login.csproj" />

diff --git a/src/app/Edelstein.Application.Server/Program.cs b/src/app/Edelstein.Application.Server/Program.cs
@@ -1,7 +1,9 @@
 using Autofac.Extensions.DependencyInjection;
+using Duey.Abstractions;
+using Duey.Provider.NX;
+using Duey.Provider.WZ;
 using Edelstein.Application.Server;
 using Edelstein.Application.Server.Configs;
-using Edelstein.Common.Data.NX;
 using Edelstein.Common.Database;
 using Edelstein.Common.Database.Repositories;
 using Edelstein.Common.Scripting.Lua;
@@ -10,7 +12,6 @@
 using Edelstein.Common.Services.Social;
 using Edelstein.Common.Utilities.Templates;
 using Edelstein.Common.Utilities.Tickers;
-using Edelstein.Protocol.Data;
 using Edelstein.Protocol.Gameplay.Models.Accounts;
 using Edelstein.Protocol.Gameplay.Models.Characters;
 using Edelstein.Protocol.Scripting;
@@ -78,7 +79,20 @@ await Host.CreateDefaultBuilder(args)
             p.GetRequiredService<ProgramConfig>().TicksPerSecond
         ));
 
-        services.AddSingleton<IDataManager>(new NXDataManager(ctx.Configuration.GetSection("Data")["Directory"] ?? throw new InvalidOperationException()));
+        switch (ctx.Configuration.GetSection("Data")["Type"])
+        {
+            case "NX":
+                services.AddSingleton<IDataNamespace>(
+                    new NXNamespace(ctx.Configuration.GetSection("Data")["Directory"] ?? throw new InvalidOperationException())
+                );
+                break;
+            case "WZ":
+                services.AddSingleton<IDataNamespace>(new WZNamespace(
+                    ctx.Configuration.GetSection("Data")["Directory"] ?? throw new InvalidOperationException(),
+                    ctx.Configuration.GetSection("Data")["Key"] ?? throw new InvalidOperationException()));
+                break;
+        }
+
         services.AddSingleton<IScriptEngine>(new LuaScriptEngine(ctx.Configuration.GetSection("Scripts")["Directory"] ?? throw new InvalidOperationException()));
         services.AddSingleton(typeof(ITemplateManager<>), typeof(TemplateManager<>));
     })

diff --git a/src/app/Edelstein.Application.Server/packages.lock.json b/src/app/Edelstein.Application.Server/packages.lock.json
@@ -31,6 +31,25 @@
           "Microsoft.Extensions.Options": "6.0.0"
         }
       },
+      "Duey.Provider.NX": {
+        "type": "Direct",
+        "requested": "[2.0.0, )",
+        "resolved": "2.0.0",
+        "contentHash": "+rUyVKH5twoxsv7Rfy0GUDvA78t0M0vKCGGtfMzljDcsX/RyeeNj0ZJENZ9w7va0J+Nm69XMPEjrxZyWMV5uVQ==",
+        "dependencies": {
+          "Duey.Abstractions": "2.0.0",
+          "K4os.Compression.LZ4": "1.3.6"
+        }
+      },
+      "Duey.Provider.WZ": {
+        "type": "Direct",
+        "requested": "[2.0.0, )",
+        "resolved": "2.0.0",
+        "contentHash": "byBI5tAqQvJ8u/Lqyhg0Dg8AkrdKuAP3rF2pA0RkQSBcgdRCsKKLP4ogisCadrt5x+xjN0OMEYOrxjUc1axYoA==",
+        "dependencies": {
+          "Duey.Abstractions": "2.0.0"
+        }
+      },
       "Foundatio.JsonNet": {
         "type": "Direct",
         "requested": "[10.6.1, )",
@@ -217,13 +236,10 @@
           "DotNetty.Common": "0.7.5"
         }
       },
-      "Duey": {
+      "Duey.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "lBOhp81i/VhsOxpn17TBEoGrbuIVht2/AL1bKvf83K9pav8wobbGQODPxAPM53IF8y4DqE9vYgzXRD03mKX6ow==",
-        "dependencies": {
-          "K4os.Compression.LZ4": "1.1.11"
-        }
+        "resolved": "2.0.0",
+        "contentHash": "KP3l7yZoT1uMk8B+rAjZ3VL+2/XfXZxKTx31wDz7JNfcPnUmllJpgoqnDYQcVEJ5e4WLWToBQHZ3OIgOm6T/kg=="
       },
       "Foundatio": {
         "type": "Transitive",
@@ -239,11 +255,8 @@
       },
       "K4os.Compression.LZ4": {
         "type": "Transitive",
-        "resolved": "1.1.11",
-        "contentHash": "RNvJw0UGkedPhCqVBNIogtfQebY+bQt0PN7xDbVe5LWLra0ZEqPfjPSl7iStj3rgDnkqkkTTpm+vCX3hU1qKmA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
+        "resolved": "1.3.6",
+        "contentHash": "RxGhoJBjZCgGeZgDqOP4Krs1cR9PHInbz6d2N19Dic0Y6ZACzVKbR3uSpqfEZf4RiUbHk9aiog2eS22nQPTc2A=="
       },
       "MathParser.org-mXparser": {
         "type": "Transitive",
@@ -585,11 +598,6 @@
         "resolved": "7.0.0",
         "contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw=="
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
-      },
       "System.Runtime.CompilerServices.Unsafe": {
         "type": "Transitive",
         "resolved": "5.0.0",
@@ -611,13 +619,6 @@
       "edelstein.common.crypto": {
         "type": "Project"
       },
-      "edelstein.common.data.nx": {
-        "type": "Project",
-        "dependencies": {
-          "Duey": "[1.0.4, )",
-          "Edelstein.Protocol.Data": "[1.0.0, )"
-        }
-      },
       "edelstein.common.database": {
         "type": "Project",
         "dependencies": {
@@ -634,9 +635,8 @@
       "edelstein.common.gameplay": {
         "type": "Project",
         "dependencies": {
-          "Duey": "[1.0.4, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Common.Utilities": "[1.0.0, )",
-          "Edelstein.Protocol.Data": "[1.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )",
           "Edelstein.Protocol.Services.Social": "[1.0.0, )",
@@ -758,9 +758,6 @@
           "RBush": "[3.2.0, )"
         }
       },
-      "edelstein.protocol.data": {
-        "type": "Project"
-      },
       "edelstein.protocol.gameplay": {
         "type": "Project",
         "dependencies": {
@@ -773,7 +770,7 @@
       "edelstein.protocol.gameplay.game": {
         "type": "Project",
         "dependencies": {
-          "Edelstein.Protocol.Data": "[1.0.0, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Auth": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )",
@@ -783,7 +780,7 @@
       "edelstein.protocol.gameplay.login": {
         "type": "Project",
         "dependencies": {
-          "Edelstein.Protocol.Data": "[1.0.0, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Auth": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )"
@@ -792,7 +789,7 @@
       "edelstein.protocol.gameplay.shop": {
         "type": "Project",
         "dependencies": {
-          "Edelstein.Protocol.Data": "[1.0.0, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Auth": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )",
@@ -802,7 +799,7 @@
       "edelstein.protocol.gameplay.trade": {
         "type": "Project",
         "dependencies": {
-          "Edelstein.Protocol.Data": "[1.0.0, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Auth": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )",

diff --git a/src/common/Edelstein.Common.Data.NX/Edelstein.Common.Data.NX.csproj b/src/common/Edelstein.Common.Data.NX/Edelstein.Common.Data.NX.csproj
diff --git a/src/common/Edelstein.Common.Data.NX/NXDataNode.cs b/src/common/Edelstein.Common.Data.NX/NXDataNode.cs
diff --git a/src/common/Edelstein.Common.Data.NX/packages.lock.json b/src/common/Edelstein.Common.Data.NX/packages.lock.json
diff --git a/src/common/Edelstein.Common.Database/packages.lock.json b/src/common/Edelstein.Common.Database/packages.lock.json
@@ -87,27 +87,16 @@
           "Npgsql": "7.0.4"
         }
       },
-      "Duey": {
+      "Duey.Abstractions": {
         "type": "Transitive",
-        "resolved": "1.0.4",
-        "contentHash": "lBOhp81i/VhsOxpn17TBEoGrbuIVht2/AL1bKvf83K9pav8wobbGQODPxAPM53IF8y4DqE9vYgzXRD03mKX6ow==",
-        "dependencies": {
-          "K4os.Compression.LZ4": "1.1.11"
-        }
+        "resolved": "2.0.0",
+        "contentHash": "KP3l7yZoT1uMk8B+rAjZ3VL+2/XfXZxKTx31wDz7JNfcPnUmllJpgoqnDYQcVEJ5e4WLWToBQHZ3OIgOm6T/kg=="
       },
       "Humanizer.Core": {
         "type": "Transitive",
         "resolved": "2.14.1",
         "contentHash": "lQKvtaTDOXnoVJ20ibTuSIOf2i0uO0MPbDhd1jm238I+U/2ZnRENj0cktKZhtchBMtCUSRQ5v4xBCUbKNmyVMw=="
       },
-      "K4os.Compression.LZ4": {
-        "type": "Transitive",
-        "resolved": "1.1.11",
-        "contentHash": "RNvJw0UGkedPhCqVBNIogtfQebY+bQt0PN7xDbVe5LWLra0ZEqPfjPSl7iStj3rgDnkqkkTTpm+vCX3hU1qKmA==",
-        "dependencies": {
-          "System.Memory": "4.5.3"
-        }
-      },
       "MathParser.org-mXparser": {
         "type": "Transitive",
         "resolved": "4.4.3",
@@ -269,11 +258,6 @@
         "resolved": "4.4.0",
         "contentHash": "2sCCb7doXEwtYAbqzbF/8UAeDRMNmPaQbU2q50Psg1J9KzumyVVCgKQY8s53WIPTufNT0DpSe9QRvVjOzfDWBA=="
       },
-      "System.Memory": {
-        "type": "Transitive",
-        "resolved": "4.5.3",
-        "contentHash": "3oDzvc/zzetpTKWMShs1AADwZjQ/36HnsufHRPcOjyRAAMLDlu2iD33MBI2opxnezcVUtXyqDXXjoFMOU9c7SA=="
-      },
       "System.Text.Encodings.Web": {
         "type": "Transitive",
         "resolved": "7.0.0",
@@ -290,9 +274,8 @@
       "edelstein.common.gameplay": {
         "type": "Project",
         "dependencies": {
-          "Duey": "[1.0.4, )",
+          "Duey.Abstractions": "[2.0.0, )",
           "Edelstein.Common.Utilities": "[1.0.0, )",
-          "Edelstein.Protocol.Data": "[1.0.0, )",
           "Edelstein.Protocol.Gameplay": "[1.0.0, )",
           "Edelstein.Protocol.Services.Server": "[1.0.0, )",
           "Edelstein.Protocol.Services.Social": "[1.0.0, )",
@@ -308,9 +291,6 @@
           "RBush": "[3.2.0, )"
         }
       },
-      "edelstein.protocol.data": {
-        "type": "Project"
-      },
       "edelstein.protocol.gameplay": {
         "type": "Project",
         "dependencies": {