Compare commits

..

17 Commits

Author SHA1 Message Date
zznty
f75ef55405 add dynamic world config
All checks were successful
Release / Get Version (push) Successful in 3m36s
Release / Build and Publish Nuget (push) Successful in 8m20s
Release / Build and Publish Package (push) Successful in 8m21s
2024-10-20 07:40:34 +07:00
Bishbash777
5804165d2b 205 fixes. (#590)
All checks were successful
Release / Get Version (push) Successful in 7s
Release / Build and Publish Nuget (push) Successful in 2m33s
Release / Build and Publish Package (push) Successful in 3m9s
(cherry picked from commit e41a26dbd2fb966b21757fa0248f6b4a4e716aad)
2024-10-15 01:18:02 +07:00
zznty
1960d2a0de fix world path being truncated if missing trailing slash
Some checks failed
Release / Get Version (push) Failing after 1s
Release / Build and Publish Nuget (push) Has been skipped
Release / Build and Publish Package (push) Has been skipped
2024-10-14 23:20:49 +07:00
zznty
0c53b2f1d3 add RegisterAuxAssembly for compat with loader wrapper
All checks were successful
Release / Get Version (push) Successful in 8s
Release / Build and Publish Nuget (push) Successful in 1m51s
Release / Build and Publish Package (push) Successful in 13m54s
2024-10-14 18:18:21 +07:00
zznty
b6e88b359f fix assembly rewriter stripping assembly resources
All checks were successful
Release / Get Version (push) Successful in 11s
Release / Build and Publish Nuget (push) Successful in 2m14s
Release / Build and Publish Package (push) Successful in 19m29s
2024-10-14 00:15:05 +07:00
zznty
b60100171d fix assembly rewriter paths on publish
All checks were successful
Release / Get Version (push) Successful in 10s
Release / Build and Publish Nuget (push) Successful in 8m54s
Release / Build and Publish Package (push) Successful in 17m25s
2024-10-13 22:46:22 +07:00
zznty
65e2f342a3 fix exception when destruction occurs before game has been initialized
All checks were successful
Release / Get Version (push) Successful in 15s
Release / Build and Publish Nuget (push) Successful in 2m21s
Release / Build and Publish Package (push) Successful in 2m51s
2024-10-13 22:29:05 +07:00
zznty
6a695f2abf fix backwards compat with some plugins 2024-10-13 22:26:09 +07:00
zznty
9289ab8003 fix compiler paths on publish 2024-10-13 22:17:07 +07:00
zznty
f1ea1930f7 move torch to official harmony for better compatibility
All checks were successful
Release / Get Version (push) Successful in 9s
Release / Build and Publish Nuget (push) Successful in 1m36s
Release / Build and Publish Package (push) Successful in 2m1s
2024-08-26 15:38:40 +07:00
zznty
fa88faffa2 add torch dockerfile 2024-08-26 15:38:19 +07:00
zznty
a7ba540fb1 remove protobuf dependency
All checks were successful
Release / Get Version (push) Successful in 9s
Release / Build and Publish Nuget (push) Successful in 1m29s
Release / Build and Publish Package (push) Successful in 2m6s
2024-08-25 22:21:11 +07:00
zznty
365fcfd2ef fix multiplayer manager patch
All checks were successful
Release / Get Version (push) Successful in 9s
Release / Build and Publish Nuget (push) Successful in 1m40s
Release / Build and Publish Package (push) Successful in 2m1s
2024-08-25 17:13:06 +07:00
zznty
9b9d8b7241 fix world checkpoint loading
All checks were successful
Release / Get Version (push) Successful in 10s
Release / Build and Publish Nuget (push) Successful in 1m46s
Release / Build and Publish Package (push) Successful in 1m58s
2024-08-25 16:53:19 +07:00
zznty
ba7ed276e6 also increase steam connect timeout 2024-08-25 16:53:04 +07:00
zznty
08063c4ce8 update harmonyx 2024-08-25 16:52:27 +07:00
zznty
0d74a5c1a8 update deps
All checks were successful
Release / Get Version (push) Successful in 11s
Release / Build and Publish Package (push) Successful in 2m11s
Release / Build and Publish Nuget (push) Successful in 4m0s
2024-08-22 14:05:36 +07:00
30 changed files with 794 additions and 1002 deletions

25
.dockerignore Normal file
View File

@@ -0,0 +1,25 @@
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/.idea
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/bin
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
LICENSE
README.md

38
Dockerfile Normal file
View File

@@ -0,0 +1,38 @@
FROM mcr.microsoft.com/dotnet/runtime:8.0-windowsservercore-ltsc2022 AS base
USER $APP_UID
WORKDIR /app
FROM mcr.microsoft.com/dotnet/sdk:8.0-windowsservercore-ltsc2022 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["NuGet.config", "."]
COPY ["Directory.Build.props", "."]
COPY ["Torch.API/Torch.API.csproj", "Torch.API/"]
COPY ["Torch/Torch.csproj", "Torch/"]
COPY ["Torch.Server/Torch.Server.csproj", "Torch.Server/"]
RUN dotnet restore "Torch.Server/Torch.Server.csproj" --locked-mode
COPY . .
WORKDIR "/src/Torch.Server"
RUN dotnet build "Torch.Server.csproj" -c %BUILD_CONFIGURATION% -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "Torch.Server.csproj" -c %BUILD_CONFIGURATION% -o /app/publish --no-self-contained /p:UseAppHost=false
FROM mcr.microsoft.com/windows/servercore:ltsc2022
ADD ["https://aka.ms/dotnet/8.0/windowsdesktop-runtime-win-x64.exe", "installer.exe"]
RUN installer.exe /install /quiet /norestart && del installer.exe
ADD ["https://github.com/abbodi1406/vcredist/releases/latest/download/VisualCppRedist_AIO_x86_x64.exe", "vc.exe"]
USER ContainerAdministrator
RUN vc.exe /ai39 && del vc.exe
USER ContainerUser
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "Torch.Server.dll"]

View File

@@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@@ -140,6 +141,22 @@ namespace Torch.API
event Action<ITorchServer> Initialized; event Action<ITorchServer> Initialized;
TimeSpan ElapsedPlayTime { get; set; } TimeSpan ElapsedPlayTime { get; set; }
#region Backwards compat
/// <summary>
/// Path of the dedicated instance folder.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
new string InstancePath => ((ITorchBase)this).InstancePath;
/// <summary>
/// Name of the dedicated instance.
/// </summary>
[EditorBrowsable(EditorBrowsableState.Never)]
new string InstanceName => ((ITorchBase)this).InstanceName;
#endregion
} }
/// <summary> /// <summary>

View File

@@ -12,16 +12,15 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" /> <PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
<PackageReference Include="NLog" Version="5.3.2" /> <PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="NuGet.Commands" Version="6.9.1" /> <PackageReference Include="NuGet.Commands" Version="6.11.0" />
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.9.1" /> <PackageReference Include="NuGet.DependencyResolver.Core" Version="6.11.0" />
<PackageReference Include="SemanticVersioning" Version="2.0.2" /> <PackageReference Include="SemanticVersioning" Version="2.0.2" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.204.15"> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.*">
<ExcludeAssets>runtime</ExcludeAssets> <ExcludeAssets>runtime</ExcludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.Linq.Async" Version="6.0.1" /> <PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

View File

@@ -4,46 +4,46 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"JetBrains.Annotations": { "JetBrains.Annotations": {
"type": "Direct", "type": "Direct",
"requested": "[2023.3.0, )", "requested": "[2024.2.0, )",
"resolved": "2023.3.0", "resolved": "2024.2.0",
"contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Direct", "type": "Direct",
"requested": "[8.0.1, )", "requested": "[8.0.2, )",
"resolved": "8.0.1", "resolved": "8.0.2",
"contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0" "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.3.2, )", "requested": "[5.3.3, )",
"resolved": "5.3.2", "resolved": "5.3.3",
"contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg==" "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Direct", "type": "Direct",
"requested": "[6.9.1, )", "requested": "[6.11.0, )",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==", "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.9.1", "NuGet.Credentials": "6.11.0",
"NuGet.ProjectModel": "6.9.1" "NuGet.ProjectModel": "6.11.0"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Direct", "type": "Direct",
"requested": "[6.9.1, )", "requested": "[6.11.0, )",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==", "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.LibraryModel": "6.9.1", "NuGet.LibraryModel": "6.11.0",
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"SemanticVersioning": { "SemanticVersioning": {
@@ -54,9 +54,9 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
"requested": "[1.204.15, )", "requested": "[1.*, )",
"resolved": "1.204.15", "resolved": "1.205.23",
"contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==", "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
"dependencies": { "dependencies": {
"SharpDX": "4.2.0-keen-cringe", "SharpDX": "4.2.0-keen-cringe",
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
@@ -71,15 +71,6 @@
"Microsoft.Bcl.AsyncInterfaces": "6.0.0" "Microsoft.Bcl.AsyncInterfaces": "6.0.0"
} }
}, },
"System.Text.Json": {
"type": "Direct",
"requested": "[8.0.3, )",
"resolved": "8.0.3",
"contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==",
"dependencies": {
"System.Text.Encodings.Web": "8.0.0"
}
},
"Microsoft.Bcl.AsyncInterfaces": { "Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "6.0.0",
@@ -118,74 +109,74 @@
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==", "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.9.1" "NuGet.Frameworks": "6.11.0"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==", "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==", "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA==" "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==", "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"NuGet.Versioning": "6.9.1" "NuGet.Versioning": "6.11.0"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==", "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.3", "Newtonsoft.Json": "13.0.3",
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.Versioning": "6.9.1", "NuGet.Versioning": "6.11.0",
"System.Security.Cryptography.Pkcs": "6.0.4" "System.Security.Cryptography.Pkcs": "6.0.4"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==", "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.9.1" "NuGet.DependencyResolver.Core": "6.11.0"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==", "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.9.1" "NuGet.Packaging": "6.11.0"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ==" "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
@@ -214,11 +205,6 @@
"type": "Transitive", "type": "Transitive",
"resolved": "4.4.0", "resolved": "4.4.0",
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
},
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
} }
}, },
"net8.0-windows7.0/win-x64": { "net8.0-windows7.0/win-x64": {
@@ -234,11 +220,6 @@
"type": "Transitive", "type": "Transitive",
"resolved": "4.4.0", "resolved": "4.4.0",
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
},
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "8.0.0",
"contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ=="
} }
} }
} }

View File

@@ -13,9 +13,9 @@
</PropertyGroup> </PropertyGroup>
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> --> <!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="NLog" Version="5.3.2" /> <PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="xunit" Version="2.8.0" /> <PackageReference Include="xunit" Version="2.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Torch.API\Torch.API.csproj" /> <ProjectReference Include="..\Torch.API\Torch.API.csproj" />

View File

