AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-28 15:30:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

Expand parameter name

Browse Source
This commit is contained in:
MuXiu1997 2022-04-27 21:45:10 +08:00
parent c8be9e5ab1
commit 2505f4822e
No known key found for this signature in database
GPG Key ID: 8E77811121A841D4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/li/cil/oc/server/component/traits/FluidContainerTransfer.scala
View File

@ -161,7 +161,7 @@ trait FluidContainerTransfer extends traits.WorldAware with traits.SideRestricte
} }
} }
private def withReplayableMove(handlerA: Option[IFluidHandler], handlerB: Option[IFluidHandler], moveFunc: (IFluidHandler, IFluidHandler) => Int, cb: (IFluidHandler, IFluidHandler, IFluidHandler => Unit, IFluidHandler => Unit) => Boolean) = { private def withReplayableMove(handlerA: Option[IFluidHandler], handlerB: Option[IFluidHandler], moveFunc: (IFluidHandler, IFluidHandler) => Int, afterMovedFunc: (IFluidHandler, IFluidHandler, IFluidHandler => Unit, IFluidHandler => Unit) => Boolean) = {
val moved = handlerA.fold(0)(a => val moved = handlerA.fold(0)(a =>
handlerB.fold(0)(b => { handlerB.fold(0)(b => {
val replayableA = FluidContainerUtils.replayableFluidHandler(a) val replayableA = FluidContainerUtils.replayableFluidHandler(a)
@ -169,20 +169,20 @@ trait FluidContainerTransfer extends traits.WorldAware with traits.SideRestricte
moveFunc(replayableA, replayableB) match { moveFunc(replayableA, replayableB) match {
case 0 => 0 case 0 => 0
case moved => case moved =>
if (cb(a, b, h => FluidContainerUtils.replay(replayableA, h), h => FluidContainerUtils.replay(replayableB, h))) moved else 0 if (afterMovedFunc(a, b, h => FluidContainerUtils.replay(replayableA, h), h => FluidContainerUtils.replay(replayableB, h))) moved else 0
} }
}) })
) )
result(moved > 0, moved) result(moved > 0, moved)
} }
private def withMove(handlerA: Option[IFluidHandler], handlerB: Option[IFluidHandler], moveFunc: (IFluidHandler, IFluidHandler) => Int, cb: (IFluidHandler, IFluidHandler) => Boolean) = { private def withMove(handlerA: Option[IFluidHandler], handlerB: Option[IFluidHandler], moveFunc: (IFluidHandler, IFluidHandler) => Int, afterMovedFunc: (IFluidHandler, IFluidHandler) => Boolean) = {
val moved = handlerA.fold(0)(a => val moved = handlerA.fold(0)(a =>
handlerB.fold(0)(b => { handlerB.fold(0)(b => {
moveFunc(a, b) match { moveFunc(a, b) match {
case 0 => 0 case 0 => 0
case moved => case moved =>
if (cb(a, b)) moved else 0 if (afterMovedFunc(a, b)) moved else 0
} }
}) })
) )