mindustry logic execution, map- and schematic- parsing and rendering
Diffstat (limited to 'src/block/logic.rs')
| -rw-r--r-- | src/block/logic.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/block/logic.rs b/src/block/logic.rs index 84c97b6..fa77f7d 100644 --- a/src/block/logic.rs +++ b/src/block/logic.rs @@ -6,7 +6,7 @@ use std::string::FromUtf8Error; use flate2::{Compress, CompressError, Compression, Decompress, DecompressError, FlushCompress, FlushDecompress, Status}; -use crate::block::{BlockLogic, DeserializeError, make_register, SerializeError}; +use crate::block::{BlockLogic, DataConvertError, DeserializeError, make_register, SerializeError}; use crate::block::simple::{SimpleBlock, state_impl}; use crate::data::{self, DataRead, DataWrite, GridPos}; use crate::data::dynamic::{DynData, DynType}; @@ -43,9 +43,9 @@ impl BlockLogic for MessageLogic true } - fn data_from_i32(&self, _: i32, _: GridPos) -> DynData + fn data_from_i32(&self, _: i32, _: GridPos) -> Result<DynData, DataConvertError> { - DynData::Empty + Ok(DynData::Empty) } fn deserialize_state(&self, data: DynData) -> Result<Option<Box<dyn Any>>, DeserializeError> @@ -88,9 +88,9 @@ impl BlockLogic for SwitchLogic true } - fn data_from_i32(&self, _: i32, _: GridPos) -> DynData + fn data_from_i32(&self, _: i32, _: GridPos) -> Result<DynData, DataConvertError> { - DynData::Empty + Ok(DynData::Empty) } fn deserialize_state(&self, data: DynData) -> Result<Option<Box<dyn Any>>, DeserializeError> @@ -136,9 +136,9 @@ impl BlockLogic for ProcessorLogic true } - fn data_from_i32(&self, _: i32, _: GridPos) -> DynData + fn data_from_i32(&self, _: i32, _: GridPos) -> Result<DynData, DataConvertError> { - DynData::Empty + Ok(DynData::Empty) } fn deserialize_state(&self, data: DynData) -> Result<Option<Box<dyn Any>>, DeserializeError> |