vs 1.22

devpikachu · devpikachu · commit 62211f577973 · 2026-03-11T19:15:05.000+02:00
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -19,6 +19,11 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        config:
+          - buildConfig.durable.json
+          - buildConfig.original.json
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -38,4 +43,4 @@ jobs:
       - name: Bootstrap
         run: bash bootstrap.sh
       - name: Build
-        run: bash build.sh --target Build --general-project DurableBetterProspecting
+        run: bash build.sh --target Build --general-config ${{ matrix.config }} --general-project DurableBetterProspecting
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -36,7 +36,8 @@ jobs:
         run: bash bootstrap.sh
       - name: Build
         run: |
-          bash build.sh --target Archive --general-project DurableBetterProspecting --general-version $GITHUB_REF_NAME
+          bash build.sh --target Archive --general-config buildConfig.durable.json --general-project DurableBetterProspecting --general-version $GITHUB_REF_NAME
+          bash build.sh --target Archive --general-config buildConfig.original.json --general-project DurableBetterProspecting --general-version $GITHUB_REF_NAME
       - name: Release
         uses: softprops/action-gh-release@v2
         with:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 22.0.0
+**Features**
+- Vintage Story 1.22 support
+
+**Other**
+- Upgrade `Common.Build` to `0.7.2`
+- Upgrade `Common.Mod` to `0.7.0`
+
 ## 21.2.1
 **Other**
 - Move to GitHub
diff --git a/DurableBetterProspecting.Cake/DurableBetterProspecting.Cake.csproj b/DurableBetterProspecting.Cake/DurableBetterProspecting.Cake.csproj
@@ -10,16 +10,17 @@
 
   <!-- NuGet References -->
   <ItemGroup>
-    <PackageReference Include="Common.Build" Version="0.6.0"/>
-    <PackageReference Include="Common.Build.Generator" Version="0.6.0"/>
+    <PackageReference Include="Common.Build" Version="0.7.2" />
+    <PackageReference Include="Common.Build.Generator" Version="0.7.2" />
   </ItemGroup>
 
   <!-- Additional Files -->
   <ItemGroup>
     <None Include="../.editorconfig"/>
     <None Include="../.gitignore"/>
     <None Include="../build.sh"/>
-    <None Include="../buildConfig.json"/>
+    <None Include="../buildConfig.durable.json"/>
+    <None Include="../buildConfig.original.json"/>
     <None Include="../CHANGELOG.md"/>
     <None Include="../README.md"/>
   </ItemGroup>
diff --git a/DurableBetterProspecting/DurableBetterProspecting.csproj b/DurableBetterProspecting/DurableBetterProspecting.csproj
@@ -6,7 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <OutputPath>bin/$(Configuration)/durablebetterprospecting</OutputPath>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <!-- Vendor References -->
@@ -53,8 +53,8 @@
 
   <!-- NuGet References -->
   <ItemGroup>
-    <PackageReference Include="Common.Mod" Version="0.6.2"/>
-    <PackageReference Include="Common.Mod.Generator" Version="0.6.2"/>
+    <PackageReference Include="Common.Mod" Version="0.7.0-rc.1" />
+    <PackageReference Include="Common.Mod.Generator" Version="0.7.0-rc.1" />
   </ItemGroup>
 
   <!-- Additional Files -->
