curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-15 16:16:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

more work on the Terminal, ComputerCraft compatibility layer (wip), quarried stone texture

Browse Source 
Former-commit-id: 1fd1b5ce05663dd41d6077077b64e08ac0f1b5a0
Former-commit-id: bd52729417fc4dfcd8ad11f00d34507943156a83
This commit is contained in:
Song Minjae
2016-09-16 20:49:46 +09:00
parent abf167d6b8
commit a0afc8ab7a
37 changed files with 897 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/net/torvald/terrarum/virtualcomputer/computer/BaseTerrarumComputer.kt
View File

@@ -5,10 +5,7 @@ import li.cil.repack.org.luaj.vm2.LuaError
import li.cil.repack.org.luaj.vm2.LuaValue
import li.cil.repack.org.luaj.vm2.lib.jse.JsePlatform
import net.torvald.terrarum.virtualcomputer.lualib.TermLib
import net.torvald.terrarum.virtualcomputer.terminal.SimpleTextTerminal
import net.torvald.terrarum.virtualcomputer.terminal.Terminal
import net.torvald.terrarum.virtualcomputer.terminal.TerminalInputStream
import net.torvald.terrarum.virtualcomputer.terminal.TerminalPrintStream
import net.torvald.terrarum.virtualcomputer.terminal.*
import org.newdawn.slick.GameContainer
import java.io.*
@@ -19,7 +16,7 @@ import java.io.*
*
* Created by minjaesong on 16-09-10.
*/
class BaseTerrarumComputer(term: Terminal?) {
class BaseTerrarumComputer(term: Teletype?) {
val luaJ_globals: Globals = JsePlatform.standardGlobals()
@@ -40,7 +37,8 @@ class BaseTerrarumComputer(term: Terminal?) {
luaJ_globals.STDERR = termErr
luaJ_globals.STDIN = termIn
loadTermLib(term)
// load libraries
TermLib(luaJ_globals, term)
}
// ROM BASIC
@@ -135,21 +133,4 @@ class BaseTerrarumComputer(term: Terminal?) {
val DEBUGTHRE = true
}
/////////////////////////
// MANUAU LIBRARY LOAD //
/////////////////////////
private fun loadTermLib(term: Terminal) {
luaJ_globals["term"] = LuaValue.tableOf()
luaJ_globals["term"]["test"] = TermLib.Test(term)
luaJ_globals["term"]["setCursorPos"] = TermLib.MoveCursor(term)
luaJ_globals["term"]["setcursorpos"] = TermLib.MoveCursor(term)
luaJ_globals["term"]["gotoxy"] = TermLib.MoveCursor(term) // pascal-style alias
luaJ_globals["term"]["getCursorPos"] = TermLib.GetCursorPos(term)
luaJ_globals["term"]["getcursorpos"] = TermLib.GetCursorPos(term)
luaJ_globals["term"]["setCursorBlink"] = TermLib.SetCursorBlink(term)
luaJ_globals["term"]["setcursorblink"] = TermLib.SetCursorBlink(term)
luaJ_globals["term"]["getSize"] = TermLib.GetSize(term)
luaJ_globals["term"]["getsize"] = TermLib.GetSize(term)
}
}