diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidExplosive.java b/core/src/mindustry/world/consumers/ConsumeLiquidExplosive.java deleted file mode 100644 index 3134d145ca..0000000000 --- a/core/src/mindustry/world/consumers/ConsumeLiquidExplosive.java +++ /dev/null @@ -1,32 +0,0 @@ -package mindustry.world.consumers; - -import mindustry.type.*; -import mindustry.world.meta.*; - -public class ConsumeLiquidExplosive extends ConsumeLiquidFilter{ - public float minExplosiveness; - - public ConsumeLiquidExplosive(float minExplosiveness, float amount){ - this.amount = amount; - this.minExplosiveness = minExplosiveness; - this.filter = liquid -> liquid.heatCapacity >= this.minExplosiveness; - } - - public ConsumeLiquidExplosive(float amount){ - this(0.2f, amount); - } - - public ConsumeLiquidExplosive(){ - this(0.2f); - } - - @Override - public void display(Stats stats){ - stats.add(booster ? Stat.booster : Stat.input, StatValues.liquidEffMultiplier(l -> l.explosiveness, amount * 60f, filter)); - } - - @Override - public float liquidEfficiencyMultiplier(Liquid liquid){ - return liquid.explosiveness; - } -} diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidHeatCapacity.java b/core/src/mindustry/world/consumers/ConsumeLiquidHeatCapacity.java deleted file mode 100644 index 3d5975626d..0000000000 --- a/core/src/mindustry/world/consumers/ConsumeLiquidHeatCapacity.java +++ /dev/null @@ -1,32 +0,0 @@ -package mindustry.world.consumers; - -import mindustry.type.*; -import mindustry.world.meta.*; - -public class ConsumeLiquidHeatCapacity extends ConsumeLiquidFilter{ - public float minHeatCapacity; - - public ConsumeLiquidHeatCapacity(float minHeatCapacity, float amount){ - this.amount = amount; - this.minHeatCapacity = minHeatCapacity; - this.filter = liquid -> liquid.heatCapacity >= this.minHeatCapacity; - } - - public ConsumeLiquidHeatCapacity(float amount){ - this(0.2f, amount); - } - - public ConsumeLiquidHeatCapacity(){ - this(0.2f); - } - - @Override - public void display(Stats stats){ - stats.add(booster ? Stat.booster : Stat.input, StatValues.liquidEffMultiplier(l -> l.heatCapacity, amount * 60f, filter)); - } - - @Override - public float liquidEfficiencyMultiplier(Liquid liquid){ - return liquid.heatCapacity; - } -} diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidTemperature.java b/core/src/mindustry/world/consumers/ConsumeLiquidTemperature.java deleted file mode 100644 index ca58f2798c..0000000000 --- a/core/src/mindustry/world/consumers/ConsumeLiquidTemperature.java +++ /dev/null @@ -1,32 +0,0 @@ -package mindustry.world.consumers; - -import mindustry.type.*; -import mindustry.world.meta.*; - -public class ConsumeLiquidTemperature extends ConsumeLiquidFilter{ - public float minTemperature; - - public ConsumeLiquidTemperature(float minTemperature, float amount){ - this.amount = amount; - this.minTemperature = minTemperature; - this.filter = liquid -> liquid.temperature >= this.minTemperature; - } - - public ConsumeLiquidTemperature(float amount){ - this(0.2f, amount); - } - - public ConsumeLiquidTemperature(){ - this(0.2f); - } - - @Override - public void display(Stats stats){ - stats.add(booster ? Stat.booster : Stat.input, StatValues.liquidEffMultiplier(l -> l.temperature, amount * 60f, filter)); - } - - @Override - public float liquidEfficiencyMultiplier(Liquid liquid){ - return liquid.temperature; - } -} diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidViscosity.java b/core/src/mindustry/world/consumers/ConsumeLiquidViscosity.java deleted file mode 100644 index 8f51569e7d..0000000000 --- a/core/src/mindustry/world/consumers/ConsumeLiquidViscosity.java +++ /dev/null @@ -1,32 +0,0 @@ -package mindustry.world.consumers; - -import mindustry.type.*; -import mindustry.world.meta.*; - -public class ConsumeLiquidViscosity extends ConsumeLiquidFilter{ - public float minViscosity; - - public ConsumeLiquidViscosity(float minViscosity, float amount){ - this.amount = amount; - this.minViscosity = minViscosity; - this.filter = liquid -> liquid.viscosity >= this.minViscosity; - } - - public ConsumeLiquidViscosity(float amount){ - this(0.2f, amount); - } - - public ConsumeLiquidViscosity(){ - this(0.2f); - } - - @Override - public void display(Stats stats){ - stats.add(booster ? Stat.booster : Stat.input, StatValues.liquidEffMultiplier(l -> l.viscosity, amount * 60f, filter)); - } - - @Override - public float liquidEfficiencyMultiplier(Liquid liquid){ - return liquid.viscosity; - } -}