@@ -4,29 +4,29 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"Microsoft.NET.Test.Sdk": { "Microsoft.NET.Test.Sdk": {
"type": "Direct", "type": "Direct",
"requested": "[17.9.0, )", "requested": "[17.11.0, )",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==",
"dependencies": { "dependencies": {
"Microsoft.CodeCoverage": "17.9.0", "Microsoft.CodeCoverage": "17.11.0",
"Microsoft.TestPlatform.TestHost": "17.9.0" "Microsoft.TestPlatform.TestHost": "17.11.0"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.3.2, )", "requested": "[5.3.3, )",
"resolved": "5.3.2", "resolved": "5.3.3",
"contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg==" "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
}, },
"xunit": { "xunit": {
"type": "Direct", "type": "Direct",
"requested": "[2.8.0, )", "requested": "[2.9.0, )",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "US3a3twJziAif1kFPGdk9fALwILHxV0n1roX5j67bN/d3o4DGNLHnV3tr5ZX+uinVrzfkf0avH3zGX8JPBC0qA==", "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==",
"dependencies": { "dependencies": {
"xunit.analyzers": "1.13.0", "xunit.analyzers": "1.15.0",
"xunit.assert": "2.8.0", "xunit.assert": "2.9.0",
"xunit.core": "[2.8.0]" "xunit.core": "[2.9.0]"
} }
}, },
"AutoCompleteTextBox": { "AutoCompleteTextBox": {
@@ -56,18 +56,19 @@
"System.Text.Json": "5.0.1" "System.Text.Json": "5.0.1"
} }
}, },
"HarmonyX": {
"type": "Transitive",
"resolved": "2.10.2-prerelease.7",
"contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
"dependencies": {
"MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
}
},
"JetBrains.Annotations": { "JetBrains.Annotations": {
"type": "Transitive", "type": "Transitive",
"resolved": "2023.3.0", "resolved": "2024.2.0",
"contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
},
"Lib.Harmony.Thin": {
"type": "Transitive",
"resolved": "2.3.3-torch",
"contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
"dependencies": {
"MonoMod.Core": "1.1.0",
"System.Text.Json": "8.0.1"
}
}, },
"MahApps.Metro": { "MahApps.Metro": {
"type": "Transitive", "type": "Transitive",
@@ -103,27 +104,29 @@
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==", "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0", "System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0", "System.Reflection.Metadata": "8.0.0"
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==", "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.9.2]" "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0"
} }
}, },
"Microsoft.CodeCoverage": { "Microsoft.CodeCoverage": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg=="
}, },
"Microsoft.Diagnostics.NETCore.Client": { "Microsoft.Diagnostics.NETCore.Client": {
"type": "Transitive", "type": "Transitive",
@@ -161,8 +164,8 @@
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.1", "resolved": "8.0.2",
"contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0" "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
} }
@@ -279,18 +282,18 @@
}, },
"Microsoft.TestPlatform.ObjectModel": { "Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==", "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==",
"dependencies": { "dependencies": {
"System.Reflection.Metadata": "1.6.0" "System.Reflection.Metadata": "1.6.0"
} }
}, },
"Microsoft.TestPlatform.TestHost": { "Microsoft.TestPlatform.TestHost": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==", "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==",
"dependencies": { "dependencies": {
"Microsoft.TestPlatform.ObjectModel": "17.9.0", "Microsoft.TestPlatform.ObjectModel": "17.11.0",
"Newtonsoft.Json": "13.0.1" "Newtonsoft.Json": "13.0.1"
} }
}, },
@@ -306,21 +309,21 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==", "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==", "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1", "MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5" "MonoMod.Utils": "25.0.4"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
@@ -328,25 +331,13 @@
"resolved": "1.0.1", "resolved": "1.0.1",
"contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
}, },
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.1.1",
"contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
"dependencies": {
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1",
"MonoMod.Core": "1.1.1",
"MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5"
}
},
"MonoMod.Utils": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.5", "resolved": "25.0.4",
"contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==", "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
@@ -357,116 +348,105 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==", "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.9.1", "NuGet.Credentials": "6.11.0",
"NuGet.ProjectModel": "6.9.1" "NuGet.ProjectModel": "6.11.0"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==", "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.9.1" "NuGet.Frameworks": "6.11.0"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==", "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==", "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==", "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.LibraryModel": "6.9.1", "NuGet.LibraryModel": "6.11.0",
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA==" "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==", "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"NuGet.Versioning": "6.9.1" "NuGet.Versioning": "6.11.0"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==", "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.3", "Newtonsoft.Json": "13.0.3",
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.Versioning": "6.9.1", "NuGet.Versioning": "6.11.0",
"System.Security.Cryptography.Pkcs": "6.0.4" "System.Security.Cryptography.Pkcs": "6.0.4"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==", "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.9.1" "NuGet.DependencyResolver.Core": "6.11.0"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==", "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.9.1" "NuGet.Packaging": "6.11.0"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ==" "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
}, },
"nulastudio.NetBeauty": { "nulastudio.NetBeauty": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.1.4.4", "resolved": "2.1.4.5",
"contentHash": "Q+4H1o9tNVVHEm4VHQq1kglc+eNAwVdEKKnNKez0kDZHBPRE+ufXIgN6ucdvi1A462nFDstChLafMt36L3kXAw==" "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.2.30", "resolved": "1.0.0",
"contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
"dependencies": {
"protobuf-net.Core": "3.2.30"
}
},
"protobuf-net.Core": {
"type": "Transitive",
"resolved": "3.2.30",
"contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -488,8 +468,8 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.204.15", "resolved": "1.205.23",
"contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==", "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
"dependencies": { "dependencies": {
"SharpDX": "4.2.0-keen-cringe", "SharpDX": "4.2.0-keen-cringe",
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
@@ -541,8 +521,8 @@
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "4.5.1",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
}, },
"System.Security.Cryptography.Pkcs": { "System.Security.Cryptography.Pkcs": {
"type": "Transitive", "type": "Transitive",
@@ -572,8 +552,8 @@
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.3", "resolved": "8.0.1",
"contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==", "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
"dependencies": { "dependencies": {
"System.Text.Encodings.Web": "8.0.0" "System.Text.Encodings.Web": "8.0.0"
} }
@@ -594,67 +574,64 @@
}, },
"xunit.analyzers": { "xunit.analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.13.0", "resolved": "1.15.0",
"contentHash": "Pai9YnDV71/Ox14nBHB6/f62iyPyLbmUG/YYMiA4dfdFZvr0gIYE9yGxSr0i5Tr3INK75wgL2MCUNEKpeiZ2Fw==" "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ=="
}, },
"xunit.assert": { "xunit.assert": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "lwf7Dy5/5HbDkaPx1YrGXCByytCEEcIn+KPI74jh2BD/RU/7RhO8c+S3k0Ph+Mr7+cLf338fl+o6UcgPCLa6PA==" "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA=="
}, },
"xunit.core": { "xunit.core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "McSTFGTETCxLpmJKE9TWi9FtFthrRbpRrjz2V2g8sK2wRt1+JHs15vwi+B+nfftFkV9aFWIXZfzZM95TIGZNIA==", "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==",
"dependencies": { "dependencies": {
"xunit.extensibility.core": "[2.8.0]", "xunit.extensibility.core": "[2.9.0]",
"xunit.extensibility.execution": "[2.8.0]" "xunit.extensibility.execution": "[2.9.0]"
} }
}, },
"xunit.extensibility.core": { "xunit.extensibility.core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "eBJv9xQeY0p5z+C/L1tFjUFYqtl5pQqIEYCGTMl+MbRzA7sOlgYKwJE//vEePBp+mgBh7NjD0Qhz0liZBYM27w==", "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==",
"dependencies": { "dependencies": {
"xunit.abstractions": "2.0.3" "xunit.abstractions": "2.0.3"
} }
}, },
"xunit.extensibility.execution": { "xunit.extensibility.execution": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "TyyrZesHB9ODZMS9c73OqiBz4x0vL944JCkSPBWW5w6PF2LlUfdfXRjjOhoIOuY6lTmEgl07rS4/Jot9mCYnpg==", "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==",
"dependencies": { "dependencies": {
"xunit.extensibility.core": "[2.8.0]" "xunit.extensibility.core": "[2.9.0]"
} }
}, },
"torch": { "torch": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[5.0.2, )", "ControlzEx": "[5.0.2, )",
"HarmonyX": "[2.10.2-prerelease.7, )", "Lib.Harmony.Thin": "[2.3.3-torch, )",
"MahApps.Metro": "[2.4.10, )", "MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.9.2, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.9.2, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"MonoMod.RuntimeDetour": "[25.1.1, )", "NLog": "[5.3.3, )",
"NLog": "[5.3.2, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
"protobuf-net": "[3.2.30, )"
} }
}, },
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JetBrains.Annotations": "[2023.3.0, )", "JetBrains.Annotations": "[2024.2.0, )",
"Microsoft.Extensions.Configuration.Binder": "[8.0.1, )", "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"NuGet.Commands": "[6.9.1, )", "NuGet.Commands": "[6.11.0, )",
"NuGet.DependencyResolver.Core": "[6.9.1, )", "NuGet.DependencyResolver.Core": "[6.11.0, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
"System.Linq.Async": "[6.0.1, )", "System.Linq.Async": "[6.0.1, )"
"System.Text.Json": "[8.0.3, )"
} }
}, },
"torch.server": { "torch.server": {
@@ -671,22 +648,22 @@
"Microsoft.Extensions.Configuration.EnvironmentVariables": "[8.0.0, )", "Microsoft.Extensions.Configuration.EnvironmentVariables": "[8.0.0, )",
"Microsoft.Extensions.Configuration.Xml": "[8.0.0, )", "Microsoft.Extensions.Configuration.Xml": "[8.0.0, )",
"Microsoft.Extensions.Logging": "[8.0.0, )", "Microsoft.Extensions.Logging": "[8.0.0, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"System.Management": "[8.0.0, )", "System.Management": "[8.0.0, )",
"Torch": "[1.0.0, )", "Torch": "[1.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"nulastudio.NetBeauty": "[2.1.4.4, )" "nulastudio.NetBeauty": "[2.1.4.5, )"
} }
}, },
"torch.tests": { "torch.tests": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"Microsoft.NET.Test.Sdk": "[17.9.0, )", "Microsoft.NET.Test.Sdk": "[17.11.0, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"Torch": "[1.0.0, )", "Torch": "[1.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"xunit": "[2.8.0, )" "xunit": "[2.9.0, )"
} }
} }
}, },

View File

