First usable version

Author: cardillan

README.md

@@ -1,3 +1,5 @@
 # MlogAssertions
 
 Provides custom mlog instructions for enhanced runtime checks in Mindustry Logic.
+
+The mod is still under development. The precise specification of instructions may still change. 

build.gradle

@@ -79,6 +79,7 @@ jar{
 
     from(projectDir){
         include "mod.hjson"
+        include "icon.png"
     }
 
     from("assets/"){

icon.pdn

@@ -4,6 +4,8 @@ displayName: "Mlog Assertions"
 #the internal name of your mod
 name: "mlog-assertions"
 
+subtitle: "Easier debugging for mlog",
+
 #your name
 author: "cardillan"
 

icon.png

@@ -32,6 +32,10 @@ public static void add(LogicBuild block, String message) {
         }
     }
 
+    public static void remove(LogicBuild block) {
+        remove((int) block.getX(), (int) block.getY());
+    }
+
     public static void remove(int x, int y) {
         blocks.remove(x, y);
         messages.remove(x, y);

mod.hjson

@@ -22,7 +22,6 @@ public static void register() {
         Seq<Prov<LStatement>> seq = statements.map(prov -> prov::get);
         LogicIO.allStatements.addAll(seq);
 
-        // Customized LStatements will register customized reader automatically.
         for (Prov<AssertStatement> prov : statements) {
             AssertStatement statement = prov.get();
             LAssembler.customParsers.put(opcode, statement::read);
@@ -36,7 +35,7 @@ private static class AssertStatement extends LStatement {
         public String value = "index";
         public AssertOp opMax = AssertOp.lessThanEq;
         public String max = "10";
-        public String message = "\"Array index out of bounds (0 to 10).\"";
+        public String message = "\"Index out of bounds (0 to 10).\"";
 
         @Override
         public LCategory category() {

src/cardillan/mlogassertions/Assertions.java

@@ -32,19 +32,22 @@ public AssertI() {
 
         @Override
         public final void run(LExecutor exec) {
+            Building building = exec.building( LExecutor.varThis);
+
             Var vaVal = var(exec, value);
             boolean typeAssert = vaVal.isobj ? type.objFunction.get(vaVal.objval) : type.function.get(vaVal.numval);
             boolean minAssert = opMin.function.get(num(exec,min), num(exec,value));
             boolean maxAssert = opMax.function.get(num(exec,value), num(exec,max));
 
             if (!typeAssert || !minAssert || !maxAssert) {
-                Building building = exec.building( LExecutor.varThis);
                 Var message = var(exec, this.message);
                 Assertions.add((LogicBlock.LogicBuild) building, LExecutor.PrintI.toString(message.objval));
 
                 //skip back to self.
                 exec.counter.numval--;
                 //exec.yield = true;
+            } else {
+                Assertions.remove((LogicBlock.LogicBuild) building);
             }
         }