From cc024a0bac721f92af9f691bbd7c1e2d7a0079d8 Mon Sep 17 00:00:00 2001
From: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
Date: Fri, 23 Oct 2020 13:34:07 -0700
Subject: [PATCH] remove timePeriod in LiquidBaseValue

---
 .../mindustry/world/blocks/production/GenericCrafter.java  | 7 +------
 .../mindustry/world/blocks/production/LiquidConverter.java | 2 +-
 core/src/mindustry/world/blocks/production/Separator.java  | 5 -----
 core/src/mindustry/world/consumers/ConsumeLiquid.java      | 2 +-
 core/src/mindustry/world/consumers/ConsumeLiquidBase.java  | 7 -------
 .../src/mindustry/world/consumers/ConsumeLiquidFilter.java | 2 +-
 6 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/core/src/mindustry/world/blocks/production/GenericCrafter.java b/core/src/mindustry/world/blocks/production/GenericCrafter.java
index c992be7d78..051fbe9f25 100644
--- a/core/src/mindustry/world/blocks/production/GenericCrafter.java
+++ b/core/src/mindustry/world/blocks/production/GenericCrafter.java
@@ -37,11 +37,6 @@ public class GenericCrafter extends Block{
 
     @Override
     public void setStats(){
-        if(consumes.has(ConsumeType.liquid)){
-            ConsumeLiquidBase cons = consumes.get(ConsumeType.liquid);
-            cons.timePeriod = craftTime;
-        }
-
         super.setStats();
         stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
 
@@ -50,7 +45,7 @@ public class GenericCrafter extends Block{
         }
 
         if(outputLiquid != null){
-            stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount, false);
+            stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * (60f / craftTime), true);
         }
     }
 
diff --git a/core/src/mindustry/world/blocks/production/LiquidConverter.java b/core/src/mindustry/world/blocks/production/LiquidConverter.java
index 8a9725d42d..da40f17842 100644
--- a/core/src/mindustry/world/blocks/production/LiquidConverter.java
+++ b/core/src/mindustry/world/blocks/production/LiquidConverter.java
@@ -27,7 +27,7 @@ public class LiquidConverter extends GenericCrafter{
     public void setStats(){
         super.setStats();
         stats.remove(Stat.output);
-        stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * craftTime, false);
+        stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * 60f, true);
     }
 
     public class LiquidConverterBuild extends GenericCrafterBuild{
diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java
index d9b355cc70..a44b854c13 100644
--- a/core/src/mindustry/world/blocks/production/Separator.java
+++ b/core/src/mindustry/world/blocks/production/Separator.java
@@ -34,11 +34,6 @@ public class Separator extends Block{
 
     @Override
     public void setStats(){
-        if(consumes.has(ConsumeType.liquid)){
-            ConsumeLiquidBase cons = consumes.get(ConsumeType.liquid);
-            cons.timePeriod = craftTime;
-        }
-
         super.setStats();
 
         stats.add(Stat.output, new ItemFilterValue(item -> {
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquid.java b/core/src/mindustry/world/consumers/ConsumeLiquid.java
index 839b59c607..0834935198 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquid.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquid.java
@@ -46,6 +46,6 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
 
     @Override
     public void display(Stats stats){
-        stats.add(booster ? Stat.booster : Stat.input, liquid, amount * timePeriod, timePeriod == 60);
+        stats.add(booster ? Stat.booster : Stat.input, liquid, amount * 60f, true);
     }
 }
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
index 47b1eb8834..5e581fc610 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidBase.java
@@ -5,13 +5,6 @@ import mindustry.gen.*;
 public abstract class ConsumeLiquidBase extends Consume{
     /** amount used per frame */
     public final float amount;
-    /**
-     * How much time is taken to use this liquid, in ticks. Used only for visual purposes.
-     * Example: a normal ConsumeLiquid with 10/s and a 10 second timePeriod would display as "100 seconds".
-     * Without a time override, it would display as "10 liquid/second".
-     * This is used for generic crafters.
-     */
-    public float timePeriod = 60;
 
     public ConsumeLiquidBase(float amount){
         this.amount = amount;
diff --git a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
index 851cf75fd2..268cdfaf54 100644
--- a/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
+++ b/core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
@@ -50,6 +50,6 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
 
     @Override
     public void display(Stats stats){
-        stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * timePeriod, timePeriod == 60f));
+        stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * 60f, true));
     }
 }