mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-13 03:30:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #577 from SquidDev-CC/feature/get-blink

Browse Source 
Add .getCursorBlink to monitors and terminals
This commit is contained in:
Daniel Ratcliffe 2019-05-26 00:14:02 +01:00 committed by GitHub
commit 1c9810890a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/dan200/computercraft/core/apis/TermAPI.java
View File

@ -78,7 +78,8 @@ public class TermAPI implements ILuaAPI
"setPaletteColour",
"setPaletteColor",
"getPaletteColour",
"getPaletteColor"
"getPaletteColor",
"getCursorBlink",
};
}
@ -298,6 +299,9 @@ public class TermAPI implements ILuaAPI
}
return null;
}
case 23:
// getCursorBlink
return new Object[] { m_terminal.getCursorBlink() };
default:
{
return null;

10
src/main/java/dan200/computercraft/shared/peripheral/monitor/MonitorPeripheral.java
View File

@ -65,7 +65,8 @@ public class MonitorPeripheral implements IPeripheral
"setPaletteColour",
"setPaletteColor",
"getPaletteColour",
"getPaletteColor"
"getPaletteColor",
"getCursorBlink",
};
}
@ -249,8 +250,13 @@ public class MonitorPeripheral implements IPeripheral
}
return null;
}
case 24:
// getCursorBlink
Terminal terminal = m_monitor.getTerminal().getTerminal();
return new Object[] { terminal.getCursorBlink() };
default:
return null;
}
return null;
}
@Override

4
src/main/resources/assets/computercraft/lua/rom/apis/window.lua
View File

@ -258,6 +258,10 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
end
end
function window.getCursorBlink()
return bCursorBlink
end
local function isColor()
return parent.isColor()
end