Cubot are now passable + Bug fixes

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

@@ -201,4 +201,9 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit {
             return null;
         }
     }
+
+    @Override
+    public boolean isAt(int x, int y) {
+        return false;
+    }
 }

Plugin NPC/src/main/java/net/simon987/npcplugin/RadioTower.java

@@ -0,0 +1,4 @@
+package net.simon987.npcplugin;
+
+public class RadioTower {
+}

Server/Server.iml

@@ -5,6 +5,8 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/${parent.project.basedir}/ServerTarget" />
       <excludeFolder url="file://$MODULE_DIR$/ServerTarget" />
       <excludeFolder url="file://$MODULE_DIR$/target" />

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

@@ -67,7 +67,6 @@ class MachineCode {
             LogManager.LOGGER.severe("Couldn't write the dst operand for instruction :" + dst);
         } else {
 
-            //Src is the 5 most significant bits
             value &= 0xF83F; //1111 1000 0011 1111
             dst <<= 6; //0000 0XXX XX00 0000
             value |= dst;

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

@@ -166,7 +166,8 @@ public class SocketServer extends WebSocketServer {
 
         LogManager.LOGGER.info("Notified " + userManager.getOnlineUsers().size() + " users");
 
-        for (OnlineUser user : userManager.getOnlineUsers()) {
+        ArrayList<OnlineUser> onlineUsers = new ArrayList<>(userManager.getOnlineUsers()); //Avoid ConcurrentModificationException
+        for (OnlineUser user : onlineUsers) {
 
             if (user.getWebSocket().isOpen()) {
 

config.properties

@@ -1,78 +0,0 @@
-# MySQL username
-mysql_user=mar
-# MySQL password/
-mysql_pass=mar
-# MySQL address
-mysql_url=jdbc:mysql://localhost:3306/mar?useSSL=false
-# File management
-save_interval=5
-clean_interval=10
-history_size=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=512
-# Address of the stack bottom
-stack_bottom=65536
-# Size of the memory in words
-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 for each blob
-biomass_yield=2
-# Minimum biomass blob count for the WorldGenerator
-minBiomassCount=3
-minBiomassRespawnCount=2
-# Maximum biomass blob count for the WorldGenerator
-maxBiomassCount=10
-maxBiomassRespawnCount=6
-# Maximum energy of the battery hardware in kJ
-battery_max_energy=60000
-# Time for biomass respawn in ticks
-biomassRespawnTime=64
-# Respawn timer will start when biomass count is below this number
-biomassRespawnThreshold=1
-# NPC lifetime in ticks
-npc_lifetime=1024
-# Maximum travel distance from the Factory in Worlds
-npc_max_factory_distance=3
-# Maximum NPC per Factory
-factory_max_npc_count=16
-# ----------------------------------------------
-# 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=100