more consistent imports

1 files changed, 42 insertions, 37 deletions

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;