Version for Mindustry 8

Release 0.3.0

Author: cardillan

build.gradle

@@ -34,8 +34,8 @@ allprojects{
 
 dependencies{
     compileOnly "com.github.Anuken.Arc:arc-core:$mindustryVersion"
-    compileOnly "com.github.Anuken.Mindustry:core:$mindustryVersion"
-//    compileOnly 'com.github.Anuken:MindustryJitpack:1470d3d32f'
+    // Manually put latest commit ID here from https://github.com/Anuken/MindustryJitpack/commits/main/
+    compileOnly 'com.github.Anuken:MindustryJitpack:47cf3c4'
 
     annotationProcessor "com.github.Anuken:jabel:$jabelVersion"
 }

mod.hjson

@@ -1,8 +1,8 @@
 #the mod name as displayed in-game
-displayName: "Mlog Assertions"
+displayName: "Mlog Assertions (v8)"
 
 #the internal name of your mod
-name: "mlog-assertions"
+name: "mlog-assertions-8"
 
 subtitle: "Easier debugging for mlog",
 
@@ -16,10 +16,10 @@ main: "cardillan.mlogassertions.Main"
 description: "Provides custom mlog instructions for enhanced runtime checks in Mindustry Logic."
 
 #the mod version
-version: 0.2.0
+version: 0.3.0
 
 #the minimum game build required to run this mod
-minGameVersion: 146
+minGameVersion: 147
 
 #this is a java mod
 java: true

src/cardillan/mlogassertions/Assertions.java

@@ -55,7 +55,7 @@ public static void init() {
     }
 
     private static void draw(LogicBuild block) {
-        if (block.tile().build != block) {
+        if (block.tile.build != block) {
             removeX = (int) block.getX();
             removeY = (int) block.getY();
             return;

src/cardillan/mlogassertions/logic/AssertionType.java

@@ -11,14 +11,14 @@ public enum AssertionType {
     ;
 
     public static final AssertionType[] all = values();
-    public final TypeAssertionObjLambda objFunction;
-    public final TypeAssertionLambda function;
+    public final AssertionTypeObjLambda objFunction;
+    public final AssertionTypeLambda function;
 
-    AssertionType(TypeAssertionLambda function) {
+    AssertionType(AssertionTypeLambda function) {
         this(function, obj -> false);
     }
 
-    AssertionType(TypeAssertionLambda function, TypeAssertionObjLambda objFunction) {
+    AssertionType(AssertionTypeLambda function, AssertionTypeObjLambda objFunction) {
         this.function = function;
         this.objFunction = objFunction;
     }
@@ -28,11 +28,11 @@ public String toString() {
         return super.toString();
     }
 
-    public interface TypeAssertionObjLambda {
+    public interface AssertionTypeObjLambda {
         boolean get(Object obj);
     }
 
-    public interface TypeAssertionLambda {
+    public interface AssertionTypeLambda {
         boolean get(double val);
     }
 }

src/cardillan/mlogassertions/logic/LogicInstructions.java

@@ -3,22 +3,22 @@
 import cardillan.mlogassertions.Assertions;
 import mindustry.gen.Building;
 import mindustry.logic.LExecutor;
-import mindustry.logic.LExecutor.Var;
+import mindustry.logic.LVar;
 import mindustry.world.blocks.logic.LogicBlock;
 
 public class LogicInstructions {
 
     public static class AssertI implements LExecutor.LInstruction {
         public AssertionType type = AssertionType.any;
-        public int multiple = 1;
-        public int min;
+        public LVar multiple;
+        public LVar min;
         public AssertOp opMin = AssertOp.lessThanEq;
-        public int value;
+        public LVar value;
         public AssertOp opMax = AssertOp.lessThanEq;
-        public int max;
-        public int message;
+        public LVar max;
+        public LVar message;
 
-        public AssertI(AssertionType type, int multiple, int min, AssertOp opMin, int value, AssertOp opMax, int max, int message) {
+        public AssertI(AssertionType type, LVar multiple, LVar min, AssertOp opMin, LVar value, AssertOp opMax, LVar max, LVar message) {
             this.type = type;
             this.multiple = multiple;
             this.min = min;
@@ -34,16 +34,16 @@ public AssertI() {
 
         @Override
         public final void run(LExecutor exec) {
-            Building building = exec.building( LExecutor.varThis);
+            Building building = exec.thisv.building();
 
-            Var vaVal = var(exec, value);
+            LVar vaVal = var(exec, value);
             if ((vaVal.isobj ? type.objFunction.get(vaVal.objval) : type.function.get(vaVal.numval))
                     && (type != AssertionType.multiple || (vaVal.numval % var(exec, multiple).numval == 0))
                     && (opMin.function.get(num(exec,min), num(exec,value)))
                     && (opMax.function.get(num(exec,value), num(exec,max)))) {
                 Assertions.remove((LogicBlock.LogicBuild) building);
             } else {
-                Var message = var(exec, this.message);
+                LVar message = var(exec, this.message);
                 Assertions.add((LogicBlock.LogicBuild) building, LExecutor.PrintI.toString(message.objval));
 
                 //skip back to self.
@@ -54,12 +54,12 @@ public final void run(LExecutor exec) {
 
         // For easier switching between v7 and v8 logic
 
-        private Var var(LExecutor exec, int var) {
-            return exec.var(var);
+        private LVar var(LExecutor exec, LVar var) {
+            return var;
         }
 
-        private double num(LExecutor exec, int var) {
-            return exec.num(var);
+        private double num(LExecutor exec, LVar var) {
+            return var.num();
         }
     }
 }