Merge remote-tracking branch 'origin/master'

core/src/mindustry/entities/part/RegionPart.java

@@ -78,8 +78,8 @@ public class RegionPart extends DrawPart{
                 mx += move.x * p;
                 my += move.y * p;
                 mr += move.rot * p;
-                gx += move.gx;
+                gx += move.gx * p;
-                gy += move.gy;
+                gy += move.gy * p;
             }
         }
 
@@ -95,7 +95,7 @@ public class RegionPart extends DrawPart{
             //can be null
             var region = drawRegion ? regions[Math.min(i, regions.length - 1)] : null;
             float sign = (i == 0 ? 1 : -1) * params.sideMultiplier;
-            Tmp.v1.set((x + mx) * sign * Draw.xscl, (y + my) * Draw.yscl).rotateRadExact((params.rotation - 90) * Mathf.degRad);
+            Tmp.v1.set((x + mx) * sign, y + my).rotateRadExact((params.rotation - 90) * Mathf.degRad);
 
             float
                 rx = params.x + Tmp.v1.x,

core/src/mindustry/game/EventType.java

@@ -257,13 +257,13 @@ public class EventType{
         }
     }
 
-    /** Called when the player configures a specific building. */
+    /** Called when a specific building has its configuration changed. */
     public static class ConfigEvent{
         public final Building tile;
-        public final Player player;
+        public final @Nullable Player player;
         public final Object value;
 
-        public ConfigEvent(Building tile, Player player, Object value){
+        public ConfigEvent(Building tile, @Nullable Player player, Object value){
             this.tile = tile;
             this.player = player;
             this.value = value;
@@ -473,6 +473,18 @@ public class EventType{
         }
     }
 
+    public static class BuildRotateEvent{
+        public final Building build;
+        public final @Nullable Unit unit;
+        public final int previous;
+
+        public BuildRotateEvent(Building build, @Nullable Unit unit, int previous){
+            this.build = build;
+            this.unit = unit;
+            this.previous = previous;
+        }
+    }
+
     /**
      * Called when a player or drone begins building something.
      * This does not necessarily happen when a new ConstructBlock is created.

core/src/mindustry/input/InputHandler.java

@@ -464,10 +464,12 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         }
 
         if(player != null) build.lastAccessed = player.name;
+        int previous = build.rotation;
         build.rotation = Mathf.mod(build.rotation + Mathf.sign(direction), 4);
         build.updateProximity();
         build.noSleep();
         Fx.rotateBlock.at(build.x, build.y, build.block.size);
+        Events.fire(new BuildRotateEvent(build, player.unit(), previous));
     }
 
     @Remote(targets = Loc.both, called = Loc.both, forward = true)

core/src/mindustry/world/Build.java

@@ -77,10 +77,12 @@ public class Build{
         //auto-rotate the block to the correct orientation and bail out
         if(tile.team() == team && tile.block == result && tile.build != null && tile.block.quickRotate){
             if(unit != null && unit.getControllerName() != null) tile.build.lastAccessed = unit.getControllerName();
+            int previous = tile.build.rotation;
             tile.build.rotation = Mathf.mod(rotation, 4);
             tile.build.updateProximity();
             tile.build.noSleep();
             Fx.rotateBlock.at(tile.build.x, tile.build.y, tile.build.block.size);
+            Events.fire(new BuildRotateEvent(tile.build, unit, previous));
             return;
         }