diff --git a/core/src/mindustry/world/blocks/power/ConsumeGenerator.java b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java index 5b52cc3d16..1347a2141e 100644 --- a/core/src/mindustry/world/blocks/power/ConsumeGenerator.java +++ b/core/src/mindustry/world/blocks/power/ConsumeGenerator.java @@ -73,14 +73,6 @@ public class ConsumeGenerator extends PowerGenerator{ if(outputLiquid != null){ stats.add(Stat.output, StatValues.liquid(outputLiquid.liquid, outputLiquid.amount * 60f, true)); } - - if(filterItem != null){ - ConsumeItemExplode explode = findConsumer(c -> c instanceof ConsumeItemExplode); - if(explode != null){ - stats.remove(Stat.input); - stats.add(Stat.input, StatValues.itemEffMultiplier(i -> filterItem.itemEfficiencyMultiplier(i), filterItem.filter, explode.filter)); - } - } } public class ConsumeGeneratorBuild extends GeneratorBuild{ diff --git a/core/src/mindustry/world/meta/StatValues.java b/core/src/mindustry/world/meta/StatValues.java index 68b1873570..8880ba0712 100644 --- a/core/src/mindustry/world/meta/StatValues.java +++ b/core/src/mindustry/world/meta/StatValues.java @@ -292,7 +292,7 @@ public class StatValues{ }; } - public static StatValue itemEffMultiplier(Floatf efficiency, Boolf filter, Boolf explosive){ + public static StatValue itemEffMultiplier(Floatf efficiency, Boolf filter){ return table -> { table.row(); table.table(c -> { @@ -302,10 +302,6 @@ public class StatValues{ b.add(item.localizedName).left().grow(); b.table(e -> { e.add(Core.bundle.format("stat.efficiency", fixValue(efficiency.get(item) * 100f))).right().labelAlign(Align.right); - if(explosive.get(item)){ - e.row(); - e.add(Core.bundle.get("stat.explosive")).right().labelAlign(Align.right); - } }).right().pad(10f).padRight(15f); }).growX().pad(5).row(); @@ -315,10 +311,6 @@ public class StatValues{ }; } - public static StatValue itemEffMultiplier(Floatf efficiency, Boolf filter){ - return itemEffMultiplier(efficiency, filter, i -> false); - } - public static StatValue liquidEffMultiplier(Floatf efficiency, Boolf filter){ return table -> { table.row();