Update to b150

Author: object-Object

README.md

@@ -1,6 +1,6 @@
 # mlogv32
 
-RISC-V processor in Mindustry logic that runs Linux. Requires Mindustry build 149+.
+RISC-V processor in Mindustry logic that runs Linux. Requires Mindustry build 150+.
 
 <img width="1823" height="1008" alt="linux" src="https://github.com/user-attachments/assets/9b1fd6fa-ba4c-4498-9892-ae87a81d4588" />
 

mod/.gitignore

@@ -0,0 +1 @@
+!/libs/**/*.jar

mod/build.gradle.kts

@@ -23,10 +23,15 @@ toxopid {
 repositories {
     mavenCentral()
     anukeXpdustry()
+    // FIXME: remove when toxopid updates
+    flatDir {
+        dir("libs/Mindustry")
+    }
 }
 
 dependencies {
-    compileOnly(toxopid.dependencies.arcCore)
+    // FIXME: uncomment when toxopid updates
+//    compileOnly(toxopid.dependencies.arcCore)
     compileOnly(toxopid.dependencies.mindustryCore)
 
     implementation(libs.kotlin.stdlib)

mod/libs/Mindustry/LICENSE

@@ -3,7 +3,7 @@ displayName: mlogv32-utils
 author: object-Object
 description: Companion mod for mlogv32.
 version: 0.1.0
-minGameVersion: "149"
+minGameVersion: "150"
 dependencies: [
     override-lib
     // kotlin-runtime

mod/libs/Mindustry/core-v150.jar

@@ -335,7 +335,7 @@ private inline fun <reified T : Building> buildVar(build: LogicBuild, name: Stri
 // why
 private fun linkedBuild(build: LogicBuild, name: String) =
     build.links
-        .firstOrNull { it.active && it.valid && it.name == name }
+        .firstOrNull { it.valid && it.name == name }
         ?.let { Vars.world.build(it.x, it.y) }
 
 private fun LVar.numu() = num().toUInt()

mod/mod.hjson

@@ -170,6 +170,8 @@ def check_unsaved_variables(ast: Iterable[ASTNode]):
                 pass
             case Statement(name="set", args=[var, *_]):
                 pass
+            case Statement(name="select", args=[var, *_]):
+                pass
             case Directive(name="start_fetch"):
                 state = "fetch"
                 continue

mod/src/main/kotlin/gay/object/mlogv32/ProcessorAccess.kt

@@ -18,12 +18,12 @@
 #% set UART3 = 'bank4'
 
 #% macro print(col, row)
-   #{{'\n'}}    draw print {{ 11 + col * 7 }} {{ 512 - 6 - row * 13 }} topLeft
+   #{{'\n'}}    draw print {{ 5 + col * 7 }} {{ 500 - row * 13 }} @topLeft
     drawflush {{DISPLAY}}
 #% endmacro
 
 #% macro rect(col, row, width, height)
-   #{{'\n'}}    draw rect {{ 11 + col * 7 }} {{ 512 - 6 - row * 13 - 3 }} {{ width * 7 }} {{ height * -13 }}
+   #{{'\n'}}    draw rect {{ 5 + col * 7 }} {{ 500 - row * 13 - 3 }} {{ width * 7 }} {{ height * -13 }}
 #% endmacro
 
 reset:

python/src/mlogv32/preprocessor/parser/mlog.py

@@ -68,7 +68,7 @@ loop__newline:
 loop__no_overflow_y:
 
 loop__print_now:
-    draw print cur_x cur_y topLeft
+    draw print cur_x cur_y @topLeft
     set cur_x next_x
     set cur_y next_y
 
@@ -100,7 +100,7 @@ loop__no_print:
     read wptr UART 511
     jump loop notEqual rptr wptr
 
-    draw print cur_x cur_y topLeft
+    draw print cur_x cur_y @topLeft
     set cur_x next_x
     set cur_y next_y