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

Some fixes for item filters

Browse Source
This commit is contained in:
DBotThePony 2025-03-29 12:07:32 +07:00
parent 78fad5d3cc
commit 8454db6785
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/kotlin/ru/dbotthepony/mc/otm/container/ItemFilterSet.kt
View File

@ -22,9 +22,7 @@ data class ItemFilterSet(val filter: ImmutableSet<ItemFilter>, val isWhitelist:
} }
fun replace(index: Int, value: ItemFilter): ItemFilterSet { fun replace(index: Int, value: ItemFilter): ItemFilterSet {
if (index !in filter.indices) if (index !in filter.indices || value in filter)
throw IndexOutOfBoundsException("No such filter at index $index")
else if (value in filter)
return this return this
val values = ObjectArrayList(filter) val values = ObjectArrayList(filter)
@ -50,7 +48,7 @@ data class ItemFilterSet(val filter: ImmutableSet<ItemFilter>, val isWhitelist:
fun removeAt(index: Int): ItemFilterSet { fun removeAt(index: Int): ItemFilterSet {
if (index !in filter.indices) if (index !in filter.indices)
throw IndexOutOfBoundsException("No such filter at index $index") return this
if (filter.size == 1) if (filter.size == 1)
return copy(filter = ImmutableSet.of()) return copy(filter = ImmutableSet.of())
@ -65,7 +63,7 @@ data class ItemFilterSet(val filter: ImmutableSet<ItemFilter>, val isWhitelist:
} }
operator fun get(index: Int): ItemFilter { operator fun get(index: Int): ItemFilter {
return filter.asList()[index] return filter.asList().getOrElse(index) { ItemFilter.EMPTY }
} }
fun clear(): ItemFilterSet { fun clear(): ItemFilterSet {

10
src/main/kotlin/ru/dbotthepony/mc/otm/menu/input/ItemFilterInput.kt
View File

@ -16,8 +16,14 @@ class ItemFilterInput(menu: MatteryMenu, maxSlots: Int, var filter: Delegate<Ite
val inputs = immutableList(maxSlots) { i -> val inputs = immutableList(maxSlots) { i ->
menu.PlayerInput(StreamCodecs.ITEM_FILTER, handler = { menu.PlayerInput(StreamCodecs.ITEM_FILTER, handler = {
if (allowRecursive || it.depth <= 1) if (allowRecursive || it.depth <= 1) {
filter?.get()?.addOrReplace(i, it) val filter = filter ?: return@PlayerInput
if (it.hasRules)
filter.accept(filter.get().addOrReplace(i, it))
else
filter.accept(filter.get().removeAt(i))
}
}) })
} }