version 2.0.0

.timetracker

@@ -1,5 +1,5 @@
 {
- "total": 78654,
+ "total": 90094,
  "sessions": [
   {
    "begin": "2026-03-11T23:50:47+01:00",
@@ -115,6 +115,41 @@
    "begin": "2026-05-22T19:13:27+02:00",
    "end": "2026-05-22T19:21:36+02:00",
    "duration": 489
+  },
+  {
+   "begin": "2026-05-22T19:22:06+02:00",
+   "end": "2026-05-22T19:47:51+02:00",
+   "duration": 1545
+  },
+  {
+   "begin": "2026-05-22T20:11:03+02:00",
+   "end": "2026-05-22T20:42:49+02:00",
+   "duration": 1906
+  },
+  {
+   "begin": "2026-05-23T00:13:03+02:00",
+   "end": "2026-05-23T00:33:04+02:00",
+   "duration": 1201
+  },
+  {
+   "begin": "2026-05-23T00:34:04+02:00",
+   "end": "2026-05-23T01:10:47+02:00",
+   "duration": 2202
+  },
+  {
+   "begin": "2026-05-23T01:10:47+02:00",
+   "end": "2026-05-23T01:38:03+02:00",
+   "duration": 1636
+  },
+  {
+   "begin": "2026-05-23T01:38:05+02:00",
+   "end": "2026-05-23T02:04:35+02:00",
+   "duration": 1590
+  },
+  {
+   "begin": "2026-05-23T02:05:09+02:00",
+   "end": "2026-05-23T02:27:49+02:00",
+   "duration": 1360
   }
  ]
 }

ChestPreview/ChestPreview/Configs/Config.cs

@@ -4,8 +4,6 @@ public sealed class Config
 {
     public string Mode { get; set; } = PreviewModes.UNDER_CURSOR;
 
-    public bool HoldKey { get; set; } = true;
-
     public bool BillboardIgnoreFront { get; set; } = false;
 
     public int BillboardColumnsPerBlock { get; set; } = 4;
@@ -21,8 +19,4 @@ public sealed class Config
     public string BlacklistedContainers { get; set; } = "";
 
     public bool GroundStorageOnlyContainers { get; set; } = true;
-
-    public bool TogglePreview { get; set; } = false;
-
-    public bool TogglePreviewNearby { get; set; } = false;
 }

ChestPreview/ChestPreview/Configs/State.cs

@@ -0,0 +1,7 @@
+namespace ChestPreview.Configs;
+
+public class State
+{
+    public bool PreviewNearbyToggleActive { get; set; } = false;
+    public bool PreviewToggleActive { get; set; } = false;
+}

ChestPreview/ChestPreview/Core/ChestPreviewModSystem.cs

