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

Update fluid handler conditions

Browse Source
This commit is contained in:
DBotThePony 2023-05-15 08:10:06 +07:00
parent fd236d8a53
commit 1967b2869a
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 4 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/ru/dbotthepony/mc/otm/block/entity/decorative/FluidTankBlockEntity.kt
View File

@ -42,18 +42,10 @@ class FluidTankBlockEntity(blockPos: BlockPos, blockState: BlockState) : Mattery
fillInput.handler(object : HandlerFilter { fillInput.handler(object : HandlerFilter {
override fun canInsert(slot: Int, stack: ItemStack): Boolean { override fun canInsert(slot: Int, stack: ItemStack): Boolean {
if (fluid.isEmpty) { if (fluid.isEmpty) {
stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).ifPresentK { return stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).map { it.tanks > 0 }.orElse(false)
return it.tanks > 0
} }
return false return stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).map { it.fill(fluid[0], IFluidHandler.FluidAction.SIMULATE) > 0 }.orElse(false)
}
stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).ifPresentK {
return it.fill(fluid[0], IFluidHandler.FluidAction.SIMULATE) > 0
}
return false
} }
override fun canExtract(slot: Int, amount: Int, stack: ItemStack): Boolean { override fun canExtract(slot: Int, amount: Int, stack: ItemStack): Boolean {

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

@ -42,29 +42,13 @@ interface HandlerFilter {
object FluidContainers : HandlerFilter { object FluidContainers : HandlerFilter {
override fun canInsert(slot: Int, stack: ItemStack): Boolean { override fun canInsert(slot: Int, stack: ItemStack): Boolean {
stack.getCapability(ForgeCapabilities.FLUID_HANDLER).ifPresentK { return stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).map { it.tanks > 0 }.orElse(false)
return it.tanks > 0
}
stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).ifPresentK {
return it.tanks > 0
}
return false
} }
} }
object DrainableFluidContainers : HandlerFilter { object DrainableFluidContainers : HandlerFilter {
override fun canInsert(slot: Int, stack: ItemStack): Boolean { override fun canInsert(slot: Int, stack: ItemStack): Boolean {
stack.getCapability(ForgeCapabilities.FLUID_HANDLER).ifPresentK { return stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).map { it.stream().anyMatch { it.isNotEmpty } }.orElse(false)
return it.stream().anyMatch { it.isNotEmpty }
}
stack.getCapability(ForgeCapabilities.FLUID_HANDLER_ITEM).ifPresentK {
return it.stream().anyMatch { it.isNotEmpty }
}
return false
} }
override fun canExtract(slot: Int, amount: Int, stack: ItemStack): Boolean { override fun canExtract(slot: Int, amount: Int, stack: ItemStack): Boolean {