Large cliff crusher block / Erekir ammo tweaks / Android file chooser fixes

This commit is contained in:
Anuken
2025-01-07 20:35:35 -05:00
parent 6c1952c674
commit a84a99aed6
17 changed files with 178 additions and 19 deletions
@@ -50,4 +50,9 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, liquid, amount * 60f, true);
}
@Override
public boolean consumes(Liquid liquid){
return liquid == this.liquid;
}
}
@@ -1,5 +1,6 @@
package mindustry.world.consumers;
import mindustry.type.*;
import mindustry.world.*;
public abstract class ConsumeLiquidBase extends Consume{
@@ -16,4 +17,6 @@ public abstract class ConsumeLiquidBase extends Consume{
public void apply(Block block){
block.hasLiquids = true;
}
public abstract boolean consumes(Liquid liquid);
}
@@ -53,7 +53,7 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
if(ed <= 0.00000001f) return 0f;
return liq != null ? Math.min(build.liquids.get(liq) / (amount * ed * multiplier.get(build)), 1f) : 0f;
}
public @Nullable Liquid getConsumed(Building build){
if(filter.get(build.liquids.current()) && build.liquids.currentAmount() > 0){
return build.liquids.current();
@@ -74,4 +74,9 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(filter, amount * 60f, true));
}
@Override
public boolean consumes(Liquid liquid){
return filter.get(liquid);
}
}