Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2025-07-27 23:52:51 -04:00
parent 0a2d8576fd 2168498a6d
commit a1b7838334
3 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/world/blocks/logic/LogicDisplay.java
View File

@@ -73,6 +73,8 @@ public class LogicDisplay extends Block{
}
public class LogicDisplayBuild extends Building{
//The root display (bottom left corner of display for tileable displays)
public LogicDisplayBuild rootDisplay = this;
public @Nullable FrameBuffer buffer;
public float color = Color.whiteFloatBits;
public float stroke = 1f;
@@ -111,8 +113,8 @@ public class LogicDisplay extends Block{
public double sense(LAccess sensor){
return switch(sensor){
case displayWidth, displayHeight -> displaySize;
case bufferSize -> commands.size;
case operations -> operations;
case bufferSize -> rootDisplay.commands.size;
case operations -> rootDisplay.operations;
default -> super.sense(sensor);
};
}

2
core/src/mindustry/world/blocks/logic/TileableLogicDisplay.java
View File

@@ -118,8 +118,6 @@ public class TileableLogicDisplay extends LogicDisplay{
}
public class TileableLogicDisplayBuild extends LogicDisplayBuild{
//bottom left corner of display
public TileableLogicDisplayBuild rootDisplay = this;
//size of display area
public int tilesWidth = 1, tilesHeight = 1, originX, originY;
public @Nullable Seq<MergeBuffer> prevBuffers;