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

Formatting.

Browse Source
This commit is contained in:
Florian Nücke 2014-06-11 14:08:56 +02:00
parent a04732e5f0
commit a8de31b577
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/li/cil/oc/client/renderer/tileentity/HologramRenderer.scala
View File

@ -280,8 +280,8 @@ object HologramRenderer extends TileEntitySpecialRenderer with Callable[Int] wit
// Flip the buffer to only fill in as much data as necessary. // Flip the buffer to only fill in as much data as necessary.
dataBuffer.flip() dataBuffer.flip()
// This buffer can be updated quite frequently, so dynamic seems sensible. // This buffer can be updated quite frequently, so dynamic seems sensible.
GL15.glBufferData(GL15.GL_ARRAY_BUFFER, dataBuffer, GL15.GL_DYNAMIC_DRAW) GL15.glBufferData(GL15.GL_ARRAY_BUFFER, dataBuffer, GL15.GL_DYNAMIC_DRAW)
} }
else { else {
// Empty hologram. // Empty hologram.

22
src/main/scala/li/cil/oc/common/block/Screen.scala
View File

@ -311,17 +311,17 @@ abstract class Screen(val parent: SimpleDelegator) extends RedstoneAware with Si
if (BuildCraft.holdsApplicableWrench(player, x, y, z)) false if (BuildCraft.holdsApplicableWrench(player, x, y, z)) false
else world.getTileEntity(x, y, z) match { else world.getTileEntity(x, y, z) match {
case screen: tileentity.Screen if screen.hasKeyboard && !player.isSneaking => case screen: tileentity.Screen if screen.hasKeyboard && !player.isSneaking =>
// Yep, this GUI is actually purely client side. We could skip this // Yep, this GUI is actually purely client side. We could skip this
// if, but it is clearer this way (to trigger it from the server we // if, but it is clearer this way (to trigger it from the server we
// would have to give screens a "container", which we do not want). // would have to give screens a "container", which we do not want).
if (world.isRemote) { if (world.isRemote) {
player.openGui(OpenComputers, GuiType.Screen.id, world, x, y, z) player.openGui(OpenComputers, GuiType.Screen.id, world, x, y, z)
} }
true true
case screen: tileentity.Screen if screen.tier > 0 && side == screen.facing => case screen: tileentity.Screen if screen.tier > 0 && side == screen.facing =>
screen.click(player, hitX, hitY, hitZ) screen.click(player, hitX, hitY, hitZ)
case _ => false case _ => false
} }
override def walk(world: World, x: Int, y: Int, z: Int, entity: Entity) = override def walk(world: World, x: Int, y: Int, z: Int, entity: Entity) =
if (!world.isRemote) world.getTileEntity(x, y, z) match { if (!world.isRemote) world.getTileEntity(x, y, z) match {