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

the refactoring continues

Browse Source
This commit is contained in:
Anuken
2022-02-22 13:33:55 -05:00
parent 370191407d
commit d4aff92fda
84 changed files with 337 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/game/Schematics.java
View File

@@ -244,20 +244,20 @@ public class Schematics implements Loadable{
Draw.rect(Tmp.tr1, buffer.getWidth()/2f, buffer.getHeight()/2f, buffer.getWidth(), -buffer.getHeight());
Draw.color();
Seq<BuildPlan> requests = schematic.tiles.map(t -> new BuildPlan(t.x, t.y, t.rotation, t.block, t.config));
Seq<BuildPlan> plans = schematic.tiles.map(t -> new BuildPlan(t.x, t.y, t.rotation, t.block, t.config));
Draw.flush();
//scale each request to fit schematic
Draw.trans().scale(resolution / tilesize, resolution / tilesize).translate(tilesize*1.5f, tilesize*1.5f);
//draw requests
requests.each(req -> {
plans.each(req -> {
req.animScale = 1f;
req.worldContext = false;
req.block.drawRequestRegion(req, requests);
req.block.drawPlanRegion(req, plans);
});
requests.each(req -> req.block.drawRequestConfigTop(req, requests));
plans.each(req -> req.block.drawPlanConfigTop(req, plans));
Draw.flush();
Draw.trans().idt();

2
core/src/mindustry/game/SectorInfo.java
View File

@@ -196,7 +196,7 @@ public class SectorInfo{
var pads = indexer.getFlagged(state.rules.defaultTeam, BlockFlag.launchPad);
//disable export when launch pads are disabled, or there aren't any active ones
if(pads.size == 0 || !pads.contains(t -> t.consValid())){
if(pads.size == 0 || !pads.contains(t -> t.consValid)){
export.clear();
}