Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
22c4cfb039 | |||
5f0ffb6f9a | |||
1b2a989441 |
@@ -22,7 +22,7 @@
|
||||
<PackageReference Include="NuGet.Commands" Version="6.6.1" />
|
||||
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.6.1" />
|
||||
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -54,9 +54,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.124, )",
|
||||
"resolved": "1.202.124",
|
||||
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==",
|
||||
"requested": "[1.203.22.3, )",
|
||||
"resolved": "1.203.22.3",
|
||||
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
|
@@ -11,7 +11,7 @@
|
||||
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
||||
<dependencies>
|
||||
<group targetFramework="net7.0-windows7.0">
|
||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.120" />
|
||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.203.22.3" />
|
||||
<dependency id="Torch.Server" version="torchVersion" />
|
||||
</group>
|
||||
</dependencies>
|
||||
|
@@ -28,6 +28,7 @@ using VRage.FileSystem;
|
||||
using VRage.Game;
|
||||
using VRage.Game.ObjectBuilder;
|
||||
using VRage.ObjectBuilders;
|
||||
using VRage.ObjectBuilders.Private;
|
||||
using VRage.Plugins;
|
||||
|
||||
namespace Torch.Server.Managers
|
||||
@@ -363,10 +364,10 @@ namespace Torch.Server.Managers
|
||||
public void SaveSandbox()
|
||||
{
|
||||
using (var f = File.Open(_checkpointPath, FileMode.Create))
|
||||
MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
|
||||
MyObjectBuilderSerializerKeen.SerializeXML(f, Checkpoint);
|
||||
|
||||
using (var f = File.Open(_worldConfigPath, FileMode.Create))
|
||||
MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
|
||||
MyObjectBuilderSerializerKeen.SerializeXML(f, WorldConfiguration);
|
||||
}
|
||||
|
||||
public void LoadSandbox()
|
||||
|
@@ -50,7 +50,7 @@
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="System.Management" Version="7.0.2" />
|
||||
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -113,9 +113,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.124, )",
|
||||
"resolved": "1.202.124",
|
||||
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==",
|
||||
"requested": "[1.203.22.3, )",
|
||||
"resolved": "1.203.22.3",
|
||||
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
|
@@ -27,6 +27,7 @@ using VRage.Game.ModAPI;
|
||||
using VRage.Groups;
|
||||
using VRage.ModAPI;
|
||||
using VRage.ObjectBuilders;
|
||||
using VRage.ObjectBuilders.Private;
|
||||
using VRage.Sync;
|
||||
using VRageMath;
|
||||
|
||||
@@ -45,14 +46,14 @@ namespace Torch.Managers
|
||||
{
|
||||
var ob = grid.GetObjectBuilder(true);
|
||||
using (var f = File.Open(path, FileMode.CreateNew))
|
||||
MyObjectBuilderSerializer.SerializeXML(f, ob);
|
||||
MyObjectBuilderSerializerKeen.SerializeXML(f, ob);
|
||||
}
|
||||
|
||||
public void ImportGrid(string path, Vector3D position)
|
||||
{
|
||||
MyObjectBuilder_EntityBase gridOb;
|
||||
using (var f = File.OpenRead(path))
|
||||
MyObjectBuilderSerializer.DeserializeXML(f, out gridOb);
|
||||
MyObjectBuilderSerializerKeen.DeserializeXML(f, out gridOb);
|
||||
|
||||
var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb);
|
||||
grid.PositionComp.SetPosition(position);
|
||||
|
@@ -82,7 +82,7 @@ public class ScriptCompilationManager : Manager
|
||||
TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None);
|
||||
|
||||
var component = ScriptComponentGetter(block);
|
||||
component.NextUpdate = UpdateType.None;
|
||||
component.UpdateFrequency = UpdateFrequency.None;
|
||||
component.NeedsUpdate = MyEntityUpdateEnum.NONE;
|
||||
|
||||
try
|
||||
|
@@ -78,6 +78,9 @@ namespace Torch.Patches
|
||||
|
||||
[ReflectedSetter(Name = "m_enabled")]
|
||||
private static Action<MyLog, bool> _enabledSetter = null!;
|
||||
|
||||
[ReflectedMethod(Type = typeof(MyLog), Name = "LogFlag")]
|
||||
private static Func<MyLog, LoggingOptions, bool> _logFlag = null!;
|
||||
|
||||
private static int GetIndentByCurrentThread()
|
||||
{
|
||||
@@ -122,7 +125,7 @@ namespace Torch.Patches
|
||||
}
|
||||
private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option)
|
||||
{
|
||||
if (__instance.LogEnabled && __instance.LogFlag(option) && _log.IsDebugEnabled)
|
||||
if (__instance.LogEnabled && _logFlag(__instance, option) && _log.IsDebugEnabled)
|
||||
_log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}");
|
||||
return false;
|
||||
}
|
||||
|
@@ -35,7 +35,7 @@
|
||||
<PackageReference Include="protobuf-net" Version="3.2.26" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.124">
|
||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>compile</IncludeAssets>
|
||||
</PackageReference>
|
||||
|
@@ -100,9 +100,9 @@
|
||||
},
|
||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||
"type": "Direct",
|
||||
"requested": "[1.202.124, )",
|
||||
"resolved": "1.202.124",
|
||||
"contentHash": "xw8mbJI2WwZcfWvgMf6c6E3agcQ/IQVVdnKZljszQBKq0cjhJG06AoonM+MI74CrYMJxf+wnA+4bzCt4mxy/Qg==",
|
||||
"requested": "[1.203.22.3, )",
|
||||
"resolved": "1.203.22.3",
|
||||
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||
"dependencies": {
|
||||
"protobuf-net": "1.0.0"
|
||||
}
|
||||
|
Reference in New Issue
Block a user