bendns' repos / mindus
mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/liquid.rs')
-rw-r--r--src/block/liquid.rs33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/block/liquid.rs b/src/block/liquid.rs
index ec6978e..59f1946 100644
--- a/src/block/liquid.rs
+++ b/src/block/liquid.rs
@@ -1,7 +1,6 @@
//! liquid related things
use thiserror::Error;
-use crate::block::distribution::BridgeBlock;
use crate::block::simple::*;
use crate::block::*;
use crate::content;
@@ -23,31 +22,6 @@ make_simple!(ConduitBlock, |_,
mask2tile(mask, rot, name, s)
});
-make_register! {
- "reinforced-pump" -> BasicBlock::new(2, true, cost!(Beryllium: 40, Tungsten: 30, Silicon: 20));
- "mechanical-pump" -> BasicBlock::new(1, true, cost!(Copper: 15, Metaglass: 10));
- "rotary-pump" -> BasicBlock::new(2, true, cost!(Copper: 70, Metaglass: 50, Titanium: 35, Silicon: 20));
- "impulse-pump" -> BasicBlock::new(3, true, cost!(Copper: 80, Metaglass: 90, Titanium: 40, Thorium: 35, Silicon: 30));
- "conduit" => ConduitBlock::new(1, false, cost!(Metaglass: 1));
- "pulse-conduit" => ConduitBlock::new(1, false, cost!(Metaglass: 1, Titanium: 2));
- "plated-conduit" => ConduitBlock::new(1, false, cost!(Metaglass: 1, Thorium: 2, Plastanium: 1));
- "liquid-router" -> BasicBlock::new(1, true, cost!(Metaglass: 2, Graphite: 4));
- "liquid-container" -> BasicBlock::new(2, true, cost!(Metaglass: 15, Titanium: 10));
- "liquid-tank" -> BasicBlock::new(3, true, cost!(Metaglass: 40, Titanium: 30));
- "liquid-junction" -> BasicBlock::new(1, true, cost!(Metaglass: 8, Graphite: 4));
- "bridge-conduit" -> BridgeBlock::new(1, true, cost!(Metaglass: 8, Graphite: 4), 4, true);
- "phase-conduit" -> BridgeBlock::new(1, true, cost!(Metaglass: 20, Titanium: 10, Silicon: 7, PhaseFabric: 5), 12, true);
- "reinforced-conduit" => ConduitBlock::new(1, false, cost!(Beryllium: 2));
- "reinforced-liquid-junction" -> BasicBlock::new(1, true, cost!(Graphite: 4, Beryllium: 8));
- "reinforced-bridge-conduit" => BridgeBlock::new(1, true, cost!(Graphite: 8, Beryllium: 20), 4, true);
- "reinforced-liquid-router" -> BasicBlock::new(1, true, cost!(Graphite: 8, Beryllium: 4));
- "reinforced-liquid-container" -> BasicBlock::new(2, true, cost!(Tungsten: 10, Beryllium: 16));
- "reinforced-liquid-tank" -> BasicBlock::new(3, true, cost!(Tungsten: 40, Beryllium: 50));
- // sandbox only
- "liquid-source" => FluidBlock::new(1, true, &[]);
- "liquid-void" -> BasicBlock::new(1, true, &[]);
-}
-
pub struct FluidBlock {
size: u8,
symmetric: bool,
@@ -123,12 +97,7 @@ impl BlockLogic for FluidBlock {
/// format:
/// - fluid: [`u16`] as [`Fluid`](fluid::Type)
- fn read(
- &self,
- b: &mut Build,
- _: &BlockRegistry,
- buff: &mut DataRead,
- ) -> Result<(), DataReadError> {
+ fn read(&self, b: &mut Build, buff: &mut DataRead) -> Result<(), DataReadError> {
let f = buff.read_u16()?;
b.state = Some(Self::create_state(fluid::Type::try_from(f).ok()));
Ok(())