From 8bd0d8af4337e35dda0b7c0c4b9346333756a77c Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Fri, 5 Sep 2014 21:15:37 -0700
Subject: [PATCH] renamed.
---
src/main/java/com/comandante/creeper/Main.java | 10 +++++-----
.../com/comandante/creeper/entity/EntityManager.java | 4 ++--
.../com/comandante/creeper/managers/GameManager.java | 8 ++++----
src/main/java/com/comandante/creeper/npc/Npc.java | 2 +-
src/main/java/com/comandante/creeper/npc/NpcMover.java | 4 ++--
.../java/com/comandante/creeper/npc/StreetHustler.java | 2 +-
.../com/comandante/creeper/player/PlayerManager.java | 2 +-
.../com/comandante/creeper/server/ChannelUtils.java | 4 ++--
.../comandante/creeper/server/command/DropCommand.java | 2 +-
.../comandante/creeper/server/command/KillCommand.java | 2 +-
.../comandante/creeper/server/command/LookCommand.java | 2 +-
.../creeper/server/command/MovementCommand.java | 6 +++---
.../creeper/server/command/PickUpCommand.java | 2 +-
.../comandante/creeper/server/command/SayCommand.java | 4 ++--
.../server/command/admin/DescriptionCommand.java | 2 +-
.../creeper/server/command/admin/SaveWorldCommand.java | 2 +-
.../creeper/server/command/admin/TagRoomCommand.java | 6 +++---
.../creeper/server/command/admin/TitleCommand.java | 2 +-
.../com/comandante/creeper/spawner/NpcSpawner.java | 4 ++--
.../com/comandante/creeper/{room => world}/Area.java | 2 +-
.../comandante/creeper/{room => world}/BasicRoom.java | 2 +-
.../creeper/{room => world}/BasicRoomBuilder.java | 2 +-
.../com/comandante/creeper/{room => world}/Coords.java | 2 +-
.../creeper/{room => world}/FloorManager.java | 2 +-
.../comandante/creeper/{room => world}/FloorModel.java | 2 +-
.../comandante/creeper/{room => world}/MapMatrix.java | 2 +-
.../creeper/{room => world}/MapsManager.java | 2 +-
.../com/comandante/creeper/{room => world}/Room.java | 2 +-
.../creeper/{room => world}/RoomBuilders.java | 10 +++++-----
.../creeper/{room => world}/RoomManager.java | 2 +-
.../comandante/creeper/{room => world}/RoomModel.java | 2 +-
.../creeper/{room => world}/RoomModelBuilder.java | 2 +-
.../creeper/{room => world}/WorldExporter.java | 2 +-
33 files changed, 53 insertions(+), 53 deletions(-)
rename src/main/java/com/comandante/creeper/{room => world}/Area.java (92%)
rename src/main/java/com/comandante/creeper/{room => world}/BasicRoom.java (95%)
rename src/main/java/com/comandante/creeper/{room => world}/BasicRoomBuilder.java (98%)
rename src/main/java/com/comandante/creeper/{room => world}/Coords.java (88%)
rename src/main/java/com/comandante/creeper/{room => world}/FloorManager.java (95%)
rename src/main/java/com/comandante/creeper/{room => world}/FloorModel.java (95%)
rename src/main/java/com/comandante/creeper/{room => world}/MapMatrix.java (99%)
rename src/main/java/com/comandante/creeper/{room => world}/MapsManager.java (98%)
rename src/main/java/com/comandante/creeper/{room => world}/Room.java (99%)
rename src/main/java/com/comandante/creeper/{room => world}/RoomBuilders.java (93%)
rename src/main/java/com/comandante/creeper/{room => world}/RoomManager.java (98%)
rename src/main/java/com/comandante/creeper/{room => world}/RoomModel.java (98%)
rename src/main/java/com/comandante/creeper/{room => world}/RoomModelBuilder.java (97%)
rename src/main/java/com/comandante/creeper/{room => world}/WorldExporter.java (99%)
diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index d6655cad..a420c4a8 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 55d53a5d..1c5374ec 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 8eac0a90..a3104b82 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 f4ebefe4..5a11e6e7 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 7707e86c..162843aa 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 e9e76c5a..965a739f 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 0874635f..825ba85d 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 11bfd5e1..5bd26a9e 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 dbd99b18..ce2233ef 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 f740bc26..76285768 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 806a541e..574021fd 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 dae384b1..81af7973 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 eb38f0f0..a204575e 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 ee5b8677..bdc82d21 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 eecf1bcc..c9fc1550 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 ff69a189..f1657ff4 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 94824894..c4084273 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 5e935153..f6b09d5b 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 f6ac311f..ee19200b 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 542893aa..53fcacca 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 6f20ed8f..fcc0e00c 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 3d703bd2..a038e11f 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 e49f54ac..86559c83 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 b18bcec8..4db93f17 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 f41f5b49..c2d42a08 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 af63cc84..6f37e4ca 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 bf0ea560..bb9ee82d 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 d56addc1..2a1268aa 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 63c6eaa7..6faeb9c3 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 767331b9..0f8b6401 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 7e7fc13f..f92b2b0c 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 71f817c3..cbb53aa2 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 0535d14c..d29fefde 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;
--
GitLab