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

More pattern matching

Browse Source
This commit is contained in:
Anuken
2021-01-15 16:04:26 -05:00
parent 650d47991e
commit 718a40d742
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/entities/comp/BuildingComp.java
+1 -1
View File
@@ -906,7 +906,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
tempTiles.clear(); tempTiles.clear();
Geometry.circle(tileX(), tileY(), range, (x, y) -> { Geometry.circle(tileX(), tileY(), range, (x, y) -> {
Building other = world.build(x, y); Building other = world.build(x, y);
if(other != null && other.block instanceof PowerNode && ((PowerNode)other.block).linkValid(other, self()) && !PowerNode.insulated(other, self()) if(other != null && other.block instanceof PowerNode node && node.linkValid(other, self()) && !PowerNode.insulated(other, self())
&& !other.proximity().contains(this.<Building>self()) && && !other.proximity().contains(this.<Building>self()) &&
!(block.outputsPower && proximity.contains(p -> p.power != null && p.power.graph == other.power.graph))){ !(block.outputsPower && proximity.contains(p -> p.power != null && p.power.graph == other.power.graph))){
tempTiles.add(other.tile); tempTiles.add(other.tile);
core/src/mindustry/world/blocks/ConstructBlock.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class ConstructBlock extends Block{
if(tile == null) return; if(tile == null) return;
float healthf = tile.build == null ? 1f : tile.build.healthf(); float healthf = tile.build == null ? 1f : tile.build.healthf();
Seq<Building> prev = tile.build instanceof ConstructBuild ? ((ConstructBuild)tile.build).prevBuild : null; Seq<Building> prev = tile.build instanceof ConstructBuild co ? co.prevBuild : null;
tile.setBlock(block, team, rotation); tile.setBlock(block, team, rotation);
core/src/mindustry/world/blocks/distribution/StackConveyor.java
+2 -2
View File
@@ -92,8 +92,8 @@ public class StackConveyor extends Block implements Autotiler{
@Override @Override
public boolean rotatedOutput(int x, int y){ public boolean rotatedOutput(int x, int y){
Building tile = world.build(x, y); Building tile = world.build(x, y);
if(tile instanceof StackConveyorBuild){ if(tile instanceof StackConveyorBuild s){
return ((StackConveyorBuild)tile).state != stateUnload; return s.state != stateUnload;
} }
return super.rotatedOutput(x, y); return super.rotatedOutput(x, y);
} }
core/src/mindustry/world/blocks/power/PowerNode.java
+3 -3
View File
@@ -246,9 +246,9 @@ public class PowerNode extends PowerBlock{
public boolean linkValid(Building tile, Building link, boolean checkMaxNodes){ public boolean linkValid(Building tile, Building link, boolean checkMaxNodes){
if(tile == link || link == null || !link.block.hasPower || tile.team != link.team) return false; if(tile == link || link == null || !link.block.hasPower || tile.team != link.team) return false;
if(overlaps(tile, link, laserRange * tilesize) || (link.block instanceof PowerNode && overlaps(link, tile, ((PowerNode)link.block).laserRange * tilesize))){ if(overlaps(tile, link, laserRange * tilesize) || (link.block instanceof PowerNode node && overlaps(link, tile, node.laserRange * tilesize))){
if(checkMaxNodes && link.block instanceof PowerNode){ if(checkMaxNodes && link.block instanceof PowerNode node){
return link.power.links.size < ((PowerNode)link.block).maxNodes || link.power.links.contains(tile.pos()); return link.power.links.size < node.maxNodes || link.power.links.contains(tile.pos());
} }
return true; return true;
} }