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

Merge git://github.com/Kilobyte22/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-06-19 15:19:20 +02:00
commit df4b1feddb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/assets/opencomputers/robot.names
View File

@ -13,6 +13,7 @@ Vexatos
Wobbo
YuRaNnNzZZ
Kodos
Kilobyte
# Names of more or less famous robots, as a bit of filler material. Feel free
# to add more via pull requests. Let's hope this won't get us sued...

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

@ -68,12 +68,26 @@ class DiskDrive(val parent: SimpleDelegator) extends SimpleDelegate {
override def rightClick(world: World, x: Int, y: Int, z: Int, player: EntityPlayer,
side: ForgeDirection, hitX: Float, hitY: Float, hitZ: Float) = {
val te = world.getBlockTileEntity(x, y, z).asInstanceOf[tileentity.DiskDrive]
if (!player.isSneaking) {
if (te.isItemValidForSlot(0, player.getCurrentEquippedItem)) {
if (te.getStackInSlot(0) != null) {
// if there is stuff inside ...
if (!world.isRemote) te.dropSlot(0, 1, te.facing) // drop it
}
te.setInventorySlotContents(0, player.getCurrentEquippedItem.splitStack(1)) // insert the disk
} else {
if (!world.isRemote) {
player.openGui(OpenComputers, GuiType.DiskDrive.id, world, x, y, z)
}
}
true
} else {
if (te.getStackInSlot(0) != null) {
if (!world.isRemote) te.dropSlot(0, 1, te.facing)
true
}
else false
}
}
}