WIP Turret field rename / More JSON consume support

This commit is contained in:
Anuken
2022-05-08 23:17:37 -04:00
parent 668b09e955
commit 5a3c8573c3
16 changed files with 120 additions and 76 deletions
@@ -4,9 +4,11 @@ import mindustry.gen.*;
/** For mods. I don't use this (yet). */
public class ConsumeItemCharged extends ConsumeItemFilter{
public float minCharge;
public ConsumeItemCharged(float minCharge){
super(item -> item.charge >= minCharge);
this.minCharge = minCharge;
filter = item -> item.charge >= this.minCharge;
}
public ConsumeItemCharged(){
@@ -3,9 +3,11 @@ package mindustry.world.consumers;
import mindustry.gen.*;
public class ConsumeItemExplosive extends ConsumeItemFilter{
public float minExplosiveness;
public ConsumeItemExplosive(float minExplosiveness){
super(item -> item.explosiveness >= minExplosiveness);
public ConsumeItemExplosive(float minCharge){
this.minExplosiveness = minCharge;
filter = item -> item.explosiveness >= this.minExplosiveness;
}
public ConsumeItemExplosive(){
@@ -12,12 +12,15 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class ConsumeItemFilter extends Consume{
public final Boolf<Item> filter;
public Boolf<Item> filter = i -> false;
public ConsumeItemFilter(Boolf<Item> item){
this.filter = item;
}
public ConsumeItemFilter(){
}
@Override
public void apply(Block block){
block.hasItems = true;
@@ -3,9 +3,11 @@ package mindustry.world.consumers;
import mindustry.gen.*;
public class ConsumeItemFlammable extends ConsumeItemFilter{
public float minFlammability;
public ConsumeItemFlammable(float minFlammability){
super(item -> item.flammability >= minFlammability);
this.minFlammability = minFlammability;
filter = item -> item.flammability >= this.minFlammability;
}
public ConsumeItemFlammable(){
@@ -3,9 +3,11 @@ package mindustry.world.consumers;
import mindustry.gen.*;
public class ConsumeItemRadioactive extends ConsumeItemFilter{
public float minRadioactivity;
public ConsumeItemRadioactive(float minRadioactivity){
super(item -> item.radioactivity >= minRadioactivity);
this.minRadioactivity = minRadioactivity;
filter = item -> item.radioactivity >= this.minRadioactivity;
}
public ConsumeItemRadioactive(){
@@ -13,7 +13,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
public class ConsumeLiquidFilter extends ConsumeLiquidBase{
public Boolf<Liquid> filter;
public Boolf<Liquid> filter = l -> false;
public ConsumeLiquidFilter(Boolf<Liquid> liquid, float amount){
super(amount);
@@ -21,7 +21,6 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
}
public ConsumeLiquidFilter(){
this.filter = l -> false;
}
@Override
@@ -3,13 +3,15 @@ package mindustry.world.consumers;
import mindustry.gen.*;
public class ConsumeLiquidFlammable extends ConsumeLiquidFilter{
public float minFlammability;
public ConsumeLiquidFlammable(float minFlammability, float amount){
super(item -> item.flammability >= minFlammability, amount);
public ConsumeLiquidFlammable(float minFlammability){
this.minFlammability = minFlammability;
filter = liquid -> liquid.flammability >= this.minFlammability;
}
public ConsumeLiquidFlammable(float amount){
this(0.2f, amount);
public ConsumeLiquidFlammable(){
this(0.2f);
}
@Override