@@ -1,132 +1,157 @@
-using ChestPreview.Configs;
+using ChestPreview.Configs;
-using ChestPreview.Rendering;
+using ChestPreview.Rendering;
-using System;
+using System;
-using Vintagestory.API.Client;
+using Vintagestory.API.Client;
-using Vintagestory.API.Common;
+using Vintagestory.API.Common;
-using Vintagestory.API.Config;
+using Vintagestory.API.Config;
-
+
-namespace ChestPreview.Core;
+namespace ChestPreview.Core;
-
+
-public class ChestPreviewModSystem : ModSystem
+public class ChestPreviewModSystem : ModSystem
-{
+{
-    internal const string CONFIG_FILENAME = "chestpreview.json";
+    internal const string CONFIG_FILENAME = "chestpreview.json";
-    internal const string CONFIGLIB_DOMAIN = "chestpreview";
+    internal const string STATE_FILENAME = "chestpreview-state.json";
-    internal const string PREVIEW_CONTAINERS_HOTKEY_CODE = "chestpreview-preview-containers";
+    internal const string CONFIGLIB_DOMAIN = "chestpreview";
-    internal const string PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE = "chestpreview-preview-containers-nearby";
+    internal const string PREVIEW_CONTAINERS_HOTKEY_CODE = "chestpreview-preview-containers";
-
+    internal const string PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE = "chestpreview-preview-containers-nearby";
-    private Config config = new();
+    internal const string TOGGLE_PREVIEW_CONTAINERS_HOTKEY_CODE = "chestpreview-preview-containers-toggle";
-    private CardRenderer? cardRenderer;
+    internal const string TOGGLE_PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE = "chestpreview-preview-containers-nearby-toggle";
-    private ConfigLibBridge? configLibBridge;
+
-    private StorageHoverHudRenderer? storageHoverHudRenderer;
+    private Config config = new();
-    private WorldBillboardRenderer? worldBillboardRenderer;
+    private CardRenderer? cardRenderer;
-
+    private ConfigLibBridge? configLibBridge;
-    public bool PreviewNearbyToggleState { get; private set; } = false;
+    private StorageHoverHudRenderer? storageHoverHudRenderer;
-    public bool PreviewToggleState { get; private set; } = false;
+    private WorldBillboardRenderer? worldBillboardRenderer;
-
+
-    public override bool ShouldLoad(EnumAppSide forSide) => forSide is EnumAppSide.Client;
+    public State State { get; } = new();
-
+
-    public override void StartClientSide(ICoreClientAPI api)
+    public override bool ShouldLoad(EnumAppSide forSide) => forSide is EnumAppSide.Client;
-    {
+
-        config = LoadClientConfig(api);
+    public override void StartClientSide(ICoreClientAPI api)
-        RegisterHotkeys(api);
+    {
-        if (api.ModLoader.IsModEnabled(ConfigLibBridge.CONFIGLIB_MODID))
+        config = LoadClientConfig(api);
-            configLibBridge = ConfigLibBridge.TryCreate(api, config);
+        RegisterHotkeys(api);
-        cardRenderer = new CardRenderer(api, config);
+        if (api.ModLoader.IsModEnabled(ConfigLibBridge.CONFIGLIB_MODID))
-
+            configLibBridge = ConfigLibBridge.TryCreate(api, config);
-        storageHoverHudRenderer = new StorageHoverHudRenderer(api, config, cardRenderer);
+        cardRenderer = new CardRenderer(api, config);
-        api.Event.RegisterRenderer(storageHoverHudRenderer, EnumRenderStage.Ortho, "chestpreview-storage-hover-hud");
+
-
+        storageHoverHudRenderer = new StorageHoverHudRenderer(api, config, cardRenderer);
-        worldBillboardRenderer = new WorldBillboardRenderer(api, config, cardRenderer);
+        api.Event.RegisterRenderer(storageHoverHudRenderer, EnumRenderStage.Ortho, "chestpreview-storage-hover-hud");
-        api.Event.RegisterRenderer(worldBillboardRenderer, EnumRenderStage.AfterOIT, "chestpreview-world-billboard-preview");
+
-
+        worldBillboardRenderer = new WorldBillboardRenderer(api, config, cardRenderer);
-        api.Input.SetHotKeyHandler(
+        api.Event.RegisterRenderer(worldBillboardRenderer, EnumRenderStage.AfterOIT, "chestpreview-world-billboard-preview");
-            hotkeyCode: PREVIEW_CONTAINERS_HOTKEY_CODE,
+
-            keycomb =>
+        api.Input.SetHotKeyHandler(
-            {
+            hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_HOTKEY_CODE,
-                if (!config.TogglePreview) return false;
+            keycomb =>
-                this.PreviewToggleState = !this.PreviewToggleState;
+            {
-                return true;
+                State.PreviewToggleActive = !State.PreviewToggleActive;
-            });
+                api.StoreModConfig(State, STATE_FILENAME);
-
+                return true;
-        api.Input.SetHotKeyHandler(
+            });
-            hotkeyCode: PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
+
-            keycomb =>
+        api.Input.SetHotKeyHandler(
-            {
+            hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
-                if (!config.TogglePreviewNearby) return false;
+            keycomb =>
-                this.PreviewNearbyToggleState = !this.PreviewNearbyToggleState;
+            {
-                return true;
+                State.PreviewNearbyToggleActive = !State.PreviewNearbyToggleActive;
-            });
+                api.StoreModConfig(State, STATE_FILENAME);
-    }
+                return true;
-
+            });
-    public override void Dispose()
+    }
-    {
+
-        configLibBridge?.Dispose();
+    public override void Dispose()
-        configLibBridge = null;
+    {
-
+        configLibBridge?.Dispose();
-        if (storageHoverHudRenderer is { } renderer)
+        configLibBridge = null;
-        {
+
-            renderer.Api.Event.UnregisterRenderer(renderer, EnumRenderStage.Ortho);
+        if (storageHoverHudRenderer is { } renderer)
-            renderer.Dispose();
+        {
-            storageHoverHudRenderer = null;
+            renderer.Api.Event.UnregisterRenderer(renderer, EnumRenderStage.Ortho);
-        }
+            renderer.Dispose();
-
+            storageHoverHudRenderer = null;
-        if (worldBillboardRenderer is { } billboardRenderer)
+        }
-        {
+
-            billboardRenderer.Api.Event.UnregisterRenderer(billboardRenderer, EnumRenderStage.AfterOIT);
+        if (worldBillboardRenderer is { } billboardRenderer)
-            billboardRenderer.Dispose();
+        {
-            worldBillboardRenderer = null;
+            billboardRenderer.Api.Event.UnregisterRenderer(billboardRenderer, EnumRenderStage.AfterOIT);
-        }
+            billboardRenderer.Dispose();
-
+            worldBillboardRenderer = null;
-        cardRenderer?.Dispose();
+        }
-        cardRenderer = null;
+
-    }
+        cardRenderer?.Dispose();
-
+        cardRenderer = null;
-    public Config LoadClientConfig(ICoreClientAPI api)
+    }
-    {
+
-        Config config;
+    public Config LoadClientConfig(ICoreClientAPI api)
-
+    {
-        try
+        Config config;
-        {
+        State state;
-            config = api.LoadModConfig<Config>(CONFIG_FILENAME) ?? new Config();
+
-        }
+        try
-        catch (Exception ex)
+        {
-        {
+            config = api.LoadModConfig<Config>(CONFIG_FILENAME) ?? new Config();
-            Mod.Logger.Error("Error while loading config.");
+            state = api.LoadModConfig<State>(STATE_FILENAME) ?? new State();
-            Mod.Logger.Error(ex);
+            State.PreviewNearbyToggleActive = state.PreviewNearbyToggleActive;
-            config = new Config();
+            State.PreviewToggleActive = state.PreviewToggleActive;
-        }
+        }
-
+        catch (Exception ex)
-        config.Mode = PreviewModes.Normalize(config.Mode);
+        {
-        if (config.BillboardColumnsPerBlock <= 0)
+            Mod.Logger.Error("Error while loading config.");
-            config.BillboardColumnsPerBlock = 5;
+            Mod.Logger.Error(ex);
-
+            config = new Config();
-        if (config.ColumnsUnderCursor <= 0)
+        }
-            config.ColumnsUnderCursor = 10;
+
-
+        config.Mode = PreviewModes.Normalize(config.Mode);
-        config.PreviewNearbyRadius = config.PreviewNearbyRadius;
+        if (config.BillboardColumnsPerBlock <= 0)
-
+            config.BillboardColumnsPerBlock = 5;
-        api.StoreModConfig(config, CONFIG_FILENAME);
+
-        return config;
+        if (config.ColumnsUnderCursor <= 0)
-    }
+            config.ColumnsUnderCursor = 10;
-
+
-    private static void RegisterHotkeys(ICoreClientAPI api)
+        config.PreviewNearbyRadius = config.PreviewNearbyRadius;
-    {
+
-        api.Input.RegisterHotKey(
+        api.StoreModConfig(config, CONFIG_FILENAME);
-            hotkeyCode: PREVIEW_CONTAINERS_HOTKEY_CODE,
+        api.StoreModConfig(State, STATE_FILENAME);
-            name: Lang.Get("chestpreview:hotkey-preview-container"),
+        return config;
-            key: GlKeys.LShift,
+    }
-            type: HotkeyType.HelpAndOverlays,
+
-            altPressed: false,
+    private static void RegisterHotkeys(ICoreClientAPI api)
-            ctrlPressed: false,
+    {
-            shiftPressed: false);
+        api.Input.RegisterHotKey(
-
+            hotkeyCode: PREVIEW_CONTAINERS_HOTKEY_CODE,
-        api.Input.RegisterHotKey(
+            name: Lang.Get("chestpreview:hotkey-preview-container"),
-            hotkeyCode: PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
+            key: GlKeys.LShift,
-            name: Lang.Get("chestpreview:hotkey-preview-containers-nearby"),
+            type: HotkeyType.HelpAndOverlays,
-            key: GlKeys.LShift,
+            altPressed: false,
-            type: HotkeyType.HelpAndOverlays,
+            ctrlPressed: false,
-            altPressed: false,
+            shiftPressed: false);
-            ctrlPressed: true,
+
-            shiftPressed: false);
+        api.Input.RegisterHotKey(
-    }
+            hotkeyCode: PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
-}
+            name: Lang.Get("chestpreview:hotkey-preview-containers-nearby"),
+            key: GlKeys.LShift,
+            type: HotkeyType.HelpAndOverlays,
+            altPressed: false,
+            ctrlPressed: true,
+            shiftPressed: false);
+
+        api.Input.RegisterHotKey(
+            hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_HOTKEY_CODE,
+            name: Lang.Get("chestpreview:hotkey-preview-container-toggle"),
+            key: GlKeys.Unknown,
+            type: HotkeyType.HelpAndOverlays,
+            altPressed: false,
+            ctrlPressed: false,
+            shiftPressed: false);
+
+        api.Input.RegisterHotKey(
+            hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
+            name: Lang.Get("chestpreview:hotkey-preview-containers-nearby-toggle"),
+            key: GlKeys.Unknown,
+            type: HotkeyType.HelpAndOverlays,
+            altPressed: false,
+            ctrlPressed: false,
+            shiftPressed: false);
+    }
+}

