From e2e7ce4f7a15acea1078d7f32ab955e8b0760910 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 13 Nov 2022 00:48:19 +0700 Subject: [PATCH] Comment on internal functions --- .../mc/otm/matter/MatterManager.kt | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt index d53779ce7..bde76fdb6 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt @@ -149,6 +149,9 @@ object MatterManager { val computeKeys = HashMap() val computeTags = HashMap, ComputeAction>() + /** + * Get matter value for item defined by `insert` or `update` registry actions + */ fun direct(value: Item): IMatterValue { val key = value.registryName ?: throw NullPointerException("$value has no registry name!") @@ -172,6 +175,9 @@ object MatterManager { return Entry.Companion } + /** + * Get matter value for item defined by `compute` registry action + */ fun indirect(value: Item): Result { var compute = computeKeys[value.registryName!!] @@ -667,30 +673,23 @@ object MatterManager { return getResult } - val value = Registry.direct(item) + val direct = Registry.direct(item) + if (direct.hasMatterValue) + return Result(direct) - if (value.hasMatterValue) { - return Result(value) - } + val determined = determinedValues[item] + if (determined?.hasMatterValue == true) + return Result(determined) - val value2 = determinedValues[item] - - if (value2?.hasMatterValue == true) { - return Result(value2) - } - - if (item in seenItems) { + if (item in seenItems) return Result.SKIPPED - } seenItems.addLast(item) try { - val value3 = Registry.indirect(item) - - if (value3.value != null) { - return value3 - } + val indirect = Registry.indirect(item) + if (indirect.value != null) + return indirect val result = doDetermineValue(item) cachedIterationResults[item] = result