Merge remote-tracking branch 'origin/master'

core/src/mindustry/logic/LAccess.java

@@ -44,7 +44,8 @@ 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"),
+    color("r", "g", "b");
 
     public final String[] params;
     public final boolean isObj;

core/src/mindustry/world/blocks/power/ImpactReactor.java

@@ -12,6 +12,7 @@ import mindustry.entities.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.ui.*;
 import mindustry.world.meta.*;
 
@@ -122,6 +123,12 @@ public class ImpactReactor extends PowerGenerator{
             Drawf.light(team, x, y, (110f + Mathf.absin(5, 5f)) * warmup, Tmp.c1.set(plasma2).lerp(plasma1, Mathf.absin(7f, 0.2f)), 0.8f * warmup);
         }
         
+        @Override
+        public double sense(LAccess sensor){
+            if(sensor == LAccess.heat) return warmup;
+            return super.sense(sensor);
+        }
+
         @Override
         public void onDestroyed(){
             super.onDestroyed();

core/src/mindustry/world/blocks/power/LightBlock.java

@@ -9,6 +9,7 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.logic.*;
 import mindustry.world.*;
 
 import static mindustry.Vars.*;
@@ -32,6 +33,15 @@ public class LightBlock extends Block{
         public int color = Pal.accent.rgba();
         public float smoothTime = 1f;
 
+        @Override
+        public void control(LAccess type, double p1, double p2, double p3, double p4){
+            if(type == LAccess.color){
+                color = Color.rgba8888((float)p1, (float)p2, (float)p3, 1f);
+            }
+
+            super.control(type, p1, p2, p3, p4);
+        }
+
         @Override
         public void draw(){
             super.draw();

servers_v6.json

@@ -62,5 +62,13 @@
   {
     "name": "Minigames",
     "address": ["shizashizashiza.ml"]
+  },
+  {
+    "name": "Korea",
+    "address": ["mindustry.kr"]
+  },
+  {
+    "name": "NikoCHIO",
+    "address": ["nikochio.ddns.net"]
   }
 ]