From 06f8d8838a37cfe3ece97bdba5d1f843fff59229 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Thu, 6 Mar 2025 22:02:09 +0700 Subject: [PATCH] More efficient pattern storage patternCapacity and storedPatterns implementations --- .../block/entity/matter/PatternStorageBlockEntity.kt | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt index 27f0099e0..3948d6d64 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/matter/PatternStorageBlockEntity.kt @@ -92,20 +92,12 @@ class PatternStorageBlockEntity(p_155229_: BlockPos, p_155230_: BlockState) : Ma } override val patternCapacity: Int get() { - var stored = 0L - - for (pattern in this.container.iterator().map { it.getCapability(MatteryCapability.PATTERN_ITEM) }.filterNotNull()) - stored += pattern.patternCapacity.toLong() - + val stored = container.sumOf { it.getCapability(MatteryCapability.PATTERN_ITEM)?.patternCapacity?.toLong() ?: 0L } return if (stored > Int.MAX_VALUE) Int.MAX_VALUE else stored.toInt() } override val storedPatterns: Int get() { - var stored = 0L - - for (pattern in this.container.iterator().map { it.getCapability(MatteryCapability.PATTERN_ITEM) }.filterNotNull()) - stored += pattern.storedPatterns.toLong() - + val stored = container.sumOf { it.getCapability(MatteryCapability.PATTERN_ITEM)?.storedPatterns?.toLong() ?: 0L } return if (stored > Int.MAX_VALUE) Int.MAX_VALUE else stored.toInt() }