diff --git a/li/cil/oc/client/ComputerRenderer.scala b/li/cil/oc/client/ComputerRenderer.scala index ddc246a32..1bcba8601 100644 --- a/li/cil/oc/client/ComputerRenderer.scala +++ b/li/cil/oc/client/ComputerRenderer.scala @@ -49,5 +49,5 @@ object ComputerRenderer extends TileEntitySpecialRenderer { } } - private def setTexture(resource: ResourceLocation) = func_110628_a(resource) + private def setTexture(resource: ResourceLocation) = bindTexture(resource) } \ No newline at end of file diff --git a/li/cil/oc/client/gui/GuiComputer.scala b/li/cil/oc/client/gui/GuiComputer.scala index bfde3d21c..6aa16baa5 100644 --- a/li/cil/oc/client/gui/GuiComputer.scala +++ b/li/cil/oc/client/gui/GuiComputer.scala @@ -70,5 +70,5 @@ class GuiComputer(inventory: InventoryPlayer, val tileEntity: TileEntityComputer } private def setTexture(value: ResourceLocation) = - mc.renderEngine.func_110577_a(value) + mc.renderEngine.bindTexture(value) } \ No newline at end of file diff --git a/li/cil/oc/client/gui/GuiScreen.scala b/li/cil/oc/client/gui/GuiScreen.scala index 2a7c7d936..d8e1923b8 100644 --- a/li/cil/oc/client/gui/GuiScreen.scala +++ b/li/cil/oc/client/gui/GuiScreen.scala @@ -178,5 +178,5 @@ object GuiScreen { } private def setTexture(value: ResourceLocation) = - textureManager.get.func_110577_a(value) + textureManager.get.bindTexture(value) } \ No newline at end of file diff --git a/li/cil/oc/client/gui/MonospaceFontRenderer.scala b/li/cil/oc/client/gui/MonospaceFontRenderer.scala index 073665b23..17c804f78 100644 --- a/li/cil/oc/client/gui/MonospaceFontRenderer.scala +++ b/li/cil/oc/client/gui/MonospaceFontRenderer.scala @@ -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) } \ No newline at end of file diff --git a/li/cil/oc/common/tileentity/TileEntityComputer.scala b/li/cil/oc/common/tileentity/TileEntityComputer.scala index c16dbfa60..9ceac1e4a 100644 --- a/li/cil/oc/common/tileentity/TileEntityComputer.scala +++ b/li/cil/oc/common/tileentity/TileEntityComputer.scala @@ -9,8 +9,12 @@ import li.cil.oc.server.computer.{Computer => ServerComputer} import li.cil.oc.server.{PacketSender => ServerPacketSender} import net.minecraft.entity.player.EntityPlayer 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) protected val computer = @@ -78,7 +82,7 @@ class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with ICo override def updateEntity() = { computer.update() if (hasChanged.get) { - worldObj.updateTileEntityChunkAndDoNothing( + worldObj.markTileEntityChunkModified( xCoord, yCoord, zCoord, this) if (isRunning != computer.isRunning) { isRunning = computer.isRunning @@ -104,4 +108,6 @@ class TileEntityComputer(isClient: Boolean) extends TileEntityRotatable with ICo override def world = worldObj override def markAsChanged() = hasChanged.set(true) + + } \ No newline at end of file diff --git a/li/cil/oc/common/tileentity/TileEntityScreen.scala b/li/cil/oc/common/tileentity/TileEntityScreen.scala index b953d5950..448825884 100644 --- a/li/cil/oc/common/tileentity/TileEntityScreen.scala +++ b/li/cil/oc/common/tileentity/TileEntityScreen.scala @@ -69,6 +69,6 @@ class TileEntityScreen extends TileEntityRotatable with IScreenEnvironment { } private def markAsChanged(): Unit = - worldObj.updateTileEntityChunkAndDoNothing( + worldObj.markTileEntityChunkModified( xCoord, yCoord, zCoord, this) } \ No newline at end of file