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

WIP constructor filter

Browse Source
This commit is contained in:
Anuken
2022-02-14 00:40:12 -05:00
parent b51090723f
commit c17be987d2
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/payloads/Constructor.java
+5 -2
View File
@@ -3,6 +3,7 @@ package mindustry.world.blocks.payloads;
import arc.graphics.*;
import arc.graphics.g2d.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import arc.util.io.*;
import mindustry.*;
@@ -15,6 +16,8 @@ import static mindustry.Vars.*;
/** Configurable BlockProducer variant. */
public class Constructor extends BlockProducer{
/** Empty seq for no filter. */
public Seq<Block> filter = new Seq<>();
public float buildSpeed = 0.4f;
public int minBlockSize = 1, maxBlockSize = 2;
@@ -43,7 +46,7 @@ public class Constructor extends BlockProducer{
}
public boolean canProduce(Block b){
return b.isVisible() && b.size >= minBlockSize && b.size <= maxBlockSize && !(b instanceof CoreBlock) && !state.rules.bannedBlocks.contains(b) && b.environmentBuildable();
return b.isVisible() && b.size >= minBlockSize && b.size <= maxBlockSize && !(b instanceof CoreBlock) && !state.rules.bannedBlocks.contains(b) && b.environmentBuildable() && (filter.isEmpty() || filter.contains(b));
}
public class ConstructorBuild extends BlockProducerBuild{
@@ -56,7 +59,7 @@ public class Constructor extends BlockProducer{
@Override
public void buildConfiguration(Table table){
ItemSelection.buildTable(Constructor.this, table, content.blocks().select(Constructor.this::canProduce), () -> recipe, this::configure);
ItemSelection.buildTable(Constructor.this, table, filter.isEmpty() ? content.blocks().select(Constructor.this::canProduce) : filter, () -> recipe, this::configure);
}
@Override