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

Dependency resolution fix

Browse Source
This commit is contained in:
Anuken
2020-11-30 17:49:20 -05:00
parent d33cea6003
commit d868ff81bf
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -632,18 +632,16 @@ public class Block extends UnlockableContent{
cons.get(stack.item);
}
if(consumes.any()){
//also requires inputs
for(Consume c : consumes.all()){
if(c instanceof ConsumeItems i){
for(ItemStack stack : i.items){
cons.get(stack.item);
}
}else if(c instanceof ConsumeLiquid i){
cons.get(i.liquid);
//also requires inputs
consumes.each(c -> {
if(c instanceof ConsumeItems i){
for(ItemStack stack : i.items){
cons.get(stack.item);
}
}else if(c instanceof ConsumeLiquid i){
cons.get(i.liquid);
}
}
});
}
@Override

8
core/src/mindustry/world/consumers/Consumers.java
View File

@@ -20,6 +20,14 @@ public class Consumers{
return results != null && results.length > 0;
}
public void each(Cons<Consume> c){
for(var cons : map){
if(cons != null){
c.get(cons);
}
}
}
public void init(){
results = Structs.filter(Consume.class, map, m -> m != null);
optionalResults = Structs.filter(Consume.class, map, m -> m != null && m.isOptional());