Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/mindustry/logic/LCanvas.java

core/src/mindustry/logic/DataType.java

@@ -1,24 +0,0 @@
-package mindustry.logic;
-
-import arc.graphics.*;
-import mindustry.graphics.*;
-
-/** The types of data a node field can be. */
-public enum DataType{
-    /** A double. Used for integer calculations as well. */
-    number(Pal.place),
-    /** Any type of content, e.g. item. */
-    content(Color.cyan),
-    /** A building of a tile. */
-    building(Pal.items),
-    /** A unit on the map. */
-    unit(Pal.health),
-    /** Java string */
-    string(Color.royal);
-
-    public final Color color;
-
-    DataType(Color color){
-        this.color = color;
-    }
-}

core/src/mindustry/logic/LAccess.java

@@ -39,9 +39,7 @@ public enum LAccess{
     enabled("to"), //"to" is standard for single parameter access
     shoot("x", "y", "shoot"),
     shootp(true, "unit", "shoot"),
-    configure(true, 30, "to")
-
-    ;
+    configure(true, 30, "to");
 
     public final String[] params;
     public final boolean isObj;

core/src/mindustry/logic/LAssembler.java

@@ -17,9 +17,9 @@ public class LAssembler{
 
     private int lastVar;
     /** Maps names to variable IDs. */
-    ObjectMap<String, BVar> vars = new ObjectMap<>();
+    public ObjectMap<String, BVar> vars = new ObjectMap<>();
     /** All instructions to be executed. */
-    LInstruction[] instructions;
+    public LInstruction[] instructions;
 
     public LAssembler(){
         //instruction counter
@@ -105,7 +105,7 @@ public class LAssembler{
             if(index++ > max) break;
 
             line = line.replace("\t", "").trim();
-            
+
             try{
                 String[] arr;
 

core/src/mindustry/logic/LCanvas.java

@@ -22,10 +22,10 @@ public class LCanvas extends Table{
     //ew static variables
     static LCanvas canvas;
 
-    DragLayout statements;
+    public DragLayout statements;
+    public ScrollPane pane;
+    public Group jumps;
     StatementElem dragging;
-    ScrollPane pane;
-    Group jumps;
     StatementElem hovered;
     float targetWidth;
     int jumpCount = 0;
@@ -78,18 +78,18 @@ public class LCanvas extends Table{
         super.draw();
     }
 
-    void add(LStatement statement){
+    public void add(LStatement statement){
         statements.addChild(new StatementElem(statement));
     }
 
-    String save(){
+    public String save(){
         Seq<LStatement> st = statements.getChildren().<StatementElem>as().map(s -> s.st);
         st.each(LStatement::saveUI);
 
         return LAssembler.write(st);
     }
 
-    void load(String asm){
+    public void load(String asm){
         jumps.clear();
 
         Seq<LStatement> statements = LAssembler.read(asm);
@@ -261,7 +261,7 @@ public class LCanvas extends Table{
     }
 
     public class StatementElem extends Table{
-        LStatement st;
+        public LStatement st;
 
         public StatementElem(LStatement st){
             this.st = st;
@@ -341,7 +341,7 @@ public class LCanvas extends Table{
             marginBottom(7);
         }
 
-        void copy(){
+        public void copy(){
             LStatement copy = st.copy();
             if(copy != null){
                 StatementElem s = new StatementElem(copy);
@@ -374,7 +374,7 @@ public class LCanvas extends Table{
         float mx, my;
         ClickListener listener;
 
-        JumpCurve curve;
+        public JumpCurve curve;
 
         public JumpButton(Prov<StatementElem> getter, Cons<StatementElem> setter){
             super(Tex.logicNode, Styles.colori);
@@ -437,7 +437,7 @@ public class LCanvas extends Table{
     }
 
     public static class JumpCurve extends Element{
-        JumpButton button;
+        public JumpButton button;
 
         public JumpCurve(JumpButton button){
             this.button = button;
@@ -492,7 +492,7 @@ public class LCanvas extends Table{
             }
         }
 
-        void drawCurve(float x, float y, float x2, float y2){
+        public void drawCurve(float x, float y, float x2, float y2){
             Lines.stroke(4f, button.color);
             Draw.alpha(parentAlpha);
 
@@ -518,8 +518,7 @@ public class LCanvas extends Table{
             x + dist, y,
             x2 + dist, y2,
             x2, y2,
-            Math.max(18, (int)(Mathf.dst(x, y, x2, y2) / 6))
-            );
+            Math.max(18, (int)(Mathf.dst(x, y, x2, y2) / 6)));
         }
     }
 }

core/src/mindustry/logic/LogicDialog.java

@@ -11,7 +11,7 @@ import mindustry.ui.dialogs.*;
 import static mindustry.Vars.*;
 
 public class LogicDialog extends BaseDialog{
-    LCanvas canvas;
+    public LCanvas canvas;
     Cons<String> consumer = s -> {};
 
     public LogicDialog(){
@@ -25,7 +25,7 @@ public class LogicDialog extends BaseDialog{
         addCloseListener();
 
         buttons.defaults().size(160f, 64f);
-        buttons.button("@back", Icon.left, this::hide);
+        buttons.button("@back", Icon.left, this::hide).name("back");
 
         buttons.button("@edit", Icon.edit, () -> {
             BaseDialog dialog = new BaseDialog("@editor.export");
@@ -53,7 +53,7 @@ public class LogicDialog extends BaseDialog{
 
             dialog.addCloseButton();
             dialog.show();
-        });
+        }).name("edit");
 
         buttons.button("@add", Icon.add, () -> {
             BaseDialog dialog = new BaseDialog("@add");
@@ -79,11 +79,11 @@ public class LogicDialog extends BaseDialog{
             dialog.show();
         }).disabled(t -> canvas.statements.getChildren().size >= LExecutor.maxInstructions);
 
-        add(canvas).grow();
+        add(canvas).grow().name("canvas");
 
         row();
 
-        add(buttons).growX();
+        add(buttons).growX().name("canvas");
 
         hidden(() -> consumer.get(canvas.save()));
 

core/src/mindustry/logic/LogicOp.java

@@ -38,9 +38,7 @@ public enum LogicOp{
     floor("floor", Math::floor),
     ceil("ceil", Math::ceil),
     sqrt("sqrt", Math::sqrt),
-    rand("rand", d -> Mathf.rand.nextDouble() * d),
-
-    ;
+    rand("rand", d -> Mathf.rand.nextDouble() * d);
 
     public static final LogicOp[] all = values();
 

core/src/mindustry/world/blocks/logic/LogicBlock.java

@@ -324,7 +324,8 @@ public class LogicBlock extends Block{
 
                     executor.load(asm);
                 }catch(Exception e){
-                    e.printStackTrace();
+                    Log.err("Failed to compile logic program @", code);
+                    Log.err(e);
 
                     //handle malformed code and replace it with nothing
                     executor.load("", LExecutor.maxInstructions);