Skip to content

Commit 4c8fefc

Browse files
committed
fix: rewrite remap script (#230)
1 parent 68d9f49 commit 4c8fefc

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

core/src/main/kotlin/kr/toxicity/model/script/RemapScript.kt

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ package kr.toxicity.model.script
99
import kr.toxicity.model.api.BetterModel
1010
import kr.toxicity.model.api.script.AnimationScript
1111
import kr.toxicity.model.api.tracker.Tracker
12-
import kr.toxicity.model.util.any
12+
import kr.toxicity.model.api.tracker.TrackerUpdateAction
1313
import kr.toxicity.model.util.toPackName
1414
import kr.toxicity.model.util.toSet
1515

@@ -34,13 +34,15 @@ class RemapScript(
3434
override fun accept(tracker: Tracker) {
3535
val f = filter
3636
newModel?.run {
37-
if (flatten().filter {
38-
f == null || f.contains(it.name())
39-
}.any {
40-
tracker.bone(it.name())?.itemStack({ true }, it.itemStack) == true
41-
}) tracker.forceUpdate(true)
37+
tracker.update(TrackerUpdateAction.perBone {
38+
(if (f == null || f.contains(it.name())) {
39+
groupByTree(it.name())?.itemStack?.let { item ->
40+
TrackerUpdateAction.itemStack(item)
41+
}
42+
} else null) ?: TrackerUpdateAction.none()
43+
})
4244
}
4345
}
4446

4547
override fun isSync(): Boolean = false
46-
}
48+
}

core/src/main/kotlin/kr/toxicity/model/util/Collections.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import java.util.stream.Stream
1616
fun <K, V> MutableMap<K, V>.toImmutableView(): Map<K, V> = Collections.unmodifiableMap(this)
1717

1818
fun <T> Stream<T>.toSet(): Set<T> = collect(Collectors.toUnmodifiableSet())
19-
fun <T> Stream<T>.any(predicate: (T) -> Boolean): Boolean = anyMatch(predicate)
2019

2120
fun parallelIOThreadPool() = try {
2221
ParallelIOThreadPool()
@@ -77,4 +76,4 @@ class ParallelIOThreadPool : AutoCloseable {
7776
}.toTypedArray()
7877
).join()
7978
}
80-
}
79+
}

0 commit comments

Comments
 (0)