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

Merge branch 'master' into 1.2

Browse Source
This commit is contained in:
Florian Nücke 2014-01-11 13:26:06 +01:00
commit cce2d4fa6e
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/opencomputers/recipes/gregtech.recipes
View File

@ -122,11 +122,11 @@ disk {
transistor { transistor {
type: assembly type: assembly
input: [redstone, {item="GT_Materials", subID=64}] input: [redstone, {item="GT_Materials", subID=96}]
count: [1, 2] count: [1, 3]
eu: 16 eu: 16
time: 500 time: 500
output: 4 output: 6
} }
chip1 { chip1 {
type: assembly type: assembly

6
li/cil/oc/client/gui/Screen.scala
View File

@ -24,7 +24,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
val mouseY = height - Mouse.getEventY * height / mc.displayHeight - 1 val mouseY = height - Mouse.getEventY * height / mc.displayHeight - 1
val bx = (mouseX - x - bufferMargin) / MonospaceFontRenderer.fontWidth + 1 val bx = (mouseX - x - bufferMargin) / MonospaceFontRenderer.fontWidth + 1
val by = (mouseY - y - bufferMargin) / MonospaceFontRenderer.fontHeight + 1 val by = (mouseY - y - bufferMargin) / MonospaceFontRenderer.fontHeight + 1
val (bw, bh) = screen.buffer.resolution val (bw, bh) = buffer.resolution
if (bx > 0 && by > 0 && bx <= bw && by <= bh) { if (bx > 0 && by > 0 && bx <= bw && by <= bh) {
val scroll = math.signum(Mouse.getEventDWheel) val scroll = math.signum(Mouse.getEventDWheel)
PacketSender.sendMouseScroll(buffer.owner, bx, by, scroll) PacketSender.sendMouseScroll(buffer.owner, bx, by, scroll)
@ -61,7 +61,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
private def clickOrDrag(mouseX: Int, mouseY: Int) { private def clickOrDrag(mouseX: Int, mouseY: Int) {
val bx = ((mouseX - x - bufferMargin) / scale / MonospaceFontRenderer.fontWidth).toInt + 1 val bx = ((mouseX - x - bufferMargin) / scale / MonospaceFontRenderer.fontWidth).toInt + 1
val by = ((mouseY - y - bufferMargin) / scale / MonospaceFontRenderer.fontHeight).toInt + 1 val by = ((mouseY - y - bufferMargin) / scale / MonospaceFontRenderer.fontHeight).toInt + 1
val (bw, bh) = screen.buffer.resolution val (bw, bh) = buffer.resolution
if (bx > 0 && by > 0 && bx <= bw && by <= bh) { if (bx > 0 && by > 0 && bx <= bw && by <= bh) {
if (bx != mx || by != my) { if (bx != mx || by != my) {
PacketSender.sendMouseClick(buffer.owner, bx, by, mx > 0 && my > 0) PacketSender.sendMouseClick(buffer.owner, bx, by, mx > 0 && my > 0)
@ -79,7 +79,7 @@ class Screen(val screen: tileentity.Screen) extends Buffer {
def drawBuffer() { def drawBuffer() {
GL11.glTranslatef(x, y, 0) GL11.glTranslatef(x, y, 0)
BufferRenderer.drawBackground() BufferRenderer.drawBackground()
if (screen.hasPower) { if (screen.origin.hasPower) {
GL11.glTranslatef(bufferMargin, bufferMargin, 0) GL11.glTranslatef(bufferMargin, bufferMargin, 0)
RenderState.makeItBlend() RenderState.makeItBlend()
BufferRenderer.drawText() BufferRenderer.drawText()

8
li/cil/oc/server/component/UpgradeNavigation.scala
View File

@ -15,13 +15,13 @@ class UpgradeNavigation(val owner: MCTileEntity, val xCenter: Int, val zCenter:
@LuaCallback("getPosition") @LuaCallback("getPosition")
def getPosition(context: RobotContext, args: Arguments): Array[AnyRef] = { def getPosition(context: RobotContext, args: Arguments): Array[AnyRef] = {
val x = owner.xCoord val x = owner.xCoord
val z = owner.zCoord
val y = owner.yCoord val y = owner.yCoord
val z = owner.zCoord
val relativeX = x - xCenter val relativeX = x - xCenter
val relativeY = z - zCenter val relativeZ = z - zCenter
if (math.abs(relativeX) <= size / 2 && math.abs(relativeY) <= size / 2) if (math.abs(relativeX) <= size / 2 && math.abs(relativeZ) <= size / 2)
result(relativeX, relativeY, y) result(relativeX, y, relativeZ)
else else
result(Unit, "out of range") result(Unit, "out of range")
} }