aeugh

core/src/mindustry/world/blocks/defense/DirectionalForceProjector.java

@@ -143,10 +143,10 @@ public class DirectionalForceProjector extends Block{
             if(buildup > 0 && false){
                 float scale = !broken ? cooldownNormal : cooldownBrokenBase;
                 Consume cons = null;
-                if(cons.valid(this)){
-                    cons.update(this);
-                    scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
-                }
+                //if(cons.valid(this)){
+                //    cons.update(this);
+                //    scale *= (cooldownLiquid * (1f + (liquids.current().heatCapacity - 0.4f) * 0.9f));
+                //}
 
                 buildup -= delta() * scale;
             }

core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java

@@ -41,10 +41,6 @@ public class LiquidTurret extends Turret{
     @Override
     public void init(){
         consume(new ConsumeLiquidFilter(i -> ammoTypes.containsKey(i), 1f){
-            @Override
-            public boolean valid(Building build){
-                return build.liquids.currentAmount() >= 0.001f;
-            }
 
             @Override
             public void update(Building build){

core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java

@@ -33,7 +33,7 @@ public class ReloadTurret extends BaseTurret{
         }
 
         protected void updateCooling(){
-            if(reload < reloadTime && coolant != null && coolant.valid(this)){
+            if(reload < reloadTime && coolant != null && coolant.efficiency(this) > 0){
                 float capacity = coolant instanceof ConsumeLiquidFilter filter ? filter.getConsumed(this).heatCapacity : 1f;
                 coolant.update(this);
                 reload += coolant.amount * edelta() * capacity * coolantMultiplier;

core/src/mindustry/world/blocks/power/ConsumeGenerator.java

@@ -81,11 +81,11 @@ public class ConsumeGenerator extends PowerGenerator{
             float multiplier = 1f;
             if(valid){
                 if(filterItem != null && filterItem.getConsumed(this) != null){
-                    itemMultiplier = filterItem.getEfficiency(this);
+                    itemMultiplier = filterItem.efficiency(this);
                 }
 
                 //efficiency is added together
-                multiplier *= itemMultiplier + (filterLiquid == null ? 0f : filterLiquid.getEfficiency(this));
+                multiplier *= (itemMultiplier + (filterLiquid == null ? 0f : filterLiquid.efficiency(this)));
             }
 
             productionEfficiency = (valid ? 1f : 0f) * multiplier;

core/src/mindustry/world/blocks/power/PowerGraph.java

@@ -340,9 +340,11 @@ public class PowerGraph{
         entity.remove();
     }
 
+    @Deprecated
     private boolean otherConsumersAreValid(Building build, Consume consumePower){
-        for(Consume cons : build.block.consumers){
-            if(cons != consumePower && !cons.optional && !cons.valid(build)){
+        for(Consume cons : build.block.nonOptionalConsumers){
+            //TODO fix this properly
+            if(cons != consumePower && cons.efficiency(build) <= 0.0000001f){
                 return false;
             }
         }