make toggle state persistent

This commit is contained in:
2026-05-23 01:38:00 +02:00
parent 05ae8bb276
commit 78eeb3dca5
5 changed files with 28 additions and 9 deletions

View File

@@ -1,5 +1,5 @@
{ {
"total": 85508, "total": 87144,
"sessions": [ "sessions": [
{ {
"begin": "2026-03-11T23:50:47+01:00", "begin": "2026-03-11T23:50:47+01:00",
@@ -135,6 +135,11 @@
"begin": "2026-05-23T00:34:04+02:00", "begin": "2026-05-23T00:34:04+02:00",
"end": "2026-05-23T01:10:47+02:00", "end": "2026-05-23T01:10:47+02:00",
"duration": 2202 "duration": 2202
},
{
"begin": "2026-05-23T01:10:47+02:00",
"end": "2026-05-23T01:38:03+02:00",
"duration": 1636
} }
] ]
} }

View File

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

View File

@@ -10,6 +10,7 @@ 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 STATE_FILENAME = "chestpreview-state.json";
internal const string CONFIGLIB_DOMAIN = "chestpreview"; internal const string CONFIGLIB_DOMAIN = "chestpreview";
internal const string PREVIEW_CONTAINERS_HOTKEY_CODE = "chestpreview-preview-containers"; internal const string PREVIEW_CONTAINERS_HOTKEY_CODE = "chestpreview-preview-containers";
internal const string PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE = "chestpreview-preview-containers-nearby"; internal const string PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE = "chestpreview-preview-containers-nearby";
@@ -22,8 +23,7 @@ public class ChestPreviewModSystem : ModSystem
private StorageHoverHudRenderer? storageHoverHudRenderer; private StorageHoverHudRenderer? storageHoverHudRenderer;
private WorldBillboardRenderer? worldBillboardRenderer; private WorldBillboardRenderer? worldBillboardRenderer;
public bool PreviewNearbyToggleActive { get; private set; } = false; public State State { get; } = new();
public bool PreviewToggleActive { get; private set; } = false;
public override bool ShouldLoad(EnumAppSide forSide) => forSide is EnumAppSide.Client; public override bool ShouldLoad(EnumAppSide forSide) => forSide is EnumAppSide.Client;
@@ -45,7 +45,8 @@ public class ChestPreviewModSystem : ModSystem
hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_HOTKEY_CODE, hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_HOTKEY_CODE,
keycomb => keycomb =>
{ {
PreviewToggleActive = !PreviewToggleActive; State.PreviewToggleActive = !State.PreviewToggleActive;
api.StoreModConfig(State, STATE_FILENAME);
return true; return true;
}); });
@@ -53,7 +54,8 @@ public class ChestPreviewModSystem : ModSystem
hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE, hotkeyCode: TOGGLE_PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE,
keycomb => keycomb =>
{ {
PreviewNearbyToggleActive = !PreviewNearbyToggleActive; State.PreviewNearbyToggleActive = !State.PreviewNearbyToggleActive;
api.StoreModConfig(State, STATE_FILENAME);
return true; return true;
}); });
} }
@@ -84,10 +86,14 @@ public class ChestPreviewModSystem : ModSystem
public Config LoadClientConfig(ICoreClientAPI api) public Config LoadClientConfig(ICoreClientAPI api)
{ {
Config config; Config config;
State state;
try try
{ {
config = api.LoadModConfig<Config>(CONFIG_FILENAME) ?? new Config(); config = api.LoadModConfig<Config>(CONFIG_FILENAME) ?? new Config();
state = api.LoadModConfig<State>(STATE_FILENAME) ?? new State();
State.PreviewNearbyToggleActive = state.PreviewNearbyToggleActive;
State.PreviewToggleActive = state.PreviewToggleActive;
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -106,6 +112,7 @@ public class ChestPreviewModSystem : ModSystem
config.PreviewNearbyRadius = config.PreviewNearbyRadius; config.PreviewNearbyRadius = config.PreviewNearbyRadius;
api.StoreModConfig(config, CONFIG_FILENAME); api.StoreModConfig(config, CONFIG_FILENAME);
api.StoreModConfig(State, STATE_FILENAME);
return config; return config;
} }

View File

@@ -24,7 +24,7 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
private readonly Config config = config; private readonly Config config = config;
private readonly List<BlockEntity> nearbyContainerEntities = []; private readonly List<BlockEntity> nearbyContainerEntities = [];
private float nearbyScanAccumulator; 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) public void CollectTargets(float deltaTime, List<PreviewTarget> targets)
{ {
@@ -87,10 +87,10 @@ internal partial class PreviewTargetProvider(ICoreClientAPI api, Config config)
var previewKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_HOTKEY_CODE); var previewKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_HOTKEY_CODE);
var previewNearbyKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE); var previewNearbyKeyHeld = IsHotkeyHeld(ChestPreviewModSystem.PREVIEW_CONTAINERS_NEARBY_HOTKEY_CODE);
if (coreModSystem.Value.PreviewNearbyToggleActive || previewNearbyKeyHeld) if (state.Value.PreviewNearbyToggleActive || previewNearbyKeyHeld)
return PreviewModes.ON_NEARBY_CONTAINERS; return PreviewModes.ON_NEARBY_CONTAINERS;
if (coreModSystem.Value.PreviewToggleActive || previewKeyHeld) if (state.Value.PreviewToggleActive || previewKeyHeld)
return PreviewModes.Normalize(config.Mode); return PreviewModes.Normalize(config.Mode);
return PreviewModes.NONE; return PreviewModes.NONE;

View File

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