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

Experimental: block loader/unloaders

Browse Source
This commit is contained in:
Anuken
2020-05-25 14:36:40 -04:00
parent 0e59a22cbe
commit 1ae9d04f47
35 changed files with 2700 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/mindustry/world/Tile.java
View File

@@ -12,7 +12,6 @@ import mindustry.game.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.world.blocks.environment.*;
import mindustry.world.modules.*;
import static mindustry.Vars.*;
@@ -24,10 +23,12 @@ public class Tile implements Position, QuadTreeObject{
/** Tile entity, usually null. */
public @Nullable Tilec entity;
public short x, y;
/** Extra data. Used for dumping. */
public byte data;
protected @NonNull Block block;
protected @NonNull Floor floor;
protected @NonNull Floor overlay;
/** Rotation, 0-3. Also used to store offload location, in which case it can be any number.*/
/** Rotation, 0-3. Not guaranteed to be in any specific range. */
protected byte rotation;
protected boolean changing = false;
@@ -45,7 +46,7 @@ public class Tile implements Position, QuadTreeObject{
this.block = wall;
//update entity and create it if needed
changeEntity(Team.derelict);
changeEntity(Team.derelict, wall::newEntity);
changed();
}
@@ -164,12 +165,16 @@ public class Tile implements Position, QuadTreeObject{
}
public void setBlock(@NonNull Block type, Team team, int rotation){
setBlock(type, team, rotation, type::newEntity);
}
public void setBlock(@NonNull Block type, Team team, int rotation, Prov<Tilec> entityprov){
changing = true;
this.block = type;
this.rotation = rotation == 0 ? 0 : (byte)Mathf.mod(rotation, 4);
preChanged();
changeEntity(team);
changeEntity(team, entityprov);
if(entity != null){
entity.team(team);
@@ -523,7 +528,7 @@ public class Tile implements Position, QuadTreeObject{
}
}
protected void changeEntity(Team team){
protected void changeEntity(Team team, Prov<Tilec> entityprov){
if(entity != null){
int size = entity.block().size;
entity.remove();
@@ -546,14 +551,7 @@ public class Tile implements Position, QuadTreeObject{
}
if(block.hasEntity()){
entity = block.newEntity().init(this, team, block.update);
entity.cons(new ConsumeModule(entity));
if(block.hasItems) entity.items(new ItemModule());
if(block.hasLiquids) entity.liquids(new LiquidModule());
if(block.hasPower){
entity.power(new PowerModule());
entity.power().graph.add(entity);
}
entity = entityprov.get().init(this, team, block.update);
}
}