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

Removed synthetic accessors / Sector sanity tests

Browse Source
This commit is contained in:
Anuken
2020-08-19 15:13:29 -04:00
parent e9f72180e6
commit bbe6c5017a
33 changed files with 87 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/Tiles.java
View File

@@ -11,7 +11,7 @@ import java.util.*;
public class Tiles implements Iterable<Tile>{
public final int width, height;
private final Tile[] array;
final Tile[] array;
public Tiles(int width, int height){
this.array = new Tile[width * height];
@@ -87,6 +87,9 @@ public class Tiles implements Iterable<Tile>{
private class TileIterator implements Iterator<Tile>{
int index = 0;
TileIterator(){
}
@Override
public boolean hasNext(){
return index < array.length;

4
core/src/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -31,8 +31,8 @@ public class ForceProjector extends Block{
public float basePowerDraw = 0.2f;
public @Load("@-top") TextureRegion topRegion;
private static ForceProjectorEntity paramEntity;
private static final Cons<Shielderc> shieldConsumer = trait -> {
static ForceProjectorEntity paramEntity;
static final Cons<Shielderc> shieldConsumer = trait -> {
if(trait.team() != paramEntity.team && Intersector.isInsideHexagon(paramEntity.x, paramEntity.y, paramEntity.realRadius() * 2f, trait.x(), trait.y())){
trait.absorb();
Fx.absorb.at(trait);

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

@@ -25,8 +25,8 @@ public class Conveyor extends Block implements Autotiler{
private static final float itemSpace = 0.4f;
private static final int capacity = 4;
private final Vec2 tr1 = new Vec2();
private final Vec2 tr2 = new Vec2();
final Vec2 tr1 = new Vec2();
final Vec2 tr2 = new Vec2();
public @Load(value = "@-#1-#2", lengths = {7, 4}) TextureRegion[][] regions;

2
core/src/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -16,7 +16,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class RepairPoint extends Block{
private static final Rect rect = new Rect();
static final Rect rect = new Rect();
public int timerTarget = timers++;