VS_CONFIGLIB for CakeBuild

.timetracker

@@ -1,5 +1,5 @@
 {
- "total": 66247,
+ "total": 73071,
  "sessions": [
   {
    "begin": "2026-03-11T23:50:47+01:00",
@@ -65,6 +65,11 @@
    "begin": "2026-03-15T20:33:08+01:00",
    "end": "2026-03-15T20:53:09+01:00",
    "duration": 1201
+  },
+  {
+   "begin": "2026-03-15T21:00:39+01:00",
+   "end": "2026-03-15T23:04:35+01:00",
+   "duration": 7435
   }
  ]
 }

ChestPreview/ChestPreview/Configs/Config.cs

@@ -14,7 +14,9 @@ public sealed class Config
 
     public bool WhitelistedContainersOnly { get; set; } = true;
 
-    public string WhitelistedContainers { get; set; } = "barrel, crate, chest-*, trunk-*, storagevessel-*, stationarybasket-*, labeledchest-*";
+    public string WhitelistedContainers { get; set; } = "barrel, crate, chest-*, trunk-*, storagevessel-*, stationarybasket-*, labeledchest-*, groundstorage";
 
     public string BlacklistedContainers { get; set; } = "";
+
+    public bool GroundStorageOnlyContainers { get; set; } = true;
 }

ChestPreview/ChestPreview/PreviewTargetProvider.cs

@@ -11,6 +11,7 @@ using Vintagestory.API.Client;
 using Vintagestory.API.Common;
 using Vintagestory.API.MathTools;
 using Vintagestory.API.Util;
+using Vintagestory.GameContent;
 
 namespace ChestPreview;
 
@@ -39,7 +40,7 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
         if (!TryGetHoveredContainer(out Block hoveredBlock, out BlockEntity hoveredBlockEntity))
             return;
 
-        if (!CanAccessContainer(hoveredBlockEntity))
+        if (!CanAccessContainer(hoveredBlock, hoveredBlockEntity))
             return;
 
         if (!IsContainerAllowed(hoveredBlock))
@@ -70,7 +71,7 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
             if (block.Id == 0)
                 continue;
 
-            if (!CanAccessContainer(blockEntity))
+            if (!CanAccessContainer(block, blockEntity))
                 continue;
 
             if (!IsContainerAllowed(block))
@@ -134,10 +135,14 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
         if (currentBlockSelection == null)
             return false;
 
-        BlockEntity? currentBlockEntity = api.World.BlockAccessor.GetBlockEntity(currentBlockSelection.Position);
+        BlockPos hoveredPos = currentBlockSelection.Position;
-        if (currentBlockEntity is IBlockEntityContainer)
+        BlockEntity? currentBlockEntity = api.World.BlockAccessor.GetBlockEntity(hoveredPos);
+        if (HasPreviewableStorage(currentBlockSelection.Block, hoveredPos, currentBlockEntity))
         {
             block = currentBlockSelection.Block;
+            if (currentBlockEntity == null)
+                return false;
+
             blockEntity = currentBlockEntity;
             return true;
         }
@@ -159,14 +164,17 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
             return false;
 
         BlockPos controllerPos = multiblockOffset.GetControlBlockPos(blockSelection.Position);
-        BlockEntity? blockEntity = api.World.BlockAccessor.GetBlockEntity(controllerPos);
-        if (blockEntity is not IBlockEntityContainer)
-            return false;
-
         controllerBlock = api.World.BlockAccessor.GetBlock(controllerPos);
         if (controllerBlock.Id == 0)
             return false;
 
+        BlockEntity? blockEntity = api.World.BlockAccessor.GetBlockEntity(controllerPos);
+        if (!HasPreviewableStorage(controllerBlock, controllerPos, blockEntity))
+            return false;
+
+        if (blockEntity == null)
+            return false;
+
         controllerBlockEntity = blockEntity;
         return true;
     }
@@ -196,11 +204,15 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
             if (Math.Abs(y + 0.5d - playerEntity.CameraPos.Y) > nearbyRadius)
                 return;
 
