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

Consistent request->plan naming

Browse Source
This commit is contained in:
Anuken
2022-02-22 16:17:22 -05:00
parent 7df4478f85
commit 040c43fe54
11 changed files with 267 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/Block.java
View File

@@ -603,7 +603,7 @@ public class Block extends UnlockableContent implements Senseable{
}
/** @return a possible replacement for this block when placed in a line by the player. */
public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
return this;
}
@@ -612,7 +612,7 @@ public class Block extends UnlockableContent implements Senseable{
}
/** Mutates the given list of requests used during line placement. */
/** Mutates the given list of plans used during line placement. */
public void handlePlacementLine(Seq<BuildPlan> plans){
}

4
core/src/mindustry/world/blocks/distribution/Conveyor.java
View File

@@ -105,10 +105,10 @@ public class Conveyor extends Block implements Autotiler{
}
@Override
public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
if(junctionReplacement == null) return this;
Boolf<Point2> cont = p -> requests.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && (req.block instanceof Conveyor || req.block instanceof Junction));
Boolf<Point2> cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && (req.block instanceof Conveyor || req.block instanceof Junction));
return cont.get(Geometry.d4(req.rotation)) &&
cont.get(Geometry.d4(req.rotation - 2)) &&
req.tile() != null &&

4
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -112,10 +112,10 @@ public class Conduit extends LiquidBlock implements Autotiler{
}
@Override
public Block getReplacement(BuildPlan req, Seq<BuildPlan> requests){
public Block getReplacement(BuildPlan req, Seq<BuildPlan> plans){
if(junctionReplacement == null) return this;
Boolf<Point2> cont = p -> requests.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && o.rotation == req.rotation && (req.block instanceof Conduit || req.block instanceof LiquidJunction));
Boolf<Point2> cont = p -> plans.contains(o -> o.x == req.x + p.x && o.y == req.y + p.y && o.rotation == req.rotation && (req.block instanceof Conduit || req.block instanceof LiquidJunction));
return cont.get(Geometry.d4(req.rotation)) &&
cont.get(Geometry.d4(req.rotation - 2)) &&
req.tile() != null &&