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

Replace all uses of getCurrentEquippedItem with getHeldItem. Technically the same, but more generic.

Browse Source
This commit is contained in:
Florian Nücke 2015-09-19 14:56:24 +02:00
parent 2aa4093973
commit 772e98bb28
15 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/li/cil/oc/client/GuiHandler.scala
View File

@ -57,14 +57,14 @@ object GuiHandler extends CommonGuiHandler {
case _ => null
}
case Some(GuiType.Category.Item) =>
Delegator.subItem(player.getCurrentEquippedItem) match {
Delegator.subItem(player.getHeldItem) match {
case Some(drive: item.traits.FileSystemLike) if id == GuiType.Drive.id =>
new gui.Drive(player.inventory, () => player.getCurrentEquippedItem)
new gui.Drive(player.inventory, () => player.getHeldItem)
case Some(database: item.UpgradeDatabase) if id == GuiType.Database.id =>
new gui.Database(player.inventory, new DatabaseInventory {
override def tier = database.tier
override def container = player.getCurrentEquippedItem
override def container = player.getHeldItem
override def isUseableByPlayer(player: EntityPlayer) = player == player
})
@ -72,12 +72,12 @@ object GuiHandler extends CommonGuiHandler {
new gui.Server(player.inventory, new ServerInventory {
override def tier = server.tier
override def container = player.getCurrentEquippedItem
override def container = player.getHeldItem
override def isUseableByPlayer(player: EntityPlayer) = player == player
})
case Some(tablet: item.Tablet) if id == GuiType.Tablet.id =>
val stack = player.getCurrentEquippedItem
val stack = player.getHeldItem
if (stack.hasTagCompound) {
item.Tablet.get(stack, player).components.collect {
case Some(buffer: TextBuffer) => buffer
@ -88,13 +88,13 @@ object GuiHandler extends CommonGuiHandler {
}
else null
case Some(tablet: item.Tablet) if id == GuiType.TabletInner.id =>
val stack = player.getCurrentEquippedItem
val stack = player.getHeldItem
if (stack.hasTagCompound) {
new gui.Tablet(player.inventory, item.Tablet.get(stack, player))
}
else null
case Some(terminal: item.Terminal) if id == GuiType.Terminal.id =>
val stack = player.getCurrentEquippedItem
val stack = player.getHeldItem
if (stack.hasTagCompound) {
val address = stack.getTagCompound.getString(Settings.namespace + "server")
val key = stack.getTagCompound.getString(Settings.namespace + "key")

8
src/main/scala/li/cil/oc/common/GuiHandler.scala
View File

@ -45,12 +45,12 @@ abstract class GuiHandler extends IGuiHandler {
case _ => null
}
case Some(GuiType.Category.Item) =>
Delegator.subItem(player.getCurrentEquippedItem) match {
Delegator.subItem(player.getHeldItem) match {
case Some(database: item.UpgradeDatabase) if id == GuiType.Database.id =>
new container.Database(player.inventory, new DatabaseInventory {
override def tier = database.tier
override def container = player.getCurrentEquippedItem
override def container = player.getHeldItem
override def isUseableByPlayer(player: EntityPlayer) = player == player
})
@ -58,12 +58,12 @@ abstract class GuiHandler extends IGuiHandler {
new container.Server(player.inventory, new ServerInventory {
override def tier = server.tier
override def container = player.getCurrentEquippedItem
override def container = player.getHeldItem
override def isUseableByPlayer(player: EntityPlayer) = player == player
})
case Some(tablet: item.Tablet) if id == GuiType.TabletInner.id =>
val stack = player.getCurrentEquippedItem
val stack = player.getHeldItem
if (stack.hasTagCompound)
new container.Tablet(player.inventory, item.Tablet.get(stack, player))
else

2
src/main/scala/li/cil/oc/common/block/DiskDrive.scala
View File

@ -54,7 +54,7 @@ class DiskDrive extends SimpleBlock with traits.GUI {
if (player.isSneaking) world.getTileEntity(x, y, z) match {
case drive: tileentity.DiskDrive =>
val isDiskInDrive = drive.getStackInSlot(0) != null
val isHoldingDisk = drive.isItemValidForSlot(0, player.getCurrentEquippedItem)
val isHoldingDisk = drive.isItemValidForSlot(0, player.getHeldItem)
if (isDiskInDrive) {
if (!world.isRemote) {
drive.dropSlot(0, 1, Option(drive.facing))

2
src/main/scala/li/cil/oc/common/block/RobotProxy.scala
View File

@ -210,7 +210,7 @@ class RobotProxy extends RedstoneAware with traits.SpecialBlock with traits.Stat
}
true
}
else if (player.getCurrentEquippedItem == null) {
else if (player.getHeldItem == null) {
if (!world.isRemote) {
world.getTileEntity(x, y, z) match {
case proxy: tileentity.RobotProxy if !proxy.machine.isRunning && proxy.isUseableByPlayer(player) => proxy.machine.start()

2
src/main/scala/li/cil/oc/common/component/Terminal.scala
View File

@ -36,7 +36,7 @@ class Terminal(val rack: tileentity.ServerRack, val number: Int) {
val keyboard = api.Driver.driverFor(keyboardItem, rack.getClass).createEnvironment(keyboardItem, rack).asInstanceOf[api.component.Keyboard]
keyboard.setUsableOverride(new UsabilityChecker {
override def isUsableByPlayer(keyboard: api.component.Keyboard, player: EntityPlayer) = {
val stack = player.getCurrentEquippedItem
val stack = player.getHeldItem
Delegator.subItem(stack) match {
case Some(t: item.Terminal) if stack.hasTagCompound => keys.contains(stack.getTagCompound.getString(Settings.namespace + "key"))
case _ => false

2
src/main/scala/li/cil/oc/common/entity/Drone.scala
View File

@ -464,7 +464,7 @@ class Drone(val world: World) extends Entity(world) with MachineHost with intern
override def interactFirst(player: EntityPlayer) = {
if (player.isSneaking) {
if (Wrench.isWrench(player.getCurrentEquippedItem)) {
if (Wrench.isWrench(player.getHeldItem)) {
kill()
}
else if (!world.isRemote && !machine.isRunning) {

4
src/main/scala/li/cil/oc/common/nanomachines/provider/DisintegrationProvider.scala
View File

@ -65,7 +65,7 @@ object DisintegrationProvider extends ScalaProvider("c4e7e3c2-8069-4fbb-b08e-74b
val timeToBreak = (1 / hardness).toInt
if (timeToBreak < 20 * 30) {
val meta = world.getBlockMetadata(pos)
val info = new SlowBreakInfo(now, now + timeToBreak, pos, Option(player.getCurrentEquippedItem).map(_.copy()), block, meta)
val info = new SlowBreakInfo(now, now + timeToBreak, pos, Option(player.getHeldItem).map(_.copy()), block, meta)
world.destroyBlockInWorldPartially(pos.hashCode(), pos, 0)
breakingMapNew += pos -> info
}
@ -101,7 +101,7 @@ object DisintegrationProvider extends ScalaProvider("c4e7e3c2-8069-4fbb-b08e-74b
var lastDamageSent = 0
def checkTool(player: EntityPlayer): Boolean = {
val currentTool = Option(player.getCurrentEquippedItem).map(_.copy())
val currentTool = Option(player.getHeldItem).map(_.copy())
(currentTool, originalTool) match {
case (Some(stackA), Some(stackB)) => stackA.getItem == stackB.getItem && (stackA.isItemStackDamageable || stackA.getItemDamage == stackB.getItemDamage)
case (None, None) => true

2
src/main/scala/li/cil/oc/integration/buildcraft/tools/EventHandlerBuildCraft.scala
View File

@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack
object EventHandlerBuildCraft {
def useWrench(player: EntityPlayer, x: Int, y: Int, z: Int, changeDurability: Boolean): Boolean = {
player.getCurrentEquippedItem.getItem match {
player.getHeldItem.getItem match {
case wrench: IToolWrench =>
if (changeDurability) {
wrench.wrenchUsed(player, x, y, z)

2
src/main/scala/li/cil/oc/integration/cofh/item/EventHandlerCoFH.scala
View File

@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack
object EventHandlerCoFH {
def useWrench(player: EntityPlayer, x: Int, y: Int, z: Int, changeDurability: Boolean): Boolean = {
player.getCurrentEquippedItem.getItem match {
player.getHeldItem.getItem match {
case wrench: IToolHammer =>
if (changeDurability) {
wrench.toolUsed(player.getHeldItem, player, x, y, z)

2
src/main/scala/li/cil/oc/integration/ic2/EventHandlerIndustrialCraft2.scala
View File

@ -48,7 +48,7 @@ object EventHandlerIndustrialCraft2 {
}
def useWrench(player: EntityPlayer, x: Int, y: Int, z: Int, changeDurability: Boolean): Boolean = {
player.getCurrentEquippedItem.getItem match {
player.getHeldItem.getItem match {
case wrench: ItemToolWrench =>
if (changeDurability) {
wrench.damage(player.getHeldItem, 1, player)

2
src/main/scala/li/cil/oc/integration/opencomputers/ModOpenComputers.scala
View File

@ -268,7 +268,7 @@ object ModOpenComputers extends ModProxy {
}
def useWrench(player: EntityPlayer, x: Int, y: Int, z: Int, changeDurability: Boolean): Boolean = {
player.getCurrentEquippedItem.getItem match {
player.getHeldItem.getItem match {
case wrench: Wrench => wrench.useWrenchOnBlock(player, player.getEntityWorld, x, y, z, !changeDurability)
case _ => false
}

2
src/main/scala/li/cil/oc/integration/railcraft/EventHandlerRailcraft.scala
View File

@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack
object EventHandlerRailcraft {
def useWrench(player: EntityPlayer, x: Int, y: Int, z: Int, changeDurability: Boolean): Boolean = {
player.getCurrentEquippedItem.getItem match {
player.getHeldItem.getItem match {
case wrench: IToolCrowbar =>
if (changeDurability) {
wrench.onWhack(player, player.getHeldItem, x, y, z)

4
src/main/scala/li/cil/oc/integration/util/Wrench.scala
View File

@ -20,8 +20,8 @@ object Wrench {
def isWrench(stack: ItemStack): Boolean = stack != null && checks.exists(IMC.tryInvokeStatic(_, stack)(false))
def holdsApplicableWrench(player: EntityPlayer, position: BlockPosition): Boolean =
player.getCurrentEquippedItem != null && usages.exists(IMC.tryInvokeStatic(_, player, int2Integer(position.x), int2Integer(position.y), int2Integer(position.z), boolean2Boolean(false))(false))
player.getHeldItem != null && usages.exists(IMC.tryInvokeStatic(_, player, int2Integer(position.x), int2Integer(position.y), int2Integer(position.z), boolean2Boolean(false))(false))
def wrenchUsed(player: EntityPlayer, position: BlockPosition): Unit =
if (player.getCurrentEquippedItem != null) usages.foreach(IMC.tryInvokeStaticVoid(_, player, int2Integer(position.x), int2Integer(position.y), int2Integer(position.z), boolean2Boolean(true)))
if (player.getHeldItem != null) usages.foreach(IMC.tryInvokeStaticVoid(_, player, int2Integer(position.x), int2Integer(position.y), int2Integer(position.z), boolean2Boolean(true)))
}

6
src/main/scala/li/cil/oc/server/PacketHandler.scala
View File

@ -83,11 +83,11 @@ object PacketHandler extends CommonPacketHandler {
def onDriveMode(p: PacketParser) = p.player match {
case player: EntityPlayerMP =>
Delegator.subItem(player.getCurrentEquippedItem) match {
Delegator.subItem(player.getHeldItem) match {
case Some(drive: FileSystemLike) =>
val data = new DriveData(player.getCurrentEquippedItem)
val data = new DriveData(player.getHeldItem)
data.isUnmanaged = p.readBoolean()
data.save(player.getCurrentEquippedItem)
data.save(player.getHeldItem)
case _ => // Invalid packet.
}
case _ => // Invalid packet.

4
src/main/scala/li/cil/oc/server/agent/Player.scala
View File

@ -176,10 +176,10 @@ class Player(val agent: internal.Agent) extends FakePlayer(agent.world.asInstanc
}
!cancel && callUsingItemInSlot(agent.equipmentInventory, 0, stack => {
val result = isItemUseAllowed(stack) && (entity.interactFirst(this) || (entity match {
case living: EntityLivingBase if getCurrentEquippedItem != null => getCurrentEquippedItem.interactWithEntity(this, living)
case living: EntityLivingBase if getHeldItem != null => getHeldItem.interactWithEntity(this, living)
case _ => false
}))
if (getCurrentEquippedItem != null && getCurrentEquippedItem.stackSize <= 0) {
if (getHeldItem != null && getHeldItem.stackSize <= 0) {
destroyCurrentEquippedItem()
}
result