-            BlockEntity? blockEntity = api.World.BlockAccessor.GetBlockEntity(new BlockPos(x, y, z));
+            if (block.Id == 0)
-            if (blockEntity is not IBlockEntityContainer)
                 return;
 
-            if (block.Id == 0)
+            BlockPos blockPos = new(x, y, z);
+            BlockEntity? blockEntity = api.World.BlockAccessor.GetBlockEntity(blockPos);
+            if (!HasPreviewableStorage(block, blockPos, blockEntity))
+                return;
+
+            if (blockEntity == null)
                 return;
 
             nearbyContainerEntities.Add(blockEntity);
@@ -232,11 +244,14 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
         }
     }
 
-    private bool CanAccessContainer(BlockEntity blockEntity)
+    private bool CanAccessContainer(Block block, BlockEntity blockEntity)
     {
-        if (blockEntity is not IBlockEntityContainer container || container.Inventory is not InventoryBase inventory)
+        if (config.GroundStorageOnlyContainers && blockEntity is BlockEntityGroundStorage && !HasHeldBagInGroundStorage(blockEntity))
             return false;
 
+        BlockPos blockPos = blockEntity.Pos;
+        if (block.GetInterface<IBlockEntityContainer>(api.World, blockPos) is { } container && container.Inventory is InventoryBase inventory)
+        {
             IPlayer? player = api.World.Player;
             EntityPlayer? playerEntity = player?.Entity;
             if (player == null || playerEntity == null)
@@ -245,6 +260,38 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
             return inventory.CanPlayerAccess(player, playerEntity.GetPos());
         }
 
+        if (blockEntity is BlockEntityBloomery or BlockEntityForge)
+            return true;
+
+        return HasHeldBagInGroundStorage(blockEntity);
+    }
+
+    private bool HasPreviewableStorage(Block block, BlockPos blockPos, BlockEntity? blockEntity)
+    {
+        if (config.GroundStorageOnlyContainers && blockEntity is BlockEntityGroundStorage)
+            return HasHeldBagInGroundStorage(blockEntity);
+
+        return block.GetInterface<IBlockEntityContainer>(api.World, blockPos) != null || HasHeldBagInGroundStorage(blockEntity) || (blockEntity is BlockEntityBloomery or BlockEntityForge);
+    }
+
+    private static bool HasHeldBagInGroundStorage(BlockEntity? blockEntity)
+    {
+        if (blockEntity is not BlockEntityGroundStorage groundStorage)
+            return false;
+
+        foreach (ItemSlot? slot in groundStorage.Inventory)
+        {
+            if (slot?.Itemstack?.Collectible is not { } collectible)
+                continue;
+
+            IHeldBag? heldBag = collectible.GetCollectibleInterface<IHeldBag>();
+            if (heldBag != null)
+                return true;
+        }
+
+        return false;
+    }
+
     private bool IsContainerAllowed(Block block)
     {
         string? code = block.Code?.Path;

ChestPreview/ChestPreview/Rendering/CardRenderer.cs

@@ -4,12 +4,15 @@ using ChestPreview.Models;
 using ChestPreview.Utils;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text;
 using Vintagestory.API.Client;
 using Vintagestory.API.Common;
 using Vintagestory.API.Config;
+using Vintagestory.API.Datastructures;
 using Vintagestory.API.MathTools;
+using Vintagestory.GameContent;
 
 namespace ChestPreview.Rendering;
 
@@ -28,6 +31,8 @@ internal class CardRenderer(ICoreClientAPI api, Config config) : IDisposable
 
     private readonly ICoreClientAPI api = api;
     private readonly Config config = config;
+    private readonly TreeAttribute tempTree = new();
+    private readonly InventoryGeneric sharedPreviewInventory = new(64, "inventory-preview", null, null);
     private readonly Dictionary<string, CachedCardTexture> cardTextureByTarget = [];
     private readonly Dictionary<int, LoadedTexture> atlasTextureById = [];
     private readonly Dictionary<string, RenderedIconEntry> renderedIconByStack = [];
@@ -46,9 +51,33 @@ internal class CardRenderer(ICoreClientAPI api, Config config) : IDisposable
     {
         texture = null!;
 
-        if (target.BlockEntity is not IBlockEntityContainer container || container.Inventory is not InventoryBase inventory)
+        if (TryResolveHeldBagContents(target.BlockEntity, out List<ItemStack>? bagContents))
+        {
+            string bagTargetKey = CreateTargetKey(target.BlockEntity.Pos);
+            if (!cardTextureByTarget.TryGetValue(bagTargetKey, out CachedCardTexture? bagCachedTexture))
+            {
+                bagCachedTexture = new CachedCardTexture(new LoadedTexture(api), string.Empty);
+                cardTextureByTarget[bagTargetKey] = bagCachedTexture;
+            }
+
+            BuildLayoutFromStacks(bagContents, maxColumns, out List<GroupedItemCell> bagCells, out int bagUsedColumns, out int bagUsedRows, out string bagFingerprint);
+            if (bagCachedTexture.Fingerprint != bagFingerprint)
+            {
+                ComposeTexture(bagCachedTexture.Texture, bagCells, bagUsedColumns, bagUsedRows);
+                bagCachedTexture.Fingerprint = bagFingerprint;
+            }
+
+            texture = bagCachedTexture.Texture;
+            return texture.TextureId != 0;
+        }
+
+        if (config.GroundStorageOnlyContainers && target.BlockEntity is BlockEntityGroundStorage)
             return false;
 
+        if (!TryResolveInventory(target, out InventoryBase? resolvedInventory))
+            return false;
+
+        InventoryBase inventory = resolvedInventory;
         IPlayer? player = api.World.Player;
         EntityPlayer? playerEntity = player?.Entity;
         if (player == null || playerEntity == null || !inventory.CanPlayerAccess(player, playerEntity.GetPos()))
@@ -61,17 +90,111 @@ internal class CardRenderer(ICoreClientAPI api, Config config) : IDisposable
             cardTextureByTarget[targetKey] = cachedTexture;
         }
 
-        BuildLayout(inventory, maxColumns, out List<GroupedItemCell> cells, out int usedColumns, out int usedRows, out string fingerprint);
+        BuildLayout(inventory, maxColumns, out List<GroupedItemCell> cellsFromInventory, out int usedColumnsFromInventory, out int usedRowsFromInventory, out string fingerprintFromInventory);
-        if (cachedTexture.Fingerprint != fingerprint)
+        if (cachedTexture.Fingerprint != fingerprintFromInventory)
         {
-            ComposeTexture(cachedTexture.Texture, cells, usedColumns, usedRows);
+            ComposeTexture(cachedTexture.Texture, cellsFromInventory, usedColumnsFromInventory, usedRowsFromInventory);
-            cachedTexture.Fingerprint = fingerprint;
+            cachedTexture.Fingerprint = fingerprintFromInventory;
         }
 
         texture = cachedTexture.Texture;
         return texture.TextureId != 0;
     }
 
