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

Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8

Browse Source 
Conflicts:
	src/main/scala/li/cil/oc/common/EventHandler.scala
This commit is contained in:
Florian Nücke 2015-04-23 21:39:02 +02:00
commit cdbce01aad
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
View File

@ -288,7 +288,7 @@ object RobotRenderer extends TileEntitySpecialRenderer {
val proxy = tileEntity.asInstanceOf[tileentity.RobotProxy]
val robot = proxy.robot
val worldTime = EventHandler.totalWorldTicks + f
val worldTime = tileEntity.getWorld.getTotalWorldTime + f
RenderState.pushMatrix()
GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5)

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

@ -37,7 +37,6 @@ import net.minecraftforge.event.world.WorldEvent
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
import net.minecraftforge.fml.common.gameevent.PlayerEvent._
import net.minecraftforge.fml.common.gameevent.TickEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent
import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent
@ -49,8 +48,6 @@ import scala.concurrent.Future
object EventHandler {
private val pending = mutable.Buffer.empty[() => Unit]
var totalWorldTicks = 0L
private val runningRobots = mutable.Set.empty[Robot]
private val keyboards = java.util.Collections.newSetFromMap[Keyboard](new java.util.WeakHashMap[Keyboard, java.lang.Boolean])
@ -119,11 +116,6 @@ object EventHandler {
machines --= closed
}
@SubscribeEvent
def onClientTick(e: ClientTickEvent) = if (e.phase == TickEvent.Phase.START) {
totalWorldTicks += 1
}
@SubscribeEvent
def playerLoggedIn(e: PlayerLoggedInEvent) {
if (SideTracker.isServer) e.player match {