UI fix for UHD monitors

fix faulty object property name

.gitattributes

@@ -0,0 +1,5 @@
+src/main/resources/static/css/bootstrap4-neon-glow.min linguist-vendored
+src/main/resources/static/css/bootstrap-grid.min linguist-vendored
+src/main/resources/static/css/bootstrap-reboot.min linguist-vendored
+src/main/resources/static/js/* linguist-vendored
+src/main/resources/static/js/ace/* linguist-vendored

.gitignore

@@ -0,0 +1,18 @@
+
+.idea/*
+mar.log
+mar.log.lck
+*.iml
+*.class
+*/target/*
+plugins/*.jar
+save.json
+Server/Server.iml
+target/*
+src/main/java/META-INF/MANIFEST.MF
+src/main/resources/static/js/mar.js
+.settings
+.project
+.classpath
+# VSCode Workspace
+.vscode/

CONTRIBUTING.md

@@ -0,0 +1,14 @@
+## General guide
+
+[Collaboration guide](https://github.com/simon987/Much-Assembly-Required/wiki/Collaboration-Guide)
+
+## Before creating a pull request
+
+Here small unordered list of guidelines to read before creating a pull request
+- Use java <= 1.8 features
+- Please follow [Google's Java style guide](https://google.github.io/styleguide/javaguide.html)
+- Constants (e.g. the energy cost of an in-game action) should be loaded from config.properties
+- Use `Logmanager.LOGGER` to log messages to the console. Use `.fine()` for debugging messages and `.info()` for 
+info for more important messages 
+that are not too frequently used.
+- Please state what tests have been performed in the pull request

Dockerfile

@@ -0,0 +1,6 @@
+FROM maven:3.5-jdk-8
+COPY /. /app/
+WORKDIR /app
+RUN mvn package
+WORKDIR /app/target
+CMD ["java", "-jar", "/app/target/server-1.6a.jar"]

Plugin Cubot/plugin.properties

@@ -1,3 +0,0 @@
-classpath=net.simon987.cubotplugin.CubotPlugin
-name=Cubot Plugin
-version=1.0

Plugin Cubot/src/net/simon987/cubotplugin/Cubot.java

@@ -1,192 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.Memory;
-import net.simon987.server.game.ControllableUnit;
-import net.simon987.server.game.Direction;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.game.Updatable;
-import net.simon987.server.user.User;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-
-public class Cubot extends GameObject implements Updatable, ControllableUnit {
-
-    private static final char MAP_INFO = 0x0080;
-    public static final int ID = 1;
-
-    private char hologram = 0;
-    private char lastHologram = 0;
-
-    /**
-     * Hit points
-     */
-    private int hp;
-    private int heldItem;
-
-    private CubotAction currentAction = CubotAction.IDLE;
-    private CubotAction lastAction = CubotAction.IDLE;
-
-    private ArrayList<Integer> keyboardBuffer = new ArrayList<>();
-
-    private FloppyDisk floppyDisk;
-
-    private User parent;
-
-    private int energy;
-    private int maxEnergy;
-
-    public Cubot() {
-
-    }
-
-    @Override
-    public char getMapInfo() {
-        return MAP_INFO;
-    }
-
-    @Override
-    public void update() {
-
-        if (currentAction == CubotAction.WALKING) {
-            if (spendEnergy(100)) {
-                if (!incrementLocation()) {
-                    //Couldn't walk
-                    currentAction = CubotAction.IDLE;
-                }
-            } else {
-                currentAction = CubotAction.IDLE;
-            }
-        }
-
-        /*
-         * CurrentAction is set during the code execution and this function is called right after
-         * If no action as been set, the action sent to the client is the action in currentAction that
-         * was set last tick (IDLE)
-         */
-        lastAction = currentAction;
-        currentAction = CubotAction.IDLE;
-
-        //Same principle for hologram
-        lastHologram = hologram;
-        hologram = 0;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("id", getObjectId());
-        json.put("type", ID);
-        json.put("x", getX());
-        json.put("y", getY());
-        json.put("direction", getDirection().ordinal());
-        json.put("heldItem", heldItem);
-        json.put("hp", hp);
-        json.put("action", lastAction.ordinal());
-        json.put("holo", (int) lastHologram);
-        json.put("energy", (int) lastHologram);
-
-        if (parent != null) {
-            json.put("parent", parent.getUsername()); //Only used client-side for now
-        }
-
-        return json;
-    }
-
-    public static Cubot deserialize(JSONObject json) {
-
-        Cubot cubot = new Cubot();
-        cubot.setObjectId((int)(long)json.get("id"));
-        cubot.setX((int)(long)json.get("x"));
-        cubot.setY((int)(long)json.get("y"));
-        cubot.hp = (int)(long)json.get("hp");
-        cubot.setDirection(Direction.getDirection((int)(long)json.get("direction")));
-        cubot.heldItem = (int)(long)json.get("heldItem");
-        cubot.energy = (int) (long) json.get("energy");
-        cubot.maxEnergy = GameServer.INSTANCE.getConfig().getInt("battery_max_energy");
-
-        return cubot;
-
-    }
-
-    public void setHeldItem(int heldItem) {
-        this.heldItem = heldItem;
-    }
-
-    public int getHeldItem() {
-        return heldItem;
-    }
-
-    @Override
-    public void setKeyboardBuffer(ArrayList<Integer> kbBuffer) {
-        keyboardBuffer = kbBuffer;
-    }
-
-    @Override
-    public ArrayList<Integer> getKeyboardBuffer() {
-        return keyboardBuffer;
-    }
-
-    public void clearKeyboardBuffer(){
-        keyboardBuffer.clear();
-    }
-
-    public void setCurrentAction(CubotAction currentAction) {
-        this.currentAction = currentAction;
-    }
-
-    public User getParent() {
-        return parent;
-    }
-
-    public void setParent(User parent) {
-        this.parent = parent;
-    }
-
-    public CubotAction getAction() {
-        return lastAction;
-    }
-
-    public void setHologram(char hologram) {
-        this.hologram = hologram;
-    }
-
-    public char getHologram() {
-        return lastHologram;
-    }
-
-
-    public int getEnergy() {
-        return energy;
-    }
-
-    public void setEnergy(int energy) {
-        this.energy = energy;
-    }
-
-    public boolean spendEnergy(int spent) {
-
-        if (energy - spent < 0) {
-            return false;
-        } else {
-            energy -= spent;
-            return true;
-        }
-
-
-    }
-
-    public void setMaxEnergy(int maxEnergy) {
-        this.maxEnergy = maxEnergy;
-    }
-
-    public int getMaxEnergy() {
-        return maxEnergy;
-    }
-
-    @Override
-    public Memory getFloppyData() {
-        return ((CubotFloppyDrive) getParent().getCpu().getHardware(CubotFloppyDrive.DEFAULT_ADDRESS)).getFloppy().getMemory();
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java

@@ -1,10 +0,0 @@
-package net.simon987.cubotplugin;
-
-public enum CubotAction {
-    IDLE,
-    DIGGING,
-    WALKING,
-    WITHDRAWING,
-    DEPOSITING
-
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotBattery.java

@@ -1,59 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import org.json.simple.JSONObject;
-
-public class CubotBattery extends CpuHardware {
-
-    public static final int DEFAULT_ADDRESS = 0x000A;
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    public static final char HWID = 0x000A;
-
-    private Cubot cubot;
-    private static final int POLL = 1;
-    private static final int GET_MAX_CAPACITY = 2;
-
-    public CubotBattery(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-
-        if (a == POLL) {
-            getCpu().getRegisterSet().getRegister("B").setValue(cubot.getEnergy());
-
-        } else if (a == GET_MAX_CAPACITY) {
-            getCpu().getRegisterSet().getRegister("B").setValue(cubot.getMaxEnergy());
-        } else if (a == 0xFFFF) {
-            cubot.setEnergy(cubot.getMaxEnergy());
-        }
-
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotBattery deserialize(JSONObject hwJSON) {
-        return new CubotBattery((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int) (long) hwJSON.get("cubot")));
-    }
-
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotDrill.java

@@ -1,75 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.TileMap;
-import org.json.simple.JSONObject;
-
-public class CubotDrill extends CpuHardware {
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    static final char HWID = 0x0005;
-
-    public static final int DEFAULT_ADDRESS = 5;
-
-    private static final int POLL = 1;
-    private static final int GATHER_SLOW = 2;
-    private static final int GATHER_FAST = 3;
-
-    private Cubot cubot;
-
-    public CubotDrill(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-
-        if (a == POLL) {
-
-            getCpu().getRegisterSet().getRegister("B").setValue(0);
-
-        } else if (a == GATHER_SLOW || a == GATHER_FAST) {
-
-            if (cubot.spendEnergy(1400)) {
-                if (cubot.getAction() == CubotAction.IDLE) {
-                    int tile = cubot.getWorld().getTileMap().getTileAt(cubot.getX(), cubot.getY());
-
-                    if (tile == TileMap.IRON_TILE) {
-                        cubot.setHeldItem(TileMap.ITEM_IRON);
-                        cubot.setCurrentAction(CubotAction.DIGGING);
-
-                    } else if (tile == TileMap.COPPER_TILE) {
-                        cubot.setHeldItem(TileMap.ITEM_COPPER);
-                        cubot.setCurrentAction(CubotAction.DIGGING);
-
-                    }
-                }
-            }
-
-
-        }
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotDrill deserialize(JSONObject hwJSON){
-        return new CubotDrill((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int)(long)hwJSON.get("cubot")));
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotHologram.java

@@ -1,49 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import org.json.simple.JSONObject;
-
-public class CubotHologram extends CpuHardware {
-
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    static final char HWID = 0x0009;
-
-    public static final int DEFAULT_ADDRESS = 9;
-
-    private Cubot cubot;
-
-    public CubotHologram(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        char a = getCpu().getRegisterSet().getRegister("A").getValue();
-        cubot.setHologram(a);
-
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    public static CubotHologram deserialize(JSONObject hwJSON) {
-        return new CubotHologram((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int) (long) hwJSON.get("cubot")));
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotInventory.java

@@ -1,61 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import org.json.simple.JSONObject;
-
-public class CubotInventory extends CpuHardware {
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    static final char HWID = 0x0006;
-
-    public static final int DEFAULT_ADDRESS = 6;
-
-    private Cubot cubot;
-
-    private static final int POLL = 1;
-    private static final int CLEAR = 2;
-
-    public CubotInventory(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-
-        if(a == POLL) {
-
-            getCpu().getRegisterSet().getRegister("B").setValue(cubot.getHeldItem());
-
-        } else if (a == CLEAR) {
-            if (cubot.spendEnergy(100)) {
-                cubot.setHeldItem(0);
-            }
-        }
-
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotInventory deserialize(JSONObject hwJSON){
-        return new CubotInventory((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int)(long)hwJSON.get("cubot")));
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotLaser.java

@@ -1,86 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.game.InventoryHolder;
-import org.json.simple.JSONObject;
-
-import java.awt.*;
-import java.util.ArrayList;
-
-public class CubotLaser extends CpuHardware {
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    static final char HWID = 0x0002;
-
-    public static final int DEFAULT_ADDRESS = 2;
-
-    private Cubot cubot;
-
-    private static final int WITHDRAW = 1;
-    private static final int DEPOSIT = 2;
-
-
-    public CubotLaser(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-        int b = getCpu().getRegisterSet().getRegister("B").getValue();
-
-
-        if(a == WITHDRAW) {
-
-
-            Point frontTile = cubot.getFrontTile();
-            ArrayList<GameObject> objects = cubot.getWorld().getGameObjectsAt(frontTile.x, frontTile.y);
-
-
-            if (cubot.getAction() != CubotAction.IDLE && objects.size() > 0) {
-                //FIXME: Problem here if more than 1 object
-                if (objects.get(0) instanceof InventoryHolder) {
-                    if (((InventoryHolder) objects.get(0)).canTakeItem(b)) {
-                        if (cubot.spendEnergy(30)) {
-                            //Take the item
-                            ((InventoryHolder) objects.get(0)).takeItem(b);
-
-                            cubot.setHeldItem(b);
-                            cubot.setCurrentAction(CubotAction.WITHDRAWING);
-                        }
-                    }
-                }
-            }
-
-
-        } else if (a == DEPOSIT) {
-
-        }
-
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotLaser deserialize(JSONObject hwJSON){
-        return new CubotLaser((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int)(long)hwJSON.get("cubot")));
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotLeg.java

@@ -1,85 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.Direction;
-import net.simon987.server.io.JSONSerialisable;
-import org.json.simple.JSONObject;
-
-public class CubotLeg extends CpuHardware implements JSONSerialisable {
-
-    public static final int DEFAULT_ADDRESS = 1;
-
-    public static final String NAME = "Cubot Leg";
-
-    private static final int SET_DIR = 1;
-    private static final int SET_DIR_AND_WALK = 2;
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    static final char HWID = 0x0001;
-
-    private Cubot cubot;
-
-    public CubotLeg(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-        int b = getCpu().getRegisterSet().getRegister("B").getValue();
-
-        if(a == SET_DIR){
-
-
-            Direction dir = Direction.getDirection(b);
-
-            if(dir != null){
-                if (cubot.spendEnergy(20)) {
-                    cubot.setDirection(Direction.getDirection(b));
-                    status.setErrorFlag(false);
-                }
-            } else {
-                status.setErrorFlag(true);
-            }
-
-
-        } else if(a == SET_DIR_AND_WALK){
-
-            Direction dir = Direction.getDirection(b);
-
-            if(dir != null){
-                cubot.setDirection(Direction.getDirection(b));
-                status.setErrorFlag(false);
-            } else {
-                status.setErrorFlag(true);
-            }
-
-            cubot.setCurrentAction(CubotAction.WALKING);
-        }
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotLeg deserialize(JSONObject hwJSON){
-        return new CubotLeg((Cubot)GameServer.INSTANCE.getGameUniverse().getObject((int)(long)hwJSON.get("cubot")));
-    }
-
-
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotLidar.java

@@ -1,152 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.game.World;
-import net.simon987.server.game.pathfinding.Node;
-import net.simon987.server.game.pathfinding.Pathfinder;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-
-public class CubotLidar extends CpuHardware implements JSONSerialisable {
-
-    /**
-     * Hardware ID (Should be unique)
-     */
-    public static final char HWID = 0x0003;
-
-    public static final int DEFAULT_ADDRESS = 3;
-
-    private Cubot cubot;
-
-    private static final int GET_POS = 1;
-    private static final int GET_PATH = 2;
-    private static final int GET_MAP = 3;
-    private static final int GET_WORLD_POS = 4;
-
-    private static final int MEMORY_MAP_START = 0x0100;
-    private static final int MEMORY_PATH_START = 0x0000;
-
-    public CubotLidar(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-
-        switch (a){
-            case GET_POS:
-                getCpu().getRegisterSet().getRegister("X").setValue(cubot.getX());
-                getCpu().getRegisterSet().getRegister("Y").setValue(cubot.getY());
-                break;
-            case GET_PATH:
-                if (cubot.spendEnergy(50)) {
-                    int b = getCpu().getRegisterSet().getRegister("B").getValue();
-                    int destX = getCpu().getRegisterSet().getRegister("X").getValue();
-                    int destY = getCpu().getRegisterSet().getRegister("Y").getValue();
-
-                    //Get path
-                    ArrayList<Node> nodes = Pathfinder.findPath(cubot.getWorld(), cubot.getX(), cubot.getY(),
-                            destX, destY, b);
-
-                    //Write to memory
-                    byte[] mem = getCpu().getMemory().getBytes();
-
-                    int counter = MEMORY_PATH_START;
-
-                    if (nodes != null) {
-
-                        Node lastNode = null;
-
-                        for (Node n : nodes) {
-                            //Store the path as a sequence of directions
-
-                            if (lastNode == null) {
-                                lastNode = n;
-                                continue;
-                            }
-
-                            if (n.x < lastNode.x) {
-                                //West
-                                mem[counter++] = 0;
-                                mem[counter++] = 3;
-                            } else if (n.x > lastNode.x) {
-                                //East
-                                mem[counter++] = 0;
-                                mem[counter++] = 1;
-                            } else if (n.y < lastNode.y) {
-                                //North
-                                mem[counter++] = 0;
-                                mem[counter++] = 0;
-                            } else if (n.y > lastNode.y) {
-                                //South
-                                mem[counter++] = 0;
-                                mem[counter++] = 2;
-                            }
-
-                            lastNode = n;
-                        }
-
-                        //Indicate end of path with 0xAAAA
-                        mem[counter++] = -86;
-                        mem[counter] = -86;
-                    } else {
-                        //Indicate invalid path 0xFFFF
-                        mem[counter++] = -1;
-                        mem[counter] = -1;
-                    }
-
-                    LogManager.LOGGER.fine("DEBUG: path to" + destX + "," + destY);
-                }
-
-                break;
-
-            case GET_MAP:
-                if (cubot.spendEnergy(10)) {
-                    char[][] mapInfo = cubot.getWorld().getMapInfo();
-
-                    int i = MEMORY_MAP_START;
-                    for (int y = 0; y < World.WORLD_SIZE; y++) {
-                        for (int x = 0; x < World.WORLD_SIZE; x++) {
-                            getCpu().getMemory().set(i++, mapInfo[x][y]);
-                        }
-                    }
-                }
-
-                break;
-            case GET_WORLD_POS:
-                getCpu().getRegisterSet().getRegister("X").setValue(cubot.getWorld().getX());
-                getCpu().getRegisterSet().getRegister("Y").setValue(cubot.getWorld().getY());
-                break;
-
-        }
-
-
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static CubotLidar deserialize(JSONObject hwJSON) {
-        return new CubotLidar((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int) (long) hwJSON.get("cubot")));
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/CubotPlugin.java

@@ -1,64 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.cubotplugin.event.CpuInitialisationListener;
-import net.simon987.cubotplugin.event.UserCreationListener;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.io.CpuHardwareDeserializer;
-import net.simon987.server.io.GameObjectDeserializer;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-public class CubotPlugin extends ServerPlugin implements GameObjectDeserializer, CpuHardwareDeserializer{
-
-
-    @Override
-    public void init() {
-        listeners.add(new CpuInitialisationListener());
-        listeners.add(new UserCreationListener());
-
-        LogManager.LOGGER.info("Initialised Cubot plugin");
-    }
-
-    @Override
-    public GameObject deserializeObject(JSONObject object) {
-
-        int objType = (int)(long)object.get("type");
-
-        if(objType == Cubot.ID) {
-
-            return Cubot.deserialize(object);
-        }
-
-        return null;
-    }
-
-    @Override
-    public CpuHardware deserializeHardware(JSONObject hwJson) {
-        int hwid = (int)(long)hwJson.get("hwid");
-
-        switch (hwid){
-            case CubotLeg.HWID:
-                return CubotLeg.deserialize(hwJson);
-            case CubotLaser.HWID:
-                return CubotLaser.deserialize(hwJson);
-            case CubotLidar.HWID:
-                return CubotLidar.deserialize(hwJson);
-            case CubotDrill.HWID:
-                return CubotDrill.deserialize(hwJson);
-            case CubotInventory.HWID:
-                return CubotInventory.deserialize(hwJson);
-            case Keyboard.HWID:
-                return Keyboard.deserialize(hwJson);
-            case CubotHologram.HWID:
-                return CubotHologram.deserialize(hwJson);
-            case CubotBattery.HWID:
-                return CubotBattery.deserialize(hwJson);
-            case CubotFloppyDrive.HWID:
-                return CubotFloppyDrive.deserialize(hwJson);
-        }
-
-        return null;
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/Keyboard.java

@@ -1,67 +0,0 @@
-package net.simon987.cubotplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import org.json.simple.JSONObject;
-
-public class Keyboard extends CpuHardware {
-
-    public static final int DEFAULT_ADDRESS = 4;
-
-    private static final int CLEAR_BUFFER = 0;
-    private static final int FETCH_KEY = 1;
-    
-    /**
-     * Hardware ID (Should be unique)
-     */
-    public static final char HWID = 0x0004;
-
-    private Cubot cubot;
-
-    public Keyboard(Cubot cubot) {
-        this.cubot = cubot;
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int a = getCpu().getRegisterSet().getRegister("A").getValue();
-
-        if(a == CLEAR_BUFFER){
-
-            cubot.clearKeyboardBuffer();
-
-        } else if (a == FETCH_KEY){
-            //pop
-            int key = 0;
-            if(cubot.getKeyboardBuffer().size() > 0){
-                key = cubot.getKeyboardBuffer().get(0);
-                cubot.getKeyboardBuffer().remove(0);
-            }
-
-            getCpu().getRegisterSet().getRegister("B").setValue(key);
-
-        }
-
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-        json.put("cubot", cubot.getObjectId());
-
-        return json;
-    }
-
-    public static Keyboard deserialize(JSONObject hwJSON){
-        return new Keyboard((Cubot) GameServer.INSTANCE.getGameUniverse().getObject((int)(long)hwJSON.get("cubot")));
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/event/CpuInitialisationListener.java

@@ -1,54 +0,0 @@
-package net.simon987.cubotplugin.event;
-
-import net.simon987.cubotplugin.*;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.event.CpuInitialisationEvent;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.User;
-
-public class CpuInitialisationListener implements GameEventListener {
-    @Override
-    public Class getListenedEventType() {
-        return CpuInitialisationEvent.class;
-    }
-
-    @Override
-    public void handle(GameEvent event) {
-        LogManager.LOGGER.fine("(Plugin) Handled CPU Initialisation event (Cubot Plugin)");
-
-        CPU cpu = (CPU)event.getSource();
-        User user = ((CpuInitialisationEvent)event).getUser();
-
-        CubotLeg legHw = new CubotLeg((Cubot) user.getControlledUnit());
-        legHw.setCpu(cpu);
-        CubotLaser laserHw = new CubotLaser((Cubot) user.getControlledUnit());
-        laserHw.setCpu(cpu);
-        CubotLidar radarHw = new CubotLidar((Cubot) user.getControlledUnit());
-        radarHw.setCpu(cpu);
-        Keyboard keyboard = new Keyboard((Cubot) user.getControlledUnit());
-        keyboard.setCpu(cpu);
-        CubotDrill drillHw = new CubotDrill((Cubot) user.getControlledUnit());
-        drillHw.setCpu(cpu);
-        CubotInventory invHw = new CubotInventory((Cubot) user.getControlledUnit());
-        invHw.setCpu(cpu);
-        CubotHologram emoteHw = new CubotHologram((Cubot) user.getControlledUnit());
-        emoteHw.setCpu(cpu);
-        CubotBattery batteryHw = new CubotBattery((Cubot) user.getControlledUnit());
-        batteryHw.setCpu(cpu);
-        CubotFloppyDrive floppyHw = new CubotFloppyDrive((Cubot) user.getControlledUnit());
-        floppyHw.setCpu(cpu);
-
-        cpu.attachHardware(legHw, CubotLeg.DEFAULT_ADDRESS);
-        cpu.attachHardware(laserHw, CubotLaser.DEFAULT_ADDRESS);
-        cpu.attachHardware(radarHw, CubotLidar.DEFAULT_ADDRESS);
-        cpu.attachHardware(keyboard, Keyboard.DEFAULT_ADDRESS);
-        cpu.attachHardware(drillHw, CubotDrill.DEFAULT_ADDRESS);
-        cpu.attachHardware(invHw, CubotInventory.DEFAULT_ADDRESS);
-        cpu.attachHardware(invHw, CubotInventory.DEFAULT_ADDRESS);
-        cpu.attachHardware(emoteHw, CubotHologram.DEFAULT_ADDRESS);
-        cpu.attachHardware(batteryHw, CubotBattery.DEFAULT_ADDRESS);
-        cpu.attachHardware(floppyHw, CubotFloppyDrive.DEFAULT_ADDRESS);
-    }
-}

Plugin Cubot/src/net/simon987/cubotplugin/event/UserCreationListener.java

@@ -1,50 +0,0 @@
-package net.simon987.cubotplugin.event;
-
-import net.simon987.cubotplugin.Cubot;
-import net.simon987.server.GameServer;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.event.UserCreationEvent;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.User;
-
-import java.awt.*;
-
-public class UserCreationListener implements GameEventListener {
-    @Override
-    public Class getListenedEventType() {
-        return UserCreationEvent.class;
-    }
-
-    @Override
-    public void handle(GameEvent event) {
-
-        User user = (User)event.getSource();
-
-        LogManager.LOGGER.fine("(Plugin) Handled User creation event (Cubot Plugin)");
-
-        Cubot cubot = new Cubot();
-
-        cubot.setWorld(GameServer.INSTANCE.getGameUniverse().getWorld(
-                GameServer.INSTANCE.getConfig().getInt("new_user_worldX"),
-                GameServer.INSTANCE.getConfig().getInt("new_user_worldY")));
-        cubot.getWorld().getGameObjects().add(cubot);
-
-        cubot.setObjectId(GameServer.INSTANCE.getGameUniverse().getNextObjectId());
-
-        cubot.setHeldItem(GameServer.INSTANCE.getConfig().getInt("new_user_item"));
-
-        cubot.setEnergy(GameServer.INSTANCE.getConfig().getInt("battery_max_energy"));
-        cubot.setMaxEnergy(GameServer.INSTANCE.getConfig().getInt("battery_max_energy"));
-
-        cubot.setParent(user);
-
-        Point point = cubot.getWorld().getRandomPassableTile();
-
-        cubot.setX(point.x);
-        cubot.setY(point.y);
-
-        user.setControlledUnit(cubot);
-
-    }
-}

Plugin Cubot/test/net/simon987/cubotplugin/CubotTest.java

@@ -1,19 +0,0 @@
-package net.simon987.cubotplugin;
-
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-
-public class CubotTest {
-
-    @Test
-    public void test(){
-        try {
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        assertEquals(1,2);
-    }
-}

Plugin Kiln/plugin.properties

@@ -1,3 +0,0 @@
-classpath=net.simon987.kilnplugin.KilnPlugin
-name=Kiln Plugin
-version=1.0

Plugin Kiln/src/net/simon987/kilnplugin/KilnPlugin.java

@@ -1,21 +0,0 @@
-package net.simon987.kilnplugin;
-
-import net.simon987.server.game.GameObject;
-import net.simon987.server.io.GameObjectDeserializer;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-public class KilnPlugin extends ServerPlugin implements GameObjectDeserializer {
-
-
-
-    @Override
-    public void init() {
-
-    }
-
-    @Override
-    public GameObject deserializeObject(JSONObject object) {
-        return null;
-    }
-}

Plugin Misc HW/plugin.properties

@@ -1,3 +0,0 @@
-classpath=net.simon987.mischwplugin.MiscHWPlugin
-name=Misc HW Plugin
-version=1.0

Plugin Misc HW/src/net/simon987/mischwplugin/Clock.java

@@ -1,42 +0,0 @@
-package net.simon987.mischwplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.Util;
-import org.json.simple.JSONObject;
-
-public class Clock extends CpuHardware {
-
-    public static final char HWID = 0x0008;
-
-    public static final char DEFAULT_ADDRESS = 0x0008;
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        int time = (int) GameServer.INSTANCE.getGameUniverse().getTime();
-
-        //Will need to be changed to quadword in about 136 years
-        getCpu().getRegisterSet().getRegister("B").setValue(Util.getHigherWord(time));
-        getCpu().getRegisterSet().getRegister("C").setValue(Util.getLowerWord(time));
-
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    public static Clock deserialize(JSONObject hwJSON) {
-        return new Clock();
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-
-        return json;
-    }
-}

Plugin Misc HW/src/net/simon987/mischwplugin/MiscHWPlugin.java

@@ -1,33 +0,0 @@
-package net.simon987.mischwplugin;
-
-import net.simon987.mischwplugin.event.CpuInitialisationListener;
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.io.CpuHardwareDeserializer;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-public class MiscHWPlugin extends ServerPlugin implements CpuHardwareDeserializer {
-
-
-    @Override
-    public void init() {
-        listeners.add(new CpuInitialisationListener());
-
-        LogManager.LOGGER.info("Initialised Misc Hardware Plugin");
-    }
-
-    @Override
-    public CpuHardware deserializeHardware(JSONObject hwJson) {
-        int hwid = (int) (long) hwJson.get("hwid");
-
-        switch (hwid) {
-            case RandomNumberGenerator.HWID:
-                return RandomNumberGenerator.deserialize(hwJson);
-            case Clock.HWID:
-                return Clock.deserialize(hwJson);
-        }
-
-        return null;
-    }
-}

Plugin Misc HW/src/net/simon987/mischwplugin/RandomNumberGenerator.java

@@ -1,44 +0,0 @@
-package net.simon987.mischwplugin;
-
-import net.simon987.server.assembly.CpuHardware;
-import net.simon987.server.assembly.Status;
-import org.json.simple.JSONObject;
-
-import java.util.Random;
-
-public class RandomNumberGenerator extends CpuHardware {
-
-    public static final char HWID = 0x0007;
-
-    public static final char DEFAULT_ADDRESS = 0x0007;
-
-    private Random random;
-
-    public RandomNumberGenerator() {
-        random = new Random();
-    }
-
-    @Override
-    public void handleInterrupt(Status status) {
-
-        getCpu().getRegisterSet().getRegister("B").setValue(random.nextInt(0xFFFF));
-
-    }
-
-    @Override
-    public char getId() {
-        return HWID;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-        json.put("hwid", (int) HWID);
-
-        return json;
-    }
-
-    public static RandomNumberGenerator deserialize(JSONObject hwJSON) {
-        return new RandomNumberGenerator();
-    }
-}

Plugin Misc HW/src/net/simon987/mischwplugin/event/CpuInitialisationListener.java

@@ -1,30 +0,0 @@
-package net.simon987.mischwplugin.event;
-
-import net.simon987.mischwplugin.Clock;
-import net.simon987.mischwplugin.RandomNumberGenerator;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.event.CpuInitialisationEvent;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-
-public class CpuInitialisationListener implements GameEventListener {
-
-    @Override
-    public Class getListenedEventType() {
-        return CpuInitialisationEvent.class;
-    }
-
-    @Override
-    public void handle(GameEvent event) {
-
-        CPU cpu = (CPU) event.getSource();
-
-        RandomNumberGenerator rngHW = new RandomNumberGenerator();
-        rngHW.setCpu(cpu);
-        Clock clock = new Clock();
-        clock.setCpu(cpu);
-
-        cpu.attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS);
-        cpu.attachHardware(clock, Clock.DEFAULT_ADDRESS);
-    }
-}

Plugin Plant/plugin.properties

@@ -1,3 +0,0 @@
-classpath=net.simon987.plantplugin.PlantPlugin
-name=Plant Plugin
-version=1.0

Plugin Plant/src/net/simon987/plantplugin/Plant.java

@@ -1,160 +0,0 @@
-package net.simon987.plantplugin;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.game.InventoryHolder;
-import net.simon987.server.game.Updatable;
-import org.json.simple.JSONObject;
-
-public class Plant extends GameObject implements Updatable, InventoryHolder{
-
-    private static final char MAP_INFO = 0x4000;
-    public static final int ID = 2;
-
-    /**
-     * Grow time (see config.properties)
-     */
-    private static final int GROW_TIME = GameServer.INSTANCE.getConfig().getInt("plant_grow_time");
-
-    /**
-     * Game time of the creation of this Plant
-     */
-    private long creationTime;
-
-    /**
-     * Whether the plant is grown or not
-     */
-    private boolean grown;
-
-    /**
-     * Yield of the plant, in biomass units
-     */
-    private int biomassCount;
-    /**
-     * Style of the plant (Only visual)
-     */
-    private int style;
-
-    private static final int ITM_BIOMASS = 1;
-
-    @Override
-    public char getMapInfo() {
-        return MAP_INFO;
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        json.put("type", ID);
-        json.put("id", getObjectId());
-        json.put("x", getX());
-        json.put("y", getY());
-        json.put("creationTime", creationTime);
-        json.put("grown", grown);
-        json.put("biomassCount", biomassCount);
-        json.put("style", style);
-
-        return json;
-    }
-
-    /**
-     * Called every tick
-     */
-    @Override
-    public void update() {
-        if (!grown) {
-            //Check grow
-            if (creationTime + GROW_TIME <= GameServer.INSTANCE.getGameUniverse().getTime()) {
-                grown = true;
-                biomassCount = GameServer.INSTANCE.getConfig().getInt("plant_yield");
-            }
-        }
-    }
-
-    public long getCreationTime() {
-        return creationTime;
-    }
-
-    public void setCreationTime(long creationTime) {
-        this.creationTime = creationTime;
-    }
-
-    public boolean isGrown() {
-        return grown;
-    }
-
-    public void setGrown(boolean grown) {
-        this.grown = grown;
-    }
-
-    public int getBiomassCount() {
-        return biomassCount;
-    }
-
-    public void setBiomassCount(int biomassCount) {
-        this.biomassCount = biomassCount;
-    }
-
-    public int getStyle() {
-        return style;
-    }
-
-    public void setStyle(int style) {
-        this.style = style;
-    }
-
-    public static Plant deserialize(JSONObject json){
-
-        Plant plant = new Plant();
-
-        plant.setObjectId((int)(long)json.get("id"));
-        plant.setX((int)(long)json.get("x"));
-        plant.setY((int)(long)json.get("y"));
-        plant.grown = (boolean)json.get("grown");
-        plant.creationTime = (long)json.get("creationTime");
-        plant.style = (int)(long)json.get("style");
-        plant.biomassCount = (int)(long)json.get("biomassCount");
-
-        return plant;
-    }
-
-    /**
-     * Called when an object attempts to place an item in this Plant
-     *
-     * @param item item id (see MarConstants.ITEM_*)
-     * @return Always returns false
-     */
-    @Override
-    public boolean placeItem(int item) {
-        //Why would you want to place an item in a plant?
-        return false;
-    }
-
-    @Override
-    public boolean canTakeItem(int item) {
-        return item == ITM_BIOMASS && grown && biomassCount >= 1;
-    }
-
-    /**
-     * Called when an object attempts to take an item from this Plant.
-     * If the object requests biomass, it will be subtracted from biomassCount, and
-     * if it reaches 0, the plant is deleted
-     *
-     * @param item item id (see MarConstants.ITEM_*)
-     */
-    @Override
-    public void takeItem(int item) {
-
-        if (item == ITM_BIOMASS) {
-            if (grown && biomassCount > 1) {
-                biomassCount--;
-            } else if (grown) {
-                //Delete plant
-                setDead(true);
-            }
-        }
-
-    }
-}

Plugin Plant/src/net/simon987/plantplugin/PlantPlugin.java

@@ -1,32 +0,0 @@
-package net.simon987.plantplugin;
-
-import net.simon987.plantplugin.event.WorldCreationListener;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.io.GameObjectDeserializer;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-public class PlantPlugin extends ServerPlugin implements GameObjectDeserializer {
-
-
-
-    @Override
-    public void init() {
-        listeners.add(new WorldCreationListener());
-        LogManager.LOGGER.info("Initialised Plant plugin");
-    }
-
-    @Override
-    public GameObject deserializeObject(JSONObject object) {
-
-        int objType = (int)(long)object.get("type");
-
-        if(objType == Plant.ID) {
-
-            return Plant.deserialize(object);
-        }
-
-        return null;
-    }
-}

Plugin Plant/src/net/simon987/plantplugin/event/WorldCreationListener.java

@@ -1,96 +0,0 @@
-package net.simon987.plantplugin.event;
-
-import net.simon987.plantplugin.Plant;
-import net.simon987.server.GameServer;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.event.WorldGenerationEvent;
-import net.simon987.server.game.World;
-import net.simon987.server.logging.LogManager;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Random;
-
-public class WorldCreationListener implements GameEventListener {
-    @Override
-    public Class getListenedEventType() {
-        return WorldGenerationEvent.class;
-    }
-
-    @Override
-    public void handle(GameEvent event) {
-
-        ArrayList<Plant> plants = generatePlants(((WorldGenerationEvent)event).getWorld());
-
-        ((WorldGenerationEvent)event).getWorld().getGameObjects().addAll(plants);
-
-    }
-
-    /**
-     * Generate a list of plants for a world
-     */
-    public ArrayList<Plant> generatePlants(World world) {
-
-        int minTreeCount = GameServer.INSTANCE.getConfig().getInt("minTreeCount");
-        int maxTreeCount = GameServer.INSTANCE.getConfig().getInt("maxTreeCount");
-        int plant_yield = GameServer.INSTANCE.getConfig().getInt("plant_yield");
-
-        Random random = new Random();
-        int treeCount = random.nextInt(maxTreeCount - minTreeCount) + minTreeCount;
-        ArrayList<Plant> plants = new ArrayList<>(maxTreeCount);
-
-        //Count number of plain tiles. If there is less plain tiles than desired amount of trees,
-        //set the desired amount of trees to the plain tile count
-        int[][] tiles = world.getTileMap().getTiles();
-        int plainCount = 0;
-        for (int y = 0; y < World.WORLD_SIZE; y++) {
-            for (int x = 0; x < World.WORLD_SIZE; x++) {
-
-                if (tiles[x][y] == 0) {
-                    plainCount++;
-                }
-            }
-        }
-
-        if (treeCount > plainCount) {
-            treeCount = plainCount;
-        }
-
-        outerLoop:
-        for (int i = 0; i < treeCount; i++) {
-
-            Point p = world.getTileMap().getRandomPlainTile();
-            if (p != null) {
-
-                //Don't block worlds
-                while (p.x == 0 || p.y == 0 || p.x == World.WORLD_SIZE - 1 || p.y == World.WORLD_SIZE - 1) {
-                    p = world.getTileMap().getRandomPlainTile();
-                }
-
-                for (Plant plant : plants) {
-                    if (plant.getX() == p.x && plant.getY() == p.y) {
-                        //There is already a plant here
-                        continue outerLoop;
-                    }
-                }
-
-                Plant plant = new Plant();
-                plant.setObjectId(GameServer.INSTANCE.getGameUniverse().getNextObjectId());
-                plant.setStyle(0); //TODO: set style depending on difficulty level? or random? from config?
-                plant.setBiomassCount(plant_yield);
-                plant.setCreationTime(0); // Plants generated by the world generator always have creationTime of 0
-                plant.setX(p.x);
-                plant.setY(p.y);
-                plant.setWorld(world);
-
-                plants.add(plant);
-            }
-        }
-
-        LogManager.LOGGER.info("Generated " + plants.size() + " plants for World (" + world.getX() + ',' +
-                world.getY() + ')');
-
-        return plants;
-    }
-}

README.md

@@ -1,11 +1,166 @@
-# [Live demo](https://muchassemblyrequired.com)
+### [Official website](https://muchassemblyrequired.com)
+
+[![CodeFactor](https://www.codefactor.io/repository/github/simon987/much-assembly-required/badge)](https://www.codefactor.io/repository/github/simon987/much-assembly-required)
+[![Build Status](https://ci.simon987.net/buildStatus/icon?job=Much-Assembly-Required)](https://ci.simon987.net/job/Much-Assembly-Required/)
+
 Program the 8086-like microprocessor of a robot in a grid-based multiplayer world. The game is web based so no installation is required.
 In its current state, players can walk around the game universe and collect Biomass blobs & Iron/copper ore using the online code editor.
 
 ![screenshot from 2017-11-12 13-01-43](https://user-images.githubusercontent.com/7120851/32701793-e5d07e98-c7a9-11e7-9931-f8db7b287994.png)
 
-Wiki: [GitHub](https://github.com/simon987/Much-Assembly-Required/wiki)    
-Chat: [Slack](https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLTkyOTIwOTA5OGY4MDVlMGI4NzM5YzlhMWJiMGY1OWE2NjUxODQ1NWQ1YTcxMTA1NGZkYzNjYzMyM2E1ODdmNzg)
+Wiki: [GitHub](https://github.com/simon987/Much-Assembly-Required/wiki)
+Chat: [Slack](https://join.slack.com/t/muchassemblyrequired/shared_invite/enQtMjY3Mjc1OTUwNjEwLWRjMjRkZTg2N2EyNWRjN2YyMDc0YzIyMTUyYzFiNTBmMTU3OGQ1ZjA0MWY0M2IyYjUxZTA4NjRkMWVkNDk2NzY)
+
+# Deploying the server
+
+## Linux
+
+**Installing tools**
+
+On Ubuntu 16.04:
+```bash
+sudo apt install git maven openjdk-8-jdk mongodb
+sudo npm install -g typescript
+```
+
+On Arch:
+``` bash
+sudo pacman -S git maven mongodb jdk8-opendjk
+sudo npm install -g typescript
+
+# Don't forget to start mongodb
+sudo systemctl start mongodb.service
+```
+
+*If needed, visit [troubleshooting mongodb](https://wiki.archlinux.org/index.php/MongoDB#Troubleshooting).*
+
+**Deploying server**
+
+``` bash
+# Obtain source files
+git clone https://github.com/simon987/Much-Assembly-Required.git
+
+# Build
+cd Much-Assembly-Required
+mvn package
+
+# Run
+cd target
+java -jar muchassemblyrequired-*.jar
+```
+
+## Windows (tested on Windows 10)
+
+Installation instructions:
+1. Download the JDK from [here](http://www.oracle.com/technetwork/java/javase/downloads/index.html).
+Install the JDK and update your PATH and JAVA_HOME enviroment variables.
+2. Download Maven from [here](https://maven.apache.org/).
+Install Maven (following the README) and update your PATH enviroment variable.
+3. Download Mongo DB Community from [here](https://www.mongodb.com/download-center#community).
+Install Mongo DB following the instructions [here](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-windows/).
+Update your PATH enviroment variable.
+
+Building instructions:
+```batch
+:: Builds the server
+cd Much-Assembly-Required
+mvn package
+```
+
+Running instructions:
+1. In one Command Prompt window, run Mongo DB:
+```batch
+:: Runs Mongo DB
+mongod
+```
+2. In a second Command Prompt window, run the MAR server:
+```batch
+:: Runs the MAR server
+cd Much-Assembly-Required\target
+java -jar muchassemblyrequired-*.jar
+```
+
+## macOS (tested on Sierra 10.12.6)
+
+**Installation**
+
+1. Install [Maven3](https://maven.apache.org/)
+   -Add Maven bin to your path
+   ```bash
+   export PATH=/path/to/maven/bin.:$PATH
+   ```
+2. Install [MongoDB](https://docs.mongodb.com/manual/tutorial/install-mongodb-on-os-x/?_ga=2.201359831.774868398.1539369140-197602459.1539369140).
+   -Via Brew:
+   ```bash
+   #Update brew
+   brew update
+
+   #Install mongodb
+   brew install mongodb
+
+   #Install latest development release
+   brew install mongodb --devel
+   ```
+   -Via .tar.gz
+   ```bash
+   #Extract files:
+   tar -zxvf mongodb-osx-ssl-x86_64-4.0.3.tgz
+   
+   #Ensure binaries are in your path
+   export PATH=<mongodb-install-directory>/bin:$PATH
+   ```
+If you do not wish to use the default data directory (/data/db), follow the steps for running MongoDB in the install doc.
+
+**Deploying Server**
+
+1. Begin MongoDB service
+   ```bash
+   #If brew:
+   #Launch on login
+   brew services start mongodb
+   #Or, if you don't want/need a background service you can just run:
+   mongod --config /usr/local/etc/mongod.conf
+   
+   #If binary:
+   mongod
+   #Optional, set data directory path:
+   mongod --dbpath <path to data directory>
+   ```
+
+2. Deploy server:
+   ```bash
+   # Obtain source files
+   git clone https://github.com/simon987/Much-Assembly-Required.git
+
+   # Build
+   cd Much-Assembly-Required
+   mvn package
+
+   # Run
+   cd target
+   java -jar muchassemblyrequired-*.jar
+   ```
+
+## Docker
+### Requirements
+
+1. [Docker Compose](https://docs.docker.com/compose/install/#install-compose) (and dependencies)
+
+### Installation
+
+Once Docker and Docker Compose are installed, you can build and start
+this application by running the following command inside this
+application's directory:
+
+`docker-compose up`
+
+Make sure to change `mongo_address` in `config.properties` to `mongodb`.
 
 
-_Building instructions coming soon_
+# Running
+
+Once the server is running, you should be able to connect to `http://localhost:4567` with your browser
+
+## VS Code Extensions
+- [Much Assembly Required (Upload on Save)](https://marketplace.visualstudio.com/items?itemName=tomhodder.much-assembly-required-upload-on-save) by tomhodder
+- [Much Assembly Required Language Support](https://marketplace.visualstudio.com/items?itemName=PJB3005.much-assembly-required-language-support) by PJB3005

Server/src/net/simon987/server/GameServer.java

@@ -1,179 +0,0 @@
-package net.simon987.server;
-
-
-import net.simon987.server.event.GameEventDispatcher;
-import net.simon987.server.game.GameUniverse;
-import net.simon987.server.game.World;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.plugin.PluginManager;
-import net.simon987.server.plugin.ServerPlugin;
-import net.simon987.server.user.User;
-import net.simon987.server.webserver.SocketServer;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.util.ArrayList;
-
-public class GameServer implements Runnable {
-
-    public final static GameServer INSTANCE = new GameServer();
-
-    private GameUniverse gameUniverse;
-    private GameEventDispatcher eventDispatcher;
-    private PluginManager pluginManager;
-
-    private ServerConfiguration config;
-
-    private SocketServer socketServer;
-
-    public GameServer() {
-
-        this.config = new ServerConfiguration(new File("config.properties"));
-
-        gameUniverse = new GameUniverse(config);
-        pluginManager = new PluginManager();
-
-        //Load all plugins in plugins folder, if it doesn't exist, create it
-        File pluginDir = new File("plugins/");
-        File[] pluginDirListing = pluginDir.listFiles();
-
-        if(pluginDirListing != null) {
-            for(File pluginFile : pluginDirListing) {
-
-                if(pluginFile.getName().endsWith(".jar")){
-                    pluginManager.load(pluginFile);
-                }
-
-            }
-        } else {
-            if(!pluginDir.mkdir()) {
-                LogManager.LOGGER.severe("Couldn't create plugin directory");
-            }
-        }
-
-        eventDispatcher = new GameEventDispatcher(pluginManager);
-
-    }
-
-    public GameUniverse getGameUniverse() {
-        return gameUniverse;
-    }
-
-    public GameEventDispatcher getEventDispatcher() {
-        return eventDispatcher;
-    }
-
-    @Override
-    public void run() {
-        LogManager.LOGGER.info("(G) Started game loop");
-
-        long startTime; //Start time of the loop
-        long uTime;     //update time
-        long waitTime;  //time to wait
-
-        boolean running = true;
-
-        while (running) {
-
-            startTime = System.currentTimeMillis();
-
-            tick();
-
-            uTime = System.currentTimeMillis() - startTime;
-            waitTime = config.getInt("tick_length") - uTime;
-
-            LogManager.LOGGER.info("Wait time : " + waitTime + "ms | Update time: " + uTime + "ms | " + (int) (((double) uTime / waitTime) * 100) + "% load");
-
-            try {
-                if (waitTime >= 0) {
-                    Thread.sleep(waitTime);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-
-        }
-
-
-    }
-
-    private void tick() {
-        gameUniverse.incrementTime();
-
-        //Process user code
-        ArrayList<User> users_ = gameUniverse.getUsers();
-        for (User user : users_) {
-
-            if(user.getCpu() != null){
-                try {
-                    user.getCpu().reset();
-                    user.getCpu().execute();
-                } catch (Exception e) {
-                    LogManager.LOGGER.severe("Error executing " + user.getUsername() + "'s code");
-                    e.printStackTrace();
-                }
-
-            }
-        }
-
-        //Process each worlds
-        //Avoid concurrent modification
-        ArrayList<World> worlds = new ArrayList<>(gameUniverse.getWorlds());
-        for (World world : worlds) {
-           world.update();
-        }
-
-        //Save
-        if (gameUniverse.getTime() % config.getInt("save_interval") == 0) {
-            save(new File("save.json"));
-        }
-
-        socketServer.tick();
-
-        LogManager.LOGGER.info("Processed " + gameUniverse.getWorlds().size() + " worlds");
-    }
-    /**
-     * Save game universe to file in JSON format
-     * @param file JSON file to save
-     */
-    public void save(File file){
-
-        try {
-            FileWriter fileWriter = new FileWriter(file);
-
-            JSONObject universe = gameUniverse.serialise();
-
-            JSONArray plugins = new JSONArray();
-
-            for(ServerPlugin plugin : pluginManager.getPlugins()){
-                plugins.add(plugin.serialise());
-            }
-
-            universe.put("plugins", plugins);
-
-            fileWriter.write(universe.toJSONString());
-            fileWriter.close();
-
-            LogManager.LOGGER.info("Saved to file " + file.getName());
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-    }
-
-    public ServerConfiguration getConfig() {
-        return config;
-    }
-
-    public PluginManager getPluginManager() {
-        return pluginManager;
-    }
-
-    public void setSocketServer(SocketServer socketServer) {
-        this.socketServer = socketServer;
-    }
-}

Server/src/net/simon987/server/Main.java

@@ -1,28 +0,0 @@
-package net.simon987.server;
-
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.webserver.SocketServer;
-
-import java.io.File;
-import java.net.InetSocketAddress;
-
-
-public class Main {
-    public static void main(String[] args){
-
-
-        LogManager.initialize();
-        ServerConfiguration config = new ServerConfiguration(new File("config.properties"));
-
-        //Load
-        GameServer.INSTANCE.getGameUniverse().load(new File("save.json"));
-
-        SocketServer socketServer = new SocketServer(new InetSocketAddress(config.getString("webSocket_host"),
-                config.getInt("webSocket_port")), config);
-
-        GameServer.INSTANCE.setSocketServer(socketServer);
-
-        (new Thread(socketServer)).start();
-        (new Thread(GameServer.INSTANCE)).start();
-    }
-}

Server/src/net/simon987/server/ServerConfiguration.java

@@ -1,42 +0,0 @@
-package net.simon987.server;
-
-
-import net.simon987.server.logging.LogManager;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-/**
- * Wrapper for Java Property
- */
-public class ServerConfiguration {
-
-    /**
-     * Properties
-     */
-    private Properties properties;
-
-    public ServerConfiguration(File file) {
-        try {
-            properties = new Properties();
-
-            properties.load(new FileInputStream(file));
-
-        } catch (IOException e) {
-            LogManager.LOGGER.severe("Problem loading server configuration: " + e.getMessage());
-        }
-    }
-
-    public int getInt(String key) {
-        return Integer.valueOf((String) properties.get(key));
-
-    }
-
-    public String getString(String key) {
-
-        return (String) properties.get(key);
-    }
-
-}

Server/src/net/simon987/server/assembly/AssemblyResult.java

@@ -1,99 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.assembly.exception.AssemblyException;
-import net.simon987.server.assembly.exception.DuplicateSegmentException;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * Result of an assembly attempt
- */
-public class AssemblyResult {
-
-
-    /**
-     * The origin of the program, default is 0x400
-     */
-    public int origin;
-    /**
-     * A list of labels
-     */
-    HashMap<String, Character> labels = new HashMap<>(20);
-    /**
-     * List of exceptions encountered during the assembly attempt,
-     * they will be displayed in the editor
-     */
-    ArrayList<AssemblyException> exceptions = new ArrayList<>(50);
-    /**
-     * Offset of the code segment
-     */
-    private int codeSegmentOffset;
-    /**
-     * Line of the code segment definition (for editor icons)
-     */
-    private int codeSegmentLine;
-
-    /**
-     * The encoded user code (will be incomplete or invalid if the
-     * assembler encountered an error during assembly)
-     */
-    public byte[] bytes;
-    /**
-     * Offset of the data segment, default is 0x4000
-     */
-    private int dataSegmentOffset;
-    /**
-     * Line of the data segment definition (for editor icons)
-     */
-    private int dataSegmentLine;
-    /**
-     * Whether or not the code segment is set
-     */
-    private boolean codeSegmentSet = false;
-    /**
-     * Whether or not the data segment is set
-     */
-    private boolean dataSegmentSet = false;
-
-    AssemblyResult(ServerConfiguration config) {
-        origin = config.getInt("org_offset");
-    }
-
-    /**
-     * Define a segment.
-     *
-     * @param segment       Segment to define
-     * @param currentOffset Current offset, in bytes of the segment
-     * @param currentLine   Line number of the segment declaration
-     * @throws DuplicateSegmentException when a segment is defined twice
-     */
-    void defineSegment(Segment segment, int currentLine, int currentOffset) throws DuplicateSegmentException {
-
-        if (segment == Segment.TEXT) {
-            //Code segment
-
-            if (!codeSegmentSet) {
-                codeSegmentOffset = origin + currentOffset;
-                codeSegmentLine = currentLine;
-                codeSegmentSet = true;
-            } else {
-                throw new DuplicateSegmentException(currentLine);
-            }
-
-        } else {
-            //Data segment
-            if (!dataSegmentSet) {
-                dataSegmentOffset = origin + currentOffset;
-                dataSegmentLine = currentLine;
-                dataSegmentSet = true;
-            } else {
-                throw new DuplicateSegmentException(currentLine);
-            }
-
-        }
-
-    }
-
-}

Server/src/net/simon987/server/assembly/CPU.java

@@ -1,458 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.assembly.exception.CancelledException;
-import net.simon987.server.assembly.instruction.*;
-import net.simon987.server.event.CpuInitialisationEvent;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.User;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * CPU: Central Processing Unit. A CPU is capable of reading bytes from
- * a Memory object and execute them. A CPU object holds registers objects &
- * a Memory object.
- */
-public class CPU implements JSONSerialisable{
-
-    /**
-     *
-     */
-    private Status status;
-
-    /**
-     * Memory associated with the CPU, 64kb max
-     */
-    private Memory memory;
-
-    /**
-     * set of instructions of this CPU
-     */
-    private InstructionSet instructionSet;
-
-    /**
-     * set of registers of this CPU
-     */
-    private RegisterSet registerSet;
-
-    /**
-     * Offset of the code segment. The code starts to get
-     * executed at this address each tick. Defaults to 0x4000
-     */
-    private int codeSegmentOffset;
-
-    /**
-     * Instruction pointer, always points to the next instruction
-     */
-    private int ip;
-
-    /**
-     * List of attached hardware, 'modules'
-     */
-    private HashMap<Integer, CpuHardware> attachedHardware;
-
-    private ServerConfiguration config;
-
-    private long timeout;
-
-    private int registerSetSize;
-
-    /**
-     * Creates a new CPU
-     */
-    public CPU(ServerConfiguration config, User user) throws CancelledException{
-        this.config = config;
-        instructionSet = new DefaultInstructionSet();
-        registerSet = new DefaultRegisterSet();
-        attachedHardware = new HashMap<>();
-        codeSegmentOffset = config.getInt("org_offset");
-
-        timeout = config.getInt("user_timeout");
-
-        instructionSet.add(new JmpInstruction(this));
-        instructionSet.add(new JnzInstruction(this));
-        instructionSet.add(new JzInstruction(this));
-        instructionSet.add(new JgInstruction(this));
-        instructionSet.add(new JgeInstruction(this));
-        instructionSet.add(new JleInstruction(this));
-        instructionSet.add(new JlInstruction(this));
-        instructionSet.add(new PushInstruction(this));
-        instructionSet.add(new PopInstruction(this));
-        instructionSet.add(new CallInstruction(this));
-        instructionSet.add(new RetInstruction(this));
-        instructionSet.add(new MulInstruction(this));
-        instructionSet.add(new DivInstruction(this));
-        instructionSet.add(new JnsInstruction(this));
-        instructionSet.add(new JsInstruction(this));
-        instructionSet.add(new HwiInstruction(this));
-        instructionSet.add(new HwqInstruction(this));
-        instructionSet.add(new XchgInstruction(this));
-        instructionSet.add(new JcInstruction(this));
-        instructionSet.add(new JncInstruction(this));
-        instructionSet.add(new JnoInstruction(this));
-        instructionSet.add(new JoInstruction(this));
-
-        status = new Status();
-        memory = new Memory(config.getInt("memory_size"));
-
-        GameEvent event = new CpuInitialisationEvent(this, user);
-        GameServer.INSTANCE.getEventDispatcher().dispatch(event);
-        if(event.isCancelled()){
-            throw new CancelledException();
-        }
-    }
-
-    public void reset() {
-        status.clear();
-        registerSet.getRegister("SP").setValue(config.getInt("stack_bottom"));
-        registerSet.getRegister("BP").setValue(config.getInt("stack_bottom"));
-        ip = codeSegmentOffset;
-    }
-
-    public void execute() {
-
-        long startTime = System.currentTimeMillis();
-        int counter = 0;
-        status.clear();
-
-        registerSetSize = registerSet.size();
-
-        // status.breakFlag = true;
-        while (!status.isBreakFlag()) {
-            counter++;
-
-            if(counter % 1000 == 0){
-                if (System.currentTimeMillis() >= (startTime + timeout)) {
-                    LogManager.LOGGER.fine("CPU Timeout " + this + " after " + counter + "instructions (" + timeout + "ms): " + (double) counter / ((double) timeout / 1000) / 1000000 + "MHz");
-                    return;
-                }
-            }
-
-            //fetch instruction
-            int machineCode = memory.get(ip);
-
-            /*
-             * Contents of machineCode should look like this:
-             * SSSS SDDD DDOO OOOO
-             * Where S is source, D is destination and O is the opCode
-             */
-            Instruction instruction = instructionSet.get(machineCode & 0x03F); // 0000 0000 00XX XXXX
-
-            int source = (machineCode >> 11) & 0x001F; // XXXX X000 0000 0000
-            int destination = (machineCode >> 6) & 0x001F; // 0000 0XXX XX00 0000
-
-            executeInstruction(instruction, source, destination);
-//            LogManager.LOGGER.info(instruction.getMnemonic());
-        }
-        double elapsed = (System.currentTimeMillis() - startTime);
-        LogManager.LOGGER.fine(counter + " instruction in " + elapsed + "ms : " + (double) counter / (elapsed / 1000) / 1000000 + "MHz");
-    }
-
-    public void executeInstruction(Instruction instruction, int source, int destination) {
-
-
-        //Execute the instruction
-        if (source == 0) {
-            //No operand (assuming that destination is also null)
-            ip++;
-            instruction.execute(status);
-        } else if (source == Operand.IMMEDIATE_VALUE) {
-            ip++;
-            int sourceValue = memory.get(ip);
-
-            if (destination == 0) {
-                //Single operand
-                ip++;
-                instruction.execute(sourceValue, status);
-            } else if (destination == Operand.IMMEDIATE_VALUE) {
-                //Destination is an immediate value too
-                //this shouldn't happen
-                LogManager.LOGGER.severe("Trying to execute an instruction with 2" +
-                        "immediate values as operands"); //todo remove debug info
-
-            } else if (destination == Operand.IMMEDIATE_VALUE_MEM) {
-                //Destination is memory immediate
-                ip += 2;
-                instruction.execute(memory, memory.get(ip - 1), sourceValue, status);
-            } else if (destination <= registerSetSize) {
-                //Destination is a register
-                ip++;
-                instruction.execute(registerSet, destination, sourceValue, status);
-
-            } else if (destination <= registerSetSize * 2) {
-                //Destination is [reg]
-                ip++;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize), sourceValue, status);
-            } else {
-                //Assuming that destination is [reg + x]
-                ip += 2;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize - registerSetSize) + memory.get(ip - 1),
-                        sourceValue, status);
-            }
-
-        } else if (source == Operand.IMMEDIATE_VALUE_MEM) {
-            //Source is [x]
-            ip++;
-            int sourceValue = memory.get(memory.get(ip));
-
-            if (destination == 0) {
-                //Single operand
-                ip++;
-                instruction.execute(sourceValue, status);
-                instruction.execute(memory, memory.get(ip - 1), status); //For POP instruction
-            } else if (destination == Operand.IMMEDIATE_VALUE) {
-                //Destination is an immediate value
-
-                //this shouldn't happen
-                LogManager.LOGGER.severe("Trying to execute an instruction with an" +
-                        "immediate values as dst operand"); //todo remove debug info
-            } else if (destination == Operand.IMMEDIATE_VALUE_MEM) {
-                //Destination is memory immediate too
-                ip += 2;
-                instruction.execute(memory, memory.get(ip - 1), sourceValue, status);
-            } else if (destination <= registerSetSize) {
-                //Destination is a register
-                ip++;
-                instruction.execute(registerSet, destination, sourceValue, status);
-            } else if (destination <= registerSetSize * 2) {
-                //Destination is [reg]
-                ip++;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize), memory, sourceValue, status);
-            } else {
-                //Assuming that destination is [reg + x]
-                ip += 2;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize - registerSetSize) + memory.get(ip - 1), sourceValue, status);
-            }
-
-        } else if (source <= registerSetSize) {
-            //Source is a register
-
-            if (destination == 0) {
-                //Single operand
-                ip++;
-                instruction.execute(registerSet, source, status);
-
-            } else if (destination == Operand.IMMEDIATE_VALUE) {
-                //Destination is an immediate value
-                //this shouldn't happen
-                LogManager.LOGGER.severe("Trying to execute an instruction with an" +
-                        "immediate values as dst operand"); //todo remove debug info
-            } else if (destination == Operand.IMMEDIATE_VALUE_MEM) {
-                //Destination is memory immediate
-                ip += 2;
-                instruction.execute(memory, memory.get(ip - 1), registerSet, source, status);
-            } else if (destination <= registerSetSize) {
-                //Destination is a register too
-                ip++;
-                instruction.execute(registerSet, destination, registerSet, source, status);
-            } else if (destination <= registerSetSize * 2) {
-                //Destination is [reg]
-                ip++;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize), registerSet, source, status);
-            } else {
-                //Assuming that destination is [reg + x]
-                ip += 2;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize - registerSetSize) + memory.get(ip - 1),
-                        registerSet, source, status);
-            }
-
-        } else if (source <= registerSetSize * 2) {
-            //Source is [reg]
-            if (destination == 0) {
-                //Single operand
-                ip++;
-                instruction.execute(memory, registerSet.get(source), status);
-            } else if (destination == Operand.IMMEDIATE_VALUE) {
-                //Destination is an immediate value
-                //this shouldn't happen
-                LogManager.LOGGER.severe("Trying to execute an instruction with an" +
-                        "immediate values as dst operand"); //todo remove debug info
-            } else if (destination == Operand.IMMEDIATE_VALUE_MEM) {
-                //Destination is an memory immediate
-                ip++;
-                instruction.execute(memory, memory.get(ip++), memory, registerSet.get(source - registerSetSize), status);
-            } else if (destination <= registerSetSize) {
-                //Destination is a register
-                ip++;
-                instruction.execute(registerSet, destination, memory, registerSet.get(source), status);
-            } else if (destination <= registerSetSize * 2) {
-                //Destination is [reg]
-                ip++;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize), memory, registerSet.get(source), status);
-            } else {
-                //Assuming that destination is [reg + x]
-                ip += 2;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize - registerSetSize) + memory.get(ip - 1),
-                        memory, registerSet.get(source - registerSetSize), status);
-            }
-        } else {
-            //Assuming that source is [reg + X]
-
-            ip++;
-            int sourceDisp = memory.get(ip);
-
-            if (destination == 0) {
-                //Single operand
-                ip += 1;
-                instruction.execute(memory, registerSet.get(source - registerSetSize - registerSetSize) + memory.get(ip - 1), status);
-
-            } else if (destination == Operand.IMMEDIATE_VALUE) {
-                //Destination is an immediate value
-                //this shouldn't happen
-                LogManager.LOGGER.severe("Trying to execute an instruction with an" +
-                        "immediate values as dst operand"); //todo remove debug info
-            } else if (destination == Operand.IMMEDIATE_VALUE_MEM) {
-                //Destination is memory immediate
-                ip += 2;
-                instruction.execute(memory, memory.get(ip - 1), memory,
-                        registerSet.get(source - registerSetSize - registerSetSize) + sourceDisp, status);
-            } else if (destination < registerSetSize) {
-                //Destination is a register
-                ip++;
-                instruction.execute(registerSet, destination, memory,
-                        registerSet.get(source - registerSetSize - registerSetSize) + sourceDisp, status);
-            } else if (destination <= registerSetSize * 2) {
-                //Destination is [reg]
-                ip++;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize), memory,
-                        registerSet.get(source - registerSetSize - registerSetSize) + sourceDisp, status);
-            } else {
-                //Assuming that destination is [reg + x]
-                ip += 2;
-                instruction.execute(memory, registerSet.get(destination - registerSetSize - registerSetSize) + memory.get(ip - 1),
-                        memory, registerSet.get(source - registerSetSize - registerSetSize) + sourceDisp, status);
-            }
-        }
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        json.put("memory", memory.serialise());
-
-        json.put("registerSet", registerSet.serialise());
-        json.put("codeSegmentOffset", codeSegmentOffset);
-
-        JSONArray hardwareList = new JSONArray();
-
-        for(Integer address : attachedHardware.keySet()){
-
-            CpuHardware hardware = attachedHardware.get(address);
-
-            JSONObject serialisedHw = hardware.serialise();
-            serialisedHw.put("address", address);
-            hardwareList.add(serialisedHw);
-        }
-
-        json.put("hardware", hardwareList);
-
-        return json;
-    }
-
-    public static CPU deserialize(JSONObject json, User user) throws CancelledException {
-
-        CPU cpu = new CPU(GameServer.INSTANCE.getConfig(), user);
-
-        cpu.codeSegmentOffset = (int)(long)json.get("codeSegmentOffset");
-
-        JSONArray hardwareList = (JSONArray)json.get("hardware");
-
-        for(JSONObject serialisedHw : (ArrayList<JSONObject>)hardwareList){
-            CpuHardware hw = CpuHardware.deserialize(serialisedHw);
-            hw.setCpu(cpu);
-            cpu.attachHardware(hw, (int)(long)serialisedHw.get("address"));
-        }
-
-        cpu.memory = Memory.deserialize((JSONObject)json.get("memory"));
-        cpu.registerSet = RegisterSet.deserialize((JSONObject) json.get("registerSet"));
-
-        return cpu;
-
-    }
-
-    public InstructionSet getInstructionSet() {
-        return instructionSet;
-    }
-
-    public RegisterSet getRegisterSet() {
-        return registerSet;
-    }
-
-    public Memory getMemory() {
-        return memory;
-    }
-
-    public Status getStatus() {
-        return status;
-    }
-
-    public int getIp() {
-        return ip;
-    }
-
-    public void setIp(char ip) {
-        this.ip = ip;
-    }
-
-    public void setCodeSegmentOffset(int codeSegmentOffset) {
-        this.codeSegmentOffset = codeSegmentOffset;
-    }
-
-    public void attachHardware(CpuHardware hardware, int address){
-        attachedHardware.put(address, hardware);
-    }
-
-    public void detachHardware(int address){
-        attachedHardware.remove(address);
-    }
-
-    public boolean hardwareInterrupt(int address){
-        CpuHardware hardware = attachedHardware.get(address);
-
-        if(hardware != null){
-            hardware.handleInterrupt(status);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public void hardwareQuery(int address) {
-        CpuHardware hardware = attachedHardware.get(address);
-
-        if (hardware != null) {
-
-            registerSet.getRegister("B").setValue(hardware.getId());
-        } else {
-            registerSet.getRegister("B").setValue(0);
-        }
-    }
-
-    @Override
-    public String toString() {
-
-        String str = "------------------------\n";
-        str += registerSet.toString();
-        str += status.toString();
-        str += "------------------------\n";
-
-        return str;
-    }
-
-    public CpuHardware getHardware(int address) {
-
-        return attachedHardware.get(address);
-
-    }
-
-
-}

Server/src/net/simon987/server/assembly/CpuHardware.java

@@ -1,45 +0,0 @@
-package net.simon987.server.assembly;
-
-
-import net.simon987.server.GameServer;
-import net.simon987.server.io.CpuHardwareDeserializer;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-public abstract class CpuHardware implements JSONSerialisable {
-
-    CPU cpu;
-
-    /**
-     * Handle an HWI instruction
-     */
-    public abstract void handleInterrupt(Status status);
-
-    public CPU getCpu() {
-        return cpu;
-    }
-
-    public void setCpu(CPU cpu) {
-        this.cpu = cpu;
-    }
-
-    public abstract char getId();
-
-    public static CpuHardware deserialize(JSONObject hwJson){
-
-        for(ServerPlugin plugin : GameServer.INSTANCE.getPluginManager().getPlugins()){
-
-            if(plugin instanceof CpuHardwareDeserializer){
-                CpuHardware hw = ((CpuHardwareDeserializer) plugin).deserializeHardware(hwJson);
-
-                if(hw != null){
-                    return hw;
-                }
-            }
-        }
-
-        return null;
-    }
-
-}

Server/src/net/simon987/server/assembly/DefaultRegisterSet.java

@@ -1,22 +0,0 @@
-package net.simon987.server.assembly;
-
-/**
- * RegisterSet with default values
- */
-class DefaultRegisterSet extends RegisterSet {
-
-
-    DefaultRegisterSet() {
-        super();
-
-        addRegister(1, new Register("A"));
-        addRegister(2, new Register("B"));
-        addRegister(3, new Register("C"));
-        addRegister(4, new Register("D"));
-        addRegister(5, new Register("X"));
-        addRegister(6, new Register("Y"));
-        addRegister(7, new Register("SP"));
-        addRegister(8, new Register("BP"));
-
-    }
-}

Server/src/net/simon987/server/assembly/Memory.java

@@ -1,152 +0,0 @@
-package net.simon987.server.assembly;
-
-
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Base64;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterOutputStream;
-
-/**
- * Represents the available memory for a CPU in the game universe
- */
-public class Memory implements Target, JSONSerialisable {
-
-
-    /**
-     * Contents of the memory
-     */
-    private byte[] bytes;
-
-    /**
-     * Create an empty Memory object
-     *
-     * @param size Size of the memory, in words
-     */
-    public Memory(int size) {
-        bytes = new byte[size];
-    }
-
-    /**
-     * Get the value at an address
-     *
-     * @param address Address of the value
-     * @return 16-bit value at the specified address
-     */
-    @Override
-    public int get(int address) {
-        address = (char)address * 2; //Because our Memory is only divisible by 16bits
-
-        if (address < 0 || address + 2 > bytes.length) {
-            LogManager.LOGGER.info("DEBUG: Trying to get memory out of bounds " + address);
-            return 0;
-        }
-
-        return (((bytes[address] & 0xFF) << 8) | (bytes[address + 1] & 0xFF));
-    }
-
-    /**
-     * Write x words from an array at an offset
-     */
-    public boolean write(int offset, byte[] bytes, int srcOffset, int count) {
-
-        offset = (char)offset * 2;
-
-
-        if (offset + count > this.bytes.length || count < 0 || offset < 0 || srcOffset >= bytes.length) {
-            return false;
-        }
-
-        System.arraycopy(bytes, srcOffset, this.bytes, offset, count);
-        return true;
-    }
-
-    /**
-     * Set the value at an address
-     *
-     * @param address address of the value to change
-     * @param value   16-bit value to set
-     */
-    @Override
-    public void set(int address, int value) {
-
-        address = (char)address * 2;
-
-
-        if (address < 0 || address + 2 > bytes.length) {
-            LogManager.LOGGER.info("DEBUG: Trying to set memory out of bounds: " + address);
-            return;
-        }
-
-        bytes[address] = (byte) ((value >> 8) & 0xFF);
-        bytes[address + 1] = (byte) (value & 0xFF);
-    }
-
-    /**
-     * Fill the memory with 0s
-     */
-    public void clear() {
-        Arrays.fill(bytes, (byte) 0);
-    }
-
-    /**
-     * Get byte array of the Memory object
-     */
-    public byte[] getBytes() {
-        return bytes;
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        try {
-            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            Deflater compressor = new Deflater(Deflater.BEST_COMPRESSION, true);
-            DeflaterOutputStream deflaterOutputStream = new DeflaterOutputStream(stream, compressor);
-            deflaterOutputStream.write(bytes);
-            deflaterOutputStream.close();
-            byte[] compressedBytes = stream.toByteArray();
-
-            json.put("zipBytes", new String(Base64.getEncoder().encode(compressedBytes)));
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return json;
-    }
-
-    public static Memory deserialize(JSONObject json){
-
-        Memory memory = new Memory(0);
-        byte[] compressedBytes = Base64.getDecoder().decode((String)json.get("zipBytes"));
-
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            Inflater decompressor = new Inflater(true);
-            InflaterOutputStream inflaterOutputStream = new InflaterOutputStream(baos, decompressor);
-            inflaterOutputStream.write(compressedBytes);
-            inflaterOutputStream.close();
-
-            memory.bytes = baos.toByteArray();
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return memory;
-    }
-
-    public void setBytes(byte[] bytes) {
-        this.bytes = bytes;
-    }
-}

Server/src/net/simon987/server/assembly/RegisterSet.java

@@ -1,191 +0,0 @@
-package net.simon987.server.assembly;
-
-
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-/**
- * A set of registers for a CPU
- */
-public class RegisterSet implements Target, JSONSerialisable {
-
-    /**
-     * List of registers
-     */
-    private HashMap<Integer, Register> registers = new HashMap<>(8);
-
-
-    /**
-     * Create an empty Register set
-     */
-    public RegisterSet() {
-
-    }
-
-    /**
-     * Get the index of a Register by its name
-     * This method assumes that the
-     *
-     * @param name Name of the register
-     * @return index of the register, -1 if not found
-     */
-    int getIndex(String name) {
-
-        name = name.toUpperCase();
-
-        for (Integer i : registers.keySet()) {
-            if (registers.get(i).getName().equals(name)) {
-
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    /**
-     * Get a register by its index
-     *
-     * @param index index of the register
-     */
-    public Register getRegister(int index) {
-        return registers.get(index);
-    }
-
-    /**
-     * Get a register by its name (e.g. "AX")
-     *
-     * @param name Name of the register, case insensitive
-     */
-    public Register getRegister(String name) {
-
-        name = name.toUpperCase();
-
-        for (Register r : registers.values()) {
-            if (r.getName().equals(name)) {
-                return r;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Get the value of a register
-     *
-     * @param address Address of the value. Can refer to a memory address or the index
-     *                of a register
-     * @return 16-bit value of a register
-     */
-    @Override
-    public int get(int address) {
-
-        Register register = registers.get(address);
-
-        if(register != null){
-            return register.getValue();
-        } else {
-            return 0;
-        }
-
-    }
-
-    /**
-     * Set the value of a register
-     *
-     * @param address index of the value to change
-     * @param value   value to set
-     */
-    @Override
-    public void set(int address, int value) {
-
-        Register register = registers.get(address);
-
-        if(register != null){
-            register.setValue(value);
-        } else {
-            LogManager.LOGGER.info("DEBUG: trying to set unknown reg index : " + address);
-        }
-    }
-
-    public void put(int index, Register register) {
-        registers.put(index, register);
-    }
-
-    public void clear() {
-        for (Register register : registers.values()) {
-            register.setValue(0);
-        }
-    }
-
-    /**
-     * Add a register to the register set
-     * <p>
-     * the register set will break if the indexes of the registers
-     * are not consecutive, starting at address 1.
-     *
-     * @param index Index of the register
-     * @param reg   Register to add
-     */
-    void addRegister(int index, Register reg) {
-        registers.put(index, reg);
-    }
-
-    int size() {
-        return registers.size();
-    }
-
-
-    @Override
-    public JSONObject serialise() {
-        JSONArray registers = new JSONArray();
-        for(Integer index : this.registers.keySet()){
-            JSONObject register = new JSONObject();
-
-            register.put("index", index);
-            register.put("name", getRegister(index).getName());
-            register.put("value", (int) getRegister(index).getValue());
-
-            registers.add(register);
-        }
-
-        JSONObject json = new JSONObject();
-        json.put("registers", registers);
-
-        return json;
-    }
-
-    public static RegisterSet deserialize(JSONObject json) {
-
-        RegisterSet registerSet = new RegisterSet();
-
-        JSONArray registers = (JSONArray)json.get("registers");
-
-        for(JSONObject jsonRegister : (ArrayList<JSONObject>)registers){
-
-            Register register = new Register((String)jsonRegister.get("name"));
-            register.setValue((int)(long)jsonRegister.get("value"));
-
-            registerSet.registers.put((int)(long)jsonRegister.get("index"), register);
-
-        }
-
-        return registerSet;
-    }
-
-    @Override
-    public String toString() {
-        String str = "";
-
-        for(Integer index: registers.keySet()){
-            str += index + " " + registers.get(index).getName() + "=" + Util.toHex(registers.get(index).getValue()) + "\n";
-        }
-
-        return str;
-    }
-}

Server/src/net/simon987/server/assembly/exception/DuplicateSegmentException.java

@@ -1,19 +0,0 @@
-package net.simon987.server.assembly.exception;
-
-/**
- * Threw when a user attempts to define the same section twice
- */
-public class DuplicateSegmentException extends AssemblyException {
-
-    /**
-     * Message of the exception
-     */
-    private static final String message = "Segments can only be defined once";
-
-    /**
-     * Create a new Duplicate Segment Exception
-     */
-    public DuplicateSegmentException(int line) {
-        super(message, line);
-    }
-}

Server/src/net/simon987/server/assembly/instruction/DivInstruction.java

@@ -1,66 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.assembly.Instruction;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.Target;
-
-/**
- * Divide instruction.
- * <p>
- * DIV C
- * A = Y:A / C
- * Y = Y:A % C
- * </p>
- */
-public class DivInstruction extends Instruction {
-
-    public static final int OPCODE = 24;
-
-    private CPU cpu;
-
-    public DivInstruction(CPU cpu) {
-        super("div", OPCODE);
-        this.cpu = cpu;
-    }
-
-    @Override
-    public Status execute(Target src, int srcIndex, Status status) {
-
-        //Source = Y:A
-        int source = ((((char)cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
-                ((char)cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
-
-        if (src.get(srcIndex) == 0) {
-            //Division by 0
-            status.setBreakFlag(true);
-            status.setErrorFlag(true);
-        } else {
-            cpu.getRegisterSet().getRegister("A").setValue((char)(source / (char)src.get(srcIndex)));
-            cpu.getRegisterSet().getRegister("Y").setValue((char)(source % (char)src.get(srcIndex)));
-        }
-
-        return status;
-    }
-
-    @Override
-    public Status execute(int src, Status status) {
-
-
-        //Source = Y:A
-        int source = ((((char)cpu.getRegisterSet().getRegister("Y").getValue() & 0xFFFF) << 16)) |
-                ((char)cpu.getRegisterSet().getRegister("A").getValue() & 0xFFFF);
-
-        if (src == 0) {
-            //Division by 0
-            status.setBreakFlag(true);
-            status.setErrorFlag(true);
-        } else {
-            cpu.getRegisterSet().getRegister("A").setValue((char)(source / (char)src));
-            cpu.getRegisterSet().getRegister("Y").setValue((char)(source % (char)src));
-        }
-
-
-        return status;
-    }
-}

Server/src/net/simon987/server/assembly/instruction/HwiInstruction.java

@@ -1,40 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.assembly.Instruction;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.Target;
-
-/**
- * Send hardware interupt
- * Used to interact with the World using hardware
- * </p>
- */
-public class HwiInstruction extends Instruction {
-
-    public static final int OPCODE = 9;
-
-    private CPU cpu;
-
-    public HwiInstruction(CPU cpu) {
-        super("hwi", OPCODE);
-        this.cpu = cpu;
-    }
-
-    @Override
-    public Status execute(Target src, int srcIndex, Status status) {
-        status.setErrorFlag(cpu.hardwareInterrupt(src.get(srcIndex)));
-
-        return status;
-    }
-
-    @Override
-    public Status execute(int src, Status status) {
-
-        status.setErrorFlag(cpu.hardwareInterrupt(src));
-
-        return status;
-    }
-
-
-}

Server/src/net/simon987/server/assembly/instruction/NegInstruction.java

@@ -1,21 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.assembly.Instruction;
-import net.simon987.server.assembly.Status;
-import net.simon987.server.assembly.Target;
-
-public class NegInstruction extends Instruction {
-
-    public static final int OPCODE = 25;
-
-    public NegInstruction() {
-        super("neg", OPCODE);
-    }
-
-    @Override
-    public Status execute(Target dst, int dstIndex, Status status) {
-        dst.set(dstIndex, -dst.get(dstIndex));
-
-        return status;
-    }
-}

Server/src/net/simon987/server/assembly/instruction/NopInstruction.java

@@ -1,14 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.assembly.Instruction;
-
-/**
- * NOP (No operation instruction).
- * Does nothing
- */
-public class NopInstruction extends Instruction {
-
-    public NopInstruction() {
-        super("nop", 63);
-    }
-}

Server/src/net/simon987/server/assembly/instruction/SalInstruction.java

@@ -1,13 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.assembly.Instruction;
-
-/**
- * Alias of SHL instruction
- */
-public class SalInstruction extends Instruction {
-
-    public SalInstruction() {
-        super("sal", ShlInstruction.OPCODE);
-    }
-}

Server/src/net/simon987/server/event/CpuInitialisationEvent.java

@@ -1,18 +0,0 @@
-package net.simon987.server.event;
-
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.user.User;
-
-public class CpuInitialisationEvent extends GameEvent{
-
-    private User user;
-
-    public CpuInitialisationEvent(CPU cpu, User user) {
-        setSource(cpu);
-        this.user = user;
-    }
-
-    public User getUser() {
-        return user;
-    }
-}

Server/src/net/simon987/server/event/GameEventDispatcher.java

@@ -1,26 +0,0 @@
-package net.simon987.server.event;
-
-import net.simon987.server.plugin.PluginManager;
-import net.simon987.server.plugin.ServerPlugin;
-
-
-public class GameEventDispatcher {
-
-    private PluginManager pluginManager;
-
-    public GameEventDispatcher(PluginManager pluginManager) {
-        this.pluginManager = pluginManager;
-    }
-
-    public void dispatch(GameEvent event){
-        for(ServerPlugin plugin: pluginManager.getPlugins()){
-            for(GameEventListener listener : plugin.getListeners()){
-                if(event.getClass().equals(listener.getListenedEventType())){
-                    listener.handle(event);
-                }
-            }
-        }
-
-    }
-
-}

Server/src/net/simon987/server/event/WorldGenerationEvent.java

@@ -1,15 +0,0 @@
-package net.simon987.server.event;
-
-import net.simon987.server.game.World;
-
-public class WorldGenerationEvent extends GameEvent {
-
-    public WorldGenerationEvent(World world) {
-        setSource(world);
-    }
-
-    public World getWorld(){
-        return (World)getSource();
-    }
-
-}

Server/src/net/simon987/server/game/ControllableUnit.java

@@ -1,20 +0,0 @@
-package net.simon987.server.game;
-
-import net.simon987.server.assembly.Memory;
-import net.simon987.server.user.User;
-
-import java.util.ArrayList;
-
-public interface ControllableUnit {
-
-    int getObjectId();
-
-    void setKeyboardBuffer(ArrayList<Integer> kbBuffer);
-
-    void setParent(User user);
-
-    ArrayList<Integer> getKeyboardBuffer();
-
-    Memory getFloppyData();
-
-}

Server/src/net/simon987/server/game/Direction.java

@@ -1,39 +0,0 @@
-package net.simon987.server.game;
-
-/**
- * Direction of a game object in a 4-direction grid-based
- * area
- */
-public enum Direction {
-    /**
-     * North, up
-     */
-    NORTH,
-    /**
-     * East, right
-     */
-    EAST,
-    /**
-     * South, bottom
-     */
-    SOUTH,
-    /**
-     * West, left
-     */
-    WEST;
-
-    public static Direction getDirection(int x) {
-        switch (x) {
-            case 0:
-                return NORTH;
-            case 1:
-                return EAST;
-            case 2:
-                return SOUTH;
-            case 3:
-                return WEST;
-            default:
-                return null;
-        }
-    }
-}

Server/src/net/simon987/server/game/EffectType.java

@@ -1,26 +0,0 @@
-package net.simon987.server.game;
-
-/**
- * Types of GameEffects
- */
-public enum EffectType {
-
-    /**
-     * Warning icon
-     */
-    WARNING,
-    /**
-     * Error icon
-     */
-    ERROR,
-    /**
-     * Dig particle effect
-     */
-    DIG,
-    /**
-     * 'A' Icon
-     */
-    A_EMOTE
-
-
-}

Server/src/net/simon987/server/game/GameEffect.java

@@ -1,64 +0,0 @@
-package net.simon987.server.game;
-
-import net.simon987.server.io.JSONSerialisable;
-import org.json.simple.JSONObject;
-
-/**
- * Represents a game effect in a World (e.g. Particles made when digging, Error animation, Attack effects etc..)
- * <br>
- * These effects are purely visual and could be changed or ignored by the client
- */
-public class GameEffect implements JSONSerialisable{
-
-
-    /**
-     * Type of the effect
-     */
-    private EffectType type;
-
-    private int x;
-
-    private int y;
-
-    public GameEffect(EffectType type, int x, int y) {
-        this.type = type;
-        this.x = x;
-        this.y = y;
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        json.put("x", x);
-        json.put("y", y);
-        json.put("type", type);
-
-        return json;
-    }
-
-    public EffectType getType() {
-        return type;
-    }
-
-    public void setType(EffectType type) {
-        this.type = type;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-}

Server/src/net/simon987/server/game/GameObject.java

@@ -1,246 +0,0 @@
-package net.simon987.server.game;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.io.GameObjectDeserializer;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.plugin.ServerPlugin;
-import org.json.simple.JSONObject;
-
-import java.awt.*;
-
-/**
- * An INSTANCE of an object (e.g. a Tree, a character ...) inside the
- * game universe
- */
-public abstract class GameObject implements JSONSerialisable {
-
-    private boolean dead;
-    /**
-     * Object's unique identifier
-     */
-    private int objectId;
-
-    /**
-     * X coordinate of the object in its World
-     */
-    private int x;
-
-    /**
-     * Y coordinate of the object in its World
-     */
-    private int y;
-
-    /**
-     * Direction of the object
-     */
-    private Direction direction = Direction.NORTH;
-
-    /**
-     * Current World of the object
-     */
-    private World world;
-
-
-    //--------
-
-    /**
-     * Increment the location of the game object by 1 tile
-     * Collision checks happen here
-     */
-    public boolean incrementLocation() {
-
-        int newX = 0, newY = 0;
-
-        if (direction == Direction.NORTH) {
-            newX = x;
-            newY = (y - 1);
-
-        } else if (direction == Direction.EAST) {
-            newX = (x + 1);
-            newY = y;
-
-        } else if (direction == Direction.SOUTH) {
-            newX = x;
-            newY = (y + 1);
-
-        } else if (direction == Direction.WEST) {
-            newX = (x - 1);
-            newY = y;
-        }
-
-        //Check if out of World bounds / collision
-        if(newX < 0) {
-            //Move object to adjacent World (left)
-            World leftWorld;
-            if (world.getX() == 0) {
-                //Warp around
-                leftWorld = GameServer.INSTANCE.getGameUniverse().getWorld(
-                        GameServer.INSTANCE.getGameUniverse().getMaxWidth(), world.getY());
-            } else {
-                leftWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX() - 1, world.getY());
-            }
-
-            if(leftWorld != null){
-                world.getGameObjects().remove(this);
-                leftWorld.getGameObjects().add(this);
-                setWorld(leftWorld);
-
-                x = World.WORLD_SIZE - 1;
-            }
-        } else if(newX >= World.WORLD_SIZE) {
-            //Move object to adjacent World (right)
-            World rightWorld;
-            if (world.getX() == GameServer.INSTANCE.getGameUniverse().getMaxWidth()) {
-                //Warp around
-                rightWorld = GameServer.INSTANCE.getGameUniverse().getWorld(0, world.getY());
-            } else {
-                rightWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX() + 1, world.getY());
-            }
-
-            if(rightWorld != null){
-                world.getGameObjects().remove(this);
-                rightWorld.getGameObjects().add(this);
-                setWorld(rightWorld);
-
-                x = 0;
-            }
-        } else if (newY < 0) {
-            //Move object to adjacent World (up)
-            World upWorld;
-            if (world.getY() == 0) {
-                //Warp around
-                upWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX(),
-                        GameServer.INSTANCE.getGameUniverse().getMaxWidth());
-            } else {
-                upWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX(), world.getY() - 1);
-            }
-
-            if(upWorld != null){
-                world.getGameObjects().remove(this);
-                upWorld.getGameObjects().add(this);
-                setWorld(upWorld);
-
-                y = World.WORLD_SIZE - 1;
-            }
-        } else if (newY >= World.WORLD_SIZE) {
-            //Move object to adjacent World (down)
-            World downWorld;
-            if (world.getY() == GameServer.INSTANCE.getGameUniverse().getMaxWidth()) {
-                //Warp around
-                downWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX(), 0);
-            } else {
-                downWorld = GameServer.INSTANCE.getGameUniverse().getWorld(world.getX(), world.getY() + 1);
-            }
-
-
-            if (downWorld != null) {
-                world.getGameObjects().remove(this);
-                downWorld.getGameObjects().add(this);
-                setWorld(downWorld);
-
-                y = 0;
-            }
-        }
-        //Check collision
-        else if (!world.isTileBlocked(newX, newY)) {
-            //Tile is passable
-            x = newX;
-            y = newY;
-        } else {
-            return false;
-        }
-
-        return true;
-
-    }
-
-    public abstract char getMapInfo();
-
-    public Point getFrontTile() {
-
-        if (direction == Direction.NORTH) {
-            return new Point(x, y - 1);
-        } else if (direction == Direction.EAST) {
-            return new Point(x + 1, y);
-        } else if (direction == Direction.SOUTH) {
-            return new Point(x, y + 1);
-        } else {
-            return new Point(x - 1, y);
-        }
-
-    }
-
-    public int getObjectId() {
-        return objectId;
-    }
-
-    public void setObjectId(int objectId) {
-        this.objectId = objectId;
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public void setX(int x) {
-        this.x = x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public void setY(int y) {
-        this.y = y;
-    }
-
-    public Direction getDirection() {
-        return direction;
-    }
-
-    public void setDirection(Direction direction) {
-        this.direction = direction;
-    }
-
-    public World getWorld() {
-        return world;
-    }
-
-    public void setWorld(World world) {
-        this.world = world;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        return new JSONObject();
-    }
-
-    public static GameObject deserialize(JSONObject objJson) {
-
-        for(ServerPlugin plugin : GameServer.INSTANCE.getPluginManager().getPlugins()){
-
-            if(plugin instanceof GameObjectDeserializer){
-                GameObject object = ((GameObjectDeserializer) plugin).deserializeObject(objJson);
-
-                if(object != null){
-                    return object;
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    public boolean isAt(int x, int y) {
-        return this.x == x && this.y == y;
-    }
-
-    public boolean isDead() {
-        return dead;
-    }
-
-    public void setDead(boolean dead) {
-        this.dead = dead;
-    }
-}

Server/src/net/simon987/server/game/GameUniverse.java

@@ -1,270 +0,0 @@
-package net.simon987.server.game;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.assembly.Assembler;
-import net.simon987.server.assembly.AssemblyResult;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.assembly.exception.CancelledException;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.User;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-
-public class GameUniverse implements JSONSerialisable{
-
-    private ArrayList<World> worlds;
-    private ArrayList<User> users;
-    private WorldGenerator worldGenerator;
-
-    private long time;
-
-    private int nextObjectId = 0;
-
-    private int maxWidth = 0xFFFF;
-
-    public GameUniverse(ServerConfiguration config) {
-
-        worlds = new ArrayList<>(32);
-        users = new ArrayList<>(16);
-
-        worldGenerator = new WorldGenerator(config);
-
-    }
-
-    public long getTime() {
-        return time;
-    }
-
-    public World getWorld(int x, int y) {
-
-        for (World world : worlds) {
-            if (world.getX() == x && world.getY() == y) {
-                return world;
-            }
-        }
-
-        if (x >= 0 && x <= maxWidth && y >= 0 && y <= maxWidth) {
-            //World does not exist
-            LogManager.LOGGER.severe("Trying to read a World that does not exist!");
-
-            World world = createWorld(x, y);
-
-            worlds.add(world);
-
-            return world;
-        } else {
-            return null;
-        }
-    }
-
-    public World createWorld(int x, int y) {
-
-        World world = null;
-        try {
-            world = worldGenerator.generateWorld(x, y);
-
-
-        } catch (CancelledException e) {
-            e.printStackTrace();
-        }
-
-        return world;
-    }
-
-    public User getUser(String username) {
-
-        for (User user : users) {
-            if (user.getUsername().equals(username)) {
-                return user;
-            }
-        }
-
-        return null;
-    }
-
-    public User getOrCreateUser(String username, boolean makeControlledUnit){
-        User user = getUser(username);
-
-        if(user != null) {
-            return user;
-        } else {
-
-            LogManager.LOGGER.info("Creating new User: " + username);
-
-            try {
-                if(makeControlledUnit) {
-                    user = new User();
-                    user.setCpu(new CPU(GameServer.INSTANCE.getConfig(), user));
-                    user.setUserCode(GameServer.INSTANCE.getConfig().getString("new_user_code"));
-
-                    //Compile user code
-                    AssemblyResult ar = new Assembler(user.getCpu().getInstructionSet(), user.getCpu().getRegisterSet(),
-                            GameServer.INSTANCE.getConfig()).parse(user.getUserCode());
-
-                    user.getCpu().getMemory().clear();
-
-                    //Write assembled code to mem
-                    user.getCpu().getMemory().write((short) ar.origin, ar.bytes, 0, ar.bytes.length);
-                    user.getCpu().setCodeSegmentOffset(ar.origin);
-
-                    //Init
-
-                } else {
-                    user = new User(null);
-                }
-
-                user.setUsername(username);
-
-                users.add(user);
-
-                return user;
-
-            } catch (CancelledException e) {
-                e.printStackTrace();
-                return null;
-            }
-
-        }
-    }
-
-    /**
-     * Get an object by id
-     * <br>
-     * ConcurrentModificationException risk when inside game loop
-     *
-     * @param id id of the game object
-     * @return GameObject, null if not found
-     */
-    public GameObject getObject(int id) {
-
-        //
-        for (World world : worlds) {
-            for(GameObject object : world.getGameObjects()){
-                if(object.getObjectId() == id){
-                    return object;
-                }
-            }
-        }
-
-        return null;
-    }
-
-
-    public void incrementTime(){
-        time++;
-    }
-
-    public ArrayList<World> getWorlds() {
-        return worlds;
-    }
-
-    public ArrayList<User> getUsers() {
-        return users;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-
-        JSONArray worlds = new JSONArray();
-
-        ArrayList<World> worlds_ = new ArrayList<>(this.worlds);
-        for (World world : worlds_){
-            worlds.add(world.serialise());
-        }
-
-        JSONArray users = new JSONArray();
-        ArrayList<User> users_ = new ArrayList<User>(this.users);
-        for (User user : users_){
-            if (!user.isGuest()) {
-                users.add(user.serialise());
-            }
-
-        }
-
-
-        json.put("users", users);
-        json.put("worlds", worlds);
-        json.put("time", time);
-        json.put("nextObjectId", nextObjectId);
-
-        return json;
-    }
-
-    /**
-     * Load game universe from JSON save file
-     * @param file JSON save file
-     */
-    public void load(File file){
-
-        JSONParser parser = new JSONParser();
-
-        if (file.isFile()) {
-            try {
-
-                FileReader reader = new FileReader(file);
-                JSONObject universeJson = (JSONObject) parser.parse(reader);
-
-                time = (long) universeJson.get("time");
-                nextObjectId = (int) (long) universeJson.get("nextObjectId");
-
-                for (JSONObject worldJson : (ArrayList<JSONObject>) universeJson.get("worlds")) {
-                    worlds.add(World.deserialize(worldJson));
-                }
-
-                for (JSONObject userJson : (ArrayList<JSONObject>) universeJson.get("users")) {
-                    users.add(User.deserialize(userJson));
-                }
-
-                LogManager.LOGGER.info("Loaded " + worlds.size() + " worlds from file");
-
-                reader.close();
-
-            } catch (IOException | ParseException | CancelledException e) {
-                e.printStackTrace();
-            }
-        } else {
-            LogManager.LOGGER.severe("Couldn't load save file save.json, creating empty game universe.");
-        }
-
-
-    }
-
-    public int getNextObjectId() {
-        return ++nextObjectId;
-    }
-
-    public String getGuestUsername() {
-        int i = 1;
-
-        while (i < 1000) { //todo get Max guest user cap from config
-            if(getUser("guest" + String.valueOf(i)) != null) {
-                i++;
-                continue;
-            }
-
-            return "guest" + String.valueOf(i);
-        }
-
-        return null;
-
-    }
-
-    public void removeUser(User user) {
-        users.remove(user);
-
-    }
-
-    public int getMaxWidth() {
-        return maxWidth;
-    }
-}

Server/src/net/simon987/server/game/InventoryHolder.java

@@ -1,24 +0,0 @@
-package net.simon987.server.game;
-
-
-public interface InventoryHolder {
-
-    /**
-     * Place an item into the inventory
-     *
-     * @param item item id (see MarConstants.ITEM_*)
-     */
-    boolean placeItem(int item);
-
-    /**
-     * Take an item from the inventory
-     * @param item Desired item id (see MarConstants.ITEM_*)
-     */
-    void takeItem(int item);
-
-    /**
-     * @param item item to take
-     * @return true if the InventoryHolder can provide this item
-     */
-    boolean canTakeItem(int item);
-}

Server/src/net/simon987/server/game/TileMap.java

@@ -1,185 +0,0 @@
-package net.simon987.server.game;
-
-
-import net.simon987.server.io.JSONSerialisable;
-import org.json.simple.JSONObject;
-
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Base64;
-import java.util.Random;
-import java.util.zip.Deflater;
-import java.util.zip.DeflaterOutputStream;
-import java.util.zip.Inflater;
-import java.util.zip.InflaterOutputStream;
-
-/**
- * A 2D map of Tile objects of size width*height
- */
-public class TileMap implements JSONSerialisable {
-
-    public static final int PLAIN_TILE = 0;
-    public static final int WALL_TILE = 1;
-    public static final int IRON_TILE = 2;
-    public static final int COPPER_TILE = 3;
-
-    public static final int ITEM_IRON = 3;
-    public static final int ITEM_COPPER = 4;
-
-    /**
-     * The map of tile
-     */
-    private int[][] tiles;
-
-    /**
-     * width, in tiles
-     */
-    private int width;
-
-    /**
-     * Height, in tiles
-     */
-    private int height;
-
-    /**
-     * Create a blank (All 0s) map
-     */
-    public TileMap(int width, int height) {
-        this.width = width;
-        this.height = height;
-
-        tiles = new int[width][height];
-    }
-
-    /**
-     * Change the tile at a specified position
-     * Sets the modified flag
-     *
-     * @param tileId id of the new Tile
-     * @param x      X coordinate of the tile to set
-     * @param y      Y coordinate of the tile to set
-     */
-    public void setTileAt(int tileId, int x, int y) {
-
-        try {
-            tiles[x][y] = tileId;
-        } catch (ArrayIndexOutOfBoundsException e) {
-            //Shouldn't happen
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Get the tile at a specific position
-     *
-     * @param x X coordinate of the tile to get
-     * @param y Y coordinate of the tile to get
-     * @return the tile at the specified position, -1 if out of bounds
-     */
-    public int getTileAt(int x, int y) {
-        try {
-            return tiles[x][y];
-        } catch (ArrayIndexOutOfBoundsException e) {
-            return -1;
-        }
-    }
-
-    public int[][] getTiles() {
-        return tiles;
-    }
-
-    public int getWidth() {
-
-        return width;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-
-        byte[] terrain = new byte[width*width];
-
-        for (int x = 0; x < World.WORLD_SIZE; x++) {
-            for (int y = 0; y < World.WORLD_SIZE; y++) {
-                terrain[x * width + y] = (byte)tiles[x][y];
-            }
-        }
-        try {
-            ByteArrayOutputStream stream = new ByteArrayOutputStream();
-            Deflater compressor = new Deflater(Deflater.BEST_COMPRESSION, true);
-            DeflaterOutputStream deflaterOutputStream = new DeflaterOutputStream(stream, compressor);
-
-            deflaterOutputStream.write(terrain);
-
-            deflaterOutputStream.close();
-            byte[] compressedBytes = stream.toByteArray();
-
-            json.put("zipTerrain", new String(Base64.getEncoder().encode(compressedBytes)));
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return json;
-    }
-
-    public static TileMap deserialize(JSONObject object) {
-
-        TileMap tileMap = new TileMap(World.WORLD_SIZE, World.WORLD_SIZE);
-
-
-        byte[] compressedBytes = Base64.getDecoder().decode((String)object.get("zipTerrain"));
-
-        try {
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            Inflater decompressor = new Inflater(true);
-            InflaterOutputStream inflaterOutputStream = new InflaterOutputStream(baos, decompressor);
-            inflaterOutputStream.write(compressedBytes);
-            inflaterOutputStream.close();
-
-            byte[] terrain = baos.toByteArray();
-
-            for (int x = 0; x < World.WORLD_SIZE; x++) {
-                for (int y = 0; y < World.WORLD_SIZE; y++) {
-                    tileMap.tiles[x][y] = terrain[x * World.WORLD_SIZE + y];
-                }
-            }
-
-            return tileMap;
-
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    public Point getRandomPlainTile() {
-
-        Random random = new Random();
-
-        int counter = 0;
-        while (true) {
-            counter++;
-
-            //Prevent infinite loop
-            if (counter >= 2500) {
-                return null;
-            }
-
-            int rx = random.nextInt(World.WORLD_SIZE);
-            int ry = random.nextInt(World.WORLD_SIZE);
-
-            if (tiles[rx][ry] == TileMap.PLAIN_TILE) {
-                return new Point(rx, ry);
-            }
-        }
-
-    }
-}

Server/src/net/simon987/server/game/World.java

@@ -1,234 +0,0 @@
-package net.simon987.server.game;
-
-import net.simon987.server.game.pathfinding.Pathfinder;
-import net.simon987.server.io.JSONSerialisable;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Random;
-
-public class World implements JSONSerialisable{
-
-    /**
-     * Size of the side of a world
-     */
-    public static final int WORLD_SIZE = 16;
-
-    private static final char INFO_BLOCKED = 0x8000;
-    private static final char INFO_IRON = 0x0200;
-    private static final char INFO_COPPER = 0x0100;
-
-    private int x;
-    private int y;
-
-    private TileMap tileMap;
-
-    private ArrayList<GameObject> gameObjects = new ArrayList<>(16);
-
-    public World(int x, int y, TileMap tileMap) {
-        this.x = x;
-        this.y = y;
-        this.tileMap = tileMap;
-    }
-
-    private World(){
-
-    }
-
-    public TileMap getTileMap() {
-        return tileMap;
-    }
-
-    /**
-     * Check if a tile is blocked, either by a game object or an impassable tile type
-     */
-    public boolean isTileBlocked(int x, int y) {
-
-        return getGameObjectsAt(x, y).size() > 0 || tileMap.getTileAt(x, y) == TileMap.WALL_TILE;
-
-    }
-
-    public int getX() {
-        return x;
-    }
-
-    public int getY() {
-        return y;
-    }
-
-    public ArrayList<GameObject> getGameObjects() {
-        return gameObjects;
-    }
-
-    public void update(){
-
-        ArrayList<GameObject> gameObjects_ = new ArrayList<>(gameObjects);
-
-        for(GameObject object : gameObjects_){
-            if(object.isDead()){
-                gameObjects.remove(object);
-                LogManager.LOGGER.fine("Removed object " + object + " id: " + object.getObjectId());
-            }
-            if (object instanceof Updatable) {
-                ((Updatable) object).update();
-            }
-        }
-    }
-
-    @Override
-    public JSONObject serialise() {
-        JSONObject json = new JSONObject();
-
-        JSONArray objects = new JSONArray();
-        ArrayList<GameObject> gameObjects_ = new ArrayList<>(gameObjects);
-        for (GameObject obj : gameObjects_) {
-            objects.add(obj.serialise());
-        }
-        json.put("objects", objects);
-
-        json.put("terrain", tileMap.serialise());
-
-        json.put("x", x);
-        json.put("y", y);
-
-        return json;
-    }
-
-    @Override
-    public String toString() {
-
-        String str = "World (" + x + ", " + y + ")\n";
-        int[][] tileMap = this.tileMap.getTiles();
-
-        for (int x = 0; x < WORLD_SIZE; x++) {
-            for (int y = 0; y < WORLD_SIZE; y++) {
-                str += tileMap[x][y] + " ";
-            }
-            str += "\n";
-        }
-
-        return str;
-
-    }
-
-    public static World deserialize(JSONObject json) {
-        World world = new World();
-        world.x = (int)(long)json.get("x");
-        world.y = (int)(long)json.get("y");
-
-        world.tileMap = TileMap.deserialize((JSONObject)json.get("terrain"));
-
-        for(JSONObject objJson : (ArrayList<JSONObject>)json.get("objects")){
-
-            GameObject object = GameObject.deserialize(objJson);
-
-            object.setWorld(world);
-            world.gameObjects.add(object);
-        }
-
-        return world;
-    }
-
-    /**
-     * Get a binary representation of the map as an array of 16-bit bit fields, one word for each
-     * tile.
-     * <p>
-     * todo Performance cache this?
-     */
-    public char[][] getMapInfo() {
-
-        char[][] mapInfo = new char[World.WORLD_SIZE][World.WORLD_SIZE];
-        int[][] tiles = tileMap.getTiles();
-
-        //Tile
-        for (int y = 0; y < World.WORLD_SIZE; y++) {
-            for (int x = 0; x < World.WORLD_SIZE; x++) {
-
-                if (tiles[x][y] == TileMap.PLAIN_TILE) {
-
-                    mapInfo[x][y] = 0;
-                } else if (tiles[x][y] == TileMap.WALL_TILE) {
-
-                    mapInfo[x][y] = INFO_BLOCKED;
-                } else if (tiles[x][y] == TileMap.COPPER_TILE) {
-
-                    mapInfo[x][y] = INFO_COPPER;
-                } else if (tiles[x][y] == TileMap.IRON_TILE) {
-
-                    mapInfo[x][y] = INFO_IRON;
-                }
-            }
-        }
-
-        //Objects
-        for (GameObject obj : this.gameObjects) {
-            mapInfo[obj.getX()][obj.getY()] |= obj.getMapInfo();
-
-        }
-
-        return mapInfo;
-
-    }
-
-    /**
-     * Get a random tile that is empty and passable
-     * The function ensures that a object spawned there will not be trapped
-     * and will be able to leave the World
-     * <br>
-     * Note: This function is quite expensive and shouldn't be used
-     * by some CpuHardware in its current state
-     *
-     * @return random non-blocked tile
-     */
-    public Point getRandomPassableTile(){
-        Random random = new Random();
-
-        int counter = 0;
-        while (true) {
-            counter++;
-
-            //Prevent infinite loop
-            if (counter >= 2500) {
-                return null;
-            }
-
-            int rx = random.nextInt(World.WORLD_SIZE);
-            int ry = random.nextInt(World.WORLD_SIZE);
-
-            if(!isTileBlocked(rx, ry)){
-
-                Object path = Pathfinder.findPath(this, rx, ry, 0, 6, 0);
-
-                if(path != null) {
-                    return new Point(rx, ry);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the list of game objects at a location
-     *
-     * @param x X coordinate on the World
-     * @param y Y coordinate on the World
-     * @return the list of game objects at a location
-     */
-    public ArrayList<GameObject> getGameObjectsAt(int x, int y) {
-
-        ArrayList<GameObject> gameObjects = new ArrayList<>(2);
-
-        for (GameObject obj : this.gameObjects) {
-
-            if (obj.isAt(x, y)) {
-                gameObjects.add(obj);
-            }
-
-        }
-
-        return gameObjects;
-    }
-
-}

Server/src/net/simon987/server/io/CpuHardwareDeserializer.java

@@ -1,10 +0,0 @@
-package net.simon987.server.io;
-
-import net.simon987.server.assembly.CpuHardware;
-import org.json.simple.JSONObject;
-
-public interface CpuHardwareDeserializer {
-
-
-    CpuHardware deserializeHardware(JSONObject hwJson);
-}

Server/src/net/simon987/server/io/DatabaseManager.java

@@ -1,45 +0,0 @@
-package net.simon987.server.io;
-
-
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.logging.LogManager;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-/**
- * Manages the database: this class manages the interactions with the database
- */
-public abstract class DatabaseManager {
-
-    /**
-     * SQL connection url
-     */
-    private String url;
-
-    /**
-     * SQL username
-     */
-    private String username;
-
-    /**
-     * SQL password
-     */
-    private String password;
-
-    public DatabaseManager(ServerConfiguration config) {
-        this.url = config.getString("mysql_url");
-        this.username = config.getString("mysql_user");
-        this.password = config.getString("mysql_pass");
-    }
-
-    protected Connection getConnection() {
-        try {
-            return DriverManager.getConnection(url, this.username, password);
-        } catch (SQLException e) {
-            LogManager.LOGGER.severe("Couldn't connect to MySQL server state:" + e.getSQLState() + " error:" + e.getErrorCode());
-            return null;
-        }
-    }
-}

Server/src/net/simon987/server/io/GameObjectDeserializer.java

@@ -1,10 +0,0 @@
-package net.simon987.server.io;
-
-import net.simon987.server.game.GameObject;
-import org.json.simple.JSONObject;
-
-public interface GameObjectDeserializer {
-
-    GameObject deserializeObject(JSONObject object);
-
-}

Server/src/net/simon987/server/io/JSONSerialisable.java

@@ -1,9 +0,0 @@
-package net.simon987.server.io;
-
-import org.json.simple.JSONObject;
-
-public interface JSONSerialisable {
-
-    JSONObject serialise();
-
-}

Server/src/net/simon987/server/logging/LogManager.java

@@ -1,41 +0,0 @@
-package net.simon987.server.logging;
-
-import java.io.IOException;
-import java.util.logging.*;
-
-/**
- * Utility class to manage log entries
- */
-public class LogManager {
-
-    /**
-     * Singleton Logger
-     */
-    public final static Logger LOGGER = Logger.getLogger("mar");
-
-    /**
-     * Initialises the logger
-     */
-    public static void initialize() {
-        LOGGER.setUseParentHandlers(false);
-
-        Handler handler = new ConsoleHandler();
-        handler.setLevel(Level.ALL);
-        handler.setFormatter(new GenericFormatter());
-
-        try {
-            Handler fileHandler = new FileHandler("mar.log");
-            fileHandler.setLevel(Level.ALL);
-            fileHandler.setFormatter(new GenericFormatter());
-
-            LOGGER.addHandler(handler);
-            LOGGER.addHandler(fileHandler);
-            LOGGER.setLevel(Level.ALL);
-
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-
-
-    }
-}

Server/src/net/simon987/server/plugin/PluginManager.java

@@ -1,71 +0,0 @@
-package net.simon987.server.plugin;
-
-import net.simon987.server.logging.LogManager;
-
-import java.io.File;
-import java.io.InputStream;
-import java.lang.reflect.Constructor;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Properties;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-public class PluginManager {
-
-    private ArrayList<ServerPlugin> plugins;
-
-    public PluginManager() {
-        this.plugins = new ArrayList<>(10);
-    }
-
-    public void load(File pluginFile){
-
-        LogManager.LOGGER.info("Loading plugin file " + pluginFile.getName());
-
-        try{
-            //Get the plugin config file from the archive
-            ZipFile zipFile = new ZipFile(pluginFile);
-
-            ZipEntry configEntry = zipFile.getEntry("plugin.properties");
-
-            if(configEntry != null){
-
-                InputStream stream = zipFile.getInputStream(configEntry);
-                Properties config = new Properties();
-                config.load(stream);
-
-                //Load the plugin
-                ClassLoader loader = URLClassLoader.newInstance(new URL[] {pluginFile.toURI().toURL() });
-                Class<?> aClass = Class.forName(config.getProperty("classpath"), true, loader);
-                Class<? extends ServerPlugin> pluginClass = aClass.asSubclass(ServerPlugin.class);
-                Constructor<? extends ServerPlugin> constructor = pluginClass.getConstructor();
-
-                ServerPlugin plugin = constructor.newInstance();
-                plugin.setName(config.getProperty("name"));
-                plugin.setVersion(config.getProperty("version"));
-
-                LogManager.LOGGER.info("Loaded " + plugin.name + " V" + plugin.version);
-
-                //Add it to the list
-                plugins.add(plugin);
-
-                //Init the plugin
-                plugin.init();
-
-            } else {
-                LogManager.LOGGER.severe("Couldn't find plugin.properties in " + pluginFile.getName());
-            }
-            zipFile.close();
-
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public ArrayList<ServerPlugin> getPlugins() {
-        return plugins;
-    }
-}

Server/src/net/simon987/server/plugin/ServerPlugin.java

@@ -1,61 +0,0 @@
-package net.simon987.server.plugin;
-
-import net.simon987.server.event.GameEventListener;
-import net.simon987.server.io.JSONSerialisable;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-
-public abstract class ServerPlugin implements JSONSerialisable {
-
-    /**
-     * Name of the plugin
-     */
-    protected String name;
-
-    /**
-     * Version of the plugin
-     */
-    protected String version;
-
-    /**
-     * List of event listeners
-     */
-    protected ArrayList<GameEventListener> listeners = new ArrayList<>(5);
-
-    /**
-     * Called when the plugin is loaded
-     */
-    public abstract void init();
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public ArrayList<GameEventListener> getListeners() {
-        return listeners;
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        json.put("name", name);
-        json.put("version", version);
-
-        return json;
-    }
-}

Server/src/net/simon987/server/user/User.java

@@ -1,110 +0,0 @@
-package net.simon987.server.user;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.CPU;
-import net.simon987.server.assembly.exception.CancelledException;
-import net.simon987.server.event.GameEvent;
-import net.simon987.server.event.UserCreationEvent;
-import net.simon987.server.game.ControllableUnit;
-import net.simon987.server.io.JSONSerialisable;
-import org.json.simple.JSONObject;
-
-/**
- * Represents a User (or player) of the game
- */
-public class User implements JSONSerialisable{
-
-    private String username;
-
-    private String userCode;
-
-    private CPU cpu;
-
-    private ControllableUnit controlledUnit;
-
-    private boolean guest;
-
-    public User() throws CancelledException {
-        GameEvent event = new UserCreationEvent(this);
-        GameServer.INSTANCE.getEventDispatcher().dispatch(event);
-        if(event.isCancelled()) {
-            throw new CancelledException();
-        }
-
-
-    }
-
-    public User(ControllableUnit unit) {
-        this.controlledUnit = unit;
-    }
-
-    @Override
-    public JSONObject serialise() {
-
-        JSONObject json = new JSONObject();
-
-        json.put("username", username);
-        json.put("code", userCode);
-        json.put("controlledUnit", controlledUnit.getObjectId());
-        json.put("cpu", cpu.serialise());
-
-        return json;
-
-
-    }
-
-    public static User deserialize(JSONObject userJson) throws CancelledException {
-
-        User user = new User((ControllableUnit)GameServer.INSTANCE.getGameUniverse().getObject((int)(long)userJson.get("controlledUnit")));
-        user.username = (String)userJson.get("username");
-        user.userCode = (String)userJson.get("code");
-
-        user.getControlledUnit().setParent(user);
-
-        user.cpu = CPU.deserialize((JSONObject)userJson.get("cpu"), user);
-
-        return user;
-    }
-
-    //----
-
-    public String getUserCode() {
-        return userCode;
-    }
-
-    public void setUserCode(String userCode) {
-        this.userCode = userCode;
-    }
-
-    public CPU getCpu() {
-        return cpu;
-    }
-
-    public void setCpu(CPU cpu) {
-        this.cpu = cpu;
-    }
-
-    public String getUsername() {
-        return username;
-    }
-
-    public ControllableUnit getControlledUnit() {
-        return controlledUnit;
-    }
-
-    public void setControlledUnit(ControllableUnit controlledUnit) {
-        this.controlledUnit = controlledUnit;
-    }
-
-    public void setUsername(String username) {
-        this.username = username;
-    }
-
-    public boolean isGuest() {
-        return guest;
-    }
-
-    public void setGuest(boolean guest) {
-        this.guest = guest;
-    }
-}

Server/src/net/simon987/server/webserver/CodeRequestHandler.java

@@ -1,37 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-public class CodeRequestHandler implements MessageHandler {
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-
-        if(json.get("t").equals("codeRequest")){
-
-            LogManager.LOGGER.info("(WS) Code request from " + user.getUser().getUsername());
-
-            if(user.isGuest()) {
-
-                JSONObject response = new JSONObject();
-
-                response.put("t", "code");
-                response.put("code", "; Create a free account to control your own Cubot with assembly language!"); //todo load from config
-
-                user.getWebSocket().send(response.toJSONString());
-
-            } else {
-
-                JSONObject response = new JSONObject();
-
-                response.put("t", "code");
-                response.put("code", user.getUser().getUserCode());
-
-                user.getWebSocket().send(response.toJSONString());
-            }
-
-
-
-        }
-    }
-}

Server/src/net/simon987/server/webserver/CodeUploadHandler.java

@@ -1,45 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.assembly.Assembler;
-import net.simon987.server.assembly.AssemblyResult;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-public class CodeUploadHandler implements MessageHandler {
-
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-        if(json.get("t").equals("uploadCode")){
-
-            LogManager.LOGGER.info("(WS) Code upload from " + user.getUser().getUsername());
-
-            if(user.isGuest()) {
-                //Ignore
-
-            } else {
-                //TODO Should we wait at the end of the tick to modify the CPU ?
-                user.getUser().setUserCode((String)json.get("code"));
-
-                AssemblyResult ar = new Assembler(user.getUser().getCpu().getInstructionSet(),
-                        user.getUser().getCpu().getRegisterSet(),
-                        GameServer.INSTANCE.getConfig()).parse(user.getUser().getUserCode());
-
-                user.getUser().getCpu().getMemory().clear();
-
-                //Write assembled code to mem
-                user.getUser().getCpu().getMemory().write((char) ar.origin, ar.bytes, 0, ar.bytes.length);
-                user.getUser().getCpu().setCodeSegmentOffset(ar.origin);
-
-                JSONObject response = new JSONObject();
-                response.put("t", "codeResponse");
-                response.put("bytes", ar.bytes.length);
-
-                user.getWebSocket().send(response.toJSONString());
-            }
-
-
-
-        }
-    }
-}

Server/src/net/simon987/server/webserver/FloppyHandler.java

@@ -1,36 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-public class FloppyHandler implements MessageHandler {
-
-    SocketServerDatabase db = new SocketServerDatabase(GameServer.INSTANCE.getConfig());
-
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-
-        if (json.get("t").equals("floppyDown")) {
-
-            LogManager.LOGGER.info("(WS) Floppy download request from " + user.getUser().getUsername());
-
-
-            //floppy
-            byte[] bytes = user.getUser().getControlledUnit().getFloppyData().getBytes();
-
-            user.getWebSocket().send(bytes);
-
-        } else if (json.get("t").equals("floppyUp")) {
-
-            LogManager.LOGGER.info("(WS) Floppy upload request from " + user.getUser().getUsername());
-
-            //Check newly uploaded file on the database
-            byte[] bytes = db.getFloppy(user.getUser().getUsername());
-
-            if (bytes != null) {
-                user.getUser().getControlledUnit().getFloppyData().setBytes(bytes);
-            }
-        }
-    }
-}

Server/src/net/simon987/server/webserver/KeypressHandler.java

@@ -1,23 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-
-public class KeypressHandler implements MessageHandler {
-
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-
-        if(!user.isGuest()) {
-            if(json.get("t").equals("k")){
-
-                LogManager.LOGGER.info("(WS) Received keypress");
-
-                int key = (int)(long)json.get("k");
-
-                user.getUser().getControlledUnit().getKeyboardBuffer().add(key);
-            }
-        }
-    }
-}

Server/src/net/simon987/server/webserver/MessageEventDispatcher.java

@@ -1,43 +0,0 @@
-package net.simon987.server.webserver;
-
-
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.util.ArrayList;
-
-public class MessageEventDispatcher {
-
-    private ArrayList<MessageHandler> handlers = new ArrayList<>(10);
-
-    public MessageEventDispatcher() {
-
-    }
-
-    public void addHandler(MessageHandler handler) {
-
-        handlers.add(handler);
-
-    }
-
-    public void dispatch(OnlineUser user, String message) {
-
-        JSONParser parser = new JSONParser();
-        try {
-            JSONObject json = (JSONObject) parser.parse(message);
-
-            if (json.containsKey("t")) {
-                for (MessageHandler handler : handlers) {
-                    handler.handle(user, json);
-                }
-            } else {
-                LogManager.LOGGER.info("Malformed JSON sent by " + user.getUser().getUsername());
-            }
-
-        } catch (ParseException e) {
-            LogManager.LOGGER.info("Malformed JSON sent by " + user.getUser().getUsername());
-        }
-    }
-}

Server/src/net/simon987/server/webserver/MessageHandler.java

@@ -1,9 +0,0 @@
-package net.simon987.server.webserver;
-
-import org.json.simple.JSONObject;
-
-public interface MessageHandler {
-
-    void handle(OnlineUser user, JSONObject json);
-
-}

Server/src/net/simon987/server/webserver/ObjectsRequestHandler.java

@@ -1,53 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.game.World;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-
-public class ObjectsRequestHandler implements MessageHandler {
-
-
-
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-        if (json.get("t").equals("object")) {
-            LogManager.LOGGER.info("(WS) Objects request from " + user.getUser().getUsername());
-
-            int x, y;
-            try {
-                x = Long.valueOf((long) json.get("x")).intValue();
-                y = Long.valueOf((long) json.get("y")).intValue();
-            } catch (Exception e) {
-                LogManager.LOGGER.info("(WS) Malformed Objects request from " + user.getUser().getUsername());
-                return;
-            }
-
-            World world = GameServer.INSTANCE.getGameUniverse().getWorld(x, y);
-
-            if (world != null) {
-                ArrayList<GameObject> gameObjects = world.getGameObjects();
-
-                JSONObject response = new JSONObject();
-                JSONArray objects = new JSONArray();
-
-
-                for (GameObject object : gameObjects) {
-                        objects.add(object.serialise());
-                    }
-
-                response.put("t", "object");
-                response.put("objects", objects);
-
-
-                if (user.getWebSocket().isOpen()) {
-                    user.getWebSocket().send(response.toJSONString());
-                }
-            }
-        }
-    }
-}

Server/src/net/simon987/server/webserver/OnlineUserManager.java

@@ -1,49 +0,0 @@
-package net.simon987.server.webserver;
-
-import org.java_websocket.WebSocket;
-
-import java.util.ArrayList;
-
-public class OnlineUserManager {
-
-    /**
-     * List of online users.
-     */
-    private ArrayList<OnlineUser> onlineUsers = new ArrayList<>(10);
-
-
-    public OnlineUser getUser(WebSocket socket) {
-
-        ArrayList<OnlineUser> _onlineUsers = new ArrayList<>(onlineUsers);
-
-        for (OnlineUser user : _onlineUsers) {
-            if (user.getWebSocket().equals(socket)) {
-                return user;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Add an user to the list
-     *
-     * @param user user to add
-     */
-    public void add(OnlineUser user) {
-        onlineUsers.add(user);
-    }
-
-    /**
-     * Remove an user to the list
-     *
-     * @param user user to remove
-     */
-    public void remove(OnlineUser user) {
-        onlineUsers.remove(user);
-    }
-
-    public ArrayList<OnlineUser> getOnlineUsers() {
-        return onlineUsers;
-    }
-}

Server/src/net/simon987/server/webserver/SocketServer.java

@@ -1,287 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.logging.LogManager;
-import net.simon987.server.user.User;
-import org.java_websocket.WebSocket;
-import org.java_websocket.handshake.ClientHandshake;
-import org.java_websocket.server.DefaultSSLWebSocketServerFactory;
-import org.java_websocket.server.WebSocketServer;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.xml.bind.DatatypeConverter;
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.security.KeyFactory;
-import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.ArrayList;
-
-
-public class SocketServer extends WebSocketServer {
-
-    private OnlineUserManager userManager = new OnlineUserManager();
-
-    private SocketServerDatabase database;
-
-    private MessageEventDispatcher messageEventDispatcher = new MessageEventDispatcher();
-
-    public SocketServer(InetSocketAddress address, ServerConfiguration config) {
-        super(address);
-
-        if (config.getInt("use_secure_webSocket") != 0) {
-
-            SSLContext context = getContext(config.getString("cert_path"));
-            if (context != null) {
-                setWebSocketFactory(new DefaultSSLWebSocketServerFactory(context));
-
-                LogManager.LOGGER.info("(WS) Enabled secure webSocket");
-            } else {
-                LogManager.LOGGER.severe("(WS) Failed to create SSL context");
-            }
-        }
-
-        setConnectionLostTimeout(30);
-
-
-        database = new SocketServerDatabase(config);
-
-        messageEventDispatcher.addHandler(new UserInfoRequestHandler());
-        messageEventDispatcher.addHandler(new TerrainRequestHandler());
-        messageEventDispatcher.addHandler(new ObjectsRequestHandler());
-        messageEventDispatcher.addHandler(new CodeUploadHandler());
-        messageEventDispatcher.addHandler(new CodeRequestHandler());
-        messageEventDispatcher.addHandler(new KeypressHandler());
-        messageEventDispatcher.addHandler(new FloppyHandler());
-
-    }
-
-    @Override
-    public void onOpen(WebSocket conn, ClientHandshake handshake) {
-        LogManager.LOGGER.info("(WS) New Websocket connection " + conn.getRemoteSocketAddress());
-        userManager.add(new OnlineUser(conn));
-    }
-
-    @Override
-    public void onClose(WebSocket conn, int code, String reason, boolean remote) {
-        LogManager.LOGGER.info("(WS) Closed " + conn.getRemoteSocketAddress() + " with exit code " + code + " additional info: " + reason);
-        userManager.remove(userManager.getUser(conn));
-    }
-
-    @Override
-    public void onMessage(WebSocket conn, String message) {
-        OnlineUser onlineUser = userManager.getUser(conn);
-
-        if (onlineUser != null) {
-
-            if (onlineUser.isAuthenticated()) {
-
-                messageEventDispatcher.dispatch(onlineUser, message);
-
-            } else {
-                LogManager.LOGGER.info("(WS) Received message from unauthenticated user " + conn.getRemoteSocketAddress());
-
-                //We expect a 128 characters long token
-                if(message.length() == 128) {
-
-                    String username = database.validateAuthToken(message);
-
-                    if (username != null) {
-                        User user = GameServer.INSTANCE.getGameUniverse().getOrCreateUser(username, true);
-
-                        LogManager.LOGGER.info("(WS) User was successfully authenticated: " + user.getUsername());
-
-                        onlineUser.setUser(user);
-                        onlineUser.setAuthenticated(true);
-
-                        conn.send("{\"t\":\"auth\", \"m\":\"ok\"}");
-
-                    } else {
-
-                        User user = GameServer.INSTANCE.getGameUniverse().getOrCreateUser(GameServer.INSTANCE.getGameUniverse().getGuestUsername(), false);
-                        onlineUser.setUser(user);
-                        onlineUser.setAuthenticated(true);
-                        onlineUser.setGuest(true);
-
-                        LogManager.LOGGER.info("(WS) Created guest user " +
-                                onlineUser.getUser().getUsername() + conn.getRemoteSocketAddress());
-
-                        conn.send("{\"t\":\"auth\", \"m\":\"ok\"}");
-                    }
-                }
-
-            }
-
-        } else {
-
-            LogManager.LOGGER.severe("(WS) FIXME: SocketServer:onMessage");
-
-        }
-
-
-    }
-
-    @Override
-    public void onMessage(WebSocket conn, ByteBuffer message) {
-        //System.out.println("received ByteBuffer from " + conn.getRemoteSocketAddress());
-    }
-
-    @Override
-    public void onError(WebSocket conn, Exception ex) {
-
-        LogManager.LOGGER.severe("an error occured on connection " + conn.getRemoteSocketAddress() + ':' + ex);
-        userManager.remove(userManager.getUser(conn));
-        conn.close();
-
-        ex.printStackTrace();
-    }
-
-    @Override
-    public void onStart() {
-        LogManager.LOGGER.info("(WS) Server started successfully");
-    }
-
-    /**
-     * Called every tick
-     */
-    public void tick() {
-
-        JSONObject json = new JSONObject();
-        json.put("t", "tick");
-
-        LogManager.LOGGER.info("Notified " + userManager.getOnlineUsers().size() + " users");
-
-        for (OnlineUser user : userManager.getOnlineUsers()) {
-
-            if (user.getWebSocket().isOpen()) {
-
-                if(user.isGuest()) {
-
-                    user.getWebSocket().send(json.toJSONString());
-
-                } else {
-                    //Send keyboard updated buffer
-                    try{
-                        ArrayList<Integer> kbBuffer = user.getUser().getControlledUnit().getKeyboardBuffer();
-                        JSONArray keys = new JSONArray();
-                        keys.addAll(kbBuffer);
-                        json.put("keys", keys);
-                        //Send tick message
-                        user.getWebSocket().send(json.toJSONString());
-                    } catch (NullPointerException e){
-                        //User is online but not completely initialised
-                    }
-                }
-
-
-
-            }
-        }
-
-    }
-
-    public OnlineUserManager getUserManager() {
-        return userManager;
-    }
-
-
-    /**
-     * See https://github.com/TooTallNate/Java-WebSocket/blob/master/src/main/example/SSLServerLetsEncryptExample.java
-     */
-    /*
-     *      * Copyright (c) 2010-2017 Nathan Rajlich
-     *
-     *  Permission is hereby granted, free of charge, to any person
-     *  obtaining a copy of this software and associated documentation
-     *  files (the "Software"), to deal in the Software without
-     *  restriction, including without limitation the rights to use,
-     *  copy, modify, merge, publish, distribute, sublicense, and/or sell
-     *  copies of the Software, and to permit persons to whom the
-     *  Software is furnished to do so, subject to the following
-     *  conditions:
-     *
-     *  The above copyright notice and this permission notice shall be
-     *  included in all copies or substantial portions of the Software.
-     */
-    private static SSLContext getContext(String pathTo) {
-        SSLContext context;
-        String password = "MAR";
-        try {
-            context = SSLContext.getInstance("TLS");
-
-            byte[] certBytes = parseDERFromPEM(getBytes(new File(pathTo + File.separator + "cert.pem")),
-                    "-----BEGIN CERTIFICATE-----", "-----END CERTIFICATE-----");
-            byte[] keyBytes = parseDERFromPEM(getBytes(new File(pathTo + File.separator + "privkey.pem")),
-                    "-----BEGIN PRIVATE KEY-----", "-----END PRIVATE KEY-----");
-
-            X509Certificate cert = generateCertificateFromDER(certBytes);
-            RSAPrivateKey key = generatePrivateKeyFromDER(keyBytes);
-
-            KeyStore keystore = KeyStore.getInstance("JKS");
-            keystore.load(null);
-            keystore.setCertificateEntry("cert-alias", cert);
-            keystore.setKeyEntry("key-alias", key, password.toCharArray(), new Certificate[]{cert});
-
-            KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-            kmf.init(keystore, password.toCharArray());
-
-            KeyManager[] km = kmf.getKeyManagers();
-
-            context.init(km, null, null);
-        } catch (Exception e) {
-            context = null;
-        }
-        return context;
-    }
-
-    private static byte[] parseDERFromPEM(byte[] pem, String beginDelimiter, String endDelimiter) {
-        String data = new String(pem);
-        String[] tokens = data.split(beginDelimiter);
-        tokens = tokens[1].split(endDelimiter);
-        return DatatypeConverter.parseBase64Binary(tokens[0]);
-    }
-
-    private static RSAPrivateKey generatePrivateKeyFromDER(byte[] keyBytes) throws InvalidKeySpecException, NoSuchAlgorithmException {
-        PKCS8EncodedKeySpec spec = new PKCS8EncodedKeySpec(keyBytes);
-
-        KeyFactory factory = KeyFactory.getInstance("RSA");
-
-        return (RSAPrivateKey) factory.generatePrivate(spec);
-    }
-
-    private static X509Certificate generateCertificateFromDER(byte[] certBytes) throws CertificateException {
-        CertificateFactory factory = CertificateFactory.getInstance("X.509");
-
-        return (X509Certificate) factory.generateCertificate(new ByteArrayInputStream(certBytes));
-    }
-
-    private static byte[] getBytes(File file) {
-        byte[] bytesArray = new byte[(int) file.length()];
-
-        FileInputStream fis;
-        try {
-            fis = new FileInputStream(file);
-            fis.read(bytesArray); //read file into bytes[]
-            fis.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return bytesArray;
-    }
-}

Server/src/net/simon987/server/webserver/SocketServerDatabase.java

@@ -1,83 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.io.DatabaseManager;
-import net.simon987.server.logging.LogManager;
-
-import java.sql.*;
-
-class SocketServerDatabase extends DatabaseManager {
-
-    public SocketServerDatabase(ServerConfiguration config) {
-        super(config);
-    }
-
-    String validateAuthToken(String token) {
-
-        Connection connection = null;
-        try {
-            connection = getConnection();
-
-            PreparedStatement p = connection.prepareStatement("SELECT username FROM mar_user WHERE authToken=?");
-            p.setString(1, token);
-
-            ResultSet rs = p.executeQuery();
-
-            if (rs.next()) {
-
-                return rs.getString("username");
-
-            } else {
-                return null;
-            }
-
-        } catch (SQLException e) {
-            LogManager.LOGGER.severe("MySQL Error " + e.getErrorCode() + ": " + e.getMessage());
-
-        } finally {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-
-        return null;
-    }
-
-    byte[] getFloppy(String username) {
-
-        Connection connection = null;
-        try {
-            connection = getConnection();
-
-            PreparedStatement p = connection.prepareStatement("SELECT floppyData FROM mar_user WHERE username=?");
-            p.setString(1, username);
-
-            ResultSet rs = p.executeQuery();
-
-            if (rs.next()) {
-                Blob blob = rs.getBlob("floppyData");
-
-                if (blob != null) {
-                    return blob.getBytes(1, (int) blob.length() - 1);
-                }
-            }
-
-        } catch (SQLException e) {
-            LogManager.LOGGER.severe("MySQL Error " + e.getErrorCode() + ": " + e.getMessage());
-
-        } finally {
-            try {
-                connection.close();
-            } catch (SQLException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-
-    }
-
-
-
-}

Server/src/net/simon987/server/webserver/TerrainRequestHandler.java

@@ -1,49 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.game.World;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-public class TerrainRequestHandler implements MessageHandler {
-
-    @Override
-    public void handle(OnlineUser user, JSONObject json) {
-        if (json.get("t").equals("terrain") && json.containsKey("x") && json.containsKey("y")) {
-
-            LogManager.LOGGER.info("Terrain request from " + user.getUser().getUsername());
-            World world;
-            try {
-                world = GameServer.INSTANCE.getGameUniverse().getWorld(
-                        Long.valueOf((long) json.get("x")).intValue(),
-                        Long.valueOf((long) json.get("y")).intValue());
-            } catch (NullPointerException e) {
-                LogManager.LOGGER.severe("FIXME: handle TerrainRequestHandler");
-                return;
-            }
-
-
-            //todo It might be a good idea to cache this
-            if (world != null) {
-                JSONObject response = new JSONObject();
-
-                JSONArray terrain = new JSONArray();
-
-                int[][] tiles = world.getTileMap().getTiles();
-                for (int x = 0; x < World.WORLD_SIZE; x++) {
-                    for (int y = 0; y < World.WORLD_SIZE; y++) {
-                        terrain.add(tiles[y][x]);
-                    }
-                }
-
-                response.put("t", "terrain");
-                response.put("terrain", terrain);
-
-                user.getWebSocket().send(response.toJSONString());
-            } else {
-                LogManager.LOGGER.severe("FIXME handle:TerrainRequestHandler");
-            }
-        }
-    }
-}

Server/src/net/simon987/server/webserver/UserInfoRequestHandler.java

@@ -1,37 +0,0 @@
-package net.simon987.server.webserver;
-
-import net.simon987.server.GameServer;
-import net.simon987.server.game.GameObject;
-import net.simon987.server.logging.LogManager;
-import org.json.simple.JSONObject;
-
-public class UserInfoRequestHandler implements MessageHandler {
-
-
-    @Override
-    public void handle(OnlineUser user, JSONObject message) {
-
-        if (message.get("t").equals("userInfo")) {
-
-            LogManager.LOGGER.info("(WS) User info request from " + user.getUser().getUsername());
-            JSONObject json = new JSONObject();
-
-            if(user.isGuest()) {
-                json.put("worldX", GameServer.INSTANCE.getConfig().getInt("new_user_worldX"));
-                json.put("worldY", GameServer.INSTANCE.getConfig().getInt("new_user_worldY"));
-
-            } else {
-                GameObject object = (GameObject)user.getUser().getControlledUnit();
-                json.put("worldX", object.getWorld().getX());
-                json.put("worldY", object.getWorld().getY());
-
-            }
-
-            json.put("t", "userInfo");
-            json.put("maxWidth", GameServer.INSTANCE.getGameUniverse().getMaxWidth());
-            user.getWebSocket().send(json.toJSONString());
-
-
-        }
-    }
-}

Server/test/net/simon987/server/assembly/CPUTest.java

@@ -1,39 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.assembly.exception.CancelledException;
-import net.simon987.server.user.User;
-import org.junit.Test;
-
-import java.io.File;
-import java.util.Random;
-
-public class CPUTest {
-
-    @Test
-    public void executeInstruction() throws CancelledException {
-
-        ServerConfiguration config = new ServerConfiguration(new File("config.properties"));
-        User user = new User();
-        CPU cpu = new CPU(config, user);
-
-
-        for(int i = 0 ; i < 3 ; i++){
-            //Execute every possible instruction with random values in memory
-            cpu.reset();
-            cpu.getMemory().clear();
-            Random random = new Random();
-            random.nextBytes(cpu.getMemory().getBytes());
-
-            for (int machineCode = Character.MIN_VALUE; machineCode < Character.MAX_VALUE; machineCode++) {
-                Instruction instruction = cpu.getInstructionSet().get(machineCode & 0x03F); // 0000 0000 00XX XXXX
-
-                int source = (machineCode >> 11) & 0x001F; // XXXX X000 0000 0000
-                int destination = (machineCode >> 6) & 0x001F; // 0000 0XXX XX00 0000
-
-                cpu.executeInstruction(instruction, source, destination);
-            }
-        }
-    }
-
-}

Server/test/net/simon987/server/assembly/MemoryTest.java

@@ -1,51 +0,0 @@
-package net.simon987.server.assembly;
-
-import net.simon987.server.ServerConfiguration;
-import org.junit.Test;
-
-import java.io.File;
-
-import static org.junit.Assert.*;
-
-
-public class MemoryTest {
-    @Test
-    public void getSet() {
-        ServerConfiguration config = new ServerConfiguration(new File("config.properties"));
-        int memorySize = config.getInt("memory_size");
-        Memory memory = new Memory(memorySize);
-
-        memory.set(1, 1);
-        assertEquals(1, memory.get(1));
-
-        memory.set(memorySize / 2 - 1, 1);
-        assertEquals(1, memory.get(memorySize / 2 - 1));
-
-        memory.get(memorySize / 2);
-        memory.get(-1);
-
-        memory.set(memorySize / 2, 1);
-        memory.set(-1, 1);
-    }
-
-    @Test
-    public void write() {
-
-        ServerConfiguration config = new ServerConfiguration(new File("config.properties"));
-        int memorySize = config.getInt("memory_size");
-        Memory memory = new Memory(memorySize);
-
-
-        assertTrue(memory.write(0, new byte[memorySize], 0, memorySize));
-        assertFalse(memory.write(0, new byte[memorySize], 0, memorySize + 1));
-        assertFalse(memory.write(0, new byte[memorySize], 0, -1));
-        assertFalse(memory.write(-1, new byte[memorySize], 0, 10));
-
-        assertFalse(memory.write(memorySize / 2, new byte[15], 0, 1));
-        assertFalse(memory.write((memorySize / 2) - 5, new byte[11], 0, 11));
-        assertTrue(memory.write((memorySize / 2) - 5, new byte[11], 0, 10));
-
-    }
-
-
-}

Server/test/net/simon987/server/assembly/instruction/CallInstructionTest.java

@@ -1,47 +0,0 @@
-package net.simon987.server.assembly.instruction;
-
-import net.simon987.server.ServerConfiguration;
-import net.simon987.server.assembly.*;
-import net.simon987.server.user.User;
-import org.junit.Test;
-
-import java.io.File;
-
-public class CallInstructionTest {
-
-
-    @Test
-    public void execute() throws Exception {
-
-        ServerConfiguration config = new ServerConfiguration(new File("config.properties"));
-        int memorySize = config.getInt("memory_size");
-
-        //Memory
-        Memory memory = new Memory(memorySize);
-        memory.clear();
-
-        //RegisterSet
-        RegisterSet registerSet = new RegisterSet();
-        registerSet.put(1, new Register("T1"));
-        registerSet.put(2, new Register("T2"));
-        registerSet.clear();
-
-        //Status
-        Status status = new Status();
-        status.clear();
-
-        CPU cpu = new CPU(config, new User());
-
-        CallInstruction callInstruction = new CallInstruction(cpu);
-
-        //We have to check if IP is 'pushed' correctly (try to pop it), the
-
-
-
-    }
-
-    @Test
-    public void execute1() throws Exception {
-    }
-
-}

config.properties

@@ -1,63 +0,0 @@
-# MySQL username
-mysql_user=mar
-# MySQL password/
-mysql_pass=mar
-# MySQL address
-mysql_url=jdbc:mysql://localhost:3306/mar?useSSL=false
-save_interval=10
-# Web server port
-webSocket_port=8887
-webSocket_host=0.0.0.0
-
-use_secure_webSocket=0
-cert_path=certificates
-# ----------------------------------------------
-
-# Length of a tick in ms
-tick_length=1000
-# Default offset of the origin (starting point of code execution) in words
-org_offset=1024
-# Address of the stack bottom
-stack_bottom=32768
-# Size of the memory in bytes
-memory_size=65536
-# Initial location of new user's controlled unit
-new_user_worldX = 32767
-new_user_worldY = 32767
-# Default user code
-new_user_code=; Welcome to Much Assembly required!\n\
-  ; You will find useful information on the game here: https://github.com/simon987/Much-Assembly-Required/wiki\n\
-  .text\n\
-  \t; Write code here\n\
-  \tbrk
-# Default held item
-new_user_item=0
-# ----------------------------------------------
-# Biomass units yield for a plant
-plant_yield=2
-# Grow time in ticks for a plant to grow
-plant_grow_time=32
-# Minimum tree count for the WorldGenerator
-minTreeCount=3
-# Maximum tree count for the WorldGenerator
-maxTreeCount=10
-# Maximum energy of the battery hardware in kJ
-battery_max_energy=60000
-# ----------------------------------------------
-# Minimum center point count for the WorldGenerator
-wg_centerPointCountMin=5
-# Maximum center point count for the WorldGenerator
-wg_centerPointCountMax=15
-# Wall/Plain tile ratio for the WorldGenerator
-wg_wallPlainRatio=4
-# Minimum iron tiles count for the WorldGenerator
-wg_minIronCount=0
-# Minimum iron tile count for the WorldGenerator
-wg_maxIronCount=2
-# Minimum copper tile count for the WorldGenerator
-wg_minCopperCount=0
-# Maximum copper tile count for the WorldGenerator
-wg_maxCopperCount=2
-# ----------------------------------------------
-# Maximum execution time of user code in ms
-user_timeout=40

docker-compose.yml

@@ -0,0 +1,27 @@
+version: "2.1"
+services:
+  server:
+    build:
+      context: .
+    command: sh -c "/usr/bin/java -jar /app/target/server-1.4a.jar"
+    depends_on:
+      mongodb:
+        condition: service_healthy
+    ports:
+      - 4567:4567
+  mongodb:
+        image: mongo:latest
+        container_name: "mongodb"
+        environment:
+          - MONGO_DATA_DIR=/data/db
+          - MONGO_LOG_DIR=/dev/null
+        volumes:
+          - ./data/db:/data/db
+        ports:
+            - 27017:27017
+        command: mongod --smallfiles --logpath=/dev/null --port 27017
+        healthcheck:
+          test: echo 'db.stats().ok' | mongo localhost:27017/mar --quiet
+          interval: 2s
+          timeout: 2s
+          retries: 2

pom.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>net.simon987.mar</groupId>
+    <artifactId>muchassemblyrequired</artifactId>
+    <version>1.6a</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>3.0.0</version>
+                <executions>
+                    <execution>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <executable>tsc</executable>
+                    <workingDirectory>./src/main/typescript/</workingDirectory>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <version>3.6.2</version>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.0.2</version>
+                <executions>
+                    <execution>
+                        <id>default-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>./target/</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>./src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>./target/libs</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.0.2</version>
+                <configuration>
+                    <outputDirectory>./target</outputDirectory>
+                    <archive>
+                        <manifest>
+                            <mainClass>net.simon987.mar.server.Main</mainClass>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>libs/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.7.2</version>
+                <configuration>
+                    <forkMode>never</forkMode>
+                    <workingDirectory>./src/main/resources</workingDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.googlecode.json-simple</groupId>
+            <artifactId>json-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>mongodb-driver-sync</artifactId>
+            <version>3.9.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.springframework.security/spring-security-core -->
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.1.11.RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-core</artifactId>
+            <version>2.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sparkjava</groupId>
+            <artifactId>spark-template-velocity</artifactId>
+            <version>2.7.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.25</version>
+        </dependency>
+    </dependencies>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+</project>

src/main/java/net/simon987/mar/biomass/BiomassBlob.java

@@ -0,0 +1,94 @@
+package net.simon987.mar.biomass;
+
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.objects.InventoryHolder;
+import org.bson.Document;
+import org.json.simple.JSONObject;
+
+public class BiomassBlob extends GameObject implements InventoryHolder {
+
+    private static final char MAP_INFO = 0x0101;
+
+    /**
+     * Yield of the blob, in biomass units
+     */
+    private int biomassCount;
+
+    public BiomassBlob() {
+    }
+
+    public BiomassBlob(Document document) {
+        super(document);
+
+        biomassCount = document.getInteger("biomassCount");
+    }
+
+    @Override
+    public char getMapInfo() {
+        return MAP_INFO;
+    }
+
+    @Override
+    public JSONObject jsonSerialise() {
+
+        JSONObject json = super.jsonSerialise();
+
+        json.put("b", biomassCount);
+
+        return json;
+    }
+
+    @Override
+    public Document mongoSerialise() {
+
+        Document dbObject = super.mongoSerialise();
+
+        dbObject.put("biomassCount", biomassCount);
+
+        return dbObject;
+
+    }
+
+    public int getBiomassCount() {
+        return biomassCount;
+    }
+
+    public void setBiomassCount(int biomassCount) {
+        this.biomassCount = biomassCount;
+    }
+
+    /**
+     * Called when an object attempts to place an item in this BiomassBlob
+     *
+     * @return Always returns false
+     */
+    @Override
+    public boolean placeItem(Item item) {
+        //Why would you want to place an item in a blob?
+        return false;
+    }
+
+    @Override
+    public boolean canTakeItem(int itemId) {
+        return itemId == ItemBiomass.ID && biomassCount >= 1;
+    }
+
+    /**
+     * Called when an object attempts to take an item from this BiomassBlob.
+     * If the object requests biomass, it will be subtracted from biomassCount, and
+     * if it reaches 0, the plant is deleted
+     */
+    @Override
+    public void takeItem(int itemId) {
+
+        if (itemId == ItemBiomass.ID) {
+            if (biomassCount > 1) {
+                biomassCount--;
+            } else {
+                //Delete plant
+                setDead(true);
+            }
+        }
+    }
+}

src/main/java/net/simon987/mar/biomass/ItemBiomass.java

@@ -0,0 +1,36 @@
+package net.simon987.mar.biomass;
+
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.ControllableUnit;
+import org.bson.Document;
+
+public class ItemBiomass extends Item {
+
+    public static final int ID = 0x0001;
+
+    private static final int energy = GameServer.INSTANCE.getConfig().getInt("biomassEnergyValue");
+
+    @Override
+    public int getId() {
+        return ID;
+    }
+
+    public ItemBiomass() {
+        super(null);
+    }
+
+    public ItemBiomass(Document document) {
+        super(document);
+    }
+
+    @Override
+    public void clear(ControllableUnit unit) {
+        unit.storeEnergy(energy);
+    }
+
+    @Override
+    public char poll() {
+        return ID;
+    }
+}

src/main/java/net/simon987/mar/biomass/WorldUtils.java

@@ -0,0 +1,78 @@
+package net.simon987.mar.biomass;
+
+import net.simon987.mar.server.game.world.TileMap;
+import net.simon987.mar.server.game.world.TilePlain;
+import net.simon987.mar.server.game.world.World;
+import org.bson.types.ObjectId;
+
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.Random;
+
+public class WorldUtils {
+
+    /**
+     * Generate a list of biomass blobs for a world
+     */
+    public static ArrayList<BiomassBlob> generateBlobs(World world, int minCount, int maxCount, int yield) {
+
+        Random random = new Random();
+        int blobCount = random.nextInt(maxCount - minCount) + minCount;
+        ArrayList<BiomassBlob> biomassBlobs = new ArrayList<>(blobCount);
+
+        //Count number of plain tiles. If there is less plain tiles than desired amount of blobs,
+        //set the desired amount of blobs to the plain tile count
+        TileMap m = world.getTileMap();
+        int plainCount = 0;
+        for (int y = 0; y < world.getWorldSize(); y++) {
+            for (int x = 0; x < world.getWorldSize(); x++) {
+
+                if (m.getTileIdAt(x, y) == TilePlain.ID) {
+                    plainCount++;
+                }
+            }
+        }
+
+        if (blobCount > plainCount) {
+            blobCount = plainCount;
+        }
+
+        outerLoop:
+        for (int i = 0; i < blobCount; i++) {
+
+            Point p = m.getRandomTile(TilePlain.ID);
+            if (p != null) {
+
+                //Don't block worlds
+                int counter = 0;
+                while (p.x == 0 || p.y == 0 || p.x == world.getWorldSize() - 1 || p.y == world.getWorldSize() - 1 ||
+                        world.getGameObjectsAt(p.x, p.y).size() != 0) {
+                    p = m.getRandomTile(TilePlain.ID);
+                    counter++;
+
+                    if (counter > 25) {
+                        continue outerLoop;
+                    }
+                }
+
+                for (BiomassBlob biomassBlob : biomassBlobs) {
+                    if (biomassBlob.getX() == p.x && biomassBlob.getY() == p.y) {
+                        //There is already a blob here
+                        continue outerLoop;
+                    }
+                }
+
+                BiomassBlob biomassBlob = new BiomassBlob();
+                biomassBlob.setObjectId(new ObjectId());
+                biomassBlob.setBiomassCount(yield);
+                biomassBlob.setX(p.x);
+                biomassBlob.setY(p.y);
+                biomassBlob.setWorld(world);
+
+                biomassBlobs.add(biomassBlob);
+            }
+        }
+
+        return biomassBlobs;
+    }
+}

src/main/java/net/simon987/mar/biomass/event/ObjectDeathListener.java

@@ -0,0 +1,65 @@
+package net.simon987.mar.biomass.event;
+
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.server.IServerConfiguration;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.ObjectDeathEvent;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.world.World;
+import org.bson.types.ObjectId;
+
+/**
+ * Handles ObjectDeathEvent events
+ */
+public class ObjectDeathListener implements GameEventListener {
+
+    private final int biomassDropCount;
+
+    public ObjectDeathListener(IServerConfiguration config) {
+        biomassDropCount = config.getInt("harvester_biomass_drop_count");
+    }
+
+    @Override
+    public Class getListenedEventType() {
+        return ObjectDeathEvent.class;
+    }
+
+    @Override
+    public void handle(GameEvent event) {
+
+        if (event.getSource().getClass().getCanonicalName().equals("net.simon987.mar.npc.HarvesterNPC")) {
+            //An HarvesterNPC ObjectDeathEvent is received
+            GameObject dyingHarvesterNPC = (GameObject) event.getSource();
+
+            //Don't spawn biomass on World border
+            if (dyingHarvesterNPC.getX() != 0 && dyingHarvesterNPC.getX() != dyingHarvesterNPC.getWorld().getWorldSize() - 1 &&
+                    dyingHarvesterNPC.getY() != 0 && dyingHarvesterNPC.getY() != dyingHarvesterNPC.getWorld().getWorldSize() - 1) {
+                //Create a new biomass
+                BiomassBlob newBiomassBlob = createBiomassBlobAt(
+                        dyingHarvesterNPC.getX(), dyingHarvesterNPC.getY(), dyingHarvesterNPC.getWorld());
+                //Add it to the world game objects
+                dyingHarvesterNPC.getWorld().addObject(newBiomassBlob);
+            }
+        }
+    }
+
+    /**
+     * Create and return a biomass at the given x, y coordinates and in the world
+     * @param x x coord of biomass location
+     * @param y y coord of biomass location
+     * @param world world in which the biomass will be created in
+     * @return the new BiomassBlob created
+     */
+    private BiomassBlob createBiomassBlobAt(int x, int y, World world) {
+
+        BiomassBlob biomassBlob = new BiomassBlob();
+        biomassBlob.setObjectId(new ObjectId());
+        biomassBlob.setBiomassCount(biomassDropCount);
+        biomassBlob.setX(x);
+        biomassBlob.setY(y);
+        biomassBlob.setWorld(world);
+
+        return biomassBlob;
+    }
+}

src/main/java/net/simon987/mar/biomass/event/WorldCreationListener.java

@@ -0,0 +1,33 @@
+package net.simon987.mar.biomass.event;
+
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.biomass.WorldUtils;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.WorldGenerationEvent;
+
+import java.util.ArrayList;
+
+public class WorldCreationListener implements GameEventListener {
+    @Override
+    public Class getListenedEventType() {
+        return WorldGenerationEvent.class;
+    }
+
+    @Override
+    public void handle(GameEvent event) {
+
+        int minCount = GameServer.INSTANCE.getConfig().getInt("minBiomassCount");
+        int maxCount = GameServer.INSTANCE.getConfig().getInt("maxBiomassCount");
+        int yield = GameServer.INSTANCE.getConfig().getInt("biomass_yield");
+
+        ArrayList<BiomassBlob> biomassBlobs = WorldUtils.generateBlobs(((WorldGenerationEvent) event).getWorld(),
+                minCount, maxCount, yield);
+
+        for (BiomassBlob blob : biomassBlobs) {
+            ((WorldGenerationEvent) event).getWorld().addObject(blob);
+        }
+
+    }
+}

src/main/java/net/simon987/mar/biomass/event/WorldUpdateListener.java

@@ -0,0 +1,75 @@
+package net.simon987.mar.biomass.event;
+
+import net.simon987.mar.biomass.BiomassBlob;
+import net.simon987.mar.biomass.WorldUtils;
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.IServerConfiguration;
+import net.simon987.mar.server.event.GameEvent;
+import net.simon987.mar.server.event.GameEventListener;
+import net.simon987.mar.server.event.WorldUpdateEvent;
+import net.simon987.mar.server.game.world.World;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+
+public class WorldUpdateListener implements GameEventListener {
+
+    private final HashMap<World, Long> worldWaitMap = new HashMap<>(200);
+
+    private static int minBlobCount;
+    private static int maxBlobCount;
+    private static int blobYield;
+    private static int waitTime;
+    private static int blobThreshold;
+
+    public WorldUpdateListener(IServerConfiguration config) {
+
+        minBlobCount = config.getInt("minBiomassRespawnCount");
+        maxBlobCount = config.getInt("maxBiomassRespawnCount");
+        waitTime = config.getInt("biomassRespawnTime");
+        blobThreshold = config.getInt("biomassRespawnThreshold");
+        blobYield = config.getInt("biomass_yield");
+
+    }
+
+    @Override
+    public Class getListenedEventType() {
+        return WorldUpdateEvent.class;
+    }
+
+
+    @Override
+    public void handle(GameEvent event) {
+
+        World world = ((WorldUpdateEvent) event).getWorld();
+
+        if (world.getDimension().startsWith("w")) {
+            //If there is less than the respawn threshold,
+            if (world.findObjects(BiomassBlob.class).size() < blobThreshold) {
+
+                //Set a timer for respawn_time ticks
+                if (!worldWaitMap.containsKey(world) || worldWaitMap.get(world) == 0L) {
+                    worldWaitMap.put(world, GameServer.INSTANCE.getUniverse().getTime() + waitTime);
+                } else {
+
+                    long waitUntil = worldWaitMap.get(world);
+
+                    if (GameServer.INSTANCE.getUniverse().getTime() >= waitUntil) {
+
+                        //If the timer was set less than respawn_time ticks ago, respawn the blobs
+                        ArrayList<BiomassBlob> newBlobs = WorldUtils.generateBlobs(world, minBlobCount,
+                                maxBlobCount, blobYield);
+                        for (BiomassBlob blob : newBlobs) {
+                            world.addObject(blob);
+                            world.incUpdatable();
+                        }
+
+                        //Set the 'waitUntil' time to 0 to indicate that we are not waiting
+                        worldWaitMap.replace(world, 0L);
+                    }
+                }
+            }
+        }
+    }
+}

src/main/java/net/simon987/mar/construction/BluePrint.java

@@ -0,0 +1,111 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.GameObject;
+import net.simon987.mar.server.game.objects.InventoryHolder;
+import net.simon987.mar.server.io.JSONSerializable;
+import net.simon987.mar.server.io.MongoSerializable;
+import org.bson.Document;
+import org.json.simple.JSONObject;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public abstract class BluePrint implements InventoryHolder, JSONSerializable, MongoSerializable {
+
+    /**
+     * Map of items id and required amount
+     * <br>The amount is decremented as the items are added
+     */
+    protected Map<Integer, Integer> requiredItems;
+
+    /**
+     * This object will be instantiated when completed
+     */
+    protected Class<? extends GameObject> targetObject;
+
+    /**
+     * Set to true when all the requirements are met
+     */
+    private boolean completed;
+
+    public BluePrint() {
+        requiredItems = new HashMap<>();
+    }
+
+    public BluePrint(Document document) {
+        requiredItems = (Map<Integer, Integer>) document.get("required_items");
+        completed = document.getBoolean("completed");
+        try {
+            targetObject = Class.forName(document.getString("target")).asSubclass(GameObject.class);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void checkCompleted() {
+
+        for (Integer remaining : requiredItems.values()) {
+            if (remaining > 0) {
+                return;
+            }
+        }
+
+        completed = true;
+    }
+
+    @Override
+    public boolean placeItem(Item item) {
+
+        if (requiredItems.containsKey(item.getId()) && requiredItems.get(item.getId()) > 0) {
+            requiredItems.put(item.getId(), requiredItems.get(item.getId()) - 1);
+            checkCompleted();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void takeItem(int itemId) {
+
+    }
+
+    @Override
+    public boolean canTakeItem(int itemId) {
+        return false;
+    }
+
+    public boolean isCompleted() {
+        return completed;
+    }
+
+    public Class<? extends GameObject> getTargetObject() {
+        return targetObject;
+    }
+
+    @Override
+    public JSONObject debugJsonSerialise() {
+        return jsonSerialise();
+    }
+
+    @Override
+    public JSONObject jsonSerialise() {
+        JSONObject json = new JSONObject();
+
+        json.put("target", targetObject);
+        json.put("required_items", requiredItems);
+
+        return json;
+    }
+
+    @Override
+    public Document mongoSerialise() {
+        Document document = new Document();
+
+        document.put("completed", completed);
+        document.put("target", targetObject);
+        document.put("required_items", requiredItems);
+
+        return document;
+    }
+}

src/main/java/net/simon987/mar/construction/BluePrintRegistry.java

@@ -0,0 +1,61 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.logging.LogManager;
+import org.bson.Document;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class BluePrintRegistry {
+
+    public static final BluePrintRegistry INSTANCE = new BluePrintRegistry();
+
+    private final Map<String, Class<? extends BluePrint>> blueprints;
+    private final Map<String, String> digitizedBlueprints;
+
+    private BluePrintRegistry() {
+        blueprints = new HashMap<>();
+        digitizedBlueprints = new HashMap<>();
+    }
+
+    public void registerBluePrint(Class<? extends BluePrint> clazz) {
+        blueprints.put(clazz.getCanonicalName(), clazz);
+        String bpData = new String(BluePrintUtil.bluePrintData(clazz));
+        digitizedBlueprints.put(bpData, clazz.getCanonicalName());
+    }
+
+    public BluePrint deserializeBlueprint(Document document) {
+
+        String type = document.getString("type");
+
+        if (blueprints.containsKey(type)) {
+
+            try {
+                return blueprints.get(type).getConstructor(Document.class).newInstance(document);
+            } catch (InstantiationException | IllegalAccessException | NoSuchMethodException e) {
+                e.printStackTrace();
+                return null;
+            } catch (InvocationTargetException e) {
+                LogManager.LOGGER.severe("(Construction Plugin) Error while trying to deserialize object of type " + type + ": " + e.getTargetException().getMessage());
+                LogManager.LOGGER.severe(document.toJson());
+                e.getTargetException().printStackTrace();
+                return null;
+            }
+        } else {
+            LogManager.LOGGER.severe("(Construction Plugin) Trying to deserialize unknown BluePrint type: " + type);
+            return null;
+        }
+    }
+
+    public BluePrint deserializeBluePrint(char[] chars) {
+
+        String bpData = new String(chars);
+
+        if (digitizedBlueprints.containsKey(bpData)) {
+            return deserializeBlueprint(new Document("type", digitizedBlueprints.get(bpData)));
+        }
+
+        return null;
+    }
+}

src/main/java/net/simon987/mar/construction/BluePrintUtil.java

@@ -0,0 +1,66 @@
+package net.simon987.mar.construction;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+class BluePrintUtil {
+
+    private static byte[] secretKey;
+    private static final String SHA512 = "SHA-512";
+
+    //We need 1024 chars = 2048 bytes = 32 values
+    private static final char[] ARBITRARY_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZ123456".toCharArray();
+
+    static void setSecretKey(String secretKey) {
+        BluePrintUtil.secretKey = secretKey.getBytes(StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Hash a message using SHA512 with the server secret key as the sal
+     *
+     * @return 128-bit char array
+     */
+    private static char[] hashMessage(String message) {
+
+        try {
+            MessageDigest md = MessageDigest.getInstance(SHA512);
+            md.update(secretKey);
+            md.update(message.getBytes(StandardCharsets.UTF_8));
+
+            byte[] digest = md.digest();
+            char[] chars = new char[digest.length / 2];
+            ByteBuffer.wrap(digest).order(ByteOrder.BIG_ENDIAN).asCharBuffer().get(chars);
+
+            return chars;
+
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns a char array representation of a blueprint. It is obtained by hashing the blueprint
+     * properties with the server secret key. Some arbitrary values are added to make a 1024-char
+     * array. The same blueprint and secret key always gives the same result.
+     */
+    static char[] bluePrintData(Class<? extends BluePrint> blueprint) {
+
+        char[] result = new char[ARBITRARY_STRING.length * 32];
+
+        for (int i = ARBITRARY_STRING.length - 1; i > 0; --i) {
+            char[] hashedBlueprint = hashMessage(ARBITRARY_STRING[i] + blueprint.getName());
+            if (hashedBlueprint != null) {
+                System.arraycopy(hashedBlueprint, 0, result,
+                        i * hashedBlueprint.length, hashedBlueprint.length);
+            }
+        }
+
+        return result;
+    }
+
+}

src/main/java/net/simon987/mar/construction/ConstructionPlugin.java

@@ -0,0 +1,12 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.GameServer;
+
+public class ConstructionPlugin {
+
+    public void init(GameServer gameServer) {
+        // TODO
+        BluePrintUtil.setSecretKey(gameServer.getSecretKey());
+        BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class);
+    }
+}

src/main/java/net/simon987/mar/construction/ConstructionSite.java

@@ -0,0 +1,82 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.item.Item;
+import net.simon987.mar.server.game.objects.InventoryHolder;
+import net.simon987.mar.server.game.objects.Structure;
+import net.simon987.mar.server.game.objects.Updatable;
+import org.bson.Document;
+import org.json.simple.JSONObject;
+
+public class ConstructionSite extends Structure implements Updatable, InventoryHolder {
+
+    public static final int MAP_INFO = 0xFFFF; //TODO: determine
+    public static final int LIFETIME = GameServer.INSTANCE.getConfig().getInt("construction_site_ttl");
+
+    private int age;
+    private final BluePrint bluePrint;
+
+    public ConstructionSite(BluePrint bluePrint) {
+        super(1, 1);
+
+        this.bluePrint = bluePrint;
+        this.age = 0;
+    }
+
+    public ConstructionSite(Document document) {
+        super(document, 1, 1);
+
+        age = document.getInteger("age");
+        bluePrint = BluePrintRegistry.INSTANCE.deserializeBlueprint((Document) document.get("blueprint"));
+    }
+
+    @Override
+    public char getMapInfo() {
+        return MAP_INFO;
+    }
+
+    @Override
+    public void update() {
+
+        age += 1;
+
+        if (age > LIFETIME) {
+            setDead(true);
+        }
+    }
+
+    @Override
+    public boolean placeItem(Item item) {
+        return bluePrint.placeItem(item);
+    }
+
+    @Override
+    public void takeItem(int itemId) {
+        //NOOP
+    }
+
+    @Override
+    public boolean canTakeItem(int itemId) {
+        return false;
+    }
+
+    @Override
+    public JSONObject jsonSerialise() {
+        JSONObject json = super.jsonSerialise();
+
+        json.put("blueprint", bluePrint.jsonSerialise());
+        json.put("age", age);
+
+        return json;
+    }
+
+    @Override
+    public Document mongoSerialise() {
+        Document document = super.mongoSerialise();
+
+        document.put("blueprint", bluePrint.mongoSerialise());
+        document.put("age", age);
+
+        return document;
+    }
+}

src/main/java/net/simon987/mar/construction/ItemBluePrint.java

@@ -0,0 +1,58 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.assembly.Memory;
+import net.simon987.mar.server.game.item.Item;
+import org.bson.Document;
+import org.json.simple.JSONObject;
+
+public class ItemBluePrint extends Item {
+
+    public static final int ID = 0x0005;
+    private Class<? extends BluePrint> bluePrint;
+
+    public ItemBluePrint() {
+        super(null);
+    }
+
+    public ItemBluePrint(Document document) {
+        super(document);
+        try {
+            bluePrint = Class.forName(document.getString("blueprint")).asSubclass(BluePrint.class);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void digitize(Memory memory, int offset) {
+        char[] data = BluePrintUtil.bluePrintData(bluePrint);
+        memory.write(offset, data, 0, data.length);
+
+        System.out.println("DEBUG: blueprint digitize " + data.length);
+    }
+
+    @Override
+    public char poll() {
+        return ID;
+    }
+
+    @Override
+    public int getId() {
+        return ID;
+    }
+
+    @Override
+    public JSONObject debugJsonSerialise() {
+        JSONObject json = super.debugJsonSerialise();
+        json.put("blueprint", bluePrint.getCanonicalName());
+        return json;
+    }
+
+    @Override
+    public Document mongoSerialise() {
+        Document document = super.mongoSerialise();
+
+        document.put("blueprint", bluePrint.getCanonicalName());
+        return document;
+    }
+}

src/main/java/net/simon987/mar/construction/Obstacle.java

@@ -0,0 +1,104 @@
+package net.simon987.mar.construction;
+
+import net.simon987.mar.server.GameServer;
+import net.simon987.mar.server.game.objects.Attackable;
+import net.simon987.mar.server.game.objects.Structure;
+import net.simon987.mar.server.game.objects.Updatable;
+import org.bson.Document;
+import org.json.simple.JSONObject;
+
+public class Obstacle extends Structure implements Attackable, Updatable {
+
+    public static final int MAP_INFO = 0x0601;
+    private static final int HEAL_RATE = GameServer.INSTANCE.getConfig().getInt("obstacle_regen");
+    private static final int MAX_HP = GameServer.INSTANCE.getConfig().getInt("obstacle_hp");
+
+    private int hp;
+    private int color;
+
+    public Obstacle() {
+        super(1, 1);
+    }
+
+    public Obstacle(Document document) {
+        super(document, 1, 1);
+
+        hp = document.getInteger(hp);
+        color = document.getInteger(color);
+    }
+
+    @Override
+    public void update() {
+        heal(HEAL_RATE);
+    }
+
+    @Override
+    public void setHealRate(int hp) {
+
+    }
+
+    @Override
+    public int getHp() {
+        return hp;
+    }
+
+    @Override
+    public void setHp(int hp) {
+        this.hp = hp;
+    }
+
+    @Override
+    public int getMaxHp() {
+        return MAX_HP;
+    }
+
+    @Override
+    public void setMaxHp(int hp) {
+
+    }
+
+    @Override
+    public void heal(int amount) {
+        hp = Math.min(getMaxHp(), hp + amount);
+    }
+
+
+    @Override
+    public void damage(int amount) {
+        hp -= amount;
+
+        if (hp < 0) {
+            setDead(true);
+        }
+    }
+
+    @Override
+    public char getMapInfo() {
+        return MAP_INFO;
+    }
+
+    @Override
+    public Document mongoSerialise() {
+        Document document = super.mongoSerialise();
+
+        document.put("hp", hp);
+        document.put("color", hp);
+
+        return document;
+    }
+
+    @Override
+    public JSONObject debugJsonSerialise() {
+        return jsonSerialise();
+    }
+
+    @Override
+    public JSONObject jsonSerialise() {
+        JSONObject json = super.jsonSerialise();
+
+        json.put("hp", hp);
+        json.put("color", hp);
+
+        return json;
+    }
+}