Fix compatibility with Rimfactory's digital storage

760/768 being the limit and errors getting thrown when randomly overhauling are issues PRF independently has, with nothing else present too
This commit is contained in:
bbradson
2024-01-27 12:48:22 +01:00
parent c8b764de68
commit 20aebe4e83
8 changed files with 78 additions and 10 deletions
@@ -9,18 +9,27 @@ public static class StorageExtensions
{
public static int TrueItemsPerCell(this Thing slotGroupParent)
=> slotGroupParent.TrueItemsPerCell(slotGroupParent.TryGetLwmCompProperties());
public static int TrueItemsPerCell(this Thing slotGroupParent, CompProperties? lwmProps)
=> lwmProps != null
? Math.Max(LwmCompCacheValue.LwmMinNumberStacks!(lwmProps), LwmCompCacheValue.LwmMaxNumberStacks!(lwmProps))
: slotGroupParent is Building building
? building.MaxItemsInCell
: 1;
=> Math.Max(lwmProps == null
? 0
: Math.Max(LwmCompCacheValue.LwmMinNumberStacks!(lwmProps),
LwmCompCacheValue.LwmMaxNumberStacks!(lwmProps)),
slotGroupParent is Building building ? building.MaxItemsInCell : 1);
public static int TrueTotalSlots(this Thing slotGroupParent, CompProperties? lwmProps,
DefModExtension? rimfactoryExtension)
=> Math.Max(rimfactoryExtension == null ? 0 : RimfactoryExtensionCacheValue.Limit!(rimfactoryExtension),
slotGroupParent.TrueItemsPerCell(lwmProps) * slotGroupParent.SlotGroupCellCount());
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static CompProperties? TryGetLwmCompProperties(this Thing thing)
=> LwmCompCache.GetOrAdd(thing).CompProperties;
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static DefModExtension? TryGetRimfactoryExtension(this Thing thing)
=> RimfactoryExtensionCache.GetOrAdd(thing).ModExtension;
public static int GetTotalSlots(this SlotGroup slotGroup) => slotGroup.GetTotalSlots(slotGroup.CellsList.Count);
public static int GetTotalSlots(this SlotGroup slotGroup, int cellCount)
@@ -28,5 +37,9 @@ public static class StorageExtensions
? storage.TrueItemsPerCell() * cellCount
: cellCount;
static StorageExtensions() => LwmCompCacheValue.EnsureInitialized();
static StorageExtensions()
{
LwmCompCacheValue.EnsureInitialized();
RimfactoryExtensionCacheValue.EnsureInitialized();
}
}