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

More specific methods in enhanced container interface

Browse Source
This commit is contained in:
DBotThePony 2025-03-06 16:37:30 +07:00
parent 5422f0fec8
commit c31549792e
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/kotlin/ru/dbotthepony/mc/otm/container/IEnhancedContainer.kt
View File

@ -88,15 +88,27 @@ interface IEnhancedContainer : IContainer, RecipeInput, Iterable<ItemStack>, Sta
} }
} }
fun emptySlotIterator(allowedSlots: IntCollection = slotRange): IntIterator { fun emptySlotIndexIterator(): IntIterator {
return emptySlotIndexIterator(slotRange)
}
fun nonEmptySlotIndexIterator(): IntIterator {
return nonEmptySlotIndexIterator(slotRange)
}
fun emptySlotIndexIterator(allowedSlots: IntCollection): IntIterator {
return slotIterator(allowedSlots) { it.isEmpty } return slotIterator(allowedSlots) { it.isEmpty }
} }
fun nonEmptySlotIterator(allowedSlots: IntCollection = slotRange): IntIterator { fun nonEmptySlotIndexIterator(allowedSlots: IntCollection): IntIterator {
return slotIterator(allowedSlots) { it.isNotEmpty } return slotIterator(allowedSlots) { it.isNotEmpty }
} }
fun slotWithItemIterator(item: Item, allowedSlots: IntCollection = slotRange): IntIterator { fun slotWithItemIterator(item: Item): IntIterator {
return slotWithItemIterator(item, slotRange)
}
fun slotWithItemIterator(item: Item, allowedSlots: IntCollection): IntIterator {
return slotIterator(allowedSlots) { it.isNotEmpty && it.item === item } return slotIterator(allowedSlots) { it.isNotEmpty && it.item === item }
} }
@ -234,7 +246,7 @@ interface IEnhancedContainer : IContainer, RecipeInput, Iterable<ItemStack>, Sta
if (!onlyIntoExisting) { if (!onlyIntoExisting) {
// двигаем в пустые слоты // двигаем в пустые слоты
for (slot in emptySlotIterator(slots)) { for (slot in emptySlotIndexIterator(slots)) {
val diff = copy.count.coerceAtMost(getMaxStackSize(slot, stack)) val diff = copy.count.coerceAtMost(getMaxStackSize(slot, stack))
if (!simulate) { if (!simulate) {

6
src/main/kotlin/ru/dbotthepony/mc/otm/container/ISlottedContainer.kt
View File

@ -2,12 +2,8 @@ package ru.dbotthepony.mc.otm.container
import it.unimi.dsi.fastutil.ints.IntCollection import it.unimi.dsi.fastutil.ints.IntCollection
import it.unimi.dsi.fastutil.ints.IntSet import it.unimi.dsi.fastutil.ints.IntSet
import net.minecraft.world.Container
import net.minecraft.world.item.ItemStack import net.minecraft.world.item.ItemStack
import net.neoforged.neoforge.items.IItemHandler
import ru.dbotthepony.kommons.collect.any import ru.dbotthepony.kommons.collect.any
import ru.dbotthepony.mc.otm.core.collect.filter
import ru.dbotthepony.mc.otm.core.collect.map
/** /**
* Skeletal implementation for containers which revolve around [IContainerSlot] * Skeletal implementation for containers which revolve around [IContainerSlot]
@ -80,7 +76,7 @@ interface ISlottedContainer : IEnhancedContainer {
} }
if (!onlyIntoExisting) { if (!onlyIntoExisting) {
for (i in emptySlotIterator(slots)) { for (i in emptySlotIndexIterator(slots)) {
val slot = containerSlot(i) val slot = containerSlot(i)
val condition: Boolean val condition: Boolean