Fix Smarter Construction compat for 1.6 cache refactor (#598)#600
Draft
M-r-A wants to merge 1 commit into
Draft
Conversation
…t#598) Smarter Construction 1.6 moved enclose/pawn caches from static fields to per-map MapComponents. The compat layer still looked up ClosedRegionDetector.cache and failed with ArgumentNullException. Detect layout via EncloseThingsCache : MapComponent + GetCache(Map), clear per-map caches on older builds, and keep the pre-1.6 static path. Fixes rwmt#598
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Smarter Construction 1.6 refactored its internal caches from static fields to per-map
MapComponents. The existing compat patch inSmarterConstruction.csstill resolvedClosedRegionDetector.cacheand other static bindings viaAccessTools.StaticFieldRefAccess. On current SC 1.6 builds those fields no longer exist, soDeclaredFieldreturns null and compat init throws:Reported in #598.
Approach
Detect which layout is loaded at init time instead of inferring from a missing static field:
GetCache(Map)onEncloseThingsCache/PawnPositionCache, clear_cache/_positionCacheper map inFind.Maps, reset_lastCacheCleanupto0.ClosedRegionDetector.cache→ nestedEncloseThingsCache.cache, staticPawnPositionCachefields).clearSecondaryCachesonce at init (ClearMapComponentCachesorClearStaticCaches) soGameComponentUtility.FinalizeInitclearing stays branch-free.Field name fallbacks (
_cache/cache,_positionCache/positionCache) retained for minor renames within each layout.Trade-off
Still uses reflection into private cache fields rather than an upstream SC API (e.g.
Compatibility.ClearCachesForMultiplayer()). Acceptable for MP Compat; a public clear hook in rimworld-smarter-construction would be more stable long-term but is out of scope here.Test plan
Multiplayer_Compat.sln, Debug)MPCompat :: Initialized compatibility for dhultgren.smarterconstruction(noArgumentNullException)FinalizeInitFinalizeInitdoes not break construction priority / enclose checks)