@@ -128,7 +128,15 @@ namespace Torch.Server.Managers
return; return;
} }
SelectWorld(DedicatedConfig.LoadWorld ?? DedicatedConfig.Worlds.First().WorldPath, false); var worldPath = DedicatedConfig.LoadWorld;
if (worldPath == null)
worldPath = DedicatedConfig.Worlds.First().WorldPath;
else
// make sure we won't end up with a file path when we expect it to be a directory
worldPath = worldPath.EndsWith(".sbc") ? Path.GetDirectoryName(worldPath) : worldPath;
SelectWorld(worldPath, false);
_instanceLoaded?.Invoke(DedicatedConfig); _instanceLoaded?.Invoke(DedicatedConfig);
} }
@@ -227,7 +235,7 @@ namespace Torch.Server.Managers
try try
{ {
MyObjectBuilderSerializer.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes); MyObjectBuilderSerializerKeen.DeserializeXML(sandboxPath, out MyObjectBuilder_Checkpoint checkpoint, out ulong sizeInBytes);
if (checkpoint == null) if (checkpoint == null)
{ {
Log.Error($"Failed to load {DedicatedConfig.LoadWorld}, checkpoint null ({sizeInBytes} bytes, instance {Torch.Config.InstancePath})"); Log.Error($"Failed to load {DedicatedConfig.LoadWorld}, checkpoint null ({sizeInBytes} bytes, instance {Torch.Config.InstancePath})");
@@ -242,7 +250,7 @@ namespace Torch.Server.Managers
Log.Debug("Loaded mod list from world"); Log.Debug("Loaded mod list from world");
if (!modsOnly) if (!modsOnly)
DedicatedConfig.SessionSettings = new SessionSettingsViewModel(checkpoint.Settings); DedicatedConfig.SessionSettings = new DynamicViewModel<MyObjectBuilder_SessionSettings>(checkpoint.Settings);
} }
catch (Exception e) catch (Exception e)
{ {
@@ -360,14 +368,14 @@ namespace Torch.Server.Managers
public void LoadSandbox() public void LoadSandbox()
{ {
if (!MyObjectBuilderSerializer.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint)) if (!MyObjectBuilderSerializerKeen.DeserializeXML(_checkpointPath, out MyObjectBuilder_Checkpoint checkpoint))
throw new SerializationException("Error reading checkpoint, see keen log for details"); throw new SerializationException("Error reading checkpoint, see keen log for details");
Checkpoint = new CheckpointViewModel(checkpoint); Checkpoint = new CheckpointViewModel(checkpoint);
// migrate old saves // migrate old saves
if (File.Exists(_worldConfigPath)) if (File.Exists(_worldConfigPath))
{ {
if (!MyObjectBuilderSerializer.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig)) if (!MyObjectBuilderSerializerKeen.DeserializeXML(_worldConfigPath, out MyObjectBuilder_WorldConfiguration worldConfig))
throw new SerializationException("Error reading settings, see keen log for details"); throw new SerializationException("Error reading settings, see keen log for details");
WorldConfiguration = new WorldConfigurationViewModel(worldConfig); WorldConfiguration = new WorldConfigurationViewModel(worldConfig);
} }

View File

@@ -10,7 +10,7 @@ namespace Torch.Server.Managers
public static void Patch(PatchContext ctx) public static void Patch(PatchContext ctx)
{ {
ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod(nameof(MyDedicatedServerBase.BanClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(BanPrefix))); ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod(nameof(MyDedicatedServerBase.BanClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(BanPrefix)));
ctx.GetPattern(typeof(MyDedicatedServerBase).GetMethod(nameof(MyDedicatedServerBase.KickClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(KickPrefix))); ctx.GetPattern(typeof(MyMultiplayerServerBase).GetMethod(nameof(MyMultiplayerServerBase.KickClient))).Prefixes.Add(typeof(MultiplayerManagerDedicatedPatchShim).GetMethod(nameof(KickPrefix)));
} }
public static void BanPrefix(ulong userId, bool banned) public static void BanPrefix(ulong userId, bool banned)

View File

@@ -26,10 +26,18 @@ namespace Torch.Patches
// Reduce response timeout from 100 seconds to 5 seconds. // Reduce response timeout from 100 seconds to 5 seconds.
foreach (var instruction in instructions) foreach (var instruction in instructions)
{ {
if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is MsilOperandInline.MsilOperandInt32 inlineI32 && inlineI32.Value == 1000) if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is
MsilOperandInline.MsilOperandInt32 { Value: 1000 } operandResponseTimeout)
{ {
_log.Info("Patching Steam response timeout to 5 seconds"); _log.Info("Patching Steam response timeout to 5 seconds");
inlineI32.Value = 50; operandResponseTimeout.Value = 50;
}
if (instruction.OpCode == OpCodes.Ldc_I4 && instruction.Operand is
MsilOperandInline.MsilOperandInt32 { Value: 10000 } inlineI32)
{
_log.Info("Patching Steam connect timeout to 60 seconds");
inlineI32.Value = 60000;
} }
yield return instruction; yield return instruction;

View File

@@ -37,7 +37,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="NLog" Version="5.3.2" /> <PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.2.0"> <PackageReference Include="Steamworks.NET" Version="20.2.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
@@ -45,7 +45,7 @@
</PackageReference> </PackageReference>
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="System.Management" Version="8.0.0" /> <PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.4" /> <PackageReference Include="nulastudio.NetBeauty" Version="2.1.4.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -1,15 +1,17 @@
namespace Torch.Server.ViewModels using VRage.Game;
namespace Torch.Server.ViewModels
{ {
public class BlockLimitViewModel : ViewModel public class BlockLimitViewModel : ViewModel
{ {
private SessionSettingsViewModel _sessionSettings; private DynamicViewModel<MyObjectBuilder_SessionSettings> _sessionSettings;
public string BlockType { get; set; } public string BlockType { get; set; }
public short Limit { get; set; } public short Limit { get; set; }
//public CommandBinding Delete { get; } = new CommandBinding(new DeleteCommand()); //public CommandBinding Delete { get; } = new CommandBinding(new DeleteCommand());
public BlockLimitViewModel(SessionSettingsViewModel sessionSettings, string blockType, short limit) public BlockLimitViewModel(DynamicViewModel<MyObjectBuilder_SessionSettings> sessionSettings, string blockType, short limit)
{ {
_sessionSettings = sessionSettings; _sessionSettings = sessionSettings;
BlockType = blockType; BlockType = blockType;

View File

@@ -18,7 +18,7 @@ namespace Torch.Server.ViewModels
{ {
_config = configDedicated; _config = configDedicated;
_config.IgnoreLastSession = true; _config.IgnoreLastSession = true;
SessionSettings = new SessionSettingsViewModel(_config.SessionSettings); SessionSettings = new DynamicViewModel<MyObjectBuilder_SessionSettings>(_config.SessionSettings);
Task.Run(() => UpdateAllModInfosAsync()); Task.Run(() => UpdateAllModInfosAsync());
} }
@@ -48,7 +48,7 @@ namespace Torch.Server.ViewModels
return true; return true;
} }
public SessionSettingsViewModel SessionSettings { get; set; } public DynamicViewModel<MyObjectBuilder_SessionSettings> SessionSettings { get; set; }
public MtObservableList<WorldViewModel> Worlds { get; } = new MtObservableList<WorldViewModel>(); public MtObservableList<WorldViewModel> Worlds { get; } = new MtObservableList<WorldViewModel>();
private WorldViewModel _selectedWorld; private WorldViewModel _selectedWorld;

View File

@@ -0,0 +1,115 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Reflection.Emit;
using HarmonyLib;
using JetBrains.Annotations;
namespace Torch.Server.ViewModels;
public class DynamicViewModel<T>(T obj) : ViewModel
{
private readonly T _obj = obj;
public ViewModel Wrapper { get; } = CreateProxy(obj);
public static implicit operator T(DynamicViewModel<T> obj) => obj._obj;
private static ViewModel CreateProxy(T obj)
{
if (DynamicViewModel.Proxies.TryGetValue(typeof(T), out var proxy))
return (ViewModel)Activator.CreateInstance(proxy, obj);
var viewModelSetMethod = AccessTools.GetDeclaredMethods(typeof(ViewModel))
.First(b => b.Name == "SetValue" && b.GetParameters()[0].ParameterType.IsByRef);
DynamicViewModel.ModuleBuilder ??=
AssemblyBuilder.DefineDynamicAssembly(new("Torch.Server.ViewModels.Generated"), AssemblyBuilderAccess.Run)
.DefineDynamicModule("Torch.Server.ViewModels.Generated");
var type = DynamicViewModel.ModuleBuilder.DefineType($"{typeof(T).FullName}ViewModel",
TypeAttributes.Public | TypeAttributes.Sealed | TypeAttributes.Class, typeof(ViewModel));
var instanceField = type.DefineField("_instance", typeof(T), FieldAttributes.Private | FieldAttributes.InitOnly);
var ctor = type.DefineConstructor(MethodAttributes.Public, CallingConventions.HasThis, [typeof(T)]);
{
var il = ctor.GetILGenerator();
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldarg_1);
il.Emit(OpCodes.Stfld, instanceField);
il.Emit(OpCodes.Ret);
}
foreach (var field in typeof(T).GetFields(BindingFlags.Instance | BindingFlags.Public))
{
var prop = type.DefineProperty(field.Name, PropertyAttributes.None, field.FieldType, null);
foreach (var customAttribute in field.GetCustomAttributesData())
{
var hasCustomArgs = customAttribute.NamedArguments?.Any() ?? false;
var customArgsField = hasCustomArgs && customAttribute.NamedArguments[0].IsField;
var constructorArgs = customAttribute.ConstructorArguments.Select(b => b.Value).ToArray();
CustomAttributeBuilder attributeBuilder;
if (!hasCustomArgs)
attributeBuilder = new CustomAttributeBuilder(customAttribute.Constructor, constructorArgs);
else if (customArgsField)
attributeBuilder = new CustomAttributeBuilder(customAttribute.Constructor, constructorArgs,
customAttribute.NamedArguments.Select(b => (FieldInfo)b.MemberInfo).ToArray(),
customAttribute.NamedArguments.Select(b => b.TypedValue.Value).ToArray());
else
attributeBuilder = new CustomAttributeBuilder(customAttribute.Constructor, constructorArgs,
customAttribute.NamedArguments.Select(b => (PropertyInfo)b.MemberInfo).ToArray(),
customAttribute.NamedArguments.Select(b => b.TypedValue.Value).ToArray());
prop.SetCustomAttribute(attributeBuilder);
}
var getMethod = type.DefineMethod($"get_{field.Name}", MethodAttributes.Public | MethodAttributes.HideBySig, field.FieldType, Type.EmptyTypes);
{
var il = getMethod.GetILGenerator();
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Ldfld, instanceField);
il.Emit(OpCodes.Ldfld, field);
il.Emit(OpCodes.Ret);
}
prop.SetGetMethod(getMethod);
if (field.IsInitOnly) continue;
var setMethod = type.DefineMethod($"set_{field.Name}", MethodAttributes.Public | MethodAttributes.HideBySig, typeof(void),
[field.FieldType]);
{
var il = setMethod.GetILGenerator();
il.Emit(OpCodes.Ldarg_0);
il.Emit(OpCodes.Dup);
il.Emit(OpCodes.Ldfld, instanceField);
il.Emit(OpCodes.Ldflda, field);
il.Emit(OpCodes.Ldarg_1);
il.Emit(OpCodes.Ldstr, field.Name);
il.Emit(OpCodes.Callvirt, viewModelSetMethod.MakeGenericMethod(field.FieldType));
il.Emit(OpCodes.Ret);
}
prop.SetSetMethod(setMethod);
}
proxy = type.CreateType();
DynamicViewModel.Proxies[typeof(T)] = proxy;
return (ViewModel)Activator.CreateInstance(proxy, obj);
}
}
file static class DynamicViewModel
{
public static readonly Dictionary<Type, Type> Proxies = [];
[CanBeNull] public static ModuleBuilder ModuleBuilder;
}

View File

@@ -1,321 +0,0 @@
using System.Collections.Generic;
using System.ComponentModel;
using VRage.Game;
using VRage.Library.Utils;
namespace Torch.Server.ViewModels
{
public class SessionSettingsViewModel : ViewModel
{
private MyObjectBuilder_SessionSettings _settings;
[Torch.Views.Display(Description = "The type of the game mode.", Name = "Game Mode", GroupName = "Others")]
public MyGameModeEnum GameMode { get => _settings.GameMode; set => SetValue(ref _settings.GameMode, value); }
[Torch.Views.Display(Description = "The type of the game online mode.", Name = "Online Mode", GroupName = "Others")]
public MyOnlineModeEnum OnlineMode { get => _settings.OnlineMode; set => SetValue(ref _settings.OnlineMode, value); }
[Torch.Views.Display(Description = "The multiplier for character inventory size.", Name = "Character Inventory Size", GroupName = "Multipliers")]
public float CharacterInventorySizeMultiplier { get => _settings.InventorySizeMultiplier; set => SetValue(ref _settings.InventorySizeMultiplier, value); }
[Torch.Views.Display(Description = "The multiplier for block inventory size.", Name = "Block Inventory Size", GroupName = "Multipliers")]
public float BlockInventorySizeMultiplier { get => _settings.BlocksInventorySizeMultiplier; set => SetValue(ref _settings.BlocksInventorySizeMultiplier, value); }
[Torch.Views.Display(Description = "The multiplier for assembler speed.", Name = "Assembler Speed", GroupName = "Multipliers")]
public float AssemblerSpeedMultiplier { get => _settings.AssemblerSpeedMultiplier; set => SetValue(ref _settings.AssemblerSpeedMultiplier, value); }
[Torch.Views.Display(Description = "The multiplier for assembler efficiency.", Name = "Assembler Efficiency", GroupName = "Multipliers")]
public float AssemblerEfficiencyMultiplier { get => _settings.AssemblerEfficiencyMultiplier; set => SetValue(ref _settings.AssemblerEfficiencyMultiplier, value); }
[Torch.Views.Display(Description = "The multiplier for refinery speed.", Name = "Refinery Speed", GroupName = "Multipliers")]
public float RefinerySpeedMultiplier { get => _settings.RefinerySpeedMultiplier; set => SetValue(ref _settings.RefinerySpeedMultiplier, value); }
[Torch.Views.Display(Description = "The maximum number of connected players.", Name = "Max Players", GroupName = "Players")]
public short MaxPlayers { get => _settings.MaxPlayers; set => SetValue(ref _settings.MaxPlayers, value); }
[Torch.Views.Display(Description = "The maximum number of existing floating objects.", Name = "Max Floating Objects", GroupName = "Environment")]
public short MaxFloatingObjects { get => _settings.MaxFloatingObjects; set => SetValue(ref _settings.MaxFloatingObjects, value); }
[Torch.Views.Display(Description = "The maximum number of backup saves.", Name = "Max Backup Saves", GroupName = "Others")]
public short MaxBackupSaves { get => _settings.MaxBackupSaves; set => SetValue(ref _settings.MaxBackupSaves, value); }
[Torch.Views.Display(Description = "The maximum number of blocks in one grid.", Name = "Max Grid Blocks", GroupName = "Block Limits")]
public int MaxGridSize { get => _settings.MaxGridSize; set => SetValue(ref _settings.MaxGridSize, value); }
[Torch.Views.Display(Description = "The maximum number of blocks per player.", Name = "Max Blocks per Player", GroupName = "Block Limits")]
public int MaxBlocksPerPlayer { get => _settings.MaxBlocksPerPlayer; set => SetValue(ref _settings.MaxBlocksPerPlayer, value); }
[Torch.Views.Display(Description = "The total number of Performance Cost Units in the world.", Name = "World PCU", GroupName = "Block Limits")]
public int TotalPCU { get => _settings.TotalPCU; set => SetValue(ref _settings.TotalPCU, value); }
[Torch.Views.Display(Description = "The maximum number of existing factions in the world.", Name = "Max Factions Count", GroupName = "Block Limits")]
public int MaxFactionsCount { get => _settings.MaxFactionsCount; set => SetValue(ref _settings.MaxFactionsCount, value); }
[Torch.Views.Display(Description = "Defines block limits mode.", Name = "Block Limits Mode", GroupName = "Block Limits")]
public MyBlockLimitsEnabledEnum BlockLimitsEnabled { get => _settings.BlockLimitsEnabled; set => SetValue(ref _settings.BlockLimitsEnabled, value); }
[Torch.Views.Display(Description = "Enables possibility to remove grid remotely from the world by an author.", Name = "Enable Remote Grid Removal", GroupName = "Others")]
public bool EnableRemoteBlockRemoval { get => _settings.EnableRemoteBlockRemoval; set => SetValue(ref _settings.EnableRemoteBlockRemoval, value); }
[Torch.Views.Display(Description = "Defines hostility of the environment.", Name = "Environment Hostility", GroupName = "Environment")]
public MyEnvironmentHostilityEnum EnvironmentHostility { get => _settings.EnvironmentHostility; set => SetValue(ref _settings.EnvironmentHostility, value); }
[Torch.Views.Display(Description = "Enables auto healing of the character.", Name = "Auto Healing", GroupName = "Players")]
public bool AutoHealing { get => _settings.AutoHealing; set => SetValue(ref _settings.AutoHealing, value); }
[Torch.Views.Display(Description = "Enables copy and paste feature.", Name = "Enable Copy & Paste", GroupName = "Players")]
public bool EnableCopyPaste { get => _settings.EnableCopyPaste; set => SetValue(ref _settings.EnableCopyPaste, value); }
[Torch.Views.Display(Description = "Enables weapons.", Name = "Enable Weapons", GroupName = "Others")]
public bool WeaponsEnabled { get => _settings.WeaponsEnabled; set => SetValue(ref _settings.WeaponsEnabled, value); }
[Torch.Views.Display(Description = "", Name = "Show Player Names on HUD", GroupName = "Players")]
public bool ShowPlayerNamesOnHud { get => _settings.ShowPlayerNamesOnHud; set => SetValue(ref _settings.ShowPlayerNamesOnHud, value); }
[Torch.Views.Display(Description = "Enables thruster damage.", Name = "Enable Thruster Damage", GroupName = "Others")]
public bool ThrusterDamage { get => _settings.ThrusterDamage; set => SetValue(ref _settings.ThrusterDamage, value); }
[Torch.Views.Display(Description = "Enables spawning of cargo ships.", Name = "Enable Cargo Ships", GroupName = "NPCs")]
public bool CargoShipsEnabled { get => _settings.CargoShipsEnabled; set => SetValue(ref _settings.CargoShipsEnabled, value); }
[Torch.Views.Display(Description = "Enables spectator camera.", Name = "Enable Spectator Camera", GroupName = "Others")]
public bool EnableSpectator { get => _settings.EnableSpectator; set => SetValue(ref _settings.EnableSpectator, value); }
/// <summary>
/// Size of the edge of the world area cube.
/// Don't use directly, as it is error-prone (it's km instead of m and edge size instead of half-extent)
/// Rather use MyEntities.WorldHalfExtent()
/// </summary>
[Torch.Views.Display(Description = "Defines the size of the world.", Name = "World Size [km]", GroupName = "Environment")]
public int WorldSizeKm { get => _settings.WorldSizeKm; set => SetValue(ref _settings.WorldSizeKm, value); }
[Torch.Views.Display(Description = "When enabled respawn ship is removed after player logout.", Name = "Remove Respawn Ships on Logoff", GroupName = "Others")]
public bool RespawnShipDelete { get => _settings.RespawnShipDelete; set => SetValue(ref _settings.RespawnShipDelete, value); }
[Torch.Views.Display(Description = "", Name = "Reset Ownership", GroupName = "Players")]
public bool ResetOwnership { get => _settings.ResetOwnership; set => SetValue(ref _settings.ResetOwnership, value); }
[Torch.Views.Display(Description = "The multiplier for welder speed.", Name = "Welder Speed", GroupName = "Multipliers")]
public float WelderSpeedMultiplier { get => _settings.WelderSpeedMultiplier; set => SetValue(ref _settings.WelderSpeedMultiplier, value); }
[Torch.Views.Display(Description = "The multiplier for grinder speed.", Name = "Grinder Speed", GroupName = "Multipliers")]
public float GrinderSpeedMultiplier { get => _settings.GrinderSpeedMultiplier; set => SetValue(ref _settings.GrinderSpeedMultiplier, value); }
[Torch.Views.Display(Description = "Enables realistic sounds.", Name = "Enable Realistic Sound", GroupName = "Environment")]
public bool RealisticSound { get => _settings.RealisticSound; set => SetValue(ref _settings.RealisticSound, value); }
[Torch.Views.Display(Description = "The multiplier for hacking speed.", Name = "Hacking Speed", GroupName = "Multipliers")]
public float HackSpeedMultiplier { get => _settings.HackSpeedMultiplier; set => SetValue(ref _settings.HackSpeedMultiplier, value); }
[Torch.Views.Display(Description = "Enables permanent death.", Name = "Permanent Death", GroupName = "Players")]
public bool? PermanentDeath { get => _settings.PermanentDeath; set => SetValue(ref _settings.PermanentDeath, value); }
[Torch.Views.Display(Description = "Defines autosave interval.", Name = "Autosave Interval [mins]", GroupName = "Others")]
public uint AutoSaveInMinutes { get => _settings.AutoSaveInMinutes; set => SetValue(ref _settings.AutoSaveInMinutes, value); }
[Torch.Views.Display(Description = "Enables saving from the menu.", Name = "Enable Saving from Menu", GroupName = "Others")]
public bool EnableSaving { get => _settings.EnableSaving; set => SetValue(ref _settings.EnableSaving, value); }
[Torch.Views.Display(Description = "Enables respawn screen.", Name = "Enable Respawn Screen in the Game", GroupName = "Players")]
public bool StartInRespawnScreen { get => _settings.StartInRespawnScreen; set => SetValue(ref _settings.StartInRespawnScreen, value); }
[Torch.Views.Display(Description = "Enables research.", Name = "Enable Research", GroupName = "Players")]
public bool EnableResearch { get => _settings.EnableResearch; set => SetValue(ref _settings.EnableResearch, value); }
[Torch.Views.Display(Description = "Enables Good.bot hints.", Name = "Enable Good.bot hints", GroupName = "Players")]
public bool EnableGoodBotHints { get => _settings.EnableGoodBotHints; set => SetValue(ref _settings.EnableGoodBotHints, value); }
[Torch.Views.Display(Description = "Enables infinite ammunition in survival game mode.", Name = "Enable Infinite Ammunition in Survival", GroupName = "Others")]
public bool InfiniteAmmo { get => _settings.InfiniteAmmo; set => SetValue(ref _settings.InfiniteAmmo, value); }
[Torch.Views.Display(Description = "Enables drop containers (unknown signals).", Name = "Enable Drop Containers", GroupName = "Others")]
public bool EnableContainerDrops { get => _settings.EnableContainerDrops; set => SetValue(ref _settings.EnableContainerDrops, value); }
[Torch.Views.Display(Description = "The multiplier for respawn ship timer.", Name = "Respawn Ship Time Multiplier", GroupName = "Players")]
public float SpawnShipTimeMultiplier { get => _settings.SpawnShipTimeMultiplier; set => SetValue(ref _settings.SpawnShipTimeMultiplier, value); }
[Torch.Views.Display(Description = "Defines density of the procedurally generated content.", Name = "Procedural Density", GroupName = "Environment")]
public float ProceduralDensity { get => _settings.ProceduralDensity; set => SetValue(ref _settings.ProceduralDensity, value); }
[Torch.Views.Display(Description = "Defines unique starting seed for the procedurally generated content.", Name = "Procedural Seed", GroupName = "Environment")]
public int ProceduralSeed { get => _settings.ProceduralSeed; set => SetValue(ref _settings.ProceduralSeed, value); }
[Torch.Views.Display(Description = "Enables destruction feature for the blocks.", Name = "Enable Destructible Blocks", GroupName = "Environment")]
public bool DestructibleBlocks { get => _settings.DestructibleBlocks; set => SetValue(ref _settings.DestructibleBlocks, value); }
[Torch.Views.Display(Description = "Enables in game scripts.", Name = "Enable Ingame Scripts", GroupName = "Others")]
public bool EnableIngameScripts { get => _settings.EnableIngameScripts; set => SetValue(ref _settings.EnableIngameScripts, value); }
[Torch.Views.Display(Description = "", Name = "Flora Density Multiplier", GroupName = "Environment")]
public float FloraDensityMultiplier { get => _settings.FloraDensityMultiplier; set => SetValue(ref _settings.FloraDensityMultiplier, value); }
[Torch.Views.Display(Description = "Enables tool shake feature.", Name = "Enable Tool Shake", GroupName = "Players")]
[DefaultValue(false)]
public bool EnableToolShake { get => _settings.EnableToolShake; set => SetValue(ref _settings.EnableToolShake, value); }
[Torch.Views.Display(Description = "", Name = "Voxel Generator Version", GroupName = "Environment")]
public int VoxelGeneratorVersion { get => _settings.VoxelGeneratorVersion; set => SetValue(ref _settings.VoxelGeneratorVersion, value); }
[Torch.Views.Display(Description = "Enables oxygen in the world.", Name = "Enable Oxygen", GroupName = "Environment")]
public bool EnableOxygen { get => _settings.EnableOxygen; set => SetValue(ref _settings.EnableOxygen, value); }
[Torch.Views.Display(Description = "Enables airtightness in the world.", Name = "Enable Airtightness", GroupName = "Environment")]
public bool EnableOxygenPressurization { get => _settings.EnableOxygenPressurization; set => SetValue(ref _settings.EnableOxygenPressurization, value); }
[Torch.Views.Display(Description = "Enables 3rd person camera.", Name = "Enable 3rd Person Camera", GroupName = "Players")]
public bool Enable3rdPersonView { get => _settings.Enable3rdPersonView; set => SetValue(ref _settings.Enable3rdPersonView, value); }
[Torch.Views.Display(Description = "Enables random encounters in the world.", Name = "Enable Encounters", GroupName = "NPCs")]
public bool EnableEncounters { get => _settings.EnableEncounters; set => SetValue(ref _settings.EnableEncounters, value); }
[Torch.Views.Display(Description = "Enables possibility of converting grid to station.", Name = "Enable Convert to Station", GroupName = "Others")]
public bool EnableConvertToStation { get => _settings.EnableConvertToStation; set => SetValue(ref _settings.EnableConvertToStation, value); }
[Torch.Views.Display(Description = "Enables possibility of station grid inside voxel.", Name = "Enable Station Grid with Voxel", GroupName = "Environment")]
public bool StationVoxelSupport { get => _settings.StationVoxelSupport; set => SetValue(ref _settings.StationVoxelSupport, value); }
[Torch.Views.Display(Description = "Enables sun rotation.", Name = "Enable Sun Rotation", GroupName = "Environment")]
public bool EnableSunRotation { get => _settings.EnableSunRotation; set => SetValue(ref _settings.EnableSunRotation, value); }
[Torch.Views.Display(Description = "Enables respawn ships.", Name = "Enable Respawn Ships", GroupName = "Others")]
public bool EnableRespawnShips { get => _settings.EnableRespawnShips; set => SetValue(ref _settings.EnableRespawnShips, value); }
[Torch.Views.Display(Description = "", Name = "Physics Iterations", GroupName = "Environment")]
public int PhysicsIterations { get => _settings.PhysicsIterations; set => SetValue(ref _settings.PhysicsIterations, value); }
[Torch.Views.Display(Description = "Defines interval of one rotation of the sun.", Name = "Sun Rotation Interval", GroupName = "Environment")]
public float SunRotationIntervalMinutes { get => _settings.SunRotationIntervalMinutes; set => SetValue(ref _settings.SunRotationIntervalMinutes, value); }
[Torch.Views.Display(Description = "Enables jetpack.", Name = "Enable Jetpack", GroupName = "Players")]
public bool EnableJetpack { get => _settings.EnableJetpack; set => SetValue(ref _settings.EnableJetpack, value); }
[Torch.Views.Display(Description = "Enables spawning with tools in the inventory.", Name = "Spawn with Tools", GroupName = "Players")]
public bool SpawnWithTools { get => _settings.SpawnWithTools; set => SetValue(ref _settings.SpawnWithTools, value); }
[Torch.Views.Display(Description = "Enables voxel destructions.", Name = "Enable Voxel Destruction", GroupName = "Environment")]
public bool EnableVoxelDestruction { get => _settings.EnableVoxelDestruction; set => SetValue(ref _settings.EnableVoxelDestruction, value); }
[Torch.Views.Display(Description = "Enables spawning of drones in the world.", Name = "Enable Drones", GroupName = "NPCs")]
public bool EnableDrones { get => _settings.EnableDrones; set => SetValue(ref _settings.EnableDrones, value); }
[Torch.Views.Display(Description = "Enables spawning of wolves in the world.", Name = "Enable Wolves", GroupName = "NPCs")]
public bool EnableWolfs { get => _settings.EnableWolfs; set => SetValue(ref _settings.EnableWolfs, value); }
[Torch.Views.Display(Description = "Enables spawning of spiders in the world.", Name = "Enable Spiders", GroupName = "NPCs")]
public bool EnableSpiders { get => _settings.EnableSpiders; set => SetValue(ref _settings.EnableSpiders, value); }
[Torch.Views.Display(Name = "Block Type World Limits", GroupName = "Block Limits")]
public Dictionary<string, short> BlockTypeLimits { get => _settings.BlockTypeLimits.Dictionary; set => SetValue(x => _settings.BlockTypeLimits.Dictionary = x, value); }
[Torch.Views.Display(Description = "Enables scripter role for administration.", Name = "Enable Scripter Role", GroupName = "Others")]
public bool EnableScripterRole { get => _settings.EnableScripterRole; set => SetValue(ref _settings.EnableScripterRole, value); }
[Torch.Views.Display(Description = "Defines minimum respawn time for drop containers.", Name = "Min Drop Container Respawn Time", GroupName = "Others")]
public int MinDropContainerRespawnTime { get => _settings.MinDropContainerRespawnTime; set => SetValue(ref _settings.MinDropContainerRespawnTime, value); }
[Torch.Views.Display(Description = "Defines maximum respawn time for drop containers.", Name = "Max Drop Container Respawn Time", GroupName = "Others")]
public int MaxDropContainerRespawnTime { get => _settings.MaxDropContainerRespawnTime; set => SetValue(ref _settings.MaxDropContainerRespawnTime, value); }
[Torch.Views.Display(Description = "Enables friendly fire for turrets.", Name = "Enable Turrets Friendly Fire", GroupName = "Environment")]
public bool EnableTurretsFriendlyFire { get => _settings.EnableTurretsFriendlyFire; set => SetValue(ref _settings.EnableTurretsFriendlyFire, value); }
[Torch.Views.Display(Description = "Enables sub-grid damage.", Name = "Enable Sub-Grid Damage", GroupName = "Environment")]
public bool EnableSubgridDamage { get => _settings.EnableSubgridDamage; set => SetValue(ref _settings.EnableSubgridDamage, value); }
[Torch.Views.Display(Description = "Defines synchronization distance in multiplayer. High distance can slow down server drastically. Use with caution.", Name = "Sync Distance", GroupName = "Environment")]
public int SyncDistance { get => _settings.SyncDistance; set => SetValue(ref _settings.SyncDistance, value); }
[Torch.Views.Display(Description = "Defines render distance for clients in multiplayer. High distance can slow down client FPS. Values larger than SyncDistance may not work as expected.", Name = "View Distance", GroupName = "Environment")]
public int ViewDistance { get => _settings.ViewDistance; set => SetValue(ref _settings.ViewDistance, value);}
[Torch.Views.Display(Description = "Enables experimental mode.", Name = "Experimental Mode", GroupName = "Others")]
public bool ExperimentalMode { get => _settings.ExperimentalMode; set => SetValue(ref _settings.ExperimentalMode, value); }
[Torch.Views.Display(Description = "Enables adaptive simulation quality system. This system is useful if you have a lot of voxel deformations in the world and low simulation speed.", Name = "Adaptive Simulation Quality", GroupName = "Others")]
public bool AdaptiveSimulationQuality { get => _settings.AdaptiveSimulationQuality; set => SetValue(ref _settings.AdaptiveSimulationQuality, value); }
[Torch.Views.Display(Description = "Enables voxel hand.", Name = "Enable voxel hand", GroupName = "Others")]
public bool EnableVoxelHand { get => _settings.EnableVoxelHand; set => SetValue(ref _settings.EnableVoxelHand, value); }
[Torch.Views.Display(Description = "Enables trash removal system.", Name = "Trash Removal Enabled", GroupName = "Trash Removal")]
public bool TrashRemovalEnabled { get => _settings.TrashRemovalEnabled; set => SetValue(ref _settings.TrashRemovalEnabled, value); }
[Torch.Views.Display(Description = "Defines flags for trash removal system.", Name = "Trash Removal Flags", GroupName = "Trash Removal")]
public MyTrashRemovalFlags TrashFlagsValue { get => (MyTrashRemovalFlags)_settings.TrashFlagsValue; set => SetValue(ref _settings.TrashFlagsValue, (int)value); }
[Torch.Views.Display(Description = "Defines block count threshold for trash removal system.", Name = "Block Count Threshold", GroupName = "Trash Removal")]
public int BlockCountThreshold { get => _settings.BlockCountThreshold; set => SetValue(ref _settings.BlockCountThreshold, value); }
[Torch.Views.Display(Description = "Defines player distance threshold for trash removal system.", Name = "Player Distance Threshold [m]", GroupName = "Trash Removal")]
public float PlayerDistanceThreshold { get => _settings.PlayerDistanceThreshold; set => SetValue(ref _settings.PlayerDistanceThreshold, value); }
[Torch.Views.Display(Description = "By setting this, server will keep number of grids around this value. \n !WARNING! It ignores Powered and Fixed flags, Block Count and lowers Distance from player.\n Set to 0 to disable.", Name = "Optimal Grid Count", GroupName = "Trash Removal")]
public int OptimalGridCount { get => _settings.OptimalGridCount; set => SetValue(ref _settings.OptimalGridCount, value); }
[Torch.Views.Display(Description = "Defines player inactivity threshold for trash removal system. \n !WARNING! This will remove all grids of the player.\n Set to 0 to disable.", Name = "Player Inactivity Threshold [hours]", GroupName = "Trash Removal")]
public float PlayerInactivityThreshold { get => _settings.PlayerInactivityThreshold; set => SetValue(ref _settings.PlayerInactivityThreshold, value); }
[Torch.Views.Display(Description = "Defines character removal threshold for trash removal system. If player disconnects it will remove his character after this time.\n Set to 0 to disable.", Name = "Character Removal Threshold [mins]", GroupName = "Trash Removal")]
public int PlayerCharacterRemovalThreshold { get => _settings.PlayerCharacterRemovalThreshold; set => SetValue(ref _settings.PlayerCharacterRemovalThreshold, value); }
[Torch.Views.Display(Description = "Sets optimal distance in meters when spawning new players near others.", Name = "Optimal Spawn Distance", GroupName = "Players")]
public float OptimalSpawnDistance { get => _settings.OptimalSpawnDistance; set => SetValue(ref _settings.OptimalSpawnDistance, value); }
[Torch.Views.Display(Description = "Enables automatic respawn at nearest available respawn point.", Name = "Enable Auto Respawn", GroupName = "Players")]
public bool EnableAutoRespawn { get => _settings.EnableAutorespawn; set => SetValue(ref _settings.EnableAutorespawn, value); }
[Torch.Views.Display(Description = "The number of NPC factions generated on the start of the world.", Name = "NPC Factions Count", GroupName = "NPCs")]
public int TradeFactionsCount { get => _settings.TradeFactionsCount; set => SetValue(ref _settings.TradeFactionsCount, value); }
[Torch.Views.Display(Description = "The inner radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Inner Radius", GroupName = "NPCs")]
public double StationsDistanceInnerRadius { get => _settings.StationsDistanceInnerRadius; set => SetValue(ref _settings.StationsDistanceInnerRadius, value); }
[Torch.Views.Display(Description = "The outer radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Outer Radius Start", GroupName = "NPCs")]
public double StationsDistanceOuterRadiusStart { get => _settings.StationsDistanceOuterRadiusStart; set => SetValue(ref _settings.StationsDistanceOuterRadiusStart, value); }
[Torch.Views.Display(Description = "The outer radius [m] (center is in 0,0,0), where stations can spawn. Does not affect planet-bound stations (surface Outposts and Orbital stations).", Name = "Stations Outer Radius End", GroupName = "NPCs")]
public double StationsDistanceOuterRadiusEnd { get => _settings.StationsDistanceOuterRadiusEnd; set => SetValue(ref _settings.StationsDistanceOuterRadiusEnd, value); }
[Torch.Views.Display(Description = "Time period between two economy updates in seconds.", Name = "Economy tick time", GroupName = "NPCs")]
public int EconomyTickInSeconds { get => _settings.EconomyTickInSeconds; set => SetValue(ref _settings.EconomyTickInSeconds, value); }
[Torch.Views.Display(Description = "If enabled bounty contracts will be available on stations.", Name = "Enable Bounty Contracts", GroupName = "Players")]
public bool EnableBountyContracts { get => _settings.EnableBountyContracts; set => SetValue(ref _settings.EnableBountyContracts, value); }
[Torch.Views.Display(Description = "Resource deposits count coefficient for generated world content (voxel generator version > 2).", Name = "Deposits Count Coefficient", GroupName = "Environment")]
public float DepositsCountCoefficient { get => _settings.DepositsCountCoefficient; set => SetValue(ref _settings.DepositsCountCoefficient, value); }
[Torch.Views.Display(Description = "Resource deposit size denominator for generated world content (voxel generator version > 2).", Name = "Deposit Size Denominator", GroupName = "Environment")]
public float DepositSideDenominator { get => _settings.DepositSizeDenominator; set => SetValue(ref _settings.DepositSizeDenominator, value); }
[Torch.Views.Display(Description = "Enables economy features.", Name = "Enable Economy", GroupName = "NPCs")]
public bool EnableEconomy { get => _settings.EnableEconomy; set => SetValue(ref _settings.EnableEconomy, value); }
[Torch.Views.Display(Description = "Enables system for voxel reverting.", Name = "Enable Voxel Reverting", GroupName = "Trash Removal")]
public bool VoxelTrashRemovalEnabled { get => _settings.VoxelTrashRemovalEnabled; set => SetValue(ref _settings.VoxelTrashRemovalEnabled, value); }
[Torch.Views.Display(Description = "Allows super gridding exploit to be used.", Name = "Enable Supergridding", GroupName = "Others")]
public bool EnableSupergridding { get => _settings.EnableSupergridding; set => SetValue(ref _settings.EnableSupergridding, value); }
[Torch.Views.Display(Description = "Enables Selective Physics", Name = "Enable Selective Physics", GroupName = "Others")]
public bool EnableSelectivePhysics { get => _settings.EnableSelectivePhysicsUpdates; set => SetValue(ref _settings.EnableSelectivePhysicsUpdates, value); }
[Torch.Views.Display(Description = "Allows steam's family sharing", Name = "Enable Family Sharing", GroupName = "Players")]
public bool EnableFamilySharing { get => _settings.FamilySharing; set => SetValue(ref _settings.FamilySharing, value); }
[Torch.Views.Display(Description = "Enables PCU trading", Name = "Enable PCU Trading", GroupName = "Block Limits")]
public bool EnablePCUTrading { get => _settings.EnablePcuTrading; set => SetValue(ref _settings.EnablePcuTrading, value); }
[Torch.Views.Display(Description = "Enables system for weather", Name = "Enable Weather System", GroupName = "Others")]
public bool EnableWeatherSystem { get => _settings.WeatherSystem; set => SetValue(ref _settings.WeatherSystem, value); }
public SessionSettingsViewModel(MyObjectBuilder_SessionSettings settings)
{
_settings = settings;
}
public static implicit operator MyObjectBuilder_SessionSettings(SessionSettingsViewModel viewModel)
{
return viewModel._settings;
}
}
}

View File

@@ -6,12 +6,12 @@ namespace Torch.Server.ViewModels
public class WorldConfigurationViewModel : ViewModel public class WorldConfigurationViewModel : ViewModel
{ {
private readonly MyObjectBuilder_WorldConfiguration _worldConfiguration; private readonly MyObjectBuilder_WorldConfiguration _worldConfiguration;
private SessionSettingsViewModel _sessionSettings; private DynamicViewModel<MyObjectBuilder_SessionSettings> _sessionSettings;
public WorldConfigurationViewModel(MyObjectBuilder_WorldConfiguration worldConfiguration) public WorldConfigurationViewModel(MyObjectBuilder_WorldConfiguration worldConfiguration)
{ {
_worldConfiguration = worldConfiguration; _worldConfiguration = worldConfiguration;
_sessionSettings = new SessionSettingsViewModel(worldConfiguration.Settings); _sessionSettings = new DynamicViewModel<MyObjectBuilder_SessionSettings>(worldConfiguration.Settings);
} }
public static implicit operator MyObjectBuilder_WorldConfiguration(WorldConfigurationViewModel model) public static implicit operator MyObjectBuilder_WorldConfiguration(WorldConfigurationViewModel model)
@@ -21,7 +21,7 @@ namespace Torch.Server.ViewModels
public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _worldConfiguration.Mods; set => SetValue(ref _worldConfiguration.Mods, value); } public List<MyObjectBuilder_Checkpoint.ModItem> Mods { get => _worldConfiguration.Mods; set => SetValue(ref _worldConfiguration.Mods, value); }
public SessionSettingsViewModel Settings public DynamicViewModel<MyObjectBuilder_SessionSettings> Settings
{ {
get => _sessionSettings; get => _sessionSettings;
set set

View File

@@ -130,7 +130,7 @@
</Grid> </Grid>
<TabControl Grid.Column="1" Margin="3"> <TabControl Grid.Column="1" Margin="3">
<TabItem Header="World"> <TabItem Header="World">
<views:PropertyGrid DataContext="{Binding SessionSettings}" /> <views:PropertyGrid DataContext="{Binding SessionSettings.Wrapper}" />
</TabItem> </TabItem>
<TabItem Header="Torch"> <TabItem Header="Torch">
<views:PropertyGrid x:Name="TorchSettings" /> <views:PropertyGrid x:Name="TorchSettings" />

View File

@@ -101,7 +101,7 @@ namespace Torch.Server
{ {
var selected = (PremadeCheckpointItem)PremadeCheckpoints.SelectedItem; var selected = (PremadeCheckpointItem)PremadeCheckpoints.SelectedItem;
_currentItem = selected; _currentItem = selected;
SettingsView.DataContext = new SessionSettingsViewModel(_currentItem.Checkpoint.Settings); SettingsView.DataContext = new DynamicViewModel<MyObjectBuilder_SessionSettings>(_currentItem.Checkpoint.Settings).Wrapper;
} }
} }

View File

@@ -107,15 +107,15 @@
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.3.2, )", "requested": "[5.3.3, )",
"resolved": "5.3.2", "resolved": "5.3.3",
"contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg==" "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
}, },
"nulastudio.NetBeauty": { "nulastudio.NetBeauty": {
"type": "Direct", "type": "Direct",
"requested": "[2.1.4.4, )", "requested": "[2.1.4.5, )",
"resolved": "2.1.4.4", "resolved": "2.1.4.5",
"contentHash": "Q+4H1o9tNVVHEm4VHQq1kglc+eNAwVdEKKnNKez0kDZHBPRE+ufXIgN6ucdvi1A462nFDstChLafMt36L3kXAw==" "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw=="
}, },
"PropertyChanged.Fody": { "PropertyChanged.Fody": {
"type": "Direct", "type": "Direct",
@@ -157,18 +157,19 @@
"resolved": "6.6.4", "resolved": "6.6.4",
"contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A==" "contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A=="
}, },
"HarmonyX": {
"type": "Transitive",
"resolved": "2.10.2-prerelease.7",
"contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
"dependencies": {
"MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
}
},
"JetBrains.Annotations": { "JetBrains.Annotations": {
"type": "Transitive", "type": "Transitive",
"resolved": "2023.3.0", "resolved": "2024.2.0",
"contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
},
"Lib.Harmony.Thin": {
"type": "Transitive",
"resolved": "2.3.3-torch",
"contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
"dependencies": {
"MonoMod.Core": "1.1.0",
"System.Text.Json": "8.0.1"
}
}, },
"MdXaml.Plugins": { "MdXaml.Plugins": {
"type": "Transitive", "type": "Transitive",
@@ -182,21 +183,23 @@
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==", "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0", "System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0", "System.Reflection.Metadata": "8.0.0"
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==", "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.9.2]" "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0"
} }
}, },
"Microsoft.Diagnostics.NETCore.Client": { "Microsoft.Diagnostics.NETCore.Client": {
@@ -227,8 +230,8 @@
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.1", "resolved": "8.0.2",
"contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0" "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
} }
@@ -315,21 +318,21 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==", "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==", "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1", "MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5" "MonoMod.Utils": "25.0.4"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
@@ -337,25 +340,13 @@
"resolved": "1.0.1", "resolved": "1.0.1",
"contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
}, },
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.1.1",
"contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
"dependencies": {
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1",
"MonoMod.Core": "1.1.1",
"MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5"
}
},
"MonoMod.Utils": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.5", "resolved": "25.0.4",
"contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==", "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
@@ -366,111 +357,100 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==", "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.9.1", "NuGet.Credentials": "6.11.0",
"NuGet.ProjectModel": "6.9.1" "NuGet.ProjectModel": "6.11.0"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==", "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.9.1" "NuGet.Frameworks": "6.11.0"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==", "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==", "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==", "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.LibraryModel": "6.9.1", "NuGet.LibraryModel": "6.11.0",
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA==" "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==", "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"NuGet.Versioning": "6.9.1" "NuGet.Versioning": "6.11.0"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==", "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.3", "Newtonsoft.Json": "13.0.3",
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.Versioning": "6.9.1", "NuGet.Versioning": "6.11.0",
"System.Security.Cryptography.Pkcs": "6.0.4" "System.Security.Cryptography.Pkcs": "6.0.4"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==", "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.9.1" "NuGet.DependencyResolver.Core": "6.11.0"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==", "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.9.1" "NuGet.Packaging": "6.11.0"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ==" "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.2.30", "resolved": "1.0.0",
"contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
"dependencies": {
"protobuf-net.Core": "3.2.30"
}
},
"protobuf-net.Core": {
"type": "Transitive",
"resolved": "3.2.30",
"contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -492,8 +472,8 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.204.15", "resolved": "1.205.23",
"contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==", "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
"dependencies": { "dependencies": {
"SharpDX": "4.2.0-keen-cringe", "SharpDX": "4.2.0-keen-cringe",
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
@@ -532,8 +512,8 @@
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "4.5.1",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
}, },
"System.Security.Cryptography.Pkcs": { "System.Security.Cryptography.Pkcs": {
"type": "Transitive", "type": "Transitive",
@@ -563,8 +543,8 @@
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.3", "resolved": "8.0.1",
"contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==", "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
"dependencies": { "dependencies": {
"System.Text.Encodings.Web": "8.0.0" "System.Text.Encodings.Web": "8.0.0"
} }
@@ -582,30 +562,27 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[5.0.2, )", "ControlzEx": "[5.0.2, )",
"HarmonyX": "[2.10.2-prerelease.7, )", "Lib.Harmony.Thin": "[2.3.3-torch, )",
"MahApps.Metro": "[2.4.10, )", "MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.9.2, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.9.2, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"MonoMod.RuntimeDetour": "[25.1.1, )", "NLog": "[5.3.3, )",
"NLog": "[5.3.2, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
"protobuf-net": "[3.2.30, )"
} }
}, },
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JetBrains.Annotations": "[2023.3.0, )", "JetBrains.Annotations": "[2024.2.0, )",
"Microsoft.Extensions.Configuration.Binder": "[8.0.1, )", "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"NuGet.Commands": "[6.9.1, )", "NuGet.Commands": "[6.11.0, )",
"NuGet.DependencyResolver.Core": "[6.9.1, )", "NuGet.DependencyResolver.Core": "[6.11.0, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
"System.Linq.Async": "[6.0.1, )", "System.Linq.Async": "[6.0.1, )"
"System.Text.Json": "[8.0.3, )"
} }
} }
}, },

