more consistent imports

22 files changed, 169 insertions, 124 deletions

diff --git a/src/assemblage.rs b/src/assemblage.rs
index bdd6c25..71142f1 100644
--- a/src/assemblage.rs
+++ b/src/assemblage.rs
@@ -1,12 +1,14 @@
 
 use std::collections::HashMap;
 use serde_json::{Value, json};
-use super::componentparameter::ComponentParameter;
-use super::parameter::{Parameter, ParameterType};
-use super::componentwrapper::{ComponentWrapper, ComponentType};
-use super::components::Serialise;
-use crate::hashmap;
-use crate::template::Template;
+use crate::{
+	componentparameter::ComponentParameter,
+	parameter::{Parameter, ParameterType},
+	componentwrapper::{ComponentWrapper, ComponentType},
+	components::Serialise,
+	hashmap,
+	Template
+};
 
 type ArgumentDef = (String, ParameterType, Option<Parameter>);
 
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 682af65..14eb248 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -17,7 +17,7 @@ use crate::{
 	RoomId,
 	Sprite,
 	controls::Control,
-	template::Template,
+	Template,
 	playerstate::RoomPos
 };
 
diff --git a/src/componentwrapper.rs b/src/componentwrapper.rs
index 27e0783..8ab991a 100644
--- a/src/componentwrapper.rs
+++ b/src/componentwrapper.rs
@@ -2,9 +2,14 @@
 use std::collections::HashMap;
 use specs::Builder;
 
-use crate::{PlayerId, RoomId, Sprite, playerstate::RoomPos};
-use crate::components::{Visible, Blocking, Player, Floor, Item, Inventory, Health, Serialise, RoomExit};
-use crate::parameter::{Parameter, ParameterType};
+use crate::{
+	PlayerId,
+	RoomId,
+	Sprite,
+	playerstate::RoomPos,
+	components::{Visible, Blocking, Player, Floor, Item, Inventory, Health, Serialise, RoomExit},
+	parameter::{Parameter, ParameterType}
+};
 
 
 
diff --git a/src/defaultencyclopedia.rs b/src/defaultencyclopedia.rs
index 7179989..75234b8 100644
--- a/src/defaultencyclopedia.rs
+++ b/src/defaultencyclopedia.rs
@@ -1,6 +1,6 @@
 
-use crate::encyclopedia::Encyclopedia;
 use serde_json::json;
