From 0ccb8846d3a203ceb2c65f5e681d8be9cc42f3b0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 19 Dec 2021 21:33:39 -0500
Subject: [PATCH] Unit assembler gallium requirement

---
 core/src/mindustry/content/Blocks.java                   | 9 ++++++---
 core/src/mindustry/world/blocks/units/UnitAssembler.java | 6 ++++++
 gradle.properties                                        | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 8f15f5232e..cf3c02c6a1 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1163,7 +1163,8 @@ public class Blocks{
 
             craftTime = 60f * 2f;
 
-            outputLiquid = new LiquidStack(Liquids.gallium, 2f);
+            continuousLiquidOutput = true;
+            outputLiquid = new LiquidStack(Liquids.gallium, 1f / 60f);
             outputItem = new ItemStack(Items.scrap, 1);
         }};
 
@@ -3315,8 +3316,7 @@ public class Blocks{
         //endregion
         //region units - erekir
 
-        //TODO 5x5?
-        //TODO completely unfinished
+        //TODO requirements
         tankAssembler = new UnitAssembler("tank-assembler"){{
             requirements(Category.units, with(Items.graphite, 10));
             size = 5;
@@ -3325,6 +3325,9 @@ public class Blocks{
             consumes.power(2f);
             areaSize = 13;
 
+            //TODO unit production is rarely continuous, can be double
+            consumes.liquid(Liquids.gallium, 1f / 60f);
+
             droneType = UnitTypes.assemblyDrone;
         }};
 
diff --git a/core/src/mindustry/world/blocks/units/UnitAssembler.java b/core/src/mindustry/world/blocks/units/UnitAssembler.java
index 32de299615..0a637790e9 100644
--- a/core/src/mindustry/world/blocks/units/UnitAssembler.java
+++ b/core/src/mindustry/world/blocks/units/UnitAssembler.java
@@ -226,6 +226,12 @@ public class UnitAssembler extends PayloadBlock{
             return plans.get(Math.min(currentTier, plans.size - 1));
         }
 
+        @Override
+        public boolean shouldConsume(){
+            //liquid is only consumed when building is being done
+            return enabled && !wasOccupied && Units.canCreate(team, plan().unit) && consumes.get(ConsumeType.payload).valid(this);
+        }
+
         @Override
         public void drawSelect(){
             for(var module : modules){
diff --git a/gradle.properties b/gradle.properties
index ac850c3659..bbc53a83d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -24,4 +24,4 @@ android.useAndroidX=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=309d2fc02d
+archash=82157de87b