View File

@@ -13,9 +13,9 @@
</PropertyGroup> </PropertyGroup>
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> --> <!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
<PackageReference Include="NLog" Version="5.3.2" /> <PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="xunit" Version="2.8.0" /> <PackageReference Include="xunit" Version="2.9.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Torch.API\Torch.API.csproj" /> <ProjectReference Include="..\Torch.API\Torch.API.csproj" />

View File

@@ -4,29 +4,29 @@
"net8.0-windows7.0": { "net8.0-windows7.0": {
"Microsoft.NET.Test.Sdk": { "Microsoft.NET.Test.Sdk": {
"type": "Direct", "type": "Direct",
"requested": "[17.9.0, )", "requested": "[17.11.0, )",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "7GUNAUbJYn644jzwLm5BD3a2p9C1dmP8Hr6fDPDxgItQk9hBs1Svdxzz07KQ/UphMSmgza9AbijBJGmw5D658A==", "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==",
"dependencies": { "dependencies": {
"Microsoft.CodeCoverage": "17.9.0", "Microsoft.CodeCoverage": "17.11.0",
"Microsoft.TestPlatform.TestHost": "17.9.0" "Microsoft.TestPlatform.TestHost": "17.11.0"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.3.2, )", "requested": "[5.3.3, )",
"resolved": "5.3.2", "resolved": "5.3.3",
"contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg==" "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
}, },
"xunit": { "xunit": {
"type": "Direct", "type": "Direct",
"requested": "[2.8.0, )", "requested": "[2.9.0, )",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "US3a3twJziAif1kFPGdk9fALwILHxV0n1roX5j67bN/d3o4DGNLHnV3tr5ZX+uinVrzfkf0avH3zGX8JPBC0qA==", "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==",
"dependencies": { "dependencies": {
"xunit.analyzers": "1.13.0", "xunit.analyzers": "1.15.0",
"xunit.assert": "2.8.0", "xunit.assert": "2.9.0",
"xunit.core": "[2.8.0]" "xunit.core": "[2.9.0]"
} }
}, },
"ControlzEx": { "ControlzEx": {
@@ -38,18 +38,19 @@
"System.Text.Json": "5.0.1" "System.Text.Json": "5.0.1"
} }
}, },
"HarmonyX": {
"type": "Transitive",
"resolved": "2.10.2-prerelease.7",
"contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
"dependencies": {
"MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
}
},
"JetBrains.Annotations": { "JetBrains.Annotations": {
"type": "Transitive", "type": "Transitive",
"resolved": "2023.3.0", "resolved": "2024.2.0",
"contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
},
"Lib.Harmony.Thin": {
"type": "Transitive",
"resolved": "2.3.3-torch",
"contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
"dependencies": {
"MonoMod.Core": "1.1.0",
"System.Text.Json": "8.0.1"
}
}, },
"MahApps.Metro": { "MahApps.Metro": {
"type": "Transitive", "type": "Transitive",
@@ -71,27 +72,29 @@
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==", "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0", "System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0", "System.Reflection.Metadata": "8.0.0"
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==", "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.9.2]" "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0"
} }
}, },
"Microsoft.CodeCoverage": { "Microsoft.CodeCoverage": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "RGD37ZSrratfScYXm7M0HjvxMxZyWZL4jm+XgMZbkIY1UPgjUpbNA/t+WTGj/rC/0Hm9A3IrH3ywbKZkOCnoZA==" "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg=="
}, },
"Microsoft.Extensions.Configuration.Abstractions": { "Microsoft.Extensions.Configuration.Abstractions": {
"type": "Transitive", "type": "Transitive",
@@ -103,8 +106,8 @@
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.1", "resolved": "8.0.2",
"contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0" "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
} }
@@ -129,18 +132,18 @@
}, },
"Microsoft.TestPlatform.ObjectModel": { "Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "1ilw/8vgmjLyKU+2SKXKXaOqpYFJCQfGqGz+x0cosl981VzjrY74Sv6qAJv+neZMZ9ZMxF3ArN6kotaQ4uvEBw==", "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==",
"dependencies": { "dependencies": {
"System.Reflection.Metadata": "1.6.0" "System.Reflection.Metadata": "1.6.0"
} }
}, },
"Microsoft.TestPlatform.TestHost": { "Microsoft.TestPlatform.TestHost": {
"type": "Transitive", "type": "Transitive",
"resolved": "17.9.0", "resolved": "17.11.0",
"contentHash": "Spmg7Wx49Ya3SxBjyeAR+nQpjMTKZwTwpZ7KyeOTIqI/WHNPnBU4HUvl5kuHPQAwGWqMy4FGZja1HvEwvoaDiA==", "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==",
"dependencies": { "dependencies": {
"Microsoft.TestPlatform.ObjectModel": "17.9.0", "Microsoft.TestPlatform.ObjectModel": "17.11.0",
"Newtonsoft.Json": "13.0.1" "Newtonsoft.Json": "13.0.1"
} }
}, },
@@ -156,21 +159,21 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==", "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==", "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1", "MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5" "MonoMod.Utils": "25.0.4"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
@@ -178,25 +181,13 @@
"resolved": "1.0.1", "resolved": "1.0.1",
"contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA=="
}, },
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.1.1",
"contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
"dependencies": {
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1",
"MonoMod.Core": "1.1.1",
"MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5"
}
},
"MonoMod.Utils": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.5", "resolved": "25.0.4",
"contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==", "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
@@ -207,111 +198,100 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==", "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.9.1", "NuGet.Credentials": "6.11.0",
"NuGet.ProjectModel": "6.9.1" "NuGet.ProjectModel": "6.11.0"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==", "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.9.1" "NuGet.Frameworks": "6.11.0"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==", "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==", "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==", "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.LibraryModel": "6.9.1", "NuGet.LibraryModel": "6.11.0",
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA==" "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==", "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"NuGet.Versioning": "6.9.1" "NuGet.Versioning": "6.11.0"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==", "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.3", "Newtonsoft.Json": "13.0.3",
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.Versioning": "6.9.1", "NuGet.Versioning": "6.11.0",
"System.Security.Cryptography.Pkcs": "6.0.4" "System.Security.Cryptography.Pkcs": "6.0.4"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==", "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.9.1" "NuGet.DependencyResolver.Core": "6.11.0"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==", "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.9.1" "NuGet.Packaging": "6.11.0"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ==" "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
}, },
"protobuf-net": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.2.30", "resolved": "1.0.0",
"contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
"dependencies": {
"protobuf-net.Core": "3.2.30"
}
},
"protobuf-net.Core": {
"type": "Transitive",
"resolved": "3.2.30",
"contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==",
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -333,8 +313,8 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.204.15", "resolved": "1.205.23",
"contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==", "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
"dependencies": { "dependencies": {
"SharpDX": "4.2.0-keen-cringe", "SharpDX": "4.2.0-keen-cringe",
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
@@ -373,8 +353,8 @@
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "4.5.1",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
}, },
"System.Security.Cryptography.Pkcs": { "System.Security.Cryptography.Pkcs": {
"type": "Transitive", "type": "Transitive",
@@ -396,8 +376,8 @@
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.3", "resolved": "8.0.1",
"contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==", "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
"dependencies": { "dependencies": {
"System.Text.Encodings.Web": "8.0.0" "System.Text.Encodings.Web": "8.0.0"
} }
@@ -418,67 +398,64 @@
}, },
"xunit.analyzers": { "xunit.analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.13.0", "resolved": "1.15.0",
"contentHash": "Pai9YnDV71/Ox14nBHB6/f62iyPyLbmUG/YYMiA4dfdFZvr0gIYE9yGxSr0i5Tr3INK75wgL2MCUNEKpeiZ2Fw==" "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ=="
}, },
"xunit.assert": { "xunit.assert": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "lwf7Dy5/5HbDkaPx1YrGXCByytCEEcIn+KPI74jh2BD/RU/7RhO8c+S3k0Ph+Mr7+cLf338fl+o6UcgPCLa6PA==" "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA=="
}, },
"xunit.core": { "xunit.core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "McSTFGTETCxLpmJKE9TWi9FtFthrRbpRrjz2V2g8sK2wRt1+JHs15vwi+B+nfftFkV9aFWIXZfzZM95TIGZNIA==", "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==",
"dependencies": { "dependencies": {
"xunit.extensibility.core": "[2.8.0]", "xunit.extensibility.core": "[2.9.0]",
"xunit.extensibility.execution": "[2.8.0]" "xunit.extensibility.execution": "[2.9.0]"
} }
}, },
"xunit.extensibility.core": { "xunit.extensibility.core": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "eBJv9xQeY0p5z+C/L1tFjUFYqtl5pQqIEYCGTMl+MbRzA7sOlgYKwJE//vEePBp+mgBh7NjD0Qhz0liZBYM27w==", "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==",
"dependencies": { "dependencies": {
"xunit.abstractions": "2.0.3" "xunit.abstractions": "2.0.3"
} }
}, },
"xunit.extensibility.execution": { "xunit.extensibility.execution": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.8.0", "resolved": "2.9.0",
"contentHash": "TyyrZesHB9ODZMS9c73OqiBz4x0vL944JCkSPBWW5w6PF2LlUfdfXRjjOhoIOuY6lTmEgl07rS4/Jot9mCYnpg==", "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==",
"dependencies": { "dependencies": {
"xunit.extensibility.core": "[2.8.0]" "xunit.extensibility.core": "[2.9.0]"
} }
}, },
"torch": { "torch": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[5.0.2, )", "ControlzEx": "[5.0.2, )",
"HarmonyX": "[2.10.2-prerelease.7, )", "Lib.Harmony.Thin": "[2.3.3-torch, )",
"MahApps.Metro": "[2.4.10, )", "MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.9.2, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.9.2, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"MonoMod.RuntimeDetour": "[25.1.1, )", "NLog": "[5.3.3, )",
"NLog": "[5.3.2, )",
"System.ComponentModel.Annotations": "[5.0.0, )", "System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )", "Torch.API": "[1.0.0, )",
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )"
"protobuf-net": "[3.2.30, )"
} }
}, },
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JetBrains.Annotations": "[2023.3.0, )", "JetBrains.Annotations": "[2024.2.0, )",
"Microsoft.Extensions.Configuration.Binder": "[8.0.1, )", "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"NuGet.Commands": "[6.9.1, )", "NuGet.Commands": "[6.11.0, )",
"NuGet.DependencyResolver.Core": "[6.9.1, )", "NuGet.DependencyResolver.Core": "[6.11.0, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
"System.Linq.Async": "[6.0.1, )", "System.Linq.Async": "[6.0.1, )"
"System.Text.Json": "[8.0.3, )"
} }
} }
}, },