ChestPreview/ChestPreview/PreviewTargetProvider.cs

@@ -24,7 +24,7 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
     private readonly Config config = config;
     private readonly List<BlockEntity> nearbyContainerEntities = [];
     private float nearbyScanAccumulator;
-    private Lazy<ChestPreviewModSystem> coreModSystem = new Lazy<ChestPreviewModSystem>(() => api.ModLoader.GetModSystem<ChestPreviewModSystem>());
+    private readonly Lazy<State> state = new(() => api.ModLoader.GetModSystem<ChestPreviewModSystem>().State);
 
     public void CollectTargets(float deltaTime, List<PreviewTarget> targets)
     {
@@ -84,39 +84,16 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
 
     private string GetActiveMode()
     {
-        if (IsPreviewContainersNearbyActive())
+        var previewKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_HOTKEY_CODE);
+        var previewNearbyKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE);
+
+        if (state.Value.PreviewNearbyToggleActive || previewNearbyKeyHeld)
             return PreviewModes.ON_NEARBY_CONTAINERS;
 
-        return IsPreviewContainersActive() ? PreviewModes.Normalize(config.Mode) : PreviewModes.NONE;
+        if (state.Value.PreviewToggleActive || previewKeyHeld)
-    }
+            return PreviewModes.Normalize(config.Mode);
 
