Fixes #107

Plugin Cubot/Plugin Cubot.iml

@@ -15,6 +15,9 @@
     <orderEntry type="module" module-name="Server" />
     <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.3.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.42" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.10.1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

Plugin Misc HW/Plugin Misc HW.iml

@@ -14,6 +14,9 @@
     <orderEntry type="module" module-name="Server" />
     <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.3.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.42" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.10.1" level="project" />
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.10" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />

Plugin NPC/Plugin NPC.iml

@@ -17,5 +17,8 @@
     <orderEntry type="module" module-name="Server" />
     <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.3.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.42" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.10.1" level="project" />
   </component>
 </module>

Plugin Plant/Plugin Plant.iml

@@ -17,5 +17,8 @@
     <orderEntry type="module" module-name="Server" />
     <orderEntry type="library" name="Maven: org.java-websocket:Java-WebSocket:1.3.6" level="project" />
     <orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.42" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.10.1" level="project" />
   </component>
 </module>

Server/Server.iml

@@ -18,5 +18,6 @@
     <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
+    <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:2.10.1" level="project" />
   </component>
 </module>

Server/src/main/java/net/simon987/server/assembly/Assembler.java

@@ -175,7 +175,18 @@ public class Assembler {
                                 out.writeChar(0);
 
                             } else {
-                                throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);
+
+                                //Integer.decode failed, try binary
+                                if (value.startsWith("0b")) {
+                                    try {
+                                        out.writeChar(Integer.parseInt(value.substring(2), 2));
+                                    } catch (NumberFormatException e2) {
+                                        throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);
+                                    }
+                                } else {
+                                    throw new InvalidOperandException("Invalid operand \"" + value + '"', currentLine);
+
+                                }
                             }
                         }
                     }

Server/src/main/java/net/simon987/server/assembly/Operand.java

@@ -224,11 +224,30 @@ public class Operand {
             }
 
             //label is invalid
-
             data = Integer.decode(expr);
             value += registerSet.size() * 2; //refers to memory with disp
             return true;
         } catch (NumberFormatException e) {
+
+            //Integer.decode failed, try binary
+            if (expr.startsWith("+0b")) {
+                try {
+                    data = Integer.parseInt(expr.substring(3), 2);
+                    value += registerSet.size() * 2; //refers to memory with disp
+                    return true;
+                } catch (NumberFormatException e2) {
+                    return false;
+                }
+            } else if (expr.startsWith("-0b")) {
+                try {
+                    data = -Integer.parseInt(expr.substring(3), 2);
+                    value += registerSet.size() * 2; //refers to memory with disp
+                    return true;
+                } catch (NumberFormatException e2) {
+                    return false;
+                }
+            }
+
             return false;
         }
     }

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

@@ -35,6 +35,9 @@ public class MessageEventDispatcher {
                         handler.handle(user, json);
                     } catch (WebsocketNotConnectedException e) {
                         LogManager.LOGGER.fine("Catched WebsocketNotConnectedException");
+                    } catch (Exception e1) {
+                        LogManager.LOGGER.severe(e1.getMessage());
+                        e1.printStackTrace();
                     }
                 }
             } else {