AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added third parameter to Geolyzer to control whether to ignore 'replaceable' blocks (except fluids), such as grass or vines.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-13 14:10:41 +02:00
parent ab355a283d
commit e89ba4238d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/scala/li/cil/oc/common/tileentity/Geolyzer.scala
View File

@ -3,7 +3,8 @@ package li.cil.oc.common.tileentity
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api.network.{Arguments, Context, Callback, Visibility} import li.cil.oc.api.network.{Arguments, Context, Callback, Visibility}
import net.minecraft.block.Block import net.minecraft.block.{BlockFluid, Block}
import net.minecraftforge.fluids.FluidRegistry
class Geolyzer extends traits.Environment { class Geolyzer extends traits.Environment {
val node = api.Network.newNode(this, Visibility.Network). val node = api.Network.newNode(this, Visibility.Network).
@ -13,10 +14,11 @@ class Geolyzer extends traits.Environment {
override def canUpdate = false override def canUpdate = false
@Callback(doc = """function() -- Analyzes the density of the column at the specified relative coordinates.""") @Callback(doc = """function(x:number, z:number[, ignoreReplaceable:boolean) -- Analyzes the density of the column at the specified relative coordinates.""")
def scan(computer: Context, args: Arguments): Array[AnyRef] = { def scan(computer: Context, args: Arguments): Array[AnyRef] = {
val rx = args.checkInteger(0) val rx = args.checkInteger(0)
val rz = args.checkInteger(1) val rz = args.checkInteger(1)
val includeReplaceable = !(args.count > 2 && args.checkBoolean(2))
if (math.abs(rx) > Settings.get.geolyzerRange || math.abs(rz) > Settings.get.geolyzerRange) { if (math.abs(rx) > Settings.get.geolyzerRange || math.abs(rz) > Settings.get.geolyzerRange) {
throw new IllegalArgumentException("location out of bounds") throw new IllegalArgumentException("location out of bounds")
} }
@ -32,11 +34,14 @@ class Geolyzer extends traits.Environment {
val blockId = world.getBlockId(bx, by, bz) val blockId = world.getBlockId(bx, by, bz)
if (blockId > 0 && !world.isAirBlock(bx, by, bz)) { if (blockId > 0 && !world.isAirBlock(bx, by, bz)) {
val block = Block.blocksList(blockId) val block = Block.blocksList(blockId)
if (block != null) if (block != null && (includeReplaceable || isFluid(block) || !block.isBlockReplaceable(world, x, y, z))) {
values(ry) = block.getBlockHardness(world, bx, by, bz) values(ry) = block.getBlockHardness(world, bx, by, bz)
}
} }
} }
result(values) result(values)
} }
private def isFluid(block: Block) = FluidRegistry.lookupFluidForBlock(block) != null || block.isInstanceOf[BlockFluid]
} }