+    private bool TryResolveHeldBagContents(BlockEntity blockEntity, [NotNullWhen(true)] out List<ItemStack>? contents)
+    {
+        contents = null;
+        if (blockEntity is not BlockEntityGroundStorage groundStorage)
+            return false;
+
+        foreach (ItemSlot? slot in groundStorage.Inventory)
+        {
+            ItemStack? bagStack = slot?.Itemstack;
+            if (bagStack?.Collectible is not { } collectible)
+                continue;
+                
+            IHeldBag? heldBag = collectible.GetCollectibleInterface<IHeldBag>();
+            if (heldBag == null)
+                continue;
+
+            ItemStack[]? bagContents;
+            try
+            {
+                bagContents = heldBag.GetContents(bagStack, api.World);
+            }
+            catch
+            {
+                continue;
+            }
+
+            if (bagContents == null)
+                continue;
+
+            contents = [];
+            foreach (ItemStack contentStack in bagContents)
+            {
+                if (contentStack == null || contentStack.StackSize <= 0)
+                    continue;
+
+                contents.Add(contentStack);
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool TryResolveInventory(PreviewTarget target, [NotNullWhen(true)] out InventoryBase? inventory)
+    {
+        inventory = null;
+
+        if (TryResolveSpecialInventory(target.BlockEntity, out InventoryBase? specialInventory))
+        {
+            inventory = specialInventory;
+            return true;
+        }
+
+        BlockPos pos = target.BlockEntity.Pos;
+        if (target.Block.GetInterface<IBlockEntityContainer>(api.World, pos) is { } container && container.Inventory is InventoryBase blockInventory)
+        {
+            inventory = blockInventory;
+            return true;
+        }
+
+        return false;
+    }
+
+    private bool TryResolveSpecialInventory(BlockEntity blockEntity, [NotNullWhen(true)] out InventoryBase? inventory)
+    {
+        inventory = null;
+        if (blockEntity is not BlockEntityBloomery and not BlockEntityForge)
+            return false;
+
+        tempTree.Clear();
+        blockEntity.ToTreeAttributes(tempTree);
+
+        ITreeAttribute sourceTree = tempTree;
+        if (blockEntity is BlockEntityForge)
+        {
+            ITreeAttribute? forgeInventoryTree = tempTree.GetTreeAttribute("inventory");
+            if (forgeInventoryTree != null)
+                sourceTree = forgeInventoryTree;
+        }
+
+        sharedPreviewInventory.FromTreeAttributes(sourceTree);
+
+        if (blockEntity is BlockEntityForge && sharedPreviewInventory[0].Itemstack == null)
+        {
+            ItemStack? legacyContents = tempTree.GetItemstack("contents");
+            if (legacyContents != null)
+                sharedPreviewInventory[0].Itemstack = legacyContents;
+        }
+
+        inventory = sharedPreviewInventory;
+        return true;
+    }
+
     public void DrawAtScreen(float x, float y, LoadedTexture texture)
     {
         if (texture.TextureId == 0)
@@ -105,16 +228,29 @@ internal class CardRenderer(ICoreClientAPI api, Config config) : IDisposable
     }
 
     private void BuildLayout(IInventory inventory, int maxColumns, out List<GroupedItemCell> cells, out int usedColumns, out int usedRows, out string fingerprint)
+    {
+        List<ItemStack> stacks = [];
+        foreach (ItemSlot? slot in inventory)
+        {
+            if (slot?.Itemstack == null || slot.Empty)
+                continue;
+
+            stacks.Add(slot.Itemstack);
+        }
+
+        BuildLayoutFromStacks(stacks, maxColumns, out cells, out usedColumns, out usedRows, out fingerprint);
+    }
+
+    private void BuildLayoutFromStacks(IEnumerable<ItemStack> stacks, int maxColumns, out List<GroupedItemCell> cells, out int usedColumns, out int usedRows, out string fingerprint)
     {
         List<GroupedItemCell> groupedItems = [];
         int naturalOrder = 0;
 
-        foreach (ItemSlot? slot in inventory)
+        foreach (ItemStack stack in stacks)
         {
-            if (slot == null || slot.Empty || slot.Itemstack == null)
+            if (stack == null || stack.StackSize <= 0)
                 continue;
 
-            ItemStack stack = slot.Itemstack;
             int existingIndex = FindMatchingItemIndex(groupedItems, stack);
             if (existingIndex >= 0)
             {

ChestPreview/ChestPreview/Rendering/WorldBillboardPresenter.cs

@@ -14,7 +14,7 @@ namespace ChestPreview.Rendering;
 internal class WorldBillboardPresenter(ICoreClientAPI api)
 {
     private const int multiblock_scan_radius = 2;
-    private static readonly float front_face_offset = 0.01f;
+    private static readonly float front_face_offset = 0.05f;
 
     private readonly ICoreClientAPI api = api;
     private readonly List<BillboardTarget> frameBillboards = [];
@@ -260,16 +260,16 @@ internal class WorldBillboardPresenter(ICoreClientAPI api)
         switch (side.ToLowerInvariant())
         {
             case "north":
-                facing = new Vec3f(0f, 0f, -1f);
-                return true;
-            case "south":
                 facing = new Vec3f(0f, 0f, 1f);
                 return true;
+            case "south":
+                facing = new Vec3f(0f, 0f, -1f);
+                return true;
             case "east":
-                facing = new Vec3f(1f, 0f, 0f);
+                facing = new Vec3f(-1f, 0f, 0f);
                 return true;
             case "west":
-                facing = new Vec3f(-1f, 0f, 0f);
+                facing = new Vec3f(1f, 0f, 0f);
                 return true;
             case "up":
                 facing = new Vec3f(0f, 1f, 0f);

ChestPreview/ChestPreview/assets/chestpreview/config/configlib-patches.json

@@ -72,7 +72,7 @@
             "code": "WhitelistedContainers",
             "comment": "config-desc-WhitelistedContainers",
             "type": "string",
-            "default": "barrel, crate, chest-*, trunk-*, storagevessel-*, stationarybasket-*, labeledchest-*",
+            "default": "barrel, crate, chest-*, trunk-*, storagevessel-*, stationarybasket-*, labeledchest-*, labeledtrunk-*, groundstorage, beehive-*",
             "clientSide": true
         },
         {
@@ -81,6 +81,13 @@
             "type": "string",
             "default": "",
             "clientSide": true
+        },
+        {
+            "code": "GroundStorageOnlyContainers",
+            "comment": "config-desc-GroundStorageOnlyContainers",
+            "type": "boolean",
+            "default": true,
+            "clientSide": true
         }
     ]
 }

ChestPreview/ChestPreview/assets/chestpreview/lang/en.json

@@ -7,6 +7,7 @@
     "config-desc-ColumnsUnderCursor": "Columns in the UnderCursor mode.",
     "config-desc-PreviewNearbyRadius": "Radius for \"Preview containers nearby\".",
     "config-desc-WhitelistedContainersOnly": "If true, only container codes in WhitelistedContainers are handled.",
+    "config-desc-GroundStorageOnlyContainers": "If true, groundstorage previews only appear when the stored item has its own inventory (for example bags/backpacks).",
     "config-desc-WhitelistedContainers": "Allowed container codes, separated by comma, semicolon, or spaces. No effectif WhitelistedContainersOnly==false.",
     "config-desc-BlacklistedContainers": "Blocked container codes, separated by comma, semicolon, or spaces."
 }

ChestPreview/ChestPreview/modinfo.json

@@ -7,7 +7,7 @@
         "OrekiWoof"
     ],
     "description": "see containers' contents without having to open them",
-    "version": "1.0.0",
+    "version": "1.1.0",
     "dependencies": {
         "game": "1.21.0"
     },

ChestPreview/ZZCakeBuild/CakeBuild.csproj

@@ -4,6 +4,9 @@
     <TargetFramework>net8.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
     <Configurations>Debug;Release;Version22</Configurations>
+    <VS_CONFIGLIB Condition="'$(VS_CONFIGLIB)' == ''">$([System.Environment]::GetEnvironmentVariable('VS_CONFIGLIB'))</VS_CONFIGLIB>
+    <ConfigLibAvailable Condition="'$(VS_CONFIGLIB)' != '' and Exists('$(VS_CONFIGLIB)')">true</ConfigLibAvailable>
+    <DefineConstants Condition="'$(ConfigLibAvailable)' == 'true'">$(DefineConstants);CONFIGLIB</DefineConstants>
   </PropertyGroup>
   
   <ItemGroup>
@@ -17,4 +20,15 @@
       <HintPath>$(VINTAGE_STORY)/VintagestoryAPI.dll</HintPath>
     </Reference>
   </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="configlib" Condition="'$(ConfigLibAvailable)' == 'true'">
+      <HintPath>$(VS_CONFIGLIB)</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
+
+  <Target Name="WarnWithoutConfigLib" BeforeTargets="CoreCompile" Condition="'$(ConfigLibAvailable)' != 'true'">
+    <Warning Text="No VS_CONFIGLIB - will compile without supporting ConfigLib. Set VS_CONFIGLIB env var to a path that contains the configlib's dlls." />
+  </Target>
 </Project>