From a7868b3ebf06e563e724496c9546f97e3a44002d Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris.kearney@urbanairship.com>
Date: Sat, 30 Aug 2014 17:44:52 -0700
Subject: [PATCH] more.

---
 .../java/com/comandante/creeper/Main.java     | 28 +++++++++----------
 .../creeper/player/PlayerMovement.java        |  2 +-
 ...java => CreeperAuthenticationHandler.java} |  6 ++--
 ...andler.java => CreeperCommandHandler.java} |  6 ++--
 .../CreeperCommandRegistry.java               |  4 +--
 .../creeper/server/CreeperServer.java         |  2 +-
 .../commands => server/command}/Command.java  |  2 +-
 .../command}/DropCommand.java                 |  2 +-
 .../command}/GossipCommand.java               |  2 +-
 .../command}/InventoryCommand.java            |  2 +-
 .../command}/KillCommand.java                 |  2 +-
 .../command}/LookCommand.java                 |  2 +-
 .../command}/MovementCommand.java             |  2 +-
 .../command}/PickUpCommand.java               |  2 +-
 .../command}/SayCommand.java                  |  2 +-
 .../command}/TellCommand.java                 |  2 +-
 .../command}/UnknownCommand.java              |  2 +-
 .../command}/UseCommand.java                  |  2 +-
 .../command}/WhoCommand.java                  |  2 +-
 .../command}/WhoamiCommand.java               |  2 +-
 20 files changed, 38 insertions(+), 38 deletions(-)
 rename src/main/java/com/comandante/creeper/server/{AuthHandler.java => CreeperAuthenticationHandler.java} (95%)
 rename src/main/java/com/comandante/creeper/server/{MudCommandHandler.java => CreeperCommandHandler.java} (88%)
 rename src/main/java/com/comandante/creeper/{command => server}/CreeperCommandRegistry.java (89%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/Command.java (97%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/DropCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/GossipCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/InventoryCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/KillCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/LookCommand.java (97%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/MovementCommand.java (99%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/PickUpCommand.java (97%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/SayCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/TellCommand.java (98%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/UnknownCommand.java (92%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/UseCommand.java (97%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/WhoCommand.java (97%)
 rename src/main/java/com/comandante/creeper/{command/commands => server/command}/WhoamiCommand.java (95%)

diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index 2d247109..c51ac646 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -1,19 +1,19 @@
 package com.comandante.creeper;
 
-import com.comandante.creeper.command.CreeperCommandRegistry;
-import com.comandante.creeper.command.commands.DropCommand;
-import com.comandante.creeper.command.commands.GossipCommand;
-import com.comandante.creeper.command.commands.InventoryCommand;
-import com.comandante.creeper.command.commands.KillCommand;
-import com.comandante.creeper.command.commands.LookCommand;
-import com.comandante.creeper.command.commands.MovementCommand;
-import com.comandante.creeper.command.commands.PickUpCommand;
-import com.comandante.creeper.command.commands.SayCommand;
-import com.comandante.creeper.command.commands.TellCommand;
-import com.comandante.creeper.command.commands.UnknownCommand;
-import com.comandante.creeper.command.commands.UseCommand;
-import com.comandante.creeper.command.commands.WhoCommand;
-import com.comandante.creeper.command.commands.WhoamiCommand;
+import com.comandante.creeper.server.CreeperCommandRegistry;
+import com.comandante.creeper.server.command.DropCommand;
+import com.comandante.creeper.server.command.GossipCommand;
+import com.comandante.creeper.server.command.InventoryCommand;
+import com.comandante.creeper.server.command.KillCommand;
+import com.comandante.creeper.server.command.LookCommand;
+import com.comandante.creeper.server.command.MovementCommand;
+import com.comandante.creeper.server.command.PickUpCommand;
+import com.comandante.creeper.server.command.SayCommand;
+import com.comandante.creeper.server.command.TellCommand;
+import com.comandante.creeper.server.command.UnknownCommand;
+import com.comandante.creeper.server.command.UseCommand;
+import com.comandante.creeper.server.command.WhoCommand;
+import com.comandante.creeper.server.command.WhoamiCommand;
 import com.comandante.creeper.entity.EntityManager;
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.managers.SessionManager;
diff --git a/src/main/java/com/comandante/creeper/player/PlayerMovement.java b/src/main/java/com/comandante/creeper/player/PlayerMovement.java
index 845f71e5..2737a30d 100644
--- a/src/main/java/com/comandante/creeper/player/PlayerMovement.java
+++ b/src/main/java/com/comandante/creeper/player/PlayerMovement.java
@@ -1,6 +1,6 @@
 package com.comandante.creeper.player;
 
-import com.comandante.creeper.command.commands.MovementCommand;
+import com.comandante.creeper.server.command.MovementCommand;
 
 public class PlayerMovement {
 
diff --git a/src/main/java/com/comandante/creeper/server/AuthHandler.java b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/server/AuthHandler.java
rename to src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
index 7800374a..14f19417 100644
--- a/src/main/java/com/comandante/creeper/server/AuthHandler.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperAuthenticationHandler.java
@@ -11,12 +11,12 @@ import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
 import static com.comandante.creeper.server.Color.RESET;
 
-public class AuthHandler extends SimpleChannelUpstreamHandler {
+public class CreeperAuthenticationHandler extends SimpleChannelUpstreamHandler {
 
     private final GameManager gameManager;
     private final CreeperAuthenticator creeperAuthenticator;
 
-    public AuthHandler(GameManager gameManager) {
+    public CreeperAuthenticationHandler(GameManager gameManager) {
         this.gameManager = gameManager;
         this.creeperAuthenticator = new GameAuth(gameManager);
     }
@@ -61,7 +61,7 @@ public class AuthHandler extends SimpleChannelUpstreamHandler {
             }
         } else {
             gameManager.getPlayerManager().getSessionManager().putSession(creeperSession);
-            e.getChannel().getPipeline().addLast("server_handler", new MudCommandHandler(gameManager));
+            e.getChannel().getPipeline().addLast("server_handler", new CreeperCommandHandler(gameManager));
             e.getChannel().getPipeline().remove(this);
             e.getChannel().setAttachment(creeperSession);
         }
diff --git a/src/main/java/com/comandante/creeper/server/MudCommandHandler.java b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
similarity index 88%
rename from src/main/java/com/comandante/creeper/server/MudCommandHandler.java
rename to src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
index 2371ba6a..33614029 100644
--- a/src/main/java/com/comandante/creeper/server/MudCommandHandler.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperCommandHandler.java
@@ -1,18 +1,18 @@
 package com.comandante.creeper.server;
 
 import com.comandante.creeper.Main;
-import com.comandante.creeper.command.commands.Command;
 import com.comandante.creeper.managers.GameManager;
+import com.comandante.creeper.server.command.Command;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.ExceptionEvent;
 import org.jboss.netty.channel.MessageEvent;
 import org.jboss.netty.channel.SimpleChannelUpstreamHandler;
 
-public class MudCommandHandler extends SimpleChannelUpstreamHandler {
+public class CreeperCommandHandler extends SimpleChannelUpstreamHandler {
 
     private final GameManager gameManager;
 
-    public MudCommandHandler(GameManager gameManager) {
+    public CreeperCommandHandler(GameManager gameManager) {
         this.gameManager = gameManager;
     }
 
diff --git a/src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java b/src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
similarity index 89%
rename from src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java
rename to src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
index 25c3a6ff..0106d1ba 100644
--- a/src/main/java/com/comandante/creeper/command/CreeperCommandRegistry.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperCommandRegistry.java
@@ -1,6 +1,6 @@
-package com.comandante.creeper.command;
+package com.comandante.creeper.server;
 
-import com.comandante.creeper.command.commands.Command;
+import com.comandante.creeper.server.command.Command;
 
 import java.util.HashMap;
 import java.util.List;
diff --git a/src/main/java/com/comandante/creeper/server/CreeperServer.java b/src/main/java/com/comandante/creeper/server/CreeperServer.java
index cbca1626..1bb8176e 100644
--- a/src/main/java/com/comandante/creeper/server/CreeperServer.java
+++ b/src/main/java/com/comandante/creeper/server/CreeperServer.java
@@ -21,7 +21,7 @@ public class CreeperServer {
 
     public void run(GameManager gameManager) throws Exception {
         ServerBootstrap bootstrap = new ServerBootstrap(new NioServerSocketChannelFactory(Executors.newCachedThreadPool(), Executors.newCachedThreadPool()));
-        AuthHandler handler = new AuthHandler(gameManager);
+        CreeperAuthenticationHandler handler = new CreeperAuthenticationHandler(gameManager);
         bootstrap.setPipelineFactory(new CreeperServerPipelineFactory(handler));
         bootstrap.bind(new InetSocketAddress(port));
     }
diff --git a/src/main/java/com/comandante/creeper/command/commands/Command.java b/src/main/java/com/comandante/creeper/server/command/Command.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/Command.java
rename to src/main/java/com/comandante/creeper/server/command/Command.java
index 43739fdf..e6ff16a5 100644
--- a/src/main/java/com/comandante/creeper/command/commands/Command.java
+++ b/src/main/java/com/comandante/creeper/server/command/Command.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Main;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/DropCommand.java
rename to src/main/java/com/comandante/creeper/server/command/DropCommand.java
index 2ec7b9a3..c4ad3a3f 100644
--- a/src/main/java/com/comandante/creeper/command/commands/DropCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/DropCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/GossipCommand.java b/src/main/java/com/comandante/creeper/server/command/GossipCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/GossipCommand.java
rename to src/main/java/com/comandante/creeper/server/command/GossipCommand.java
index 2ea4b4ab..5f16171c 100644
--- a/src/main/java/com/comandante/creeper/command/commands/GossipCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/GossipCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java b/src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java
rename to src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
index c2b15100..f745fe94 100644
--- a/src/main/java/com/comandante/creeper/command/commands/InventoryCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/InventoryCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.Items.Item;
diff --git a/src/main/java/com/comandante/creeper/command/commands/KillCommand.java b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/KillCommand.java
rename to src/main/java/com/comandante/creeper/server/command/KillCommand.java
index 42027687..f0f297c4 100644
--- a/src/main/java/com/comandante/creeper/command/commands/KillCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/KillCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.fight.FightManager;
 import com.comandante.creeper.fight.FightResults;
diff --git a/src/main/java/com/comandante/creeper/command/commands/LookCommand.java b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/LookCommand.java
rename to src/main/java/com/comandante/creeper/server/command/LookCommand.java
index 51c12d53..56c8b2c7 100644
--- a/src/main/java/com/comandante/creeper/command/commands/LookCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/LookCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/MovementCommand.java b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/command/commands/MovementCommand.java
rename to src/main/java/com/comandante/creeper/server/command/MovementCommand.java
index 1ccdb315..18895f12 100644
--- a/src/main/java/com/comandante/creeper/command/commands/MovementCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/MovementCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.fight.FightManager;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java
rename to src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
index da58f120..cfd7f815 100644
--- a/src/main/java/com/comandante/creeper/command/commands/PickUpCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/PickUpCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.Items.Item;
 import com.comandante.creeper.managers.GameManager;
diff --git a/src/main/java/com/comandante/creeper/command/commands/SayCommand.java b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/SayCommand.java
rename to src/main/java/com/comandante/creeper/server/command/SayCommand.java
index 5ffacf45..c0eca5a5 100644
--- a/src/main/java/com/comandante/creeper/command/commands/SayCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/SayCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/TellCommand.java b/src/main/java/com/comandante/creeper/server/command/TellCommand.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/command/commands/TellCommand.java
rename to src/main/java/com/comandante/creeper/server/command/TellCommand.java
index 8f9d4aff..0976f48b 100644
--- a/src/main/java/com/comandante/creeper/command/commands/TellCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/TellCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java b/src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
similarity index 92%
rename from src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java
rename to src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
index 76317c1f..d516deff 100644
--- a/src/main/java/com/comandante/creeper/command/commands/UnknownCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/UnknownCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/command/commands/UseCommand.java b/src/main/java/com/comandante/creeper/server/command/UseCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/UseCommand.java
rename to src/main/java/com/comandante/creeper/server/command/UseCommand.java
index 42802213..83673d4e 100644
--- a/src/main/java/com/comandante/creeper/command/commands/UseCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/UseCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 
 import com.comandante.creeper.Items.Item;
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java b/src/main/java/com/comandante/creeper/server/command/WhoCommand.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
rename to src/main/java/com/comandante/creeper/server/command/WhoCommand.java
index 39806d9f..5db783ae 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/WhoCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
diff --git a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java b/src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
similarity index 95%
rename from src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
rename to src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
index 2d318fbc..9570b896 100644
--- a/src/main/java/com/comandante/creeper/command/commands/WhoamiCommand.java
+++ b/src/main/java/com/comandante/creeper/server/command/WhoamiCommand.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.command.commands;
+package com.comandante.creeper.server.command;
 
 import com.comandante.creeper.managers.GameManager;
 import com.comandante.creeper.player.Player;
-- 
GitLab