Skip to content

Commit 2ed168f

Browse files
authored
Automatons update (#538)
* Update TorchBranchType.cs (#535) * Automatons public beta (#534) * Fix startup crash and add in missing mod identification (credit to zznty for the mod related stuff) * For some reason on new version of SE, this patch breaks torch in debug * Branch switch for public test * public beta for automatons * Force install beta branch * Fix typo and force update * Correction * Actually downloads now - yay :) * Set publicbeta branch as default when launching the branch directly without switching. * publicbeta as first (default) in enum * Update jenkins-grab-se.ps1 * Update Jenkinsfile * Update jenkins-grab-se.ps1 * Update Initializer.cs * Update TorchConfig.cs
1 parent a70cd28 commit 2ed168f

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎Jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ node('windows') {
4040
} else {
4141
buildMode = "Debug"
4242
}
43+
buildMode = "Release"
4344
bat "IF EXIST \"bin\" rmdir /Q /S \"bin\""
4445
bat "IF EXIST \"bin-test\" rmdir /Q /S \"bin-test\""
4546
bat "\"${tool 'MSBuild'}msbuild\" Torch.sln /p:Configuration=${buildMode} /p:Platform=x64 /t:Clean"

‎Torch.API/TorchBranchType.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace Torch.API
88
{
99
public enum TorchBranchType
1010
{
11+
publicbeta,
1112
master,
1213
staging,
1314
publicbeta,

‎Torch/Patches/ModsDownloadingPatch.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,22 @@ internal static class ModsDownloadingPatch
2424

2525
public static void Patch(PatchContext ctx)
2626
{
27+
#if !DEBUG
2728
_log.Info("Patching mods downloading");
2829

2930
ctx.GetPattern(_downloadWorldModsBlockingMethod).Suffixes
3031
.Add(typeof(ModsDownloadingPatch).GetMethod(nameof(Postfix)));
32+
#endif
3133
}
32-
public static void Postfix(MyWorkshop.ResultData __result)
34+
public static void Postfix(MyWorkshop.ResultData __result, List<MyObjectBuilder_Checkpoint.ModItem> mods)
3335
{
3436
if (__result.Success) return;
3537
_log.Warn("Missing Mods:");
36-
__result.MismatchMods?.ForEach(b => _log.Info($"\t{b}"));
38+
var mismatchMods = mods.Where(b => __result.Mods.All(c => b.PublishedFileId != c.Id));
39+
foreach (var mod in mismatchMods)
40+
{
41+
_log.Warn($"\t{mod.PublishedFileId} : {mod.FriendlyName}");
42+
}
3743
}
3844
}
3945
}

0 commit comments

Comments
 (0)