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

updated to 1.6.4

Browse Source
This commit is contained in:
Johannes Lohrer 2013-09-30 20:18:15 +02:00
parent fe6cc8cc44
commit a4546d00de
6 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
li/cil/oc/client/ComputerRenderer.scala
View File

@ -49,5 +49,5 @@ object ComputerRenderer extends TileEntitySpecialRenderer {
} }
} }
private def setTexture(resource: ResourceLocation) = func_110628_a(resource) private def setTexture(resource: ResourceLocation) = bindTexture(resource)
} }

2
li/cil/oc/client/gui/GuiComputer.scala
View File

@ -70,5 +70,5 @@ class GuiComputer(inventory: InventoryPlayer, val tileEntity: TileEntityComputer
} }
private def setTexture(value: ResourceLocation) = private def setTexture(value: ResourceLocation) =
mc.renderEngine.func_110577_a(value) mc.renderEngine.bindTexture(value)
} }

2
li/cil/oc/client/gui/GuiScreen.scala
View File

@ -178,5 +178,5 @@ object GuiScreen {
} }
private def setTexture(value: ResourceLocation) = private def setTexture(value: ResourceLocation) =
textureManager.get.func_110577_a(value) textureManager.get.bindTexture(value)
} }

2
li/cil/oc/client/gui/MonospaceFontRenderer.scala
View File

@ -88,5 +88,5 @@ object MonospaceFontRenderer {
} }
} }
private def setTexture(tm: TextureManager, resource: ResourceLocation) = tm.func_110577_a(resource) private def setTexture(tm: TextureManager, resource: ResourceLocation) = tm.bindTexture(resource)
} }

10
li/cil/oc/common/tileentity/TileEntityComputer.scala
View File

@ -9,8 +9,12 @@ import li.cil.oc.server.computer.{Computer => ServerComputer}
import li.cil.oc.server.{PacketSender => ServerPacketSender} import li.cil.oc.server.{PacketSender => ServerPacketSender}
import net.minecraft.entity.player.EntityPlayer import net.minecraft.entity.player.EntityPlayer
import net.minecraft.nbt.NBTTagCompound import net.minecraft.nbt.NBTTagCompound
import ic2.api.energy.tile.IEnergySink
import net.minecraftforge.common.{MinecraftForge, ForgeDirection}
import ic2.api.energy.event.EnergyTileLoadEvent
import net.minecraft.tileentity.TileEntity
class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with IComputerEnvironment with ItemComponentProxy { class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with IComputerEnvironment with ItemComponentProxy {
def this() = this(false) def this() = this(false)
protected val computer = protected val computer =
@ -78,7 +82,7 @@ class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with ICo
override def updateEntity() = { override def updateEntity() = {
computer.update() computer.update()
if (hasChanged.get) { if (hasChanged.get) {
worldObj.updateTileEntityChunkAndDoNothing( worldObj.markTileEntityChunkModified(
xCoord, yCoord, zCoord, this) xCoord, yCoord, zCoord, this)
if (isRunning != computer.isRunning) { if (isRunning != computer.isRunning) {
isRunning = computer.isRunning isRunning = computer.isRunning
@ -104,4 +108,6 @@ class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with ICo
override def world = worldObj override def world = worldObj
override def markAsChanged() = hasChanged.set(true) override def markAsChanged() = hasChanged.set(true)
} }

2
li/cil/oc/common/tileentity/TileEntityScreen.scala
View File

@ -69,6 +69,6 @@ class TileEntityScreen extends TileEntityRotatable with IScreenEnvironment {
} }
private def markAsChanged(): Unit = private def markAsChanged(): Unit =
worldObj.updateTileEntityChunkAndDoNothing( worldObj.markTileEntityChunkModified(
xCoord, yCoord, zCoord, this) xCoord, yCoord, zCoord, this)
} }