DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Move indirect computations behind seenItems

Browse Source
This commit is contained in:
DBotThePony 2022-11-13 00:01:01 +07:00
parent 9592860349
commit 6d97731614
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/data/kotlin/ru/dbotthepony/mc/otm/datagen/MatterData.kt
View File

@ -28,18 +28,6 @@ fun addMatterData(provider: MatterDataProvider) {
Items.OXIDIZED_CUT_COPPER, Items.OXIDIZED_CUT_COPPER,
) to Items.CUT_COPPER, ) to Items.CUT_COPPER,
listOf(
Items.EXPOSED_CUT_COPPER_SLAB,
Items.WEATHERED_CUT_COPPER_SLAB,
Items.OXIDIZED_CUT_COPPER_SLAB,
) to Items.CUT_COPPER_SLAB,
listOf(
Items.EXPOSED_CUT_COPPER_STAIRS,
Items.WEATHERED_CUT_COPPER_STAIRS,
Items.OXIDIZED_CUT_COPPER_STAIRS,
) to Items.CUT_COPPER_STAIRS,
listOf( listOf(
Items.WAXED_EXPOSED_COPPER, Items.WAXED_EXPOSED_COPPER,
Items.WAXED_WEATHERED_COPPER, Items.WAXED_WEATHERED_COPPER,
@ -51,18 +39,6 @@ fun addMatterData(provider: MatterDataProvider) {
Items.WAXED_WEATHERED_CUT_COPPER, Items.WAXED_WEATHERED_CUT_COPPER,
Items.WAXED_OXIDIZED_CUT_COPPER, Items.WAXED_OXIDIZED_CUT_COPPER,
) to Items.WAXED_CUT_COPPER, ) to Items.WAXED_CUT_COPPER,
listOf(
Items.WAXED_EXPOSED_CUT_COPPER_SLAB,
Items.WAXED_WEATHERED_CUT_COPPER_SLAB,
Items.WAXED_OXIDIZED_CUT_COPPER_SLAB,
) to Items.WAXED_CUT_COPPER_SLAB,
listOf(
Items.WAXED_EXPOSED_CUT_COPPER_STAIRS,
Items.WAXED_WEATHERED_CUT_COPPER_STAIRS,
Items.WAXED_OXIDIZED_CUT_COPPER_STAIRS,
) to Items.WAXED_CUT_COPPER_STAIRS,
) )
for ((children, parent) in copper) { for ((children, parent) in copper) {

12
src/main/kotlin/ru/dbotthepony/mc/otm/matter/MatterManager.kt
View File

@ -679,12 +679,6 @@ object MatterManager {
return Result(value2) return Result(value2)
} }
val value3 = Registry.indirect(item)
if (value3.value != null) {
return value3
}
if (item in seenItems) { if (item in seenItems) {
return Result.SKIPPED return Result.SKIPPED
} }
@ -692,6 +686,12 @@ object MatterManager {
seenItems.addLast(item) seenItems.addLast(item)
try { try {
val value3 = Registry.indirect(item)
if (value3.value != null) {
return value3
}
val result = doDetermineValue(item) val result = doDetermineValue(item)
cachedIterationResults[item] = result cachedIterationResults[item] = result
return result return result