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

Get rid of compressable

Browse Source
This commit is contained in:
Patrick 'Quezler' Mounier
2020-01-03 17:29:08 +01:00
parent f6af699428
commit 6efcbe69a0
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,8 +99,6 @@ public class Block extends BlockStorage{
public boolean sync; public boolean sync;
/** Whether this block uses conveyor-type placement mode.*/ /** Whether this block uses conveyor-type placement mode.*/
public boolean conveyorPlacement; public boolean conveyorPlacement;
/** Whether this block uses is compatible with compressed.*/
public boolean compressable;
/** /**
* The color of this block when displayed on the minimap or map preview. * The color of this block when displayed on the minimap or map preview.
* Do not set manually! This is overriden when loading for most blocks. * Do not set manually! This is overriden when loading for most blocks.

9
core/src/mindustry/world/blocks/distribution/CraterConveyor.java
View File

@@ -24,7 +24,6 @@ public class CraterConveyor extends BaseConveyor{
public CraterConveyor(String name){ public CraterConveyor(String name){
super(name); super(name);
compressable = true;
entityType = CraterConveyorEntity::new; entityType = CraterConveyorEntity::new;
} }
@@ -217,7 +216,7 @@ public class CraterConveyor extends BaseConveyor{
public boolean acceptItem(Item item, Tile tile, Tile source){ public boolean acceptItem(Item item, Tile tile, Tile source){
CraterConveyorEntity entity = tile.ent(); CraterConveyorEntity entity = tile.ent();
if(!isStart(tile) && !source.block().compressable) return false; if(!isStart(tile) && !(tile.front().block() instanceof CraterConveyor)) return false;
if(entity.items.total() > 0 && !entity.items.has(item)) return false; if(entity.items.total() > 0 && !entity.items.has(item)) return false;
if(entity.items.total() >= getMaximumAccepted(tile, item)) return false; if(entity.items.total() >= getMaximumAccepted(tile, item)) return false;
@@ -258,14 +257,14 @@ public class CraterConveyor extends BaseConveyor{
@Override @Override
public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock) { public boolean blends(Tile tile, int rotation, int otherx, int othery, int otherrot, Block otherblock) {
return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock.compressable; return otherblock.outputsItems() && blendsArmored(tile, rotation, otherx, othery, otherrot, otherblock) && otherblock instanceof CraterConveyor;
} }
// has no crater conveyors facing into it // has no crater conveyors facing into it
private boolean isStart(Tile tile){ private boolean isStart(Tile tile){
Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()}; Tile[] inputs = new Tile[]{tile.back(), tile.left(), tile.right()};
for(Tile input : inputs){ for(Tile input : inputs){
if(input != null && input.getTeam() == tile.getTeam() && input.block().compressable && input.front() == tile) return false; if(input != null && input.getTeam() == tile.getTeam() && input.block() instanceof CraterConveyor && input.front() == tile) return false;
} }
return true; return true;
@@ -275,7 +274,7 @@ public class CraterConveyor extends BaseConveyor{
private boolean isEnd(Tile tile){ private boolean isEnd(Tile tile){
if(tile.front() == null) return true; if(tile.front() == null) return true;
if(tile.getTeam() != tile.front().getTeam()) return true; if(tile.getTeam() != tile.front().getTeam()) return true;
if(!tile.front().block().compressable) return true; if(!(tile.front().block() instanceof CraterConveyor)) return true;
return false; return false;
} }