15 files changed, 283 insertions, 195 deletions

diff --git a/src/esieequest/controller/commands/DoCommand.java b/src/esieequest/controller/commands/DoCommand.java
index 219dba9..95269de 100644
--- a/src/esieequest/controller/commands/DoCommand.java
+++ b/src/esieequest/controller/commands/DoCommand.java
@@ -23,7 +23,7 @@ public class DoCommand implements Executable {
                         return;
                 }
 
-                if (currentSide.hasItem()) {
+                if (currentSide.getInventory().getSize() == 1) {
                         Command.TAKE.execute(argument, game, view);
                         return;
                 }
diff --git a/src/esieequest/controller/commands/DropCommand.java b/src/esieequest/controller/commands/DropCommand.java
index 8d2b820..09b2394 100644
--- a/src/esieequest/controller/commands/DropCommand.java
+++ b/src/esieequest/controller/commands/DropCommand.java
@@ -23,18 +23,13 @@ public class DropCommand implements Executable {
                         return;
                 }
 
-                if (!game.getPlayer().hasItem(itemName)) {
+                if (!game.getPlayer().getInventory().hasItem(itemName)) {
                         view.echo(Text.NO_SUCH_ITEM.getText());
                         return;
                 }
 
-                if (game.getPlayer().getCurrentSide().hasItem()) {
-                        view.echo(Text.ROOM_INVENTORY_FULL.getText());
-                        return;
-                }
-
-                final Item item = game.getPlayer().takeItem(itemName);
-                game.getPlayer().getCurrentSide().putItem(item);
+                final Item item = game.getPlayer().getInventory().takeItem(itemName);
+                game.getPlayer().getCurrentSide().getInventory().putItem(item);
 
         }
 
diff --git a/src/esieequest/controller/commands/InventoryCommand.java b/src/esieequest/controller/commands/InventoryCommand.java
index 0f95ead..a6ce080 100644
--- a/src/esieequest/controller/commands/InventoryCommand.java
+++ b/src/esieequest/controller/commands/InventoryCommand.java
@@ -13,7 +13,7 @@ public class InventoryCommand implements Executable {
         @Override
         public void execute(final String argument, final Game game, final Viewable view) {
 
-                view.echo(game.getPlayer().listItemsNamesString() + game.getPlayer().getWeightString());
+                view.echo(game.getPlayer().getInventory().listItemsNamesString() + game.getPlayer().getInventory().getWeightString());
 
         }
 
diff --git a/src/esieequest/controller/commands/TakeCommand.java b/src/esieequest/controller/commands/TakeCommand.java
index 16327e4..8b8a461 100644
--- a/src/esieequest/controller/commands/TakeCommand.java
+++ b/src/esieequest/controller/commands/TakeCommand.java
@@ -29,23 +29,23 @@ public class TakeCommand implements Executable {
                         item = currentRoom.getItem(itemName);
                 } else {
                         final Side currentSide = game.getPlayer().getCurrentSide();
-                        if (!currentSide.hasItem()) {
+                        if (currentSide.getInventory().getSize() != 1) {
                                 view.echo(Text.NO_ITEM.getText());
                                 return;
                         }
-                        item = currentSide.getItem();
+                        item = currentSide.getInventory().getItem();
                 }
 
                 // handle inventory weight limit
                 final int maximumWeight = game.getPlayer().getInventoryWeightLimit();
-                final int futureWeight = game.getPlayer().getItemsWeight() + item.getWeight();
+                final int futureWeight = game.getPlayer().getInventory().getTotalWeight() + item.getWeight();
                 if (futureWeight > maximumWeight) {
                         view.echo(Text.INVENTORY_FULL.getText());
                         return;
                 }
 
                 game.getPlayer().getCurrentRoom().removeItem(item);
-                game.getPlayer().addItem(item);
+                game.getPlayer().getInventory().putItem(item);
 
         }
 
diff --git a/src/esieequest/controller/commands/UseCommand.java b/src/esieequest/controller/commands/UseCommand.java
index 56eaf00..00fc234 100644
--- a/src/esieequest/controller/commands/UseCommand.java
+++ b/src/esieequest/controller/commands/UseCommand.java
@@ -22,12 +22,12 @@ public class UseCommand implements Executable {
                         return;
                 }
 
-                if (!game.getPlayer().hasItem(itemName)) {
+                if (!game.getPlayer().getInventory().hasItem(itemName)) {
                         view.echo(Text.NO_SUCH_ITEM.getText());
                         return;
                 }
 
-                final Item item = game.getPlayer().getItem(itemName);
+                final Item item = game.getPlayer().getInventory().getItem(itemName);
                 item.use(game, view);
 
         }
diff --git a/src/esieequest/controller/utils/SerialisableList.java b/src/esieequest/controller/utils/SerialisableList.java
new file mode 100644
index 0000000..8e2cb78
--- /dev/null
+++ b/src/esieequest/controller/utils/SerialisableList.java
@@ -0,0 +1,27 @@
+package esieequest.controller.utils;
+
+import org.json.simple.JSONArray;
+
+/**
+ * Represents an Object that can be serialised and deserialised.
+ * 
+ * @author Pacien TRAN-GIRARD
+ */
+public interface SerialisableList {
+
+        /**
+         * Serialises to a JSONObject.
+         * 
+         * @return the JSONObject
+         */
+        public JSONArray serialise();
+
+        /**
+         * Deserialises from a JSONObject.
+         * 
+         * @param o
+         *            the JSONObject
+         */
+        public void deserialise(final JSONArray o);
+
+}
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 05fdcd2..bdcc698 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -178,7 +178,7 @@ public class Game implements SerialisableObject {
          *            the Item
          */
         private void i(final Room room, final Direction direction, final Item item) {
-                room.getSide(direction).setItem(item);
+                room.getSide(direction).getInventory().putItem(item);
         }
 
         /**
diff --git a/src/esieequest/model/Player.java b/src/esieequest/model/Player.java
index 68930e2..a0066dc 100644
--- a/src/esieequest/model/Player.java
+++ b/src/esieequest/model/Player.java
@@ -1,20 +1,17 @@
 package esieequest.model;
 
-import java.util.ArrayList;
 import java.util.Stack;
 
 import lombok.Getter;
 import lombok.Setter;
 import net.pacien.util.CleanJSONObject;
-import net.pacien.util.IntrinsicMap;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
 import esieequest.controller.utils.EnumUtils;
-import esieequest.controller.utils.ListUtils;
 import esieequest.controller.utils.SerialisableObject;
-import esieequest.model.items.Item;
+import esieequest.model.items.Inventory;
 import esieequest.model.map.Direction;
 import esieequest.model.map.Room;
 import esieequest.model.map.Side;
@@ -40,8 +37,9 @@ public class Player implements SerialisableObject {
         @Setter
         private Direction currentDirection;