diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index d6655cadaa458156dbbc80d7e7f63dc07168fb5a..a420c4a890bc8c21259565dd82f8bc21ef26d833 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -6,11 +6,11 @@ import com.comandante.creeper.managers.SessionManager;
import com.comandante.creeper.npc.StreetHustler;
import com.comandante.creeper.player.PlayerManager;
import com.comandante.creeper.player.PlayerMetadata;
-import com.comandante.creeper.room.Area;
-import com.comandante.creeper.room.MapsManager;
-import com.comandante.creeper.room.Room;
-import com.comandante.creeper.room.RoomManager;
-import com.comandante.creeper.room.WorldExporter;
+import com.comandante.creeper.world.Area;
+import com.comandante.creeper.world.MapsManager;
+import com.comandante.creeper.world.Room;
+import com.comandante.creeper.world.RoomManager;
+import com.comandante.creeper.world.WorldExporter;
import com.comandante.creeper.server.CreeperCommandRegistry;
import com.comandante.creeper.server.CreeperServer;
import com.comandante.creeper.server.command.DropCommand;
diff --git a/src/main/java/com/comandante/creeper/entity/EntityManager.java b/src/main/java/com/comandante/creeper/entity/EntityManager.java
index 55d53a5d4841b8b97fad130fcd9c34f01a815cef..1c5374ecd8a0ce0b6c4c367c170686cca026ff30 100644
--- a/src/main/java/com/comandante/creeper/entity/EntityManager.java
+++ b/src/main/java/com/comandante/creeper/entity/EntityManager.java
@@ -5,8 +5,8 @@ import com.comandante.creeper.Items.ItemSerializer;
import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.player.Player;
import com.comandante.creeper.player.PlayerManager;
-import com.comandante.creeper.room.Room;
-import com.comandante.creeper.room.RoomManager;
+import com.comandante.creeper.world.Room;
+import com.comandante.creeper.world.RoomManager;
import org.mapdb.DB;
import org.mapdb.HTreeMap;
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
index 8eac0a900d6f483b74b7d51bc6850829128e70f7..a3104b8238cac91c3c7784b80fcc6650fe26e9d7 100644
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -9,10 +9,10 @@ import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.player.Player;
import com.comandante.creeper.player.PlayerManager;
import com.comandante.creeper.player.PlayerMovement;
-import com.comandante.creeper.room.FloorManager;
-import com.comandante.creeper.room.MapsManager;
-import com.comandante.creeper.room.Room;
-import com.comandante.creeper.room.RoomManager;
+import com.comandante.creeper.world.FloorManager;
+import com.comandante.creeper.world.MapsManager;
+import com.comandante.creeper.world.Room;
+import com.comandante.creeper.world.RoomManager;
import com.comandante.creeper.server.ChannelUtils;
import com.comandante.creeper.server.Color;
import com.comandante.creeper.server.CreeperSession;
diff --git a/src/main/java/com/comandante/creeper/npc/Npc.java b/src/main/java/com/comandante/creeper/npc/Npc.java
index f4ebefe4dce842a19fa2817f005b6accc2f71fd6..5a11e6e70b9f58013078597e4231f9389826b8e0 100644
--- a/src/main/java/com/comandante/creeper/npc/Npc.java
+++ b/src/main/java/com/comandante/creeper/npc/Npc.java
@@ -3,7 +3,7 @@ package com.comandante.creeper.npc;
import com.comandante.creeper.entity.CreeperEntity;
import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.room.Area;
+import com.comandante.creeper.world.Area;
import com.comandante.creeper.stat.Stats;
import com.google.common.base.Optional;
diff --git a/src/main/java/com/comandante/creeper/npc/NpcMover.java b/src/main/java/com/comandante/creeper/npc/NpcMover.java
index 7707e86cf3db194171366066080a5107f22af1bd..162843aaa54a71d093bde8d58e7b66c834c1c632 100644
--- a/src/main/java/com/comandante/creeper/npc/NpcMover.java
+++ b/src/main/java/com/comandante/creeper/npc/NpcMover.java
@@ -1,8 +1,8 @@
package com.comandante.creeper.npc;
import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.room.Area;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Area;
+import com.comandante.creeper.world.Room;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
diff --git a/src/main/java/com/comandante/creeper/npc/StreetHustler.java b/src/main/java/com/comandante/creeper/npc/StreetHustler.java
index e9e76c5af6930ac6d0cfbf72020cc7e649340a4a..965a739fe5409853f56f73ba0d8b08c205eca998 100644
--- a/src/main/java/com/comandante/creeper/npc/StreetHustler.java
+++ b/src/main/java/com/comandante/creeper/npc/StreetHustler.java
@@ -1,7 +1,7 @@
package com.comandante.creeper.npc;
import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.room.Area;
+import com.comandante.creeper.world.Area;
import com.comandante.creeper.server.Color;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
diff --git a/src/main/java/com/comandante/creeper/player/PlayerManager.java b/src/main/java/com/comandante/creeper/player/PlayerManager.java
index 0874635f8c5141e1a58c5e9ce201d25b6c3c0b17..825ba85de5edc43978110ab312e4be97740a5ad0 100644
--- a/src/main/java/com/comandante/creeper/player/PlayerManager.java
+++ b/src/main/java/com/comandante/creeper/player/PlayerManager.java
@@ -3,7 +3,7 @@ package com.comandante.creeper.player;
import com.comandante.creeper.fight.FightManager;
import com.comandante.creeper.managers.SessionManager;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.stat.Stats;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
diff --git a/src/main/java/com/comandante/creeper/server/ChannelUtils.java b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
index 11bfd5e1008911785cd660bc55f08d8bb93c33e1..5bd26a9e0b174200f6f4c36926a21c24217bd5d3 100644
--- a/src/main/java/com/comandante/creeper/server/ChannelUtils.java
+++ b/src/main/java/com/comandante/creeper/server/ChannelUtils.java
@@ -2,8 +2,8 @@ package com.comandante.creeper.server;
import com.comandante.creeper.player.Player;
import com.comandante.creeper.player.PlayerManager;
-import com.comandante.creeper.room.Room;
-import com.comandante.creeper.room.RoomManager;
+import com.comandante.creeper.world.Room;
+import com.comandante.creeper.world.RoomManager;
import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/server/command/DropCommand.java b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
index dbd99b18886bdfb011487db32310032ac6b79b43..ce2233ef61bcaf3b4dc01b4da6552b41304958e1 100644
--- a/src/main/java/com/comandante/creeper/server/command/DropCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
@@ -3,7 +3,7 @@ package com.comandante.creeper.server.command;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.PlayerMetadata;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Joiner;
import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/server/command/KillCommand.java b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
index f740bc26696765f4371a54d13f02b53e49e94b71..76285768ad92be37e5768ee08264554f1813865c 100644
--- a/src/main/java/com/comandante/creeper/server/command/KillCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
@@ -6,7 +6,7 @@ import com.comandante.creeper.fight.FightRun;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
diff --git a/src/main/java/com/comandante/creeper/server/command/LookCommand.java b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
index 806a541e6967b18808de7764828f25880022e421..574021fd143af14f5d4f2cef10d13285eee3f198 100644
--- a/src/main/java/com/comandante/creeper/server/command/LookCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
@@ -2,7 +2,7 @@ package com.comandante.creeper.server.command;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Joiner;
import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/server/command/MovementCommand.java b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
index dae384b17724c02aad271e9f2965a1151c2757c9..81af797323751505a09e50c1b14a0a6e4348bc57 100644
--- a/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
@@ -4,8 +4,8 @@ import com.comandante.creeper.fight.FightManager;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.PlayerMovement;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Coords;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Coords;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.ChannelUtils;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Optional;
@@ -50,7 +50,7 @@ public class MovementCommand extends Command {
Optional<Room> roomOptional = gameManager.getRoomManager().getPlayerCurrentRoom(player);
ChannelUtils channelUtils = gameManager.getChannelUtils();
if (!roomOptional.isPresent()) {
- throw new RuntimeException("Player is not in a room, movement failed!");
+ throw new RuntimeException("Player is not in a world, movement failed!");
}
if (FightManager.isActiveFight(session)) {
channelUtils.write(getPlayerId(session), "You can't not move while in a fight!");
diff --git a/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
index eb38f0f0705f0cf1d63868e765facc8017b2b505..a204575e551f89167a0fd6b1bda0e0057f8f70b5 100644
--- a/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
@@ -3,7 +3,7 @@ package com.comandante.creeper.server.command;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Joiner;
import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/server/command/SayCommand.java b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
index ee5b86776b9bb3c90fbe530c101e0b79b5aa81ac..bdc82d211b02d29c220c32a32ea1ba2df83cf174 100644
--- a/src/main/java/com/comandante/creeper/server/command/SayCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
@@ -2,7 +2,7 @@ package com.comandante.creeper.server.command;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.google.common.base.Joiner;
import com.google.common.base.Optional;
@@ -19,7 +19,7 @@ import static com.comandante.creeper.server.Color.RESET;
public class SayCommand extends Command {
final static List<String> validTriggers = Arrays.asList("say");
- final static String description = "Say something to the room.";
+ final static String description = "Say something to the world.";
public SayCommand(GameManager gameManager) {
super(gameManager, validTriggers, description);
diff --git a/src/main/java/com/comandante/creeper/server/command/admin/DescriptionCommand.java b/src/main/java/com/comandante/creeper/server/command/admin/DescriptionCommand.java
index eecf1bccf654d47f0ce35f801d0ce808098de12f..c9fc15506b11ca49605aab6e10f81c4c18697681 100644
--- a/src/main/java/com/comandante/creeper/server/command/admin/DescriptionCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/admin/DescriptionCommand.java
@@ -3,7 +3,7 @@ package com.comandante.creeper.server.command.admin;
import com.comandante.creeper.CreeperEntry;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.comandante.creeper.server.MultiLineInputManager;
import com.comandante.creeper.server.command.Command;
diff --git a/src/main/java/com/comandante/creeper/server/command/admin/SaveWorldCommand.java b/src/main/java/com/comandante/creeper/server/command/admin/SaveWorldCommand.java
index ff69a18989677378dece9b88638a704b08ab1bb2..f1657ff456eb14c4c80ef547296004745f8d289c 100644
--- a/src/main/java/com/comandante/creeper/server/command/admin/SaveWorldCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/admin/SaveWorldCommand.java
@@ -1,7 +1,7 @@
package com.comandante.creeper.server.command.admin;
import com.comandante.creeper.managers.GameManager;
-import com.comandante.creeper.room.WorldExporter;
+import com.comandante.creeper.world.WorldExporter;
import com.comandante.creeper.server.command.Command;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
diff --git a/src/main/java/com/comandante/creeper/server/command/admin/TagRoomCommand.java b/src/main/java/com/comandante/creeper/server/command/admin/TagRoomCommand.java
index 948248947f348ad6468a0352bb09bdbe25c64f15..c4084273d8bfec9695afeff5b76f42b149e63788 100644
--- a/src/main/java/com/comandante/creeper/server/command/admin/TagRoomCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/admin/TagRoomCommand.java
@@ -2,7 +2,7 @@ package com.comandante.creeper.server.command.admin;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.command.Command;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.MessageEvent;
@@ -14,7 +14,7 @@ import java.util.List;
public class TagRoomCommand extends Command {
final static List<String> validTriggers = Arrays.asList("tr", "tagRoom");
- final static String description = "Sets a tag on a room.";
+ final static String description = "Sets a tag on a world.";
final static boolean isAdminOnly = true;
public TagRoomCommand(GameManager gameManager) {
@@ -41,7 +41,7 @@ public class TagRoomCommand extends Command {
return;
}
playerCurrentRoom.addTag(originalMessageParts.get(0));
- gameManager.getChannelUtils().write(player.getPlayerId(), String.format("tagged room with tag: \"%s\".", originalMessageParts.get(0)));
+ gameManager.getChannelUtils().write(player.getPlayerId(), String.format("tagged world with tag: \"%s\".", originalMessageParts.get(0)));
} finally {
super.messageReceived(ctx, e);
}
diff --git a/src/main/java/com/comandante/creeper/server/command/admin/TitleCommand.java b/src/main/java/com/comandante/creeper/server/command/admin/TitleCommand.java
index 5e93515355942604b35db50cb267e30a66491949..f6b09d5b743211f30db68f980aad14df8886ee0c 100644
--- a/src/main/java/com/comandante/creeper/server/command/admin/TitleCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/admin/TitleCommand.java
@@ -2,7 +2,7 @@ package com.comandante.creeper.server.command.admin;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Room;
import com.comandante.creeper.server.CreeperSession;
import com.comandante.creeper.server.command.Command;
import com.google.common.base.Joiner;
diff --git a/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java b/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java
index f6ac311fd526017852ce6166cb494805446242ff..ee19200b187883d31c0c74d05a3fd0e951efde28 100644
--- a/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java
+++ b/src/main/java/com/comandante/creeper/spawner/NpcSpawner.java
@@ -4,8 +4,8 @@ package com.comandante.creeper.spawner;
import com.comandante.creeper.entity.CreeperEntity;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.npc.Npc;
-import com.comandante.creeper.room.Area;
-import com.comandante.creeper.room.Room;
+import com.comandante.creeper.world.Area;
+import com.comandante.creeper.world.Room;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
diff --git a/src/main/java/com/comandante/creeper/room/Area.java b/src/main/java/com/comandante/creeper/world/Area.java
similarity index 92%
rename from src/main/java/com/comandante/creeper/room/Area.java
rename to src/main/java/com/comandante/creeper/world/Area.java
index 542893aaeac692d0dec5071f72fd850337fc161c..53fcaccaf520bafe9d1f38c89797c078de4ad5df 100644
--- a/src/main/java/com/comandante/creeper/room/Area.java
+++ b/src/main/java/com/comandante/creeper/world/Area.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
public enum Area {
DEFAULT("default"),
diff --git a/src/main/java/com/comandante/creeper/room/BasicRoom.java b/src/main/java/com/comandante/creeper/world/BasicRoom.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/room/BasicRoom.java
rename to src/main/java/com/comandante/creeper/world/BasicRoom.java
index 6f20ed8f1bd2f22c08f7647aa9bf5423473090a7..fcc0e00c4b5678681a8e581c5d4380938cbf3cc7 100644
--- a/src/main/java/com/comandante/creeper/room/BasicRoom.java
+++ b/src/main/java/com/comandante/creeper/world/BasicRoom.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.common.base.Optional;
diff --git a/src/main/java/com/comandante/creeper/room/BasicRoomBuilder.java b/src/main/java/com/comandante/creeper/world/BasicRoomBuilder.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/room/BasicRoomBuilder.java
rename to src/main/java/com/comandante/creeper/world/BasicRoomBuilder.java
index 3d703bd21a8f0687532122e3c18ca3e07ce680c7..a038e11f3ddba9030c7cced03f872d6d2d5b5b03 100644
--- a/src/main/java/com/comandante/creeper/room/BasicRoomBuilder.java
+++ b/src/main/java/com/comandante/creeper/world/BasicRoomBuilder.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.common.base.Optional;
import com.google.common.collect.Sets;
diff --git a/src/main/java/com/comandante/creeper/room/Coords.java b/src/main/java/com/comandante/creeper/world/Coords.java
similarity index 88%
rename from src/main/java/com/comandante/creeper/room/Coords.java
rename to src/main/java/com/comandante/creeper/world/Coords.java
index e49f54ac771496c93ac761bb44e8b490749ae1f2..86559c83281b52a09cc4155731d53063aeb753ef 100644
--- a/src/main/java/com/comandante/creeper/room/Coords.java
+++ b/src/main/java/com/comandante/creeper/world/Coords.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
public class Coords {
diff --git a/src/main/java/com/comandante/creeper/room/FloorManager.java b/src/main/java/com/comandante/creeper/world/FloorManager.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/room/FloorManager.java
rename to src/main/java/com/comandante/creeper/world/FloorManager.java
index b18bcec83d3ab7f6fe1e3105ab682d9b2ee80a19..4db93f174318f86fbd7588b73f366d92007636da 100644
--- a/src/main/java/com/comandante/creeper/room/FloorManager.java
+++ b/src/main/java/com/comandante/creeper/world/FloorManager.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
diff --git a/src/main/java/com/comandante/creeper/room/FloorModel.java b/src/main/java/com/comandante/creeper/world/FloorModel.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/room/FloorModel.java
rename to src/main/java/com/comandante/creeper/world/FloorModel.java
index f41f5b49a35815b81fad677c46f59bc4d5dd2f04..c2d42a0893e880abadfd3a4f1636aa16619bcc74 100644
--- a/src/main/java/com/comandante/creeper/room/FloorModel.java
+++ b/src/main/java/com/comandante/creeper/world/FloorModel.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/room/MapMatrix.java b/src/main/java/com/comandante/creeper/world/MapMatrix.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/room/MapMatrix.java
rename to src/main/java/com/comandante/creeper/world/MapMatrix.java
index af63cc8422bb60a02a4bff41f5e58ad92a2e4bb5..6f37e4ca5906333edd96410bfba40f5b8a0fa7d0 100644
--- a/src/main/java/com/comandante/creeper/room/MapMatrix.java
+++ b/src/main/java/com/comandante/creeper/world/MapMatrix.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterators;
diff --git a/src/main/java/com/comandante/creeper/room/MapsManager.java b/src/main/java/com/comandante/creeper/world/MapsManager.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/room/MapsManager.java
rename to src/main/java/com/comandante/creeper/world/MapsManager.java
index bf0ea560df7b16703be13c32cfa7190db1aed631..bb9ee82d39fb5741299b332eb86a5e7ce2ac66a6 100644
--- a/src/main/java/com/comandante/creeper/room/MapsManager.java
+++ b/src/main/java/com/comandante/creeper/world/MapsManager.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.comandante.creeper.server.Color;
import com.google.common.base.Function;
diff --git a/src/main/java/com/comandante/creeper/room/Room.java b/src/main/java/com/comandante/creeper/world/Room.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/room/Room.java
rename to src/main/java/com/comandante/creeper/world/Room.java
index d56addc15ecba8656fc8d87872b5d122f7f98ac4..2a1268aa8b4f647d0bffa18a33876499f5e9e051 100644
--- a/src/main/java/com/comandante/creeper/room/Room.java
+++ b/src/main/java/com/comandante/creeper/world/Room.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.comandante.creeper.entity.CreeperEntity;
import com.comandante.creeper.spawner.ItemSpawner;
diff --git a/src/main/java/com/comandante/creeper/room/RoomBuilders.java b/src/main/java/com/comandante/creeper/world/RoomBuilders.java
similarity index 93%
rename from src/main/java/com/comandante/creeper/room/RoomBuilders.java
rename to src/main/java/com/comandante/creeper/world/RoomBuilders.java
index 63c6eaa71ac54a1c5a2e574ba363d9d3fd1211f7..6faeb9c3971f440ec5962e1e0e696847c42dcc55 100644
--- a/src/main/java/com/comandante/creeper/room/RoomBuilders.java
+++ b/src/main/java/com/comandante/creeper/world/RoomBuilders.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.comandante.creeper.Items.ItemType;
import com.comandante.creeper.entity.EntityManager;
@@ -25,7 +25,7 @@ public class RoomBuilders {
entityManager.addEntity(basicRoom);
- BasicRoom room1 = new BasicRoomBuilder().setRoomId(2).setRoomTitle("Quarter Deck").setNorthId(Optional.of(3)).setSouthId(Optional.of(1)).setEastId(Optional.of(4)).setWestId(Optional.of(5)).setUpId(Optional.of(6)).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing on the quarter deck of the Training Encampment. Federation flags line the walls of this large room. A statue of the Grand Marshal of the Federation sit in the back. A Private on watch is behind a desk in the center of the room. To the west you hear the sounds of gun fire. To the east a sentry stands by a door waiting to scan the credentials of anyone looking for access to the armory. A staircase leads up stairs. You get the feeling only high ranking officers are allowed on the second floor. To the north is a door leading to the training fields.\r\n").createBasicRoom();
+ BasicRoom room1 = new BasicRoomBuilder().setRoomId(2).setRoomTitle("Quarter Deck").setNorthId(Optional.of(3)).setSouthId(Optional.of(1)).setEastId(Optional.of(4)).setWestId(Optional.of(5)).setUpId(Optional.of(6)).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing on the quarter deck of the Training Encampment. Federation flags line the walls of this large world. A statue of the Grand Marshal of the Federation sit in the back. A Private on watch is behind a desk in the center of the world. To the west you hear the sounds of gun fire. To the east a sentry stands by a door waiting to scan the credentials of anyone looking for access to the armory. A staircase leads up stairs. You get the feeling only high ranking officers are allowed on the second floor. To the north is a door leading to the training fields.\r\n").createBasicRoom();
room1.setAreas(Sets.newHashSet(Area.NEWBIE_ZONE));
entityManager.addEntity(room1);
BasicRoom room2 = new BasicRoomBuilder().setRoomId(3).setRoomTitle("Training Field").setNorthId(Optional.of(8)).setSouthId(Optional.of(2)).setEastId(Optional.<Integer>absent()).setWestId(Optional.<Integer>absent()).setUpId(Optional.<Integer>absent()).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing on the center of a massive training field. You see a large field with a track" +
@@ -37,15 +37,15 @@ public class RoomBuilders {
BasicRoom room3 = new BasicRoomBuilder().setRoomId(4).setRoomTitle("Armory").setNorthId(Optional.<Integer>absent()).setSouthId(Optional.<Integer>absent()).setEastId(Optional.<Integer>absent()).setWestId(Optional.of(2)).setUpId(Optional.<Integer>absent()).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing in the Federation Training Encampment armory. A counter extends from wall to wall" +
" separating you from the stock. A Lieutenant is standing behind the counter filling out paper" +
- " work. You can see shelves extending to the back of the room fully stocked with Federation" +
+ " work. You can see shelves extending to the back of the world fully stocked with Federation" +
" issued weapons. The door closes and locks behind you.\r\n").createBasicRoom();
room3.setAreas(Sets.newHashSet(Area.NEWBIE_ZONE));
entityManager.addEntity(room3);
- entityManager.addEntity(new BasicRoomBuilder().setRoomId(5).setRoomTitle("Firing Range").setNorthId(Optional.<Integer>absent()).setSouthId(Optional.<Integer>absent()).setEastId(Optional.of(2)).setWestId(Optional.<Integer>absent()).setUpId(Optional.<Integer>absent()).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing in the Federation Training Encampment firing range. You see many rows each separated by a blaster proof divider. At the end of each row sits a target. The sounds of weapon fire fills the room. Straight ahead you see an empty row. Down Range a target is hovering, waiting to be shot.\r\n").createBasicRoom());
+ entityManager.addEntity(new BasicRoomBuilder().setRoomId(5).setRoomTitle("Firing Range").setNorthId(Optional.<Integer>absent()).setSouthId(Optional.<Integer>absent()).setEastId(Optional.of(2)).setWestId(Optional.<Integer>absent()).setUpId(Optional.<Integer>absent()).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing in the Federation Training Encampment firing range. You see many rows each separated by a blaster proof divider. At the end of each row sits a target. The sounds of weapon fire fills the world. Straight ahead you see an empty row. Down Range a target is hovering, waiting to be shot.\r\n").createBasicRoom());
- entityManager.addEntity(new BasicRoomBuilder().setRoomId(6).setRoomTitle("Marshal's Office").setNorthId(Optional.<Integer>absent()).setSouthId(Optional.<Integer>absent()).setEastId(Optional.<Integer>absent()).setWestId(Optional.<Integer>absent()).setUpId(Optional.<Integer>absent()).setDownId(Optional.of(2)).setRoomDescription("You are standing in the Marshal's office. A beautiful wooden desk sits in the center of the room. Shelves and bookcases line the walls showing off some of the Marshals accomplishments. A floor to ceiling window in the back of the room looks over the training fields. \r\n").createBasicRoom());
+ entityManager.addEntity(new BasicRoomBuilder().setRoomId(6).setRoomTitle("Marshal's Office").setNorthId(Optional.<Integer>absent()).setSouthId(Optional.<Integer>absent()).setEastId(Optional.<Integer>absent()).setWestId(Optional.<Integer>absent()).setUpId(Optional.<Integer>absent()).setDownId(Optional.of(2)).setRoomDescription("You are standing in the Marshal's office. A beautiful wooden desk sits in the center of the world. Shelves and bookcases line the walls showing off some of the Marshals accomplishments. A floor to ceiling window in the back of the world looks over the training fields. \r\n").createBasicRoom());
entityManager.addEntity(new BasicRoomBuilder().setRoomId(7).setRoomTitle("Emerald City Bullet Station").setNorthId(Optional.of(100)).setSouthId(Optional.of(8)).setEastId(Optional.of(200)).setWestId(Optional.of(300)).setUpId(Optional.<Integer>absent()).setDownId(Optional.<Integer>absent()).setRoomDescription("You are standing in the Emerald City bullet train station. A sign points to the north for the train to Tacoma Space Port, to the west New Portland and the east Shanty town. \r\n").createBasicRoom());
diff --git a/src/main/java/com/comandante/creeper/room/RoomManager.java b/src/main/java/com/comandante/creeper/world/RoomManager.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/room/RoomManager.java
rename to src/main/java/com/comandante/creeper/world/RoomManager.java
index 767331b9f24282e238d8c34a6b59c380d2759f88..0f8b640180adb7f0b3cebae59efb87dae67c70ea 100644
--- a/src/main/java/com/comandante/creeper/room/RoomManager.java
+++ b/src/main/java/com/comandante/creeper/world/RoomManager.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/room/RoomModel.java b/src/main/java/com/comandante/creeper/world/RoomModel.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/room/RoomModel.java
rename to src/main/java/com/comandante/creeper/world/RoomModel.java
index 7e7fc13ffd4a7cb4bf699ccf30b6139759b9ee53..f92b2b0cb76d750aa70c7c933f7a1220983a8f36 100644
--- a/src/main/java/com/comandante/creeper/room/RoomModel.java
+++ b/src/main/java/com/comandante/creeper/world/RoomModel.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/comandante/creeper/room/RoomModelBuilder.java b/src/main/java/com/comandante/creeper/world/RoomModelBuilder.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/room/RoomModelBuilder.java
rename to src/main/java/com/comandante/creeper/world/RoomModelBuilder.java
index 71f817c36ce2309a6305aeee653632daff9498de..cbb53aa2e3bbb5d98ba26d850c5278dcfebdcaaa 100644
--- a/src/main/java/com/comandante/creeper/room/RoomModelBuilder.java
+++ b/src/main/java/com/comandante/creeper/world/RoomModelBuilder.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.google.common.collect.Sets;
diff --git a/src/main/java/com/comandante/creeper/room/WorldExporter.java b/src/main/java/com/comandante/creeper/world/WorldExporter.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/room/WorldExporter.java
rename to src/main/java/com/comandante/creeper/world/WorldExporter.java
index 0535d14cfbaf6b36b9544f37e6d2bcd889d93681..d29fefde5730eb5d50818e2cb1efe918e5917f87 100644
--- a/src/main/java/com/comandante/creeper/room/WorldExporter.java
+++ b/src/main/java/com/comandante/creeper/world/WorldExporter.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.room;
+package com.comandante.creeper.world;
import com.comandante.creeper.entity.EntityManager;
import com.google.common.base.Function;