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

Merge pull request #8 from repo-alt/feature/MultTtankSupport

Browse Source 
Added source tank parameter to the transposer.transferFluid
This commit is contained in:
Martin Robertz 2020-03-30 00:47:44 +02:00 committed by GitHub
commit 1695dfc284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/li/cil/oc/server/component/traits/InventoryTransfer.scala
View File

@ -40,19 +40,20 @@ trait InventoryTransfer extends traits.WorldAware with traits.SideRestricted {
} }
} }
@Callback(doc = """function(sourceSide:number, sinkSide:number[, count:number]):number -- Transfer some items between two inventories.""") @Callback(doc = """function(sourceSide:number, sinkSide:number[, count:number [, sourceTank:number]]):number -- Transfer some items between two inventories.""")
def transferFluid(context: Context, args: Arguments): Array[AnyRef] = { def transferFluid(context: Context, args: Arguments): Array[AnyRef] = {
val sourceSide = checkSideForAction(args, 0) val sourceSide = checkSideForAction(args, 0)
val sourcePos = position.offset(sourceSide) val sourcePos = position.offset(sourceSide)
val sinkSide = checkSideForAction(args, 1) val sinkSide = checkSideForAction(args, 1)
val sinkPos = position.offset(sinkSide) val sinkPos = position.offset(sinkSide)
val count = args.optFluidCount(2) val count = args.optFluidCount(2)
val sourceTank = args.optInteger(3, -1)
onTransferContents() match { onTransferContents() match {
case Some(reason) => case Some(reason) =>
result(Unit, reason) result(Unit, reason)
case _ => case _ =>
val moved = FluidUtils.transferBetweenFluidHandlersAt(sourcePos, sourceSide.getOpposite, sinkPos, sinkSide.getOpposite, count) val moved = FluidUtils.transferBetweenFluidHandlersAt(sourcePos, sourceSide.getOpposite, sinkPos, sinkSide.getOpposite, count, sourceTank)
if (moved > 0) context.pause(moved / 1000 * 0.25) // Allow up to 4 buckets per second. if (moved > 0) context.pause(moved / 1000 * 0.25) // Allow up to 4 buckets per second.
result(moved > 0, moved) result(moved > 0, moved)
} }

23
src/main/scala/li/cil/oc/util/FluidUtils.scala
View File

@ -40,13 +40,20 @@ object FluidUtils {
* <p/> * <p/>
* This returns <tt>true</tt> if some fluid was transferred. * This returns <tt>true</tt> if some fluid was transferred.
*/ */
def transferBetweenFluidHandlers(source: IFluidHandler, sourceSide: ForgeDirection, sink: IFluidHandler, sinkSide: ForgeDirection, limit: Int = FluidContainerRegistry.BUCKET_VOLUME) : Int = { def transferBetweenFluidHandlers(source: IFluidHandler, sourceSide: ForgeDirection, sink: IFluidHandler, sinkSide: ForgeDirection, limit: Int = FluidContainerRegistry.BUCKET_VOLUME, sourceTank: Int = -1) : Int = {
val drained = source.drain(sourceSide, limit, false) val ti = source.getTankInfo(sourceSide)
if (drained == null) { val srcFluid = if (sourceTank < 0 || ti == null || ti.length <= sourceTank) null else ti(sourceTank).fluid.copy()
return 0
val drained = if (srcFluid == null)
source.drain(sourceSide, limit, false)
else {
srcFluid.amount = limit
source.drain(sourceSide, srcFluid, false)
} }
val filled = sink.fill(sinkSide, drained, false) if (drained != null) {
sink.fill(sinkSide, source.drain(sourceSide, filled, true), true) val filled = sink.fill(sinkSide, drained, false)
sink.fill(sinkSide, source.drain(sourceSide, filled, true), true)
} else 0
} }
/** /**
@ -56,10 +63,10 @@ object FluidUtils {
* This uses the <tt>fluidHandlerAt</tt> method, and therefore handles special * This uses the <tt>fluidHandlerAt</tt> method, and therefore handles special
* cases such as fluid blocks. * cases such as fluid blocks.
*/ */
def transferBetweenFluidHandlersAt(sourcePos: BlockPosition, sourceSide: ForgeDirection, sinkPos: BlockPosition, sinkSide: ForgeDirection, limit: Int = FluidContainerRegistry.BUCKET_VOLUME) = def transferBetweenFluidHandlersAt(sourcePos: BlockPosition, sourceSide: ForgeDirection, sinkPos: BlockPosition, sinkSide: ForgeDirection, limit: Int = FluidContainerRegistry.BUCKET_VOLUME, sourceTank: Int = -1) =
fluidHandlerAt(sourcePos).fold(0)(source => fluidHandlerAt(sourcePos).fold(0)(source =>
fluidHandlerAt(sinkPos).fold(0)(sink => fluidHandlerAt(sinkPos).fold(0)(sink =>
transferBetweenFluidHandlers(source, sourceSide, sink, sinkSide, limit))) transferBetweenFluidHandlers(source, sourceSide, sink, sinkSide, limit, sourceTank)))
/** /**
* Lookup fluid taking into account flowing liquid blocks... * Lookup fluid taking into account flowing liquid blocks...