From 8bf4735da7f0901c99e6ea7a152d70d3210f93ea Mon Sep 17 00:00:00 2001 From: OrekiWoof Date: Fri, 22 May 2026 19:25:16 +0200 Subject: [PATCH] update envs --- .timetracker | 42 ++++++++++++++++++- .vscode/tasks.json | 4 +- ChestPreview/ChestPreview/ChestPreview.csproj | 2 + ChestPreview/ZZCakeBuild/CakeBuild.csproj | 5 +++ readme.md | 4 +- 5 files changed, 52 insertions(+), 5 deletions(-) diff --git a/.timetracker b/.timetracker index 13eddb6..8551acd 100644 --- a/.timetracker +++ b/.timetracker @@ -1,5 +1,5 @@ { - "total": 75390, + "total": 78654, "sessions": [ { "begin": "2026-03-11T23:50:47+01:00", @@ -75,6 +75,46 @@ "begin": "2026-03-28T03:48:55+01:00", "end": "2026-03-28T04:27:34+01:00", "duration": 2319 + }, + { + "begin": "2026-05-22T17:40:18+02:00", + "end": "2026-05-22T18:03:45+02:00", + "duration": 1406 + }, + { + "begin": "2026-05-22T18:30:12+02:00", + "end": "2026-05-22T18:34:35+02:00", + "duration": 262 + }, + { + "begin": "2026-05-22T18:34:49+02:00", + "end": "2026-05-22T18:38:39+02:00", + "duration": 229 + }, + { + "begin": "2026-05-22T18:38:55+02:00", + "end": "2026-05-22T18:39:22+02:00", + "duration": 27 + }, + { + "begin": "2026-05-22T18:58:35+02:00", + "end": "2026-05-22T19:03:47+02:00", + "duration": 311 + }, + { + "begin": "2026-05-22T19:03:52+02:00", + "end": "2026-05-22T19:05:29+02:00", + "duration": 96 + }, + { + "begin": "2026-05-22T19:05:33+02:00", + "end": "2026-05-22T19:12:57+02:00", + "duration": 444 + }, + { + "begin": "2026-05-22T19:13:27+02:00", + "end": "2026-05-22T19:21:36+02:00", + "duration": 489 } ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index e464cad..5aed4ae 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,9 +4,9 @@ { "label": "check env", "type": "shell", - "command": "[ -n \"$VINTAGE_STORY\" ] || { echo 'ERROR: VINTAGE_STORY is not set'; exit 1; }; [ -n \"$VINTAGE_STORY_DATA\" ] || { echo 'ERROR: VINTAGE_STORY_DATA is not set'; exit 1; }", + "command": "if [ \"${input:buildConfig}\" = \"Version22\" ]; then [ -n \"$VINTAGE_STORY_22\" ] || { echo 'ERROR: VINTAGE_STORY_22 is not set'; exit 1; }; [ -n \"$VINTAGE_STORY_DATA_22\" ] || { echo 'ERROR: VINTAGE_STORY_DATA_22 is not set'; exit 1; }; else [ -n \"$VINTAGE_STORY_21\" ] || { echo 'ERROR: VINTAGE_STORY_21 is not set'; exit 1; }; [ -n \"$VINTAGE_STORY_DATA_21\" ] || { echo 'ERROR: VINTAGE_STORY_DATA_21 is not set'; exit 1; }; fi", "windows": { - "command": "if (-not $env:VINTAGE_STORY) { Write-Host 'ERROR: VINTAGE_STORY is not set'; exit 1 }; if (-not $env:VINTAGE_STORY_DATA) { Write-Host 'ERROR: VINTAGE_STORY_DATA is not set'; exit 1 }" + "command": "if ('${input:buildConfig}' -eq 'Version22') { if (-not $env:VINTAGE_STORY_22) { Write-Host 'ERROR: VINTAGE_STORY_22 is not set'; exit 1 }; if (-not $env:VINTAGE_STORY_DATA_22) { Write-Host 'ERROR: VINTAGE_STORY_DATA_22 is not set'; exit 1 } } else { if (-not $env:VINTAGE_STORY_21) { Write-Host 'ERROR: VINTAGE_STORY_21 is not set'; exit 1 }; if (-not $env:VINTAGE_STORY_DATA_21) { Write-Host 'ERROR: VINTAGE_STORY_DATA_21 is not set'; exit 1 } }" }, "problemMatcher": [] }, diff --git a/ChestPreview/ChestPreview/ChestPreview.csproj b/ChestPreview/ChestPreview/ChestPreview.csproj index 80225f8..45bef3f 100644 --- a/ChestPreview/ChestPreview/ChestPreview.csproj +++ b/ChestPreview/ChestPreview/ChestPreview.csproj @@ -6,6 +6,8 @@ bin\$(Configuration)\Mods\mod enable Debug;Release;Version22 + $(VINTAGE_STORY_21) + $(VINTAGE_STORY_DATA_21) $([System.Environment]::GetEnvironmentVariable('VS_CONFIGLIB')) true $(DefineConstants);CONFIGLIB diff --git a/ChestPreview/ZZCakeBuild/CakeBuild.csproj b/ChestPreview/ZZCakeBuild/CakeBuild.csproj index 7790154..1a0acff 100644 --- a/ChestPreview/ZZCakeBuild/CakeBuild.csproj +++ b/ChestPreview/ZZCakeBuild/CakeBuild.csproj @@ -4,10 +4,15 @@ net8.0 $(MSBuildProjectDirectory) Debug;Release;Version22 + $(VINTAGE_STORY_21) $([System.Environment]::GetEnvironmentVariable('VS_CONFIGLIB')) true $(DefineConstants);CONFIGLIB + + + $(VINTAGE_STORY_22) + diff --git a/readme.md b/readme.md index 5bb8eec..e25dc0f 100644 --- a/readme.md +++ b/readme.md @@ -9,8 +9,8 @@ ### Required env vars -- `VINTAGE_STORY`: path to the 1.21 game install (on Windows default is %appdata%/VintageStory) -- `VINTAGE_STORY_DATA`: path to the 1.21 game data directory (on Windows default is %appdata%/VintageStoryData) +- `VINTAGE_STORY_21`: path to the 1.21 game install (on Windows default is %appdata%/VintageStory) +- `VINTAGE_STORY_DATA_21`: path to the 1.21 game data directory (on Windows default is %appdata%/VintageStoryData) - `VINTAGE_STORY_22`: for 1.22 (`Version22` configuration) - `VINTAGE_STORY_DATA_22`: for 1.22 (`Version22` configuration) - `VS_CONFIGLIB`: path to `configlib.dll`. If not set, will compile with a warning and without configlib support