diff --git a/factorio-blueprint-generator/src/assembly.rs b/factorio-blueprint-generator/src/assembly.rs index 52de721..776ab0d 100644 --- a/factorio-blueprint-generator/src/assembly.rs +++ b/factorio-blueprint-generator/src/assembly.rs @@ -1,6 +1,12 @@ use factorio_blueprint::abstraction::{Blueprint, ElectricPoleType, Entity, InserterType}; use factorio_core::{beltoptions::Beltspeed, prelude::*}; +/* + +AAABBBCCC + + +*/ pub fn assembly_line( assembly_machines: usize, machine: impl AsRef, @@ -490,7 +496,7 @@ pub fn assembly_line_2_input( } blueprint.add_entity(Entity::new_production( - "assembling-machine-3", + machine.as_ref(), recipe.as_ref(), Position::new(-3, 21), Direction::Up, diff --git a/factorio-blueprint-generator/src/bin/assembly.rs b/factorio-blueprint-generator/src/bin/assembly.rs index 29ffb55..bb7fa8f 100644 --- a/factorio-blueprint-generator/src/bin/assembly.rs +++ b/factorio-blueprint-generator/src/bin/assembly.rs @@ -2,12 +2,14 @@ use clap::Parser; use factorio_blueprint::{BlueprintString, encode}; use factorio_blueprint_generator::assembly::assembly_line_2_input; use factorio_core::beltoptions::Beltspeed; +use factorio_core::visualize::Visualize; #[derive(Parser)] struct Args { #[arg(short, long)] json: bool, assembly_machines: usize, + machine: String, recipe: String, output_belt: Beltspeed, input_belt: Vec, @@ -15,17 +17,19 @@ struct Args { fn main() { let args = Args::parse(); - let b = BlueprintString::Blueprint( - assembly_line_2_input( - args.assembly_machines, - args.recipe, - args.input_belt[0], - args.input_belt.get(1).copied(), - args.output_belt, - ) - .0 - .to_blueprint(), - ); + let b = assembly_line_2_input( + args.assembly_machines, + args.machine, + args.recipe, + args.input_belt[0], + args.input_belt.get(1).copied(), + args.output_belt, + ) + .0; + + b.print_visualization(); + + let b = BlueprintString::Blueprint(b.to_blueprint()); if args.json { println!("{}", serde_json::to_string_pretty(&b).unwrap()); diff --git a/factorio-blueprint-generator/src/bin/multistation.rs b/factorio-blueprint-generator/src/bin/multistation.rs index 72fae24..1ce6b78 100644 --- a/factorio-blueprint-generator/src/bin/multistation.rs +++ b/factorio-blueprint-generator/src/bin/multistation.rs @@ -1,4 +1,4 @@ -use clap::{Parser, ValueEnum}; +use clap::Parser; use factorio_blueprint::{BlueprintString, encode}; use factorio_blueprint_generator::multistation::{StationSpec, multistation}; use factorio_core::beltoptions::Beltspeed;