+use crate::Encyclopedia;
 
 pub fn default_encyclopedia() -> Encyclopedia {
 	Encyclopedia::from_json(json!({
diff --git a/src/encyclopedia.rs b/src/encyclopedia.rs
index bdb12af..a7bb5b6 100644
--- a/src/encyclopedia.rs
+++ b/src/encyclopedia.rs
@@ -1,9 +1,11 @@
 
 use std::collections::HashMap;
 use serde_json::Value;
-use crate::assemblage::Assemblage;
-use crate::componentwrapper::PreEntity;
-use crate::template::Template;
+use crate::{
+	assemblage::Assemblage,
+	componentwrapper::PreEntity,
+	Template
+};
 
 #[derive(Default, Clone)]
 pub struct Encyclopedia {
diff --git a/src/gameserver.rs b/src/gameserver.rs
index ebfbe0e..9778275 100644
--- a/src/gameserver.rs
+++ b/src/gameserver.rs
@@ -5,9 +5,11 @@ use std::io;
 
 use serde_json::{Value, json};
 
-use super::controls::{Control, Action};
-use super::server::Server;
-use crate::PlayerId;
+use crate::{
+	controls::{Control, Action},
+	server::Server,
+	PlayerId
+};
 
 
 #[derive(Debug)]
diff --git a/src/main.rs b/src/main.rs
index dbc8728..0dea859 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -32,25 +32,29 @@ mod worldloader;
 mod world;
 mod sprite;
 
-pub use self::pos::Pos;
-pub use self::playerid::PlayerId;
-pub use self::roomid::RoomId;
-pub use self::util::Result;
-pub use self::sprite::Sprite;
-pub use self::template::Template;
-pub use self::encyclopedia::Encyclopedia;
+pub use self::{
+	pos::Pos,
+	playerid::PlayerId,
+	roomid::RoomId,
+	util::Result,
+	sprite::Sprite,
+	template::Template,
+	encyclopedia::Encyclopedia
+};
 
-use self::gameserver::GameServer;
-use self::server::unixserver::UnixServer;
-use self::server::tcpserver::TcpServer;
-use self::server::Server;
-use self::util::ToJson;
-use self::defaultencyclopedia::default_encyclopedia;
-use self::persistence::FileStorage;
-use crate::controls::Action;
-use crate::worldloader::WorldLoader;
-use crate::world::World;
-use crate::worldmessages::MessageCache;
+use self::{
+	gameserver::GameServer,
+	server::unixserver::UnixServer,
+	server::tcpserver::TcpServer,
+	server::Server,
+	util::ToJson,
+	defaultencyclopedia::default_encyclopedia,
+	persistence::FileStorage,
+	controls::Action,
+	worldloader::WorldLoader,
+	world::World,
+	worldmessages::MessageCache
+};
 
 
 
diff --git a/src/parameter.rs b/src/parameter.rs
index 65dd4d0..1b9bd4f 100644
--- a/src/parameter.rs
+++ b/src/parameter.rs
@@ -1,6 +1,6 @@
 
 use serde_json::{Value, json};
-use crate::template::Template;
+use crate::Template;
 use crate::components::item::ItemAction;
 
 #[derive(Debug, PartialEq, Clone)]
diff --git a/src/persistence.rs b/src/persistence.rs
index aab4088..e9ce787 100644
--- a/src/persistence.rs
+++ b/src/persistence.rs
@@ -9,7 +9,7 @@ use crate::{
 	RoomId,
 	savestate::SaveState,
 	playerstate::PlayerState,
-	util::Result
+	Result
 };
 
 pub trait PersistentStorage {
diff --git a/src/playerstate.rs b/src/playerstate.rs
index 8e3d99f..694ce60 100644
--- a/src/playerstate.rs
+++ b/src/playerstate.rs
@@ -1,8 +1,8 @@
 
 
 use serde_json::{Value, json};
-use crate::template::Template;
 use crate::{
+	Template,
 	componentwrapper::{ComponentWrapper, PreEntity},
 	PlayerId,
 	RoomId,
diff --git a/src/pos.rs b/src/pos.rs
index d64cc7a..1b89772 100644
--- a/src/pos.rs
+++ b/src/pos.rs
@@ -3,7 +3,7 @@
 use std::ops::Add;
 use serde_json::{Value, json};
 use serde::{Serialize, Serializer, ser::SerializeTuple};
-use super::util::{clamp, ToJson};
+use crate::util::{clamp, ToJson};
 
 #[derive(Debug, Hash, PartialEq, Eq, Clone, Copy, Default)]
 pub struct Pos {
diff --git a/src/resources/mod.rs b/src/resources/mod.rs
index 5524298..d3777e5 100644
--- a/src/resources/mod.rs
+++ b/src/resources/mod.rs
@@ -3,15 +3,15 @@ use std::collections::{HashMap, HashSet};
 use specs::{Entity, ReadStorage, Component};
 
 use crate::{
-	pos::Pos,
+	Pos,
 	controls::Control,
 	worldmessages::WorldMessage,
 	componentwrapper::PreEntity,
-	encyclopedia::Encyclopedia,
+	Encyclopedia,
 	PlayerId,
 	RoomId,
-	util::Result,
-	template::Template,
+	Result,
+	Template,
 	components::Visible,
 	playerstate::RoomPos
 };
diff --git a/src/room.rs b/src/room.rs
index dd5c736..ff7b75f 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -11,44 +11,49 @@ use specs::{
 	Entity
 };
 
-use super::controls::Control;
-use super::worldmessages::WorldMessage;
-use super::resources::{
-	Size,
-	Output,
-	Input,
-	NewEntities,
-	Spawn,
-	Players,
-	Emigration
+use crate::{
+	controls::Control,
+	worldmessages::WorldMessage,
+	resources::{
+		Size,
+		Output,
+		Input,
+		NewEntities,
+		Spawn,
+		Players,
+		Emigration
+	},
+	systems::{
+		Move,
+		RegisterNew,
+		ControlInput,
+		View,
+		Remove,
+		Create,
+		Take,
+		Migrate,
+		Use
+	},
+	components::{
+		Position,
+		Serialise,
+		Player,
+		Inventory,
+		Health,
+		New,
+		Removed
+	},
+	Encyclopedia,
+	roomtemplate::RoomTemplate,
+	savestate::SaveState,
+	Template,
+	playerstate::{PlayerState, RoomPos},
+	Pos,
+	PlayerId,
+	RoomId,
+	aerr,
+	Result
 };
-use super::systems::{
-	moving::Move,
-	registernew::RegisterNew,
-	controlinput::ControlInput,
-	view::View,
-	remove::Remove,
-	create::Create,
-	take::Take,
-	migrate::Migrate,
-	useitem::Use
-};
-use crate::components::{
-	Position,
-	Serialise,
-	Player,
-	Inventory,
-	Health,
-	New,
-	Removed
-};
-use crate::encyclopedia::Encyclopedia;
-use crate::roomtemplate::RoomTemplate;
-use crate::savestate::SaveState;
-use crate::template::Template;
-use crate::playerstate::{PlayerState, RoomPos};
-use crate::{Pos, PlayerId, RoomId, aerr};
-use crate::util::Result;
 
 
 
diff --git a/src/roomtemplate.rs b/src/roomtemplate.rs
index 84110b9..2a778a7 100644
--- a/src/roomtemplate.rs
+++ b/src/roomtemplate.rs
@@ -1,9 +1,12 @@
 
 use std::collections::HashMap;
 use serde_json::{json, Value};
-use crate::Pos;
-use crate::template::Template;
-use crate::{Result, aerr};
+use crate::{
+	Pos,
+	Template,
+	Result,
+	aerr
+};
 
 pub struct RoomTemplate {
 	pub size: (i64, i64),
diff --git a/src/savestate.rs b/src/savestate.rs
index 68af12c..2992531 100644
--- a/src/savestate.rs
+++ b/src/savestate.rs
@@ -1,9 +1,12 @@
 
 use std::collections::HashMap;
 use serde_json::{json, Value};
-use crate::Pos;
-use crate::template::Template;
-use crate::{Result, aerr};
+use crate::{
+	Pos,
+	Template,
+	Result,
+	aerr
+};
 
 pub struct SaveState {
 	pub changes: HashMap<Pos, Vec<Template>>
diff --git a/src/systems/mod.rs b/src/systems/mod.rs
index 546669b..88e67ad 100644
--- a/src/systems/mod.rs
+++ b/src/systems/mod.rs
@@ -1,10 +1,22 @@
 
-pub mod controlinput;
-pub mod registernew;
-pub mod moving;
-pub mod view;
-pub mod remove;
-pub mod create;
-pub mod take;
-pub mod migrate;
-pub mod useitem;
+mod controlinput;
+mod registernew;
+mod moving;
+mod view;
+mod remove;
+mod create;
+mod take;
+mod migrate;
+mod useitem;
+
+pub use self::{
+	controlinput::ControlInput,
+	registernew::RegisterNew,
+	moving::Move,
+	view::View,
+	remove::Remove,
+	create::Create,
+	take::Take,
+	migrate::Migrate,
+	useitem::Use
+};
diff --git a/src/systems/moving.rs b/src/systems/moving.rs
index f5c1b4a..ccd9455 100644
--- a/src/systems/moving.rs
+++ b/src/systems/moving.rs
@@ -11,26 +11,24 @@ use specs::{
 	Write
 };
 
-use crate::pos::Pos;
-
-use crate::components::{
-	Controller,
-	Blocking,
-	Position,
-	Floor,
-	Moved
-};
-
-use crate::controls::{
-	Control
+use crate::{
+	Pos,
+	components::{
+		Controller,
+		Blocking,
+		Position,
+		Floor,
+		Moved
+	},
+	controls::{
+		Control
+	},
+	resources::{
+		Size,
+		Ground
+	},
 };
 
-use crate::resources::{
-	Size,
-	Ground
-};
-
-
 
 pub struct Move;
 impl <'a> System<'a> for Move {
diff --git a/src/systems/view.rs b/src/systems/view.rs
index 7d41820..158a187 100644
--- a/src/systems/view.rs
+++ b/src/systems/view.rs
@@ -10,11 +10,13 @@ use specs::{
 	Entities
 };
 
-use crate::{Pos, Sprite};
-use crate::components::{Visible, Player, Position, Inventory, New, Moved, Removed, Health};
-use crate::resources::{Size, Output, Ground};
-use crate::worldmessages::{WorldMessage, FieldMessage};
-
+use crate::{
+	Pos,
+	Sprite,
+	components::{Visible, Player, Position, Inventory, New, Moved, Removed, Health},
+	resources::{Size, Output, Ground},
+	worldmessages::{WorldMessage, FieldMessage}
+};
 
 #[derive(Default)]
 pub struct View;
diff --git a/src/template.rs b/src/template.rs
index 52f7d2d..805a8a3 100644
--- a/src/template.rs
+++ b/src/template.rs
@@ -2,8 +2,11 @@
 
 use std::collections::HashMap;
 use serde_json::{json, Value};
-use crate::parameter::Parameter;
-use crate::{Result, aerr};
+use crate::{
+	parameter::Parameter,
+	Result,
+	aerr
+};
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct Template {
diff --git a/src/world.rs b/src/world.rs
index dad3f13..9c22e0f 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -8,9 +8,9 @@ use crate::{
 	worldloader::WorldLoader,
 	persistence::PersistentStorage,
 	playerstate::{PlayerState, RoomPos},
-	encyclopedia::Encyclopedia,
+	Encyclopedia,
 	controls::Control,
-	util::Result,
+	Result,
 	aerr,
 	worldmessages::WorldMessage,
 };
diff --git a/src/worldloader.rs b/src/worldloader.rs
index 8745bf4..afaabb7 100644
--- a/src/worldloader.rs
+++ b/src/worldloader.rs
@@ -6,7 +6,7 @@ use serde_json::Value;
 use crate::{
 	RoomId,
 	roomtemplate::RoomTemplate,
-	util::Result
+	Result
 };
 
 
diff --git a/src/worldmessages.rs b/src/worldmessages.rs
index c70b8b0..8d45c6e 100644
--- a/src/worldmessages.rs
+++ b/src/worldmessages.rs
@@ -3,7 +3,11 @@ use std::collections::HashMap;
 use serde_json::{Value, json};
 use serde::Serialize;
 use crate::util::ToJson;
-use crate::{Pos, Sprite, PlayerId};
+use crate::{
+	Pos,
+	Sprite,
+	PlayerId
+};
 
 macro_rules! worldmessages {
 	($($name: ident, $typ: ident, $strname: expr);*;) => {