diff --git a/DurableBetterProspecting/DurableBetterProspectingSystem.cs b/DurableBetterProspecting/DurableBetterProspectingSystem.cs
@@ -14,7 +14,7 @@ namespace DurableBetterProspecting;
 [UsedImplicitly]
 public class DurableBetterProspectingSystem : System<DurableBetterProspectingSystem>
 {
-    public override string ModId() => "durablebetterprospecting";
+    public override string ModId() => "%MOD_ID%";
     public override string ModVersion() => "12.34.56";
     public override string ModName() => "Durable Better Prospecting";
 
diff --git a/DurableBetterProspecting/Items/ItemProspectingPick.cs b/DurableBetterProspecting/Items/ItemProspectingPick.cs
@@ -10,7 +10,6 @@
 using Vintagestory.API.MathTools;
 using Vintagestory.API.Server;
 using Vintagestory.API.Util;
-using Vintagestory.Server;
 
 namespace DurableBetterProspecting.Items;
 
@@ -47,7 +46,7 @@ public ItemProspectingPick()
     public override int GetToolMode(ItemSlot slot, IPlayer byPlayer, BlockSelection blockSel)
     {
         var skillItemsLength = _modeManager.GetSkillItems().Length;
-        return Math.Clamp(slot.Itemstack.Attributes.GetInt("toolMode"), 0, skillItemsLength - 1);
+        return Math.Clamp(slot.Itemstack?.Attributes.GetInt("toolMode") ?? 0, 0, skillItemsLength - 1);
     }
 
     public override SkillItem[] GetToolModes(ItemSlot slot, IClientPlayer forPlayer, BlockSelection blockSel)
@@ -117,7 +116,8 @@ public override bool OnBlockBrokenWith(IWorldAccessor world, Entity byEntity, It
             SampleArea(world, player, blockSel, mode);
         }
 
-        if (DamagedBy is not null && DamagedBy.Contains(EnumItemDamageSource.BlockBreaking))
+        var damagedBy = GetDamagedBy(itemSlot);
+        if (damagedBy is not null && damagedBy.Contains(EnumItemDamageSource.BlockBreaking))
         {
             DamageItem(world, byEntity, itemSlot, damage);
         }
diff --git a/DurableBetterProspecting/buildConfig.json b/DurableBetterProspecting/buildConfig.json
diff --git a/DurableBetterProspecting/modinfo.json b/DurableBetterProspecting/modinfo.json
@@ -1,14 +1,16 @@
 {
   "type": "code",
   "name": "Durable Better Prospecting",
-  "modid": "durablebetterprospecting",
+  "modid": "%MOD_ID%",
   "version": "12.34.56",
   "description": "Improve your prospecting experience, without removing the difficulty completely.",
-  "website": "https://git.omni.ms/vintage-story-mods/durable-better-prospecting",
+  "website": "https://github.com/devpikachu/DurableBetterProspecting",
   "authors": [
     "DetPikachu"
   ],
-  "contributors": [],
+  "contributors": [
+    "JohnVintageStory"
+  ],
   "dependencies": {
     "game": "*"
   }
diff --git a/README.md b/README.md
@@ -4,13 +4,13 @@
     <a title="GPL-3.0" target="_blank" href="https://www.gnu.org/licenses/gpl-3.0.en.html">
         <img alt="License Badge" src="https://img.shields.io/badge/license-GPL--3.0--or--later-blue.svg" />
     </a>
-    <img alt="Vintage Story Version Badge" src="https://img.shields.io/badge/vintage--story-1.21.6-%2391A357" />
-    <img alt=".NET Version Badge" src="https://img.shields.io/badge/dotnet-9.0-%236F419A" />
+    <img alt="Vintage Story Version Badge" src="https://img.shields.io/badge/vintage--story-1.22.0-%2391A357" />
+    <img alt=".NET Version Badge" src="https://img.shields.io/badge/dotnet-10.0-%236F419A" />
     <a title="Common.Build" target="_blank" href="https://github.com/devpikachu/Common.Build">
-        <img alt="Common.Build Badge" src="https://img.shields.io/badge/Common.Build-0.6.0-blue" />
+        <img alt="Common.Build Badge" src="https://img.shields.io/badge/Common.Build-0.7.2-blue" />
     </a>
     <a title="Common.Mod" target="_blank" href="https://github.com/devpikachu/Common.Mod">
-        <img alt="Common.Mod Badge" src="https://img.shields.io/badge/Common.Mod-0.6.2-blue" />
+        <img alt="Common.Mod Badge" src="https://img.shields.io/badge/Common.Mod-0.7.0-blue" />
     </a>
     <a title="CI Pipeline" target="_blank" href="https://github.com/devpikachu/DurableBetterProspecting/actions">
         <img alt="CI Status Badge" src="https://img.shields.io/github/check-runs/devpikachu/DurableBetterProspecting/main" />
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -2,10 +2,15 @@
 
 set -e
 
-vsVersion="1.21.6"
-vsImGuiVersion="1.1.14"
-configLibVersion="1.10.8"
-autoConfigLibVersion="2.0.9"
+# vsChannel="stable"
+vsChannel="unstable"
+vsVersion="1.22.0-rc.2"
+vsImGuiId="76347"
+vsImGuiVersion="1.2.0"
+configLibId="76348"
+configLibVersion="1.11.0"
+autoConfigLibId="79793"
+autoConfigLibVersion="2.0.10"
 
 directories=(
     "Common.Mod.Example/run/Mods"
@@ -48,7 +53,7 @@ done
 
 # Download Vintage Story
 if [[ ! -f "vendor/vs.tar.gz" ]]; then
-    curl -L "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${vsVersion}.tar.gz" -o "vendor/vs.tar.gz"
+    curl -L "https://cdn.vintagestory.at/gamefiles/${vsChannel}/vs_client_linux-x64_${vsVersion}.tar.gz" -o "vendor/vs.tar.gz"
 fi
 
 # Extract Vintage Story
@@ -58,6 +63,6 @@ if [[ ! -d "vendor/vs" ]]; then
 fi
 
 # Download, copy and extract 3rd party mods
-download_and_extract_mod "vsimgui" "58527/vsimgui_${vsImGuiVersion}.zip"
-download_and_extract_mod "configlib" "57734/configlib_${configLibVersion}.zip"
-download_and_extract_mod "autoconfiglib" "54531/autoconfiglib_${autoConfigLibVersion}.zip"
+download_and_extract_mod "vsimgui" "${vsImGuiId}/vsimgui_${vsImGuiVersion}.zip"
+download_and_extract_mod "configlib" "${configLibId}/configlib_${configLibVersion}.zip"
+download_and_extract_mod "autoconfiglib" "${autoConfigLibId}/autoconfiglib_${autoConfigLibVersion}.zip"
diff --git a/buildConfig.durable.json b/buildConfig.durable.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/devpikachu/Common.Build/refs/tags/0.7.2/schemas/config.schema.json",
+  "archiveName": "durablebetterprospecting",
+  "defaultProject": "DurableBetterProspecting",
+  "projects": [
+    {
+      "name": "DurableBetterProspecting",
+      "outputSubdirectory": "durablebetterprospecting",
+      "substitutionTargets": [
+        "DurableBetterProspectingSystem.cs",
+        "config.json",
+        "modinfo.json"
+      ]
+    }
+  ],
+  "substitutions": {
+    "%MOD_ID%": "durablebetterprospecting"
+  }
+}
diff --git a/buildConfig.json b/buildConfig.json
diff --git a/buildConfig.original.json b/buildConfig.original.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/devpikachu/Common.Build/refs/tags/0.7.2/schemas/config.schema.json",
+  "archiveName": "betterprospecting",
+  "defaultProject": "DurableBetterProspecting",
+  "projects": [
+    {
+      "name": "DurableBetterProspecting",
+      "outputSubdirectory": "durablebetterprospecting",
+      "substitutionTargets": [
+        "DurableBetterProspectingSystem.cs",
+        "config.json",
+        "modinfo.json"
+      ]
+    }
+  ],
+  "substitutions": {
+    "%MOD_ID%": "BetterProspecting"
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ namespace DurableBetterProspecting;`
`14`	`14`	`[UsedImplicitly]`
`15`	`15`	`public class DurableBetterProspectingSystem : System<DurableBetterProspectingSystem>`
`16`	`16`	`{`
`17`		`- public override string ModId() => "durablebetterprospecting";`
	`17`	`+ public override string ModId() => "%MOD_ID%";`
`18`	`18`	`public override string ModVersion() => "12.34.56";`
`19`	`19`	`public override string ModName() => "Durable Better Prospecting";`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`	`using Vintagestory.API.MathTools;`
`11`	`11`	`using Vintagestory.API.Server;`
`12`	`12`	`using Vintagestory.API.Util;`
`13`		`-using Vintagestory.Server;`
`14`	`13`
`15`	`14`	`namespace DurableBetterProspecting.Items;`
`16`	`15`
`@@ -47,7 +46,7 @@ public ItemProspectingPick()`
`47`	`46`	`public override int GetToolMode(ItemSlot slot, IPlayer byPlayer, BlockSelection blockSel)`
`48`	`47`	`{`
`49`	`48`	`var skillItemsLength = _modeManager.GetSkillItems().Length;`
`50`		`- return Math.Clamp(slot.Itemstack.Attributes.GetInt("toolMode"), 0, skillItemsLength - 1);`
	`49`	`+ return Math.Clamp(slot.Itemstack?.Attributes.GetInt("toolMode") ?? 0, 0, skillItemsLength - 1);`
`51`	`50`	`}`
`52`	`51`
`53`	`52`	`public override SkillItem[] GetToolModes(ItemSlot slot, IClientPlayer forPlayer, BlockSelection blockSel)`
`@@ -117,7 +116,8 @@ public override bool OnBlockBrokenWith(IWorldAccessor world, Entity byEntity, It`
`117`	`116`	`SampleArea(world, player, blockSel, mode);`
`118`	`117`	`}`
`119`	`118`
`120`		`- if (DamagedBy is not null && DamagedBy.Contains(EnumItemDamageSource.BlockBreaking))`
	`119`	`+ var damagedBy = GetDamagedBy(itemSlot);`
	`120`	`+ if (damagedBy is not null && damagedBy.Contains(EnumItemDamageSource.BlockBreaking))`
`121`	`121`	`{`
`122`	`122`	`DamageItem(world, byEntity, itemSlot, damage);`
`123`	`123`	`}`