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

Changed GeolyzerEvent.Analyze to take an absolute position instead of the side of the host for more flexibility.

Browse Source
This commit is contained in:
Florian Nücke 2015-02-03 17:10:41 +01:00
parent 9c86caa7da
commit 578df68bc7
3 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/li/cil/oc/api/event/GeolyzerEvent.java
View File

@ -3,7 +3,6 @@ package li.cil.oc.api.event;
import cpw.mods.fml.common.eventhandler.Cancelable; import cpw.mods.fml.common.eventhandler.Cancelable;
import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.Event;
import li.cil.oc.api.driver.EnvironmentHost; import li.cil.oc.api.driver.EnvironmentHost;
import net.minecraftforge.common.util.ForgeDirection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -71,18 +70,22 @@ public abstract class GeolyzerEvent extends Event {
*/ */
public static class Analyze extends GeolyzerEvent { public static class Analyze extends GeolyzerEvent {
/** /**
* The side of the geolyzer on which the block to scan is located. * The position of the block to scan.
* <p/>
* Note: get the world via the host if you need it.
*/ */
public final ForgeDirection side; public final int x, y, z;
/** /**
* The retrieved data for the block being scanned. * The retrieved data for the block being scanned.
*/ */
public final Map<String, Object> data = new HashMap<String, Object>(); public final Map<String, Object> data = new HashMap<String, Object>();
public Analyze(EnvironmentHost host, Map<?, ?> options, ForgeDirection side) { public Analyze(EnvironmentHost host, Map<?, ?> options, int x, int y, int z) {
super(host, options); super(host, options);
this.side = side; this.x = x;
this.y = y;
this.z = z;
} }
} }
} }

2
src/main/scala/li/cil/oc/common/event/GeolyzerHandler.scala
View File

@ -43,7 +43,7 @@ object GeolyzerHandler {
@SubscribeEvent @SubscribeEvent
def onGeolyzerAnalyze(e: GeolyzerEvent.Analyze) { def onGeolyzerAnalyze(e: GeolyzerEvent.Analyze) {
val world = e.host.world val world = e.host.world
val blockPos = BlockPosition(e.host).offset(e.side) val blockPos = BlockPosition(e.x, e.y, e.z, world)
val block = world.getBlock(blockPos) val block = world.getBlock(blockPos)
e.data += "name" -> Block.blockRegistry.getNameForObject(block) e.data += "name" -> Block.blockRegistry.getNameForObject(block)

34
src/main/scala/li/cil/oc/server/component/Geolyzer.scala
View File

@ -1,6 +1,5 @@
package li.cil.oc.server.component package li.cil.oc.server.component
import com.google.common.base.Strings
import li.cil.oc.Settings import li.cil.oc.Settings
import li.cil.oc.api import li.cil.oc.api
import li.cil.oc.api.driver.EnvironmentHost import li.cil.oc.api.driver.EnvironmentHost
@ -17,7 +16,6 @@ import li.cil.oc.util.BlockPosition
import li.cil.oc.util.DatabaseAccess import li.cil.oc.util.DatabaseAccess
import li.cil.oc.util.ExtendedArguments._ import li.cil.oc.util.ExtendedArguments._
import li.cil.oc.util.ExtendedWorld._ import li.cil.oc.util.ExtendedWorld._
import net.minecraft.block.Block
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.item.Item import net.minecraft.item.Item
import net.minecraft.item.ItemStack import net.minecraft.item.ItemStack
@ -65,7 +63,8 @@ class Geolyzer(val host: EnvironmentHost) extends prefab.ManagedEnvironment {
if (!node.tryChangeBuffer(-Settings.get.geolyzerScanCost)) if (!node.tryChangeBuffer(-Settings.get.geolyzerScanCost))
return result(Unit, "not enough energy") return result(Unit, "not enough energy")
val event = new Analyze(host, options, globalSide) val globalPos = BlockPosition(host).offset(globalSide)
val event = new Analyze(host, options, globalPos.x, globalPos.y, globalPos.z)
MinecraftForge.EVENT_BUS.post(event) MinecraftForge.EVENT_BUS.post(event)
if (event.isCanceled) result(Unit, "scan was canceled") if (event.isCanceled) result(Unit, "scan was canceled")
else result(event.data) else result(event.data)
@ -106,30 +105,15 @@ class Geolyzer(val host: EnvironmentHost) extends prefab.ManagedEnvironment {
case machine: api.machine.Machine => (machine.host, message.data) match { case machine: api.machine.Machine => (machine.host, message.data) match {
case (tablet: internal.Tablet, Array(nbt: NBTTagCompound, stack: ItemStack, player: EntityPlayer, blockPos: BlockPosition, side: ForgeDirection, hitX: java.lang.Float, hitY: java.lang.Float, hitZ: java.lang.Float)) => case (tablet: internal.Tablet, Array(nbt: NBTTagCompound, stack: ItemStack, player: EntityPlayer, blockPos: BlockPosition, side: ForgeDirection, hitX: java.lang.Float, hitY: java.lang.Float, hitZ: java.lang.Float)) =>
if (node.tryChangeBuffer(-Settings.get.geolyzerScanCost)) { if (node.tryChangeBuffer(-Settings.get.geolyzerScanCost)) {
// TODO 1.5 replace with event (change event to allow arbitrary coordinates) val event = new Analyze(host, Map.empty[AnyRef, AnyRef], blockPos.x, blockPos.y, blockPos.z)
val world = player.getEntityWorld MinecraftForge.EVENT_BUS.post(event)
val block = world.getBlock(blockPos) if (!event.isCanceled) {
for ((key, value) <- event.data) value match {
if (!Strings.isNullOrEmpty(Block.blockRegistry.getNameForObject(block))) { case number: java.lang.Number => nbt.setDouble(key, number.doubleValue())
nbt.setString("name", Block.blockRegistry.getNameForObject(block)) case string: String if !string.isEmpty => nbt.setString(key, string)
case _ => // Unsupported, ignore.
} }
nbt.setInteger("metadata", world.getBlockMetadata(blockPos))
nbt.setFloat("hardness", world.getBlockHardness(blockPos))
nbt.setInteger("harvestLevel", world.getBlockHarvestLevel(blockPos))
if (!Strings.isNullOrEmpty(world.getBlockHarvestTool(blockPos))) {
nbt.setString("harvestTool", world.getBlockHarvestTool(blockPos))
} }
nbt.setInteger("color", world.getBlockMapColor(blockPos).colorValue)
// val event = new Analyze(host, Map.empty[AnyRef, AnyRef], side)
// MinecraftForge.EVENT_BUS.post(event)
// if (!event.isCanceled) {
// for ((key, value) <- event.data) value match {
// case number: java.lang.Number => nbt.setDouble(key, number.doubleValue())
// case string: String if !string.isEmpty => nbt.setString(key, string)
// case _ => // Unsupported, ignore.
// }
// }
} }
case _ => // Ignore. case _ => // Ignore.
} }