back to main branch

update harmony
fix restart from pl
add setup script for ease of install
This commit is contained in:
zznty
2023-03-31 20:17:44 +07:00
parent ce1fd45519
commit 6badf3121a
6 changed files with 69 additions and 61 deletions

View File

@@ -19,14 +19,14 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.3" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
<PackageReference Include="MinVer" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NLog" Version="5.1.1" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" />
<PackageReference Include="System.Management" Version="7.0.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.0" />
@@ -37,6 +37,12 @@
<ProjectReference Include="..\PluginLoader\PluginLoader.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="setup.bat">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>
<Target Name="Unfuckit" AfterTargets="Build">
<Delete Files="$(OutputPath)$(AssemblyName).deps.json" />
</Target>

View File

@@ -4,11 +4,11 @@
"net7.0-windows10.0.19041": {
"HarmonyX": {
"type": "Direct",
"requested": "[2.10.2-prerelease.3, )",
"resolved": "2.10.2-prerelease.3",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
"requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.4",
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
"MonoModReorg.RuntimeDetour": "23.3.22.1"
}
},
"Microsoft.CodeAnalysis.CSharp": {
@@ -34,9 +34,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.48, )",
"resolved": "1.202.48",
"contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
"requested": "[1.201.13, )",
"resolved": "1.201.13",
"contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
"dependencies": {
"protobuf-net": "1.0.0"
}
@@ -124,48 +124,48 @@
},
"MonoModReorg.Backports": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
"resolved": "23.3.22.1",
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
"MonoModReorg.ILHelpers": "23.3.22.1"
}
},
"MonoModReorg.Core": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
"resolved": "23.3.22.1",
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.ILHelpers": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
"resolved": "23.3.22.1",
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
},
"MonoModReorg.RuntimeDetour": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
"resolved": "23.3.22.1",
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.Core": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.Utils": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
"resolved": "23.3.22.1",
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1"
}
},
"protobuf-net": {
@@ -320,7 +320,7 @@
"pluginloader": {
"type": "Project",
"dependencies": {
"HarmonyX": "[2.10.2-prerelease.3, )",
"HarmonyX": "[2.10.2-prerelease.4, )",
"Steamworks.NET": "[20.1.0, )"
}
}

2
CringeLauncher/setup.bat Normal file
View File

@@ -0,0 +1,2 @@
move SpaceEngineers.exe OrigSpaceEngineers.exe
mklink SpaceEngineers.exe CringeLauncher.exe

View File

@@ -100,8 +100,8 @@ public static class LoaderTools
public static void Restart()
{
Application.Restart();
Process.GetCurrentProcess().Kill();
Process.Start("explorer.exe", "steam://rungameid/244850");
Environment.Exit(0);
}
public static void ExecuteMain(SEPMPlugin plugin)

View File

@@ -8,9 +8,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.3" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.48" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.201.13" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup>

View File

@@ -4,11 +4,11 @@
"net7.0-windows10.0.19041": {
"HarmonyX": {
"type": "Direct",
"requested": "[2.10.2-prerelease.3, )",
"resolved": "2.10.2-prerelease.3",
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
"requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.4",
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"dependencies": {
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
"MonoModReorg.RuntimeDetour": "23.3.22.1"
}
},
"Microsoft.CodeAnalysis.CSharp": {
@@ -22,9 +22,9 @@
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.202.48, )",
"resolved": "1.202.48",
"contentHash": "iP34MZD14Z/4HTg8rcKQlzJ+azM8/9HVScMJqdYejYbSDAiZzaZS6wlbPkDOKGhbLV2+iW7N5Ix/hCUATBYGuw==",
"requested": "[1.201.13, )",
"resolved": "1.201.13",
"contentHash": "FRXuNLENsz5jGQvL0QkogAGsxEJyUQlXhvWHBWfZiHCnCrAWMD60nEis6yt0xCQpazszfMtHonbxz72XMxnFoQ==",
"dependencies": {
"protobuf-net": "1.0.0"
}
@@ -61,48 +61,48 @@
},
"MonoModReorg.Backports": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
"resolved": "23.3.22.1",
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"dependencies": {
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
"MonoModReorg.ILHelpers": "23.3.22.1"
}
},
"MonoModReorg.Core": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
"resolved": "23.3.22.1",
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.ILHelpers": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
"resolved": "23.3.22.1",
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
},
"MonoModReorg.RuntimeDetour": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
"resolved": "23.3.22.1",
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.Core": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
"MonoModReorg.Utils": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.Utils": {
"type": "Transitive",
"resolved": "23.1.2-prerelease.1",
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
"resolved": "23.3.22.1",
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.1.2-prerelease.1",
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1"
}
},
"protobuf-net": {