-    private bool IsPreviewContainersNearbyActive()
+        return PreviewModes.NONE;
-    {
-        if (config.TogglePreviewNearby)
-        {
-            return coreModSystem.Value.PreviewNearbyToggleState;
-        }
-        else
-        {
-            return IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE);
-        }
-    }
-
-    private bool IsPreviewContainersActive()
-    {
-        if (config.TogglePreview)
-        {
-            return coreModSystem.Value.PreviewToggleState;
-        }
-        else if (config.HoldKey)
-        {
-            return IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_HOTKEY_CODE);
-        }
-        else
-        {
-            // Always
-            return true;
-        }
     }
 
     private bool IsHotkeyHeld(string hotkeyCode)

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

@@ -20,13 +20,6 @@
             ],
             "clientSide": true
         },
-        {
-            "code": "HoldKey",
-            "comment": "config-desc-HoldKey",
-            "type": "boolean",
-            "default": true,
-            "clientSide": true
-        },
         {
             "code": "BillboardIgnoreFront",
             "comment": "config-desc-BillboardIgnoreFront",
@@ -90,25 +83,11 @@
             "clientSide": true
         },
         {
-          "code": "GroundStorageOnlyContainers",
+            "code": "GroundStorageOnlyContainers",
-          "comment": "config-desc-GroundStorageOnlyContainers",
+            "comment": "config-desc-GroundStorageOnlyContainers",
-          "type": "boolean",
+            "type": "boolean",
-          "default": true,
+            "default": true,
-          "clientSide": true
+            "clientSide": true
-        },
-        {
-          "code": "TogglePreview",
-          "comment": "config-desc-TogglePreview",
-          "type": "boolean",
-          "default": false,
-          "clientSide": true
-        },
-        {
-          "code": "TogglePreviewNearby",
-          "comment": "config-desc-TogglePreviewNearby",
-          "type": "boolean",
-          "default": false,
-          "clientSide": true
         }
     ]
 }

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

@@ -1,8 +1,9 @@
 {
     "hotkey-preview-container": "Preview container",
     "hotkey-preview-containers-nearby": "Preview containers nearby",
+    "hotkey-preview-container-toggle": "Toggle preview container",
+    "hotkey-preview-containers-nearby-toggle": "Toggle preview on containers nearby",
     "config-desc-Mode": "Preview mode. Valid values: None, UnderCursor, OnHoveredContainer, OnNearbyContainers.",
-    "config-desc-HoldKey": "Previews only show while the \"Preview containers\" key is held.",
     "config-desc-BillboardIgnoreFront": "With this set to false, in-world previews show on the front side of containers. By setting this to true, the previews show on the side determined to be most visible.",
     "config-desc-BillboardColumnsPerBlock": "Columns per block width used for world billboards. For containers 2 blocks wide it's doubled.",
     "config-desc-ColumnsUnderCursor": "Columns in the UnderCursor mode.",
@@ -10,7 +11,5 @@
     "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.",
+    "config-desc-BlacklistedContainers": "Blocked container codes, separated by comma, semicolon, or spaces."
-    "config-desc-TogglePreview": "If true, \"Preview container\" is toggled on/off with the key instead of being held. HoldKey will be ignored.",
-    "config-desc-TogglePreviewNearby": "If true, \"Preview containers nearby\" is toggled on/off with the key instead of being held. Note: Toggle may not work with modifier-only key combinations (e.g. Ctrl+Shift). You might need to reassign the hotkey."
 }

ChestPreview/ChestPreview/modinfo.json

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