View File

@@ -10,6 +10,7 @@ using Torch.API;
using Torch.API.Managers; using Torch.API.Managers;
using Torch.Utils; using Torch.Utils;
using VRage.Game; using VRage.Game;
using VRage.GameServices;
using Color = VRageMath.Color; using Color = VRageMath.Color;
namespace Torch.Managers.ChatManager namespace Torch.Managers.ChatManager
@@ -76,7 +77,7 @@ namespace Torch.Managers.ChatManager
_chatMessageRecievedReplacer = _chatMessageReceivedFactory.Invoke(); _chatMessageRecievedReplacer = _chatMessageReceivedFactory.Invoke();
_scriptedChatMessageRecievedReplacer = _scriptedChatMessageReceivedFactory.Invoke(); _scriptedChatMessageRecievedReplacer = _scriptedChatMessageReceivedFactory.Invoke();
_chatMessageRecievedReplacer.Replace( _chatMessageRecievedReplacer.Replace(
new Action<ulong, string, ChatChannel, long, string, ulong?>(Multiplayer_ChatMessageReceived), new Action<ulong, string, ChatChannel, long, ChatMessageCustomData?>(Multiplayer_ChatMessageReceived),
MyMultiplayer.Static); MyMultiplayer.Static);
_scriptedChatMessageRecievedReplacer.Replace( _scriptedChatMessageRecievedReplacer.Replace(
new Action<string, string, string, Color>(Multiplayer_ScriptedChatMessageReceived), new Action<string, string, string, Color>(Multiplayer_ScriptedChatMessageReceived),
@@ -133,14 +134,14 @@ namespace Torch.Managers.ChatManager
} }
private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, string customAuthorName, ulong? customSenderId = null) private void Multiplayer_ChatMessageReceived(ulong steamUserId, string messageText, ChatChannel channel, long targetId, ChatMessageCustomData? customData )
{ {
#pragma warning disable CS0612 #pragma warning disable CS0612
var torchMsg = new TorchChatMessage(steamUserId, messageText, channel, targetId, var torchMsg = new TorchChatMessage(steamUserId, messageText, channel, targetId,
#pragma warning restore CS0612 #pragma warning restore CS0612
(steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue); (steamUserId == MyGameService.UserId) ? MyFontEnum.DarkBlue : MyFontEnum.Blue);
if (!RaiseMessageRecieved(torchMsg) && HasHud) if (!RaiseMessageRecieved(torchMsg) && HasHud)
_hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customAuthorName, customSenderId); _hudChatMessageReceived.Invoke(MyHud.Chat, steamUserId, messageText, channel, targetId, customData);
} }
private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color) private void Multiplayer_ScriptedChatMessageReceived(string message, string author, string font, Color color)
@@ -165,7 +166,7 @@ namespace Torch.Managers.ChatManager
protected static bool HasHud => !Sandbox.Engine.Platform.Game.IsDedicated; protected static bool HasHud => !Sandbox.Engine.Platform.Game.IsDedicated;
[ReflectedMethod(Name = _hudChatMessageReceivedName)] [ReflectedMethod(Name = _hudChatMessageReceivedName)]
private static Action<MyHudChat, ulong, string, ChatChannel, long, string, ulong?> _hudChatMessageReceived = null!; private static Action<MyHudChat, ulong, string, ChatChannel, long, ChatMessageCustomData?> _hudChatMessageReceived = null!;
[ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)] [ReflectedMethod(Name = _hudChatScriptedMessageReceivedName)]
private static Action<MyHudChat, string, string, string, Color> _hudChatScriptedMessageReceived = null!; private static Action<MyHudChat, string, string, string, Color> _hudChatScriptedMessageReceived = null!;

