From 41b08f38c521e9d75ade82bfd7d05311c921cbaf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 1 Apr 2019 11:34:10 -0400
Subject: [PATCH] Fixed tests

---
 .../world/blocks/power/ItemLiquidGenerator.java      |  5 -----
 .../anuke/mindustry/world/modules/ConsumeModule.java |  4 ----
 .../test/java/power/ItemLiquidGeneratorTests.java    | 12 ------------
 3 files changed, 21 deletions(-)

diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
index b0772abe13..21208477c4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java
@@ -79,11 +79,6 @@ public class ItemLiquidGenerator extends PowerGenerator{
         //Power amount is delta'd by PowerGraph class already.
         float calculationDelta = entity.delta();
 
-        if(!entity.cons.valid()){
-            entity.productionEfficiency = 0.0f;
-            return;
-        }
-
         Liquid liquid = null;
         for(Liquid other : content.liquids()){
             if(hasLiquids && entity.liquids.get(other) >= 0.001f && getLiquidEfficiency(other) >= minLiquidEfficiency){
diff --git a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java
index 7ba6163c4e..63280ec9c9 100644
--- a/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java
+++ b/core/src/io/anuke/mindustry/world/modules/ConsumeModule.java
@@ -1,6 +1,5 @@
 package io.anuke.mindustry.world.modules;
 
-import io.anuke.arc.util.Log;
 import io.anuke.mindustry.entities.type.TileEntity;
 import io.anuke.mindustry.world.consumers.Consume;
 
@@ -22,10 +21,7 @@ public class ConsumeModule extends BlockModule{
         optionalValid = true;
         boolean docons = entity.block.shouldConsume(entity.tile);
 
-        Log.info("update begin: is valid");
-
         for(Consume cons : entity.block.consumes.all()){
-            Log.info("check cons {1}: {0}", cons, cons.valid(entity));
             if(docons && cons.isUpdate() && prevValid && cons.valid(entity)){
                 cons.update(entity);
             }
diff --git a/tests/src/test/java/power/ItemLiquidGeneratorTests.java b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
index df2ef50d7b..decffc8884 100644
--- a/tests/src/test/java/power/ItemLiquidGeneratorTests.java
+++ b/tests/src/test/java/power/ItemLiquidGeneratorTests.java
@@ -1,6 +1,5 @@
 package power;
 
-import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
@@ -8,8 +7,6 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.Liquid;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.power.ItemLiquidGenerator;
-import io.anuke.mindustry.world.consumers.Consume;
-import io.anuke.mindustry.world.consumers.ConsumeItemFilter;
 import org.junit.jupiter.api.DynamicTest;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestFactory;
@@ -92,7 +89,6 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
 
         entity.liquids.add(liquid, availableLiquidAmount);
         entity.cons.update();
-        assertTrue(entity.cons.valid());
 
         // Perform an update on the generator once - This should use up any resource up to the maximum liquid usage
         generator.update(tile);
@@ -137,14 +133,6 @@ public class ItemLiquidGeneratorTests extends PowerTestFixture{
             entity.items.add(item, amount);
         }
         entity.cons.update();
-        if(!entity.cons.valid()){
-            Log.info("not valid: ");
-            for(Consume cons : entity.block.consumes.all()){
-                if(cons instanceof ConsumeItemFilter)
-                Log.info("--" + cons.getClass().getSimpleName() + ": " + cons.valid(entity) + " " + ((ConsumeItemFilter)cons).filter.test(item) + " update: " + cons.isUpdate() + " optional: " + cons.isOptional());
-            }
-        }
-        assertTrue(entity.cons.valid());
 
         // Perform an update on the generator once - This should use up one or zero items - dependent on if the item is accepted and available or not.
         generator.update(tile);