diff --git a/factorio-blueprint-generator/src/factory.rs b/factorio-blueprint-generator/src/factory.rs index 28a6019..f598365 100644 --- a/factorio-blueprint-generator/src/factory.rs +++ b/factorio-blueprint-generator/src/factory.rs @@ -1,11 +1,10 @@ -use std::collections::HashMap; - use factorio_blueprint::abstraction::{Blueprint, Entity}; use factorio_core::{beltoptions::Beltspeed, prelude::*, visualize::Visualize}; use factorio_layout::{Connection, Interface, LayoutInput, Layouter, MacroBlock}; use factorio_pathfinding::Pathfinder; -use rand::{Rng, SeedableRng, seq::IndexedRandom}; +use rand::{Rng, SeedableRng}; use serde::{Deserialize, Serialize}; +use std::collections::HashMap; use crate::{ assembly::assembly_line_2_input, @@ -256,7 +255,7 @@ pub fn generate_factory { - let step = 1; + // let step = 1; // static_input.extend((0..*inputs).map(|y| Interface { // offset: Position::new( // -1, diff --git a/factorio-blueprint/src/abstraction.rs b/factorio-blueprint/src/abstraction.rs index 8770f96..28cbc53 100644 --- a/factorio-blueprint/src/abstraction.rs +++ b/factorio-blueprint/src/abstraction.rs @@ -1,3 +1,4 @@ +use crate::{BlueprintEntity, BlueprintPosition}; use factorio_core::{ aabb::AABB, beltoptions::Beltspeed, @@ -7,12 +8,7 @@ use factorio_core::{ quaterdirection::QuaterDirection, visualize::{Color, Visualization}, }; -use std::{ - collections::{HashMap, HashSet}, - sync::atomic::AtomicUsize, -}; - -use crate::{BlueprintEntity, BlueprintPosition}; +use std::{collections::HashMap, sync::atomic::AtomicUsize}; mod power_connection; mod visualize; @@ -386,7 +382,7 @@ impl Entity { } fn visualize(&self, v: &mut Visualization, offset: Position) { match &self.entity { - EntityType::Belt(beltspeed) => { + EntityType::Belt(_beltspeed) => { v.add_symbol( (self.position - Position::new(1, 1)) / 2 + offset, factorio_core::visualize::Symbol::Arrow(self.direction.unwrap_dir()), @@ -394,7 +390,7 @@ impl Entity { None, ); } - EntityType::UndergroundBelt(beltspeed, underground_type) => match underground_type { + EntityType::UndergroundBelt(_beltspeed, underground_type) => match underground_type { UndergroundType::Input => { v.add_symbol( (self.position - Position::new(1, 1)) / 2 + offset, @@ -412,7 +408,7 @@ impl Entity { ); } }, - EntityType::Splitter(beltspeed) => (), + EntityType::Splitter(_beltspeed) => (), EntityType::ElectricPole(electric_pole_type) => match electric_pole_type { ElectricPoleType::Small => v.add_symbol( (self.position - Position::new(1, 1)) / 2 + offset, @@ -447,13 +443,7 @@ impl Entity { } } }, - EntityType::Inserter { - inserter_type, - override_stack_size, - } => (), - EntityType::Production { name, recipe, size } => (), - EntityType::Rail { rail_type } => (), - EntityType::Unknown { name, size, misc } => (), + _ => (), } } } @@ -627,7 +617,7 @@ impl Blueprint { } #[derive(Debug)] -struct Placibility { +pub struct Placibility { blocked: PositionMap, } @@ -637,7 +627,7 @@ impl Placibility { for y in aabb.min().y..=aabb.max().y { for x in aabb.min().x..=aabb.max().x { if !self.blocked.get_aabb().contains_pos(Position::new(x, y)) - || self.blocked[Position::new(x, y)] == true + || self.blocked[Position::new(x, y)] { return false; } diff --git a/factorio-blueprint/src/abstraction/power_connection.rs b/factorio-blueprint/src/abstraction/power_connection.rs index 6192f55..c483f6c 100644 --- a/factorio-blueprint/src/abstraction/power_connection.rs +++ b/factorio-blueprint/src/abstraction/power_connection.rs @@ -1,4 +1,3 @@ -use factorio_core::visualize::Visualize; use factorio_graph::{ priority_queue::binary_heap::FastBinaryHeap, wheighted_graph::{WheightedGraph, steiner_tree}, diff --git a/factorio-layout/src/bin/new_layout.rs b/factorio-layout/src/bin/new_layout.rs index 8426148..154cdaf 100644 --- a/factorio-layout/src/bin/new_layout.rs +++ b/factorio-layout/src/bin/new_layout.rs @@ -38,5 +38,5 @@ fn main() { let r = l.layout(&problem, &p, &mut rng); - // dbg!(r); + dbg!(r); }