View File

@@ -45,6 +45,12 @@ namespace Torch.Patches
private static void WhitelistCtorPrefix(MyScriptCompiler scriptCompiler) private static void WhitelistCtorPrefix(MyScriptCompiler scriptCompiler)
{ {
var baseDir = new FileInfo(typeof(Type).Assembly.Location).DirectoryName!; var baseDir = new FileInfo(typeof(Type).Assembly.Location).DirectoryName!;
var binDir =
#if DEBUG
baseDir;
#else
Path.Join(AppContext.BaseDirectory, "torch64");
#endif
scriptCompiler.AddReferencedAssemblies( scriptCompiler.AddReferencedAssemblies(
typeof(Type).Assembly.Location, typeof(Type).Assembly.Location,
@@ -57,22 +63,22 @@ namespace Torch.Patches
typeof(TypeConverter).Assembly.Location, typeof(TypeConverter).Assembly.Location,
typeof(System.Diagnostics.TraceSource).Assembly.Location, typeof(System.Diagnostics.TraceSource).Assembly.Location,
typeof(System.Security.Policy.Evidence).Assembly.Location, typeof(System.Security.Policy.Evidence).Assembly.Location,
Path.Combine(baseDir, "System.Xml.ReaderWriter.dll"), Path.Join(binDir, "System.Xml.ReaderWriter.dll"),
Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.dll"), Path.Join(MyFileSystem.ExePath, "ProtoBuf.Net.dll"),
Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"), Path.Join(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"),
Path.Combine(baseDir, "netstandard.dll"), Path.Join(binDir, "netstandard.dll"),
Path.Combine(baseDir, "System.Runtime.dll"), Path.Join(baseDir, "System.Runtime.dll"),
Path.Combine(MyFileSystem.ExePath, "Sandbox.Game.dll"), Path.Join(MyFileSystem.ExePath, "Sandbox.Game.dll"),
Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"), Path.Join(MyFileSystem.ExePath, "Sandbox.Common.dll"),
Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"), Path.Join(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.dll"), Path.Join(MyFileSystem.ExePath, "VRage.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.Library.dll"), Path.Join(MyFileSystem.ExePath, "VRage.Library.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.Math.dll"), Path.Join(MyFileSystem.ExePath, "VRage.Math.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.Game.dll"), Path.Join(MyFileSystem.ExePath, "VRage.Game.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.Render.dll"), Path.Join(MyFileSystem.ExePath, "VRage.Render.dll"),
Path.Combine(MyFileSystem.ExePath, "VRage.Input.dll"), Path.Join(MyFileSystem.ExePath, "VRage.Input.dll"),
Path.Combine(MyFileSystem.ExePath, "SpaceEngineers.ObjectBuilders.dll"), Path.Join(MyFileSystem.ExePath, "SpaceEngineers.ObjectBuilders.dll"),
Path.Combine(MyFileSystem.ExePath, "SpaceEngineers.Game.dll")); Path.Join(MyFileSystem.ExePath, "SpaceEngineers.Game.dll"));
} }
private static bool InitializePrefix(Thread updateThread, Type[] referencedTypes, string[] symbols) private static bool InitializePrefix(Thread updateThread, Type[] referencedTypes, string[] symbols)

View File

@@ -19,8 +19,11 @@ internal static class AssemblyRewriter
{ {
_defaultResolver = new(); _defaultResolver = new();
_zipResolver = new(_defaultResolver); _zipResolver = new(_defaultResolver);
_defaultResolver.AddSearchDirectory(Directory.GetCurrentDirectory()); _defaultResolver.AddSearchDirectory(AppContext.BaseDirectory);
_defaultResolver.AddSearchDirectory(Path.Combine(Directory.GetCurrentDirectory(), "DedicatedServer64")); _defaultResolver.AddSearchDirectory(Path.Combine(Directory.GetCurrentDirectory(), "DedicatedServer64"));
#if !DEBUG
_defaultResolver.AddSearchDirectory(Path.Join(AppContext.BaseDirectory, "torch64"));
#endif
} }
public static Assembly ProcessWeavers(this Stream stream, ZipArchive archive) public static Assembly ProcessWeavers(this Stream stream, ZipArchive archive)
@@ -60,17 +63,17 @@ internal static class AssemblyRewriter
private static Assembly ProcessInternal(Stream inputStream, IAssemblyResolver resolver) private static Assembly ProcessInternal(Stream inputStream, IAssemblyResolver resolver)
{ {
using var module = ModuleDefinition.ReadModule(inputStream, new() using var assembly = AssemblyDefinition.ReadAssembly(inputStream, new()
{ {
AssemblyResolver = resolver AssemblyResolver = resolver
}); });
foreach (var fieldDefinition in FindAllToRewrite(module)) foreach (var fieldDefinition in FindAllToRewrite(assembly.MainModule))
{ {
fieldDefinition.IsInitOnly = false; fieldDefinition.IsInitOnly = false;
} }
using var memStream = new MemoryStream(); using var memStream = new MemoryStream();
module.Assembly.Write(memStream); assembly.Write(memStream);
return Assembly.Load(memStream.ToArray()); return Assembly.Load(memStream.ToArray());
} }

View File

@@ -14,17 +14,15 @@
<Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" /> <Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
<ItemGroup> <ItemGroup>
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.1.1" /> <PackageReference Include="Lib.Harmony.Thin" Version="2.3.3-torch" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.7" />
<PackageReference Include="ControlzEx" Version="5.0.2" /> <PackageReference Include="ControlzEx" Version="5.0.2" />
<PackageReference Include="InfoOf.Fody" Version="2.2.0" PrivateAssets="all" /> <PackageReference Include="InfoOf.Fody" Version="2.2.0" PrivateAssets="all" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" /> <PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="NLog" Version="5.3.2" /> <PackageReference Include="NLog" Version="5.3.3" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" /> <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
<PackageReference Include="protobuf-net" Version="3.2.30" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" /> <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
</ItemGroup> </ItemGroup>

View File

@@ -140,20 +140,6 @@ namespace Torch
if (state == TorchGameState.Created) if (state == TorchGameState.Created)
PatchManager.CommitInternal(); PatchManager.CommitInternal();
}; };
var harmonyLog = LogManager.GetLogger("HarmonyX");
HarmonyLib.Tools.Logger.ChannelFilter = HarmonyLib.Tools.Logger.LogChannel.Debug;
HarmonyLib.Tools.Logger.MessageReceived += (_, args) => harmonyLog.Log(args.LogChannel switch
{
HarmonyLib.Tools.Logger.LogChannel.None => LogLevel.Off,
HarmonyLib.Tools.Logger.LogChannel.Info => LogLevel.Info,
HarmonyLib.Tools.Logger.LogChannel.IL => LogLevel.Trace,
HarmonyLib.Tools.Logger.LogChannel.Warn => LogLevel.Warn,
HarmonyLib.Tools.Logger.LogChannel.Error => LogLevel.Error,
HarmonyLib.Tools.Logger.LogChannel.Debug => LogLevel.Debug,
HarmonyLib.Tools.Logger.LogChannel.All => LogLevel.Debug,
_ => throw new ArgumentOutOfRangeException()
}, args.Message);
} }
[Obsolete("Prefer using Managers.GetManager for global managers")] [Obsolete("Prefer using Managers.GetManager for global managers")]
@@ -409,5 +395,15 @@ namespace Torch
/// <inheritdoc/> /// <inheritdoc/>
public event TorchGameStateChangedDel GameStateChanged; public event TorchGameStateChangedDel GameStateChanged;
#region Backwards compat
[Obsolete("Dont use that", true)]
internal static void RegisterAuxAssembly(Assembly assembly)
{
TorchLauncher.RegisterAssembly(assembly);
}
#endregion
} }
} }

View File

@@ -312,7 +312,7 @@ namespace Torch
private void Destroy() private void Destroy()
{ {
_game.Dispose(); _game?.Dispose();
_game = null; _game = null;
MyGameService.ShutDown(); MyGameService.ShutDown();
@@ -462,7 +462,8 @@ namespace Torch
public void SignalDestroy() public void SignalDestroy()
{ {
_destroyGame = true; _destroyGame = true;
SignalStop(); if (_game is not null)
SignalStop();
_commandChanged.Set(); _commandChanged.Set();
} }

View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Reflection; using System.Reflection;
using System.Windows; using System.Windows;
using JetBrains.Annotations;
namespace Torch.Views namespace Torch.Views
{ {
@@ -19,21 +20,18 @@ namespace Torch.Views
private PropertyInfo _property; private PropertyInfo _property;
private object _obj; private object _obj;
public void EditEnum(PropertyInfo prop, object obj) public void EditEnum(PropertyInfo prop, object obj, [CanBeNull] Type propertyType = null)
{ {
if (!prop.PropertyType.IsEnum || prop.PropertyType.GetCustomAttribute<FlagsAttribute>() == null)
throw new ArgumentException("Type is not a flags enum");
_property = prop; _property = prop;
_obj = obj; _obj = obj;
_flags = new List<Flag>(); _flags = new List<Flag>();
var initial = (int)Convert.ChangeType(prop.GetValue(obj), typeof(int)); var initial = (int)Convert.ChangeType(prop.GetValue(obj), typeof(int));
foreach (var value in Enum.GetValues(prop.PropertyType)) foreach (var value in Enum.GetValues(propertyType ??= prop.PropertyType))
{ {
var val = (int)Convert.ChangeType(value, typeof(int)); var val = (int)Convert.ChangeType(value, typeof(int));
_flags.Add(new Flag _flags.Add(new Flag
{ {
Name = Enum.GetName(prop.PropertyType, value), Name = Enum.GetName(propertyType, value),
Value = val, Value = val,
IsChecked = (initial & val) > 0 IsChecked = (initial & val) > 0
}); });

View File

@@ -1,6 +1,7 @@
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using System.Windows; using System.Windows;
@@ -9,6 +10,7 @@ using System.Windows.Data;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using VRage.Serialization; using VRage.Serialization;
using VRage.Utils;
namespace Torch.Views namespace Torch.Views
{ {
@@ -65,6 +67,11 @@ namespace Torch.Views
foreach (var property in properties) foreach (var property in properties)
{ {
var browsableAttribute = property.GetCustomAttribute<BrowsableAttribute>();
if (browsableAttribute is { Browsable: false })
continue;
//Attempt to load our custom DisplayAttribute //Attempt to load our custom DisplayAttribute
var a = property.GetCustomAttribute<DisplayAttribute>(); var a = property.GetCustomAttribute<DisplayAttribute>();
//If not found and IgnoreDisplay is not set, fall back to system DisplayAttribute //If not found and IgnoreDisplay is not set, fall back to system DisplayAttribute
@@ -73,7 +80,7 @@ namespace Torch.Views
if (!IgnoreDisplay && a == null || a?.Visible == false) if (!IgnoreDisplay && a == null || a?.Visible == false)
continue; continue;
descriptors[property] = a; descriptors[property] = a;
string category = a?.GroupName ?? "Misc"; string category = a?.GroupName ?? property.GetCustomAttribute<CategoryAttribute>()?.Category ?? "Misc";
if (!categories.TryGetValue(category, out List<PropertyInfo> l)) if (!categories.TryGetValue(category, out List<PropertyInfo> l))
{ {
@@ -154,9 +161,9 @@ namespace Torch.Views
valueControl = new CheckBox(); valueControl = new CheckBox();
valueControl.SetBinding(CheckBox.IsCheckedProperty, property.Name); valueControl.SetBinding(CheckBox.IsCheckedProperty, property.Name);
} }
else if (propertyType.IsEnum) else if (propertyType.IsEnum || property.HasAttribute<MyFlagEnumAttribute>())
{ {
var isFlags = propertyType.GetCustomAttribute<FlagsAttribute>() != null; var isFlags = property.HasAttribute<MyFlagEnumAttribute>() || propertyType.HasAttribute<FlagsAttribute>();
if (isFlags) if (isFlags)
{ {
@@ -299,11 +306,13 @@ namespace Torch.Views
var propName = btn.GetBindingExpression(DataContextProperty).ParentBinding.Path.Path; var propName = btn.GetBindingExpression(DataContextProperty).ParentBinding.Path.Path;
var propInfo = DataContext.GetType().GetProperty(propName); var propInfo = DataContext.GetType().GetProperty(propName);
var propTypeOverride = propInfo?.GetCustomAttribute<MyFlagEnumAttribute>()?.EnumType;
new FlagsEditorDialog new FlagsEditorDialog
{ {
WindowStartupLocation = WindowStartupLocation.CenterOwner, WindowStartupLocation = WindowStartupLocation.CenterOwner,
Owner = Window.GetWindow(this) Owner = Window.GetWindow(this)
}.EditEnum(propInfo, obj); }.EditEnum(propInfo, obj, propTypeOverride);
} }
private void EditDictionary(object dict) private void EditDictionary(object dict)

View File

@@ -12,15 +12,6 @@
"System.Text.Json": "5.0.1" "System.Text.Json": "5.0.1"
} }
}, },
"HarmonyX": {
"type": "Direct",
"requested": "[2.10.2-prerelease.7, )",
"resolved": "2.10.2-prerelease.7",
"contentHash": "15kgPt5Cqeu7w1CHp4YqlVXuq6FKZj9iZwA/oNd7SaRVwvq2kZ9EODmJ2+U61ZLFasQY7nr2w/latSAv/Pjn/g==",
"dependencies": {
"MonoMod.RuntimeDetour": "25.1.0-prerelease.1"
}
},
"InfoOf.Fody": { "InfoOf.Fody": {
"type": "Direct", "type": "Direct",
"requested": "[2.2.0, )", "requested": "[2.2.0, )",
@@ -30,6 +21,16 @@
"Fody": "6.8.0" "Fody": "6.8.0"
} }
}, },
"Lib.Harmony.Thin": {
"type": "Direct",
"requested": "[2.3.3-torch, )",
"resolved": "2.3.3-torch",
"contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==",
"dependencies": {
"MonoMod.Core": "1.1.0",
"System.Text.Json": "8.0.1"
}
},
"MahApps.Metro": { "MahApps.Metro": {
"type": "Direct", "type": "Direct",
"requested": "[2.4.10, )", "requested": "[2.4.10, )",
@@ -41,43 +42,32 @@
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Direct", "type": "Direct",
"requested": "[4.9.2, )", "requested": "[4.11.0, )",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "M5PThug7b2AdxL7xKmQs50KzAQTl9jENw5jMT3iUt16k+DAFlw1S87juU3UuPs3gvBm8trMBSOEvSFDr31c9Vw==", "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0", "System.Collections.Immutable": "8.0.0",
"System.Reflection.Metadata": "8.0.0", "System.Reflection.Metadata": "8.0.0"
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Direct", "type": "Direct",
"requested": "[4.9.2, )", "requested": "[4.11.0, )",
"resolved": "4.9.2", "resolved": "4.11.0",
"contentHash": "HGIo7E9Mf3exAJbUdYpDFfLoYkSVaHDJXPyusWTYUTBaOPCowGw+Gap5McE1w+K+ryIXre72oiqL88sQHmHBmg==", "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.9.2]" "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
} "Microsoft.CodeAnalysis.Common": "[4.11.0]",
}, "System.Collections.Immutable": "8.0.0",
"MonoMod.RuntimeDetour": { "System.Reflection.Metadata": "8.0.0"
"type": "Direct",
"requested": "[25.1.1, )",
"resolved": "25.1.1",
"contentHash": "05oD6LyB3N4eqssBbDHfywNBalBRleX3/HHOQxLhjAyl59tWfZFah2WN0nZ/mrwQ5We3tFIUEHAfbyUxlAbeFw==",
"dependencies": {
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1",
"MonoMod.Core": "1.1.1",
"MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.3.2, )", "requested": "[5.3.3, )",
"resolved": "5.3.2", "resolved": "5.3.3",
"contentHash": "cQRQZuDMjSyMe9EQBnI9v55YAMMz8GAfFd6fFJ6tc/kXnG7Hze8p1I8MgvWSBG6E36wA8vSxRrlm8uSIG+SENg==" "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ=="
}, },
"PropertyChanged.Fody": { "PropertyChanged.Fody": {
"type": "Direct", "type": "Direct",
@@ -88,15 +78,6 @@
"Fody": "6.6.4" "Fody": "6.6.4"
} }
}, },
"protobuf-net": {
"type": "Direct",
"requested": "[3.2.30, )",
"resolved": "3.2.30",
"contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==",
"dependencies": {
"protobuf-net.Core": "3.2.30"
}
},
"System.ComponentModel.Annotations": { "System.ComponentModel.Annotations": {
"type": "Direct", "type": "Direct",
"requested": "[5.0.0, )", "requested": "[5.0.0, )",
@@ -120,8 +101,8 @@
}, },
"JetBrains.Annotations": { "JetBrains.Annotations": {
"type": "Transitive", "type": "Transitive",
"resolved": "2023.3.0", "resolved": "2024.2.0",
"contentHash": "PHfnvdBUdGaTVG9bR/GEfxgTwWM0Z97Y6X3710wiljELBISipSfF5okn/vz+C2gfO+ihoEyVPjaJwn8ZalVukA==" "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw=="
}, },
"Microsoft.Bcl.AsyncInterfaces": { "Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive", "type": "Transitive",
@@ -143,8 +124,8 @@
}, },
"Microsoft.Extensions.Configuration.Binder": { "Microsoft.Extensions.Configuration.Binder": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.1", "resolved": "8.0.2",
"contentHash": "2UKFJnLiBt7Od6nCnTqP9rTIUNhzmn9Hv1l2FchyKbz8xieB9ULwZTbQZMw+M24Qw3F5dzzH1U9PPleN0LNLOQ==", "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.Configuration.Abstractions": "8.0.0" "Microsoft.Extensions.Configuration.Abstractions": "8.0.0"
} }
@@ -179,21 +160,21 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "lExtjdkld5iWrhYEspoT1bvy0pJ4oBOBkKu+tWKabK1rHvjuS+gjbAd2bG62UGKc0JRBG3myaWtvgIIwYDw1bQ==", "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.1.1", "resolved": "1.1.0",
"contentHash": "7m7RqlxiWHilriKwzbK+F1FZiJG1vvVzfzRktVnoRb4OKYfdRalost/78LYTNOp9htwLgPKojZydRsNlI1/qHw==", "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1", "MonoMod.ILHelpers": "1.0.1",
"MonoMod.Utils": "25.0.5" "MonoMod.Utils": "25.0.4"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
@@ -203,11 +184,11 @@
}, },
"MonoMod.Utils": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.5", "resolved": "25.0.4",
"contentHash": "1lcpjEOiK1dfOxG9DsKkHNcP4G0DZSwtBEOhTGDfszjCvmLzCZqqFQvSzLRpzp3wfTKak+R0K2K5O5TbO0kwvg==", "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.5", "Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.1", "MonoMod.Backports": "1.1.0",
"MonoMod.ILHelpers": "1.0.1" "MonoMod.ILHelpers": "1.0.1"
} }
}, },
@@ -218,103 +199,100 @@
}, },
"NuGet.Commands": { "NuGet.Commands": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "pI2X+KRQYsVcmjJUIAXT+8fvUCZgNWBQiSizKCOltRqaMjtUHLetfADfz7jfreOBohsDxNzhBnNqPQ8MU/Gjxw==", "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
"NuGet.Credentials": "6.9.1", "NuGet.Credentials": "6.11.0",
"NuGet.ProjectModel": "6.9.1" "NuGet.ProjectModel": "6.11.0"
} }
}, },
"NuGet.Common": { "NuGet.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "FbuWZBjQ1NJXBDqCwSddN2yvw3Plq3sTCIh0nc66Hu8jrNr+BOaxlKZv78jvJ+pSy8BvurYOdF9sl9KoORjrtg==", "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==",
"dependencies": { "dependencies": {
"NuGet.Frameworks": "6.9.1" "NuGet.Frameworks": "6.11.0"
} }
}, },
"NuGet.Configuration": { "NuGet.Configuration": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "GM06pcUzWdNsizeGciqCjAhryfI1F/rQPETLDF+8pDRgzVpA+wKAR01/4aFU+IXzugnQ9LqOb5YyCRuR1OVZiQ==", "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"System.Security.Cryptography.ProtectedData": "4.4.0" "System.Security.Cryptography.ProtectedData": "4.4.0"
} }
}, },
"NuGet.Credentials": { "NuGet.Credentials": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "elTErAznCWoqOLILVDN4FTa3+rpVVdUbHUaOUqJkk9+Z/ZSqyDPbCIhLaqTkPkWqoKa93gqzX9IFwURkMphPnw==", "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==",
"dependencies": { "dependencies": {
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.DependencyResolver.Core": { "NuGet.DependencyResolver.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "gVWIEScv1K40H2Fvs6HGaOzRMpG+r1RUqYpBdh7gqQ18kgsswWUSr90jCNtBb7PUYKkMU1oAhxTslj/gQjO+Vw==", "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==",
"dependencies": { "dependencies": {
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.LibraryModel": "6.9.1", "NuGet.LibraryModel": "6.11.0",
"NuGet.Protocol": "6.9.1" "NuGet.Protocol": "6.11.0"
} }
}, },
"NuGet.Frameworks": { "NuGet.Frameworks": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "DaKh3lenPUvzGccPkbI97BIvA27z+/UsL3ankfoZlX/4vBVDK5N1sheFTQ+GuJf+IgSzsJz/A21SPUpQLHwUtA==" "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA=="
}, },
"NuGet.LibraryModel": { "NuGet.LibraryModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "xlOpbZTc4862vKHkZHLJ5VgDteo+78ftVkajB8rKgSpevnBqwPKv2Y5OfUxct9HCqWYw0ikVfNf/qfjqnQCV1Q==", "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==",
"dependencies": { "dependencies": {
"NuGet.Common": "6.9.1", "NuGet.Common": "6.11.0",
"NuGet.Versioning": "6.9.1" "NuGet.Versioning": "6.11.0"
} }
}, },
"NuGet.Packaging": { "NuGet.Packaging": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "6FyasOxKInCELJ+pGy8f17ub9st6ofFeNcBNTo7CRiPJlxyhJfKGKNpfe3HHYwvnZhc3Vdfr0kSR+f1BVGDuTA==", "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==",
"dependencies": { "dependencies": {
"Newtonsoft.Json": "13.0.3", "Newtonsoft.Json": "13.0.3",
"NuGet.Configuration": "6.9.1", "NuGet.Configuration": "6.11.0",
"NuGet.Versioning": "6.9.1", "NuGet.Versioning": "6.11.0",
"System.Security.Cryptography.Pkcs": "6.0.4" "System.Security.Cryptography.Pkcs": "6.0.4"
} }
}, },
"NuGet.ProjectModel": { "NuGet.ProjectModel": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "x98QkS3oloaJfdSsDFOGTH5oeoHHTDoyTO7oyg/7g60be14AQowLqgPQV52Kuscl4lknx/3259RTxyDcbkdifQ==", "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==",
"dependencies": { "dependencies": {
"NuGet.DependencyResolver.Core": "6.9.1" "NuGet.DependencyResolver.Core": "6.11.0"
} }
}, },
"NuGet.Protocol": { "NuGet.Protocol": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "h3bdjqUY4jvwM02D/7QM4FR8x/bbf4Pyjrc1Etw7an2OrWKPUSx0vJPdapKzioxIw7GXl/aVUM/DCeIc3S9brA==", "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==",
"dependencies": { "dependencies": {
"NuGet.Packaging": "6.9.1" "NuGet.Packaging": "6.11.0"
} }
}, },
"NuGet.Versioning": { "NuGet.Versioning": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.9.1", "resolved": "6.11.0",
"contentHash": "ypnSvEtpNGo48bAWn95J1oHChycCXcevFSbn53fqzLxlXFSZP7dawu8p/7mHAfGufZQSV2sBpW80XQGIfXO8kQ==" "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A=="
}, },
"protobuf-net.Core": { "protobuf-net": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.2.30", "resolved": "1.0.0",
"contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==", "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw=="
"dependencies": {
"System.Collections.Immutable": "7.0.0"
}
}, },
"SemanticVersioning": { "SemanticVersioning": {
"type": "Transitive", "type": "Transitive",
@@ -336,8 +314,8 @@
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.204.15", "resolved": "1.205.23",
"contentHash": "xq1quPCVGi1d4D/iH2iwd8B+1OH5Lqi9H/ld8kaZN8fZ9axz2wtqdq3jYbe9r/FKdSaMhqaERD5W62sHuI9tPA==", "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==",
"dependencies": { "dependencies": {
"SharpDX": "4.2.0-keen-cringe", "SharpDX": "4.2.0-keen-cringe",
"protobuf-net": "1.0.0" "protobuf-net": "1.0.0"
@@ -371,8 +349,8 @@
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "4.5.1",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" "contentHash": "Zh8t8oqolRaFa9vmOZfdQm/qKejdqz0J9kr7o2Fu0vPeoH3BL1EOXipKWwkWtLT1JPzjByrF19fGuFlNbmPpiw=="
}, },
"System.Security.Cryptography.Pkcs": { "System.Security.Cryptography.Pkcs": {
"type": "Transitive", "type": "Transitive",
@@ -394,8 +372,8 @@
}, },
"System.Text.Json": { "System.Text.Json": {
"type": "Transitive", "type": "Transitive",
"resolved": "8.0.3", "resolved": "8.0.1",
"contentHash": "hpagS9joOwv6efWfrMmV9MjQXpiXZH72PgN067Ysfr6AWMSD1/1hEcvh/U5mUpPLezEWsOJSuVrmqDIVD958iA==", "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==",
"dependencies": { "dependencies": {
"System.Text.Encodings.Web": "8.0.0" "System.Text.Encodings.Web": "8.0.0"
} }
@@ -403,15 +381,14 @@
"torch.api": { "torch.api": {
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"JetBrains.Annotations": "[2023.3.0, )", "JetBrains.Annotations": "[2024.2.0, )",
"Microsoft.Extensions.Configuration.Binder": "[8.0.1, )", "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )",
"NLog": "[5.3.2, )", "NLog": "[5.3.3, )",
"NuGet.Commands": "[6.9.1, )", "NuGet.Commands": "[6.11.0, )",
"NuGet.DependencyResolver.Core": "[6.9.1, )", "NuGet.DependencyResolver.Core": "[6.11.0, )",
"SemanticVersioning": "[2.0.2, )", "SemanticVersioning": "[2.0.2, )",
"SpaceEngineersDedicated.ReferenceAssemblies": "[1.204.15, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )",
"System.Linq.Async": "[6.0.1, )", "System.Linq.Async": "[6.0.1, )"
"System.Text.Json": "[8.0.3, )"
} }
} }
}, },