diff --git a/.gitattributes b/.gitattributes index 1bbd367..20366a9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ -Server/src/main/resources/static/css/bootstrap4-neon-glow.min linguist-vendored -Server/src/main/resources/static/css/bootstrap-grid.min linguist-vendored -Server/src/main/resources/static/css/bootstrap-reboot.min linguist-vendored -Server/src/main/resources/static/js/* linguist-vendored -Server/src/main/resources/static/js/ace/* linguist-vendored \ No newline at end of file +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 diff --git a/.gitignore b/.gitignore index f8d0532..69d4552 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,4 @@ -plugins/Plugin NPC.jar -plugins/Plugin Misc HW.jar -plugins/Plant.jar -plugins/Cubot.jar .idea/* mar.log mar.log.lck @@ -13,10 +9,10 @@ plugins/*.jar save.json Server/Server.iml target/* -Server/Server.iml -Server/src/main/java/META-INF/MANIFEST.MF +src/main/java/META-INF/MANIFEST.MF +src/main/resources/static/js/mar.js .settings .project .classpath # VSCode Workspace -.vscode/ \ No newline at end of file +.vscode/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ba30ee1..0c6c832 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -8,12 +8,7 @@ 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 -- The project is separated into multiple modules, the `Server` module and its plugins. Plugins should -not depend on another plugin to compile or to run. -(e.g. NPC plugin shouldn't import `net.simon987.biomassplugin` ) -- Use `Logmanager.LOGGER` to log messages to the console. Use `.fine()` for debugging messages and `.info()` for +- 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. -- Do not submit a pull request for a new feature that has not been approved -by [simon987](https://github.com/simon987) in an Issue beforehand - Please state what tests have been performed in the pull request diff --git a/Dockerfile b/Dockerfile index dab0c78..04e0598 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,4 +3,4 @@ COPY /. /app/ WORKDIR /app RUN mvn package WORKDIR /app/target -CMD ["java", "-jar", "/app/target/server-1.4a.jar"] \ No newline at end of file +CMD ["java", "-jar", "/app/target/server-1.6a.jar"] diff --git a/Plugin Cubot/Plugin Cubot.iml b/Plugin Cubot/Plugin Cubot.iml deleted file mode 100644 index 779d178..0000000 --- a/Plugin Cubot/Plugin Cubot.iml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin Cubot/pom.xml b/Plugin Cubot/pom.xml deleted file mode 100644 index 204bd8f..0000000 --- a/Plugin Cubot/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.plugincubot - plugin-cubot - 1.4a - - - - - net.simon987.server - server - 1.4a - - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - - \ No newline at end of file diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java deleted file mode 100644 index 5f1d7b2..0000000 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotPlugin.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.simon987.cubotplugin; - -import net.simon987.cubotplugin.event.*; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; - -public class CubotPlugin extends ServerPlugin { - - - @Override - public void init(GameServer gameServer) { - listeners.add(new CpuInitialisationListener()); - listeners.add(new UserCreationListener()); - //Debug commands - listeners.add(new ChargeShieldCommandListener()); - listeners.add(new SetInventoryPosition()); - listeners.add(new PutItemCommandListener()); - listeners.add(new PopItemCommandListener()); - //Leaderboard - listeners.add(new DeathListener()); - listeners.add(new WalkListener()); - - GameRegistry registry = gameServer.getRegistry(); - - registry.registerGameObject(Cubot.class); - - registry.registerHardware(CubotLeg.class); - registry.registerHardware(CubotLaser.class); - registry.registerHardware(CubotLidar.class); - registry.registerHardware(CubotDrill.class); - registry.registerHardware(CubotInventory.class); - registry.registerHardware(CubotKeyboard.class); - registry.registerHardware(CubotHologram.class); - registry.registerHardware(CubotBattery.class); - registry.registerHardware(CubotFloppyDrive.class); - registry.registerHardware(CubotComPort.class); - registry.registerHardware(CubotShield.class); - registry.registerHardware(CubotCore.class); - - LogManager.LOGGER.info("(Cubot Plugin) Initialised Cubot plugin"); - } -} diff --git a/Plugin Cubot/src/main/resources/plugin.properties b/Plugin Cubot/src/main/resources/plugin.properties deleted file mode 100644 index 5460a2b..0000000 --- a/Plugin Cubot/src/main/resources/plugin.properties +++ /dev/null @@ -1,3 +0,0 @@ -classpath=net.simon987.cubotplugin.CubotPlugin -name=Cubot Plugin -version=1.0 \ No newline at end of file diff --git a/Plugin Cubot/test/net/simon987/cubotplugin/CubotTest.java b/Plugin Cubot/test/net/simon987/cubotplugin/CubotTest.java deleted file mode 100644 index b7e7f97..0000000 --- a/Plugin Cubot/test/net/simon987/cubotplugin/CubotTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.simon987.cubotplugin; - - -import org.junit.Test; - -public class CubotTest { - - @Test - public void test(){ - - } -} \ No newline at end of file diff --git a/Plugin Misc HW/Plugin Misc HW.iml b/Plugin Misc HW/Plugin Misc HW.iml deleted file mode 100644 index b60e708..0000000 --- a/Plugin Misc HW/Plugin Misc HW.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin Misc HW/pom.xml b/Plugin Misc HW/pom.xml deleted file mode 100644 index a9813c7..0000000 --- a/Plugin Misc HW/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.pluginmischw - plugin-misc-hw - 1.4a - - - - net.simon987.server - server - 1.4a - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - - \ No newline at end of file diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/MiscHWPlugin.java b/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/MiscHWPlugin.java deleted file mode 100644 index 562d5bd..0000000 --- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/MiscHWPlugin.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.simon987.mischwplugin; - -import net.simon987.mischwplugin.event.CpuInitialisationListener; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; - -/** - * Plugin that adds miscellaneous hardware to the game - */ -public class MiscHWPlugin extends ServerPlugin { - - - @Override - public void init(GameServer gameServer) { - listeners.add(new CpuInitialisationListener()); - - GameRegistry registry = gameServer.getRegistry(); - - registry.registerHardware(RandomNumberGenerator.class); - registry.registerHardware(Clock.class); - - LogManager.LOGGER.info("(Mist HW Plugin) Initialised Misc Hardware Plugin"); - } -} diff --git a/Plugin Misc HW/src/main/resources/plugin.properties b/Plugin Misc HW/src/main/resources/plugin.properties deleted file mode 100644 index 38fc991..0000000 --- a/Plugin Misc HW/src/main/resources/plugin.properties +++ /dev/null @@ -1,3 +0,0 @@ -classpath=net.simon987.mischwplugin.MiscHWPlugin -name=Misc HW Plugin -version=1.0 \ No newline at end of file diff --git a/Plugin NPC/Plugin NPC.iml b/Plugin NPC/Plugin NPC.iml deleted file mode 100644 index 277b9e7..0000000 --- a/Plugin NPC/Plugin NPC.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin NPC/pom.xml b/Plugin NPC/pom.xml deleted file mode 100644 index 38f7569..0000000 --- a/Plugin NPC/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.pluginnpc - plugin-npc - 1.4a - - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - net.simon987.server - server - 1.4a - - - \ No newline at end of file diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java deleted file mode 100644 index 139bb66..0000000 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java +++ /dev/null @@ -1,93 +0,0 @@ -package net.simon987.npcplugin; - -import net.simon987.npcplugin.event.CpuInitialisationListener; -import net.simon987.npcplugin.event.VaultCompleteListener; -import net.simon987.npcplugin.event.VaultWorldUpdateListener; -import net.simon987.npcplugin.event.WorldCreationListener; -import net.simon987.npcplugin.world.TileVaultFloor; -import net.simon987.npcplugin.world.TileVaultWall; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; -import org.bson.Document; - -import java.io.InputStream; -import java.util.Map; -import java.util.Scanner; -import java.util.concurrent.ConcurrentHashMap; - -public class NpcPlugin extends ServerPlugin { - - public static Map settlementMap; - - public static Document DEFAULT_HACKED_NPC; - - @Override - public void init(GameServer gameServer) { - - IServerConfiguration configuration = gameServer.getConfig(); - GameRegistry registry = gameServer.getRegistry(); - - listeners.add(new WorldCreationListener(configuration.getInt("settlement_spawn_rate"))); - listeners.add(new CpuInitialisationListener()); - listeners.add(new VaultWorldUpdateListener(configuration)); - listeners.add(new VaultCompleteListener()); - - registry.registerGameObject(HarvesterNPC.class); - registry.registerGameObject(Factory.class); - registry.registerGameObject(RadioTower.class); - registry.registerGameObject(VaultDoor.class); - registry.registerGameObject(Obstacle.class); - registry.registerGameObject(ElectricBox.class); - registry.registerGameObject(Portal.class); - registry.registerGameObject(VaultExitPortal.class); - registry.registerGameObject(HackedNPC.class); - - registry.registerHardware(RadioReceiverHardware.class); - registry.registerHardware(NpcBattery.class); - registry.registerHardware(NpcInventory.class); - - registry.registerTile(TileVaultFloor.ID, TileVaultFloor.class); - registry.registerTile(TileVaultWall.ID, TileVaultWall.class); - - settlementMap = new ConcurrentHashMap<>(); - - LogManager.LOGGER.fine("(NPC Plugin) Loading default HackedNPC settings from" + - " defaultHackedCubotHardware.json"); - InputStream is = getClass().getClassLoader().getResourceAsStream("defaultHackedCubotHardware.json"); - Scanner scanner = new Scanner(is).useDelimiter("\\A"); - String json = scanner.next(); - DEFAULT_HACKED_NPC = Document.parse(json); - - LogManager.LOGGER.info("(NPC Plugin) Initialised NPC plugin"); - } - - @Override - public Document mongoSerialise() { - Document document = super.mongoSerialise(); - - Document settlements = new Document(); - for (String world : settlementMap.keySet()) { - settlements.put(world, settlementMap.get(world).mongoSerialise()); - } - - document.put("settlement_map", settlements); - - return document; - } - - @Override - public void load(Document document) { - super.load(document); - - Document settlements = (Document) document.get("settlement_map"); - - for (String world : settlements.keySet()) { - settlementMap.put(world, new Settlement((Document) settlements.get(world))); - } - - LogManager.LOGGER.fine(String.format("(%s) Loaded %d settlements", name, settlementMap.size())); - } -} diff --git a/Plugin NPC/src/main/resources/plugin.properties b/Plugin NPC/src/main/resources/plugin.properties deleted file mode 100644 index bfd7fd6..0000000 --- a/Plugin NPC/src/main/resources/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -classpath=net.simon987.npcplugin.NpcPlugin -name=NPC Plugin -version=1.1 -depend=Cubot Plugin \ No newline at end of file diff --git a/Plugin Plant/Plugin Plant.iml b/Plugin Plant/Plugin Plant.iml deleted file mode 100644 index 277b9e7..0000000 --- a/Plugin Plant/Plugin Plant.iml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Plugin Plant/pom.xml b/Plugin Plant/pom.xml deleted file mode 100644 index 9d2148d..0000000 --- a/Plugin Plant/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.pluginplant - plugin-biomassBlob - 1.4a - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - net.simon987.server - server - 1.4a - - - \ No newline at end of file diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassPlugin.java b/Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassPlugin.java deleted file mode 100644 index 4f7c7da..0000000 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassPlugin.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.simon987.biomassplugin; - -import net.simon987.biomassplugin.event.ObjectDeathListener; -import net.simon987.biomassplugin.event.WorldCreationListener; -import net.simon987.biomassplugin.event.WorldUpdateListener; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; - - -public class BiomassPlugin extends ServerPlugin { - - - @Override - public void init(GameServer gameServer) { - - IServerConfiguration config = gameServer.getConfig(); - GameRegistry registry = gameServer.getRegistry(); - - listeners.add(new WorldCreationListener()); - listeners.add(new WorldUpdateListener(config)); - listeners.add(new ObjectDeathListener(config)); - - registry.registerGameObject(BiomassBlob.class); - registry.registerItem(ItemBiomass.ID, ItemBiomass.class); - - LogManager.LOGGER.info("(BiomassPlugin) Initialised Biomass plugin"); - } -} diff --git a/Plugin Plant/src/main/resources/plugin.properties b/Plugin Plant/src/main/resources/plugin.properties deleted file mode 100644 index c9c6fc2..0000000 --- a/Plugin Plant/src/main/resources/plugin.properties +++ /dev/null @@ -1,4 +0,0 @@ -classpath=net.simon987.biomassplugin.BiomassPlugin -name=Biomass Plugin -version=1.0 -depend=NPC Plugin \ No newline at end of file diff --git a/Plugin Radioactive Cloud/pom.xml b/Plugin Radioactive Cloud/pom.xml deleted file mode 100644 index 291513b..0000000 --- a/Plugin Radioactive Cloud/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.pluginradioactivecloud - plugin-radioactiveCloud - 1.4a - - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - net.simon987.server - server - 1.4a - - - diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloudPlugin.java b/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloudPlugin.java deleted file mode 100644 index ad6906f..0000000 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloudPlugin.java +++ /dev/null @@ -1,14 +0,0 @@ -package net.simon987.pluginradioactivecloud; - -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; - -public class RadioactiveCloudPlugin extends ServerPlugin { - - @Override - public void init(GameServer gameServer) { - - LogManager.LOGGER.info("(Radioactive cloud Plugin) Initialised Radioactive cloud plugin."); - } -} \ No newline at end of file diff --git a/Plugin Radioactive Cloud/src/main/resources/plugin.properties b/Plugin Radioactive Cloud/src/main/resources/plugin.properties deleted file mode 100644 index 0c8253a..0000000 --- a/Plugin Radioactive Cloud/src/main/resources/plugin.properties +++ /dev/null @@ -1,3 +0,0 @@ -classpath=net.simon987.pluginradioactivecloud.RadioactiveCloudPlugin -name=Radioactive cloud Plugin -version=1.4 \ No newline at end of file diff --git a/README.md b/README.md index ce82991..6e2b3ad 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,7 @@ mvn package # Run cd target -java -jar server-1.4a.jar +java -jar muchassemblyrequired-*.jar ``` ## Windows (tested on Windows 10) @@ -75,7 +75,7 @@ mongod ```batch :: Runs the MAR server cd Much-Assembly-Required\target -java -jar server-1.4a.jar +java -jar muchassemblyrequired-*.jar ``` ## macOS (tested on Sierra 10.12.6) @@ -136,7 +136,7 @@ If you do not wish to use the default data directory (/data/db), follow the step # Run cd target - java -jar server-1.4a.jar + java -jar muchassemblyrequired-*.jar ``` ## Docker @@ -155,18 +155,6 @@ application's directory: Make sure to change `mongo_address` in `config.properties` to `mongodb`. -## Vagrant -### Requirements -1. [Vagrant](https://www.vagrantup.com/downloads.html) -2. [VirtualBox](https://www.virtualbox.org/wiki/Downloads) - -### Installation - -When vagrant is installed, you can build and start this application by running the following -command inside this application's directory: - -`vagrant up` - # Running Once the server is running, you should be able to connect to `http://localhost:4567` with your browser diff --git a/Server/pom.xml b/Server/pom.xml deleted file mode 100644 index 837a91b..0000000 --- a/Server/pom.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - 4.0.0 - - - - - - - maven-resources-plugin - 3.0.2 - - - default-resources - - prepare-package - - resources - - - ../target/ - - - ../Server/src/main/resources - - - - - - - - 3.6.2 - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - prepare-package - - copy-dependencies - - - ../target/libs - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - ../target - - - net.simon987.server.Main - true - libs/ - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.7.2 - - never - ./src/main/resources - - - - - - net.simon987.server - server - 1.4a - - - - junit - junit - 4.12 - test - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - org.apache.commons - commons-text - 1.6 - - - org.mongodb - mongodb-driver-sync - 3.9.1 - - - - org.springframework.security - spring-security-core - 5.1.11.RELEASE - - - com.sparkjava - spark-core - 2.8.0 - - - com.sparkjava - spark-template-velocity - 2.7.1 - - - org.slf4j - slf4j-simple - 1.7.25 - - - - - - - UTF-8 - - - \ No newline at end of file diff --git a/Server/src/main/java/net/simon987/server/event/GameEventDispatcher.java b/Server/src/main/java/net/simon987/server/event/GameEventDispatcher.java deleted file mode 100644 index b6beeeb..0000000 --- a/Server/src/main/java/net/simon987/server/event/GameEventDispatcher.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.simon987.server.event; - -import net.simon987.server.plugin.PluginManager; -import net.simon987.server.plugin.ServerPlugin; - -import java.util.ArrayList; - - -public class GameEventDispatcher { - - private PluginManager pluginManager; - - private ArrayList listeners; - - public GameEventDispatcher(PluginManager pluginManager) { - this.pluginManager = pluginManager; - listeners = new ArrayList<>(5); - } - - public void dispatch(GameEvent event) { - - //Dispatch to 'local' listeners - for (GameEventListener listener : listeners) { - if (event.getClass().equals(listener.getListenedEventType())) { - listener.handle(event); - } - } - - //Dispatch to plugins - for (ServerPlugin plugin : pluginManager.getPlugins()) { - for (GameEventListener listener : plugin.getListeners()) { - if (event.getClass().equals(listener.getListenedEventType())) { - listener.handle(event); - } - } - } - - } - - public ArrayList getListeners() { - return listeners; - } -} diff --git a/Server/src/main/java/net/simon987/server/plugin/PluginManager.java b/Server/src/main/java/net/simon987/server/plugin/PluginManager.java deleted file mode 100644 index 7a12e87..0000000 --- a/Server/src/main/java/net/simon987/server/plugin/PluginManager.java +++ /dev/null @@ -1,173 +0,0 @@ -package net.simon987.server.plugin; - -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Properties; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; - -public class PluginManager { - - private ArrayList loadedPlugins; - private ArrayList toLoadPlugins; - - private GameServer gameServer; - - public PluginManager(GameServer gameServer) { - this.gameServer = gameServer; - this.toLoadPlugins = new ArrayList<>(10); - this.loadedPlugins = new ArrayList<>(10); - } - - private ServerPlugin load(File pluginFile) { - - LogManager.LOGGER.info("Loading plugin file " + pluginFile.getName()); - - ZipFile zipFile = null; - try { - //Get the plugin config file from the archive - zipFile = new ZipFile(pluginFile); - - ZipEntry configEntry = zipFile.getEntry("plugin.properties"); - - if (configEntry != null) { - - InputStream stream = zipFile.getInputStream(configEntry); - Properties pluginConfig = new Properties(); - pluginConfig.load(stream); - - ClassLoader loader = URLClassLoader.newInstance(new URL[]{pluginFile.toURI().toURL()}); - Class aClass = Class.forName(pluginConfig.getProperty("classpath"), true, loader); - Class pluginClass = aClass.asSubclass(ServerPlugin.class); - Constructor constructor = pluginClass.getConstructor(); - - ServerPlugin plugin = constructor.newInstance(); - plugin.setName(pluginConfig.getProperty("name")); - plugin.setVersion(pluginConfig.getProperty("version")); - - String dependStr = pluginConfig.getProperty("depend"); - if (dependStr != null) { - for (String dep : dependStr.split(",")) { - plugin.dependencies.add(dep.trim()); - } - } - - return plugin; - - } else { - LogManager.LOGGER.severe("Couldn't find plugin.properties in " + pluginFile.getName()); - } - - } catch (Exception e) { - e.printStackTrace(); - - } finally { - try { - if (zipFile != null) { - zipFile.close(); - } - } catch (IOException e) { - e.printStackTrace(); - } - } - - return null; - } - - /** - * Load all plugins in plugins folder, if it doesn't exist, create it - * - * @return true if all the plugins could be loaded - */ - public boolean loadInFolder(String dir) { - - File pluginDir = new File(dir); - File[] pluginDirListing = pluginDir.listFiles(); - - if (pluginDirListing == null) { - if (!pluginDir.mkdir()) { - LogManager.LOGGER.severe("Couldn't create plugin directory"); - } - return false; - } - - for (File pluginFile : pluginDirListing) { - if (pluginFile.getName().endsWith(".jar")) { - toLoadPlugins.add(load(pluginFile)); - } - } - - while (toLoadPlugins.size() > 0) { - - ServerPlugin plugin = toLoadPlugins.get(0); - - if (!initWithDependencies(plugin)) { - LogManager.LOGGER.severe("Plugin " + plugin.name + " has unmet dependencies: " + - Arrays.toString(plugin.dependencies.toArray())); - return false; - } - } - - toLoadPlugins.clear(); - return true; - } - - private boolean initWithDependencies(ServerPlugin plugin) { - - for (String depName : plugin.dependencies) { - - if (!isLoaded(depName)) { - ServerPlugin dep = getPluginByName(depName, toLoadPlugins); - - if (dep != null) { - initWithDependencies(dep); - } else { - return false; - } - } - } - - initPlugin(plugin); - return true; - } - - private static ServerPlugin getPluginByName(String name, List plugins) { - - for (ServerPlugin p : plugins) { - if (p.name.equals(name)) { - return p; - } - } - - return null; - } - - public ServerPlugin getPluginByName(String name) { - return PluginManager.getPluginByName(name, loadedPlugins); - } - - private boolean isLoaded(String name) { - return getPluginByName(name, loadedPlugins) != null; - } - - private void initPlugin(ServerPlugin plugin) { - - toLoadPlugins.remove(plugin); - loadedPlugins.add(plugin); - plugin.init(gameServer); - } - - public ArrayList getPlugins() { - return loadedPlugins; - } -} diff --git a/Server/src/main/java/net/simon987/server/plugin/ServerPlugin.java b/Server/src/main/java/net/simon987/server/plugin/ServerPlugin.java deleted file mode 100644 index c6a2d8d..0000000 --- a/Server/src/main/java/net/simon987/server/plugin/ServerPlugin.java +++ /dev/null @@ -1,73 +0,0 @@ -package net.simon987.server.plugin; - -import net.simon987.server.GameServer; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; -import org.bson.Document; - -import java.util.ArrayList; -import java.util.List; - -public abstract class ServerPlugin implements MongoSerializable { - - /** - * Name of the plugin - */ - protected String name; - - /** - * Version of the plugin - */ - protected String version; - - /** - * List of event listeners - */ - protected List listeners = new ArrayList<>(5); - - protected List dependencies = new ArrayList<>(); - - /** - * Called when the plugin is loaded - */ - public abstract void init(GameServer gameServer); - - 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 List getListeners() { - return listeners; - } - - @Override - public Document mongoSerialise() { - Document document = new Document(); - - document.put("version", version); - - return document; - } - - public void load(Document document) { - - LogManager.LOGGER.fine(String.format("(%s) Loading from database", name)); - if (!version.equals(document.getString("version"))) { - LogManager.LOGGER.warning(String.format("(%s) Version mismatch with database!" + - " This could cause problems. %s!=%s", name, version, document.getString("version"))); - } - } -} diff --git a/Server/src/main/resources/static/js/mar.js b/Server/src/main/resources/static/js/mar.js deleted file mode 100644 index 6ea23c9..0000000 --- a/Server/src/main/resources/static/js/mar.js +++ /dev/null @@ -1,1945 +0,0 @@ -var __extends = (this && this.__extends) || (function () { - var extendStatics = function (d, b) { - extendStatics = Object.setPrototypeOf || - ({__proto__: []} instanceof Array && function (d, b) { - d.__proto__ = b; - }) || - function (d, b) { - for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; - }; - return extendStatics(d, b); - } - return function (d, b) { - extendStatics(d, b); - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; -})(); -var MarGame = (function () { - function MarGame() { - this.cursorPos = new Phaser.Plugin.Isometric.Point3(); - this.debugMessages = []; - this.animationFrames = {}; - var self = this; - this.game = new Phaser.Game(RENDERER_WIDTH, RENDERER_HEIGHT, Phaser.AUTO, 'game', null, true, false); - this.bootState = { - preload: function () { - if (DEBUG) { - console.log("[MAR] Loading sprites.png as JSONHash"); - } - this.game.load.atlasJSONHash("sheet", "./images/sprites.png", "./images/sprites.json").onLoadComplete.add(function () { - self.game.time.advancedTiming = true; - if (DEBUG) { - console.log("[MAR] Enabling isometric plugin"); - } - self.game.plugins.add(new Phaser.Plugin.Isometric(self.game)); - self.game.iso.anchor.setTo(0.5, 0); - self.game.world.setBounds(0, 0, 2200, 1100); - self.game.camera.x = 280; - self.game.camera.y = 90; - self.game.scale.scaleMode = Phaser.ScaleManager.RESIZE; - self.game.scale.pageAlignHorizontally = true; - self.game.scale.pageAlignVertically = true; - self.game.stage.disableVisibilityChange = true; - self.client = new GameClient(); - self.game.input.onDown.add(function () { - document.getElementById("game").focus(); - if (DEBUG) { - console.log("Grabbed focus of #game"); - } - }); - self.isoGroup = mar.game.add.group(); - self.textGroup = mar.game.add.group(); - self.hudGroup = mar.game.add.group(); - self.hudGroup.fixedToCamera = true; - }); - }, - create: function () { - if (DEBUG) { - console.log("[MAR] create"); - } - self.initialiseAnimations(); - self.initialiseStaticHud(); - }, - update: function () { - self.game.scale.refresh(); - self.game.iso.unproject(self.game.input.activePointer.position, self.cursorPos); - self.isoGroup.forEach(function (tile) { - if (tile instanceof Tile) { - var inBounds = tile.isoBounds.containsXY(self.cursorPos.x, self.cursorPos.y); - if (!tile.selected && inBounds) { - tile.selected = true; - tile.onHover(); - self.isoGroup.forEach(function (obj) { - if (obj instanceof GameObject && obj.onTileHover != undefined && obj.isAt(tile.tileX, tile.tileY)) { - obj.onTileHover(); - } - }, 1); - } - else if (tile.selected && !inBounds) { - tile.selected = false; - tile.onExit(); - self.isoGroup.forEach(function (obj) { - if (obj.onTileExit != undefined && obj.isAt(tile.tileX, tile.tileY)) { - obj.onTileExit(); - } - }, 0); - } - } - }, 0); - if (this.game.input.activePointer.isDown) { - if (this.game.origDragPoint) { - this.game.camera.x += this.game.origDragPoint.x - this.game.input.activePointer.position.x; - this.game.camera.y += this.game.origDragPoint.y - this.game.input.activePointer.position.y; - } - this.game.origDragPoint = this.game.input.activePointer.position.clone(); - } - else { - this.game.origDragPoint = null; - } - self.game.iso.topologicalSort(self.isoGroup); - }, - render: function () { - for (var i = 0; i < self.debugMessages.length; i++) { - self.game.debug.text(self.debugMessages[i].getMessage(), self.debugMessages[i].x, self.debugMessages[i].y); - } - } - }; - this.game.state.add('Boot', this.bootState); - this.game.state.start('Boot'); - } - MarGame.prototype.addDebugMessage = function (debugMsg) { - this.debugMessages.push(debugMsg); - }; - MarGame.prototype.initialiseAnimations = function () { - this.animationFrames.walk_e_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.walk_e_start.push("cubot/walk_e/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_e = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.walk_e.push("cubot/walk_e/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_e_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.harvester_walk_e_start.push("harvester/walk_e/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_e = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.harvester_walk_e.push("harvester/walk_e/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_n_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.walk_n_start.push("cubot/walk_n/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_n = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.walk_n.push("cubot/walk_n/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_n_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.harvester_walk_n_start.push("harvester/walk_n/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_n = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.harvester_walk_n.push("harvester/walk_n/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_s_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.walk_s_start.push("cubot/walk_s/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_s = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.walk_s.push("cubot/walk_s/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_s_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.harvester_walk_s_start.push("harvester/walk_s/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_s = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.harvester_walk_s.push("harvester/walk_s/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_w_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.walk_w_start.push("cubot/walk_w/" + ("0000" + i).slice(-4)); - } - this.animationFrames.walk_w = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.walk_w.push("cubot/walk_w/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_w_start = []; - for (var i = 0; i < 10; i++) { - this.animationFrames.harvester_walk_w_start.push("harvester/walk_w/" + ("0000" + i).slice(-4)); - } - this.animationFrames.harvester_walk_w = []; - for (var i = 10; i < 30; i++) { - this.animationFrames.harvester_walk_w.push("harvester/walk_w/" + ("0000" + i).slice(-4)); - } - this.animationFrames.dig_e = []; - for (var i = 1; i <= 41; i++) { - this.animationFrames.dig_e.push("cubot/dig_e/" + ("0000" + i).slice(-4)); - } - this.animationFrames.dig_n = []; - for (var i = 1; i <= 41; i++) { - this.animationFrames.dig_n.push("cubot/dig_n/" + ("0000" + i).slice(-4)); - } - this.animationFrames.dig_s = []; - for (var i = 1; i <= 41; i++) { - this.animationFrames.dig_s.push("cubot/dig_s/" + ("0000" + i).slice(-4)); - } - this.animationFrames.dig_w = []; - for (var i = 1; i <= 41; i++) { - this.animationFrames.dig_w.push("cubot/dig_w/" + ("0000" + i).slice(-4)); - } - this.animationFrames.biomassIdle = []; - for (var i = 1; i < 60; i++) { - this.animationFrames.biomassIdle.push("objects/biomass/idle/" + ("0000" + i).slice(-4)); - } - this.animationFrames.vaultDoorScreen = []; - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/2"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/3"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/4"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/5"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/6"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - this.animationFrames.vaultDoorScreen.push("objects/VaultDoorScreen/1"); - }; - MarGame.prototype.initialiseStaticHud = function () { - this.addDebugMessage(new WorldIndicator(10, 20)); - this.tileIndicator = new TileIndicator(10, 40); - this.addDebugMessage(this.tileIndicator); - }; - return MarGame; -}()); -var DebugMessage = (function () { - function DebugMessage(x, y) { - this.x = x; - this.y = y; - } - return DebugMessage; -}()); -var TileIndicator = (function (_super) { - __extends(TileIndicator, _super); - function TileIndicator() { - return _super !== null && _super.apply(this, arguments) || this; - } - TileIndicator.prototype.getMessage = function () { - if (this.tileType != undefined) { - return this.tileX + ", " + this.tileY + " : " + this.tileType; - } - else { - return ""; - } - }; - return TileIndicator; -}(DebugMessage)); -var WorldIndicator = (function (_super) { - __extends(WorldIndicator, _super); - function WorldIndicator() { - return _super !== null && _super.apply(this, arguments) || this; - } - WorldIndicator.prototype.getMessage = function () { - if (mar.world != undefined) { - return "World: " + mar.client.dimension + "(" + Number(mar.client.worldX).toString(16).toUpperCase() + ", " + - Number(mar.client.worldY).toString(16).toUpperCase() + ")"; - } - else { - return "Loading..."; - } - }; - return WorldIndicator; -}(DebugMessage)); -var RENDERER_WIDTH = document.getElementById("game").clientWidth * window.devicePixelRatio; -var RENDERER_HEIGHT = (window.innerHeight / 1.40) * window.devicePixelRatio; -var DEBUG = true; -var config = { - kbBuffer: { - x: 350, - y: 35, - }, - cubot: { - tint: 0xFFFFFF, - hoverTint: 0x00FF00, - lowEnergyTint: 0xCC0000, - walkDuration: 800, - lowEnergy: 100, - otherCubotAlpha: 0.6, - }, - hackedNpc: { - tint: 0xE040FB, - }, - biomass: { - tint: 0x63B85F, - tintHover: 0x00FF00, - }, - tile: { - hover: 0x00FF00, - vaultWall: 0x3F2D2A, - vaultFloor: 0x2B1E1C, - fluid: 0x0ACED6, - ore: 0xF3F3F3, - plain: 0xFFFFFF, - wall: 0xDDDDDD, - plainSprite: "tiles/tile", - magneticSprite: "tiles/magneticTile", - wallSprite: "tiles/bigTile", - wallSprite2: "tiles/bigTile2", - }, - item: { - ironColor: 0x434341, - copperColor: 0xC87D38, - blueprintColor: 0xaced6, - }, - portal: { - tint: 0xff43c8, - }, - text: { - textFill: "#FFFFFF", - textStroke: "#9298a8", - textIron: "#434341", - textCopper: "#C87D38", - hologramFill: "#0aced6", - hologramStroke: "#12FFB0", - selfUsername: 0xFB4D0A, - bigMessageFill: "#ff803d", - holoStyle: function (fill) { - return { - fontSize: 32, - fill: fill ? fill : config.text.hologramFill, - stroke: config.text.hologramStroke, - strokeThickness: 1, - font: "fixedsys" - }; - }, - }, - arrow: { - tint: 0xFFFFFF, - tintHover: 0x00FF00, - }, - arrowTextStyle: { - fontSize: 32, - fill: "#ffffff", - stroke: "#9298a8", - strokeThickness: 1, - font: "fixedsys" - }, - world: { - defaultSize: 16 - } -}; -var Util = (function () { - function Util() { - } - Util.getIsoY = function (y) { - return Util.getIsoX(y); - }; - Util.getIsoX = function (x) { - return (x * 71.5); - }; - Util.getDeltaX = function (direction) { - switch (direction) { - case Direction.NORTH: - case Direction.SOUTH: - return 0; - case Direction.EAST: - return 1; - case Direction.WEST: - return -1; - } - }; - Util.getDeltaY = function (direction) { - switch (direction) { - case Direction.EAST: - case Direction.WEST: - return 0; - case Direction.NORTH: - return -1; - case Direction.SOUTH: - return 1; - } - }; - Util.itemColor = function (item) { - switch (item) { - case 1: - return config.biomass.tint; - case 3: - return config.item.ironColor; - case 4: - return config.item.copperColor; - case 5: - return config.item.blueprintColor; - } - }; - return Util; -}()); -var Debug = (function () { - function Debug() { - } - Debug.setTileAt = function (x, y, newTile) { - mar.client.sendDebugCommand({ - t: "debug", command: "setTileAt", x: x, y: y, newTile: newTile, - worldX: mar.client.worldX, worldY: mar.client.worldY, dimension: mar.client.dimension - }); - mar.client.requestTerrain(); - }; - Debug.createWorld = function (x, y, dimension) { - mar.client.sendDebugCommand({ t: "debug", command: "createWorld", worldX: x, worldY: y, dimension: dimension }); - window.setTimeout(mar.client.requestTerrain, 250); - }; - Debug.createWorldHex = function (x, y, dimension) { - mar.client.sendDebugCommand({ - t: "debug", command: "createWorld", - worldX: parseInt(x, 16), worldY: parseInt(y, 16), dimension: dimension - }); - }; - Debug.goTo = function (worldX, worldY, dimension) { - mar.client.worldX = worldX; - mar.client.worldY = worldY; - mar.client.dimension = dimension; - mar.client.requestTerrain(); - }; - Debug.goToHex = function (worldX, worldY, dimension) { - mar.client.worldX = parseInt(worldX, 16); - mar.client.worldY = parseInt(worldY, 16); - mar.client.dimension = dimension; - mar.client.requestTerrain(); - }; - Debug.killAll = function (x, y) { - mar.client.sendDebugCommand({ - t: "debug", command: "killAll", x: x, y: y, - worldX: mar.client.worldX, worldY: mar.client.worldY, dimension: mar.client.dimension - }); - }; - Debug.objInfo = function (x, y) { - mar.client.sendDebugCommand({ - t: "debug", command: "objInfo", x: x, y: y, - worldX: mar.client.worldX, worldY: mar.client.worldY, dimension: mar.client.dimension - }); - }; - Debug.userInfo = function (username) { - mar.client.sendDebugCommand({ t: "debug", command: "userInfo", username: username }); - }; - Debug.moveObj = function (objectId, x, y) { - mar.client.sendDebugCommand({ t: "debug", command: "moveObj", objectId: objectId, x: x, y: y }); - mar.client.requestObjects(); - }; - Debug.tpObj = function (objectId, x, y, worldX, worldY, dimension) { - mar.client.sendDebugCommand({ - t: "debug", command: "tpObj", objectId: objectId, x: x, y: y, worldX: worldX, - worldY: worldY, dimension: dimension - }); - mar.client.requestObjects(); - }; - Debug.tpObjHex = function (objectId, x, y, worldX, worldY, dimension) { - mar.client.sendDebugCommand({ - t: "debug", command: "tpObj", objectId: objectId, x: x, y: y, worldX: parseInt(worldX, 16), - worldY: parseInt(worldY, 16), dimension: dimension - }); - mar.client.requestObjects(); - }; - Debug.spawnObj = function (data) { - mar.client.sendDebugCommand({ - t: "debug", command: "spawnObj", data: data, - worldX: mar.client.worldX, worldY: mar.client.worldY, dimension: mar.client.dimension - }); - }; - Debug.comPortMsg = function (objectId, message) { - mar.client.sendDebugCommand({ t: "debug", command: "comPortMsg", objectId: objectId, message: message }); - }; - Debug.healObj = function (objectId, amount) { - mar.client.sendDebugCommand({ t: "debug", command: "healObj", objectId: objectId, amount: amount }); - }; - Debug.damageObj = function (objectId, amount) { - mar.client.sendDebugCommand({ t: "debug", command: "damageObj", objectId: objectId, amount: amount }); - }; - Debug.chargeShield = function (objectId, amount) { - mar.client.sendDebugCommand({ t: "debug", command: "chargeShield", objectId: objectId, amount: amount }); - }; - Debug.setEnergy = function (objectId, amount) { - mar.client.sendDebugCommand({ t: "debug", command: "setEnergy", objectId: objectId, amount: amount }); - }; - Debug.saveGame = function () { - mar.client.sendDebugCommand({t: "debug", command: "saveGame"}); - }; - Debug.popItem = function (objectId) { - mar.client.sendDebugCommand({t: "debug", command: "popItem", objectId: objectId}); - }; - Debug.putItem = function (objectId, item) { - mar.client.sendDebugCommand({t: "debug", command: "putItem", objectId: objectId, item: item}); - }; - Debug.setInventoryPosition = function (objectId, position) { - mar.client.sendDebugCommand({ - t: "debug", - command: "setInventoryPosition", - objectId: objectId, - position: position - }); - }; - Debug.SELF_ID = ""; - return Debug; -}()); -DEBUG = false; -var mar = new MarGame(); -var KeyboardBuffer = (function (_super) { - __extends(KeyboardBuffer, _super); - function KeyboardBuffer() { - var _this = _super !== null && _super.apply(this, arguments) || this; - _this.keys = []; - return _this; - } - KeyboardBuffer.prototype.getMessage = function () { - var str = "KB: "; - for (var i = 0; i < 16; i++) { - if (this.keys[i] !== undefined) { - str += this.keys[i].toString(16).toUpperCase() + " "; - } - else { - str += "__ "; - } - } - return str; - }; - return KeyboardBuffer; -}(DebugMessage)); -var ObjectsListener = (function () { - function ObjectsListener() { - } - ObjectsListener.prototype.getListenedMessageType = function () { - return "object"; - }; - ObjectsListener.prototype.handle = function (message) { - if (DEBUG) { - console.log("[MAR] Received " + message.objects.length + " objects"); - } - if (mar.world != undefined) { - mar.world.handleObjectsUpdate(message.objects); - } - }; - return ObjectsListener; -}()); -var TickListener = (function () { - function TickListener() { - } - TickListener.prototype.getListenedMessageType = function () { - return "tick"; - }; - TickListener.prototype.handle = function (message) { - mar.client.requestObjects(); - if (message.keys !== undefined) { - mar.client.keyboardBuffer.keys = message.keys; - } - if (message.c != undefined) { - mar.client.consoleScreen.handleConsoleBufferUpdate(message.console_message_buffer, message.console_mode); - if (DEBUG) { - console.log("[MAR] Received " + message.console_message_buffer.length + " console message(s)"); - } - } - }; - return TickListener; -}()); -var UserInfoListener = (function () { - function UserInfoListener() { - } - UserInfoListener.prototype.getListenedMessageType = function () { - return "userInfo"; - }; - UserInfoListener.prototype.handle = function (message) { - if (DEBUG) { - console.log("[MAR] Received user info message"); - } - mar.client.worldX = message.worldX; - mar.client.worldY = message.worldY; - mar.client.dimension = message.dimension; - Debug.SELF_ID = message.id; - mar.client.maxWidth = message.maxWidth; - mar.client.requestTerrain(); - }; - return UserInfoListener; -}()); -var AuthListener = (function () { - function AuthListener() { - } - AuthListener.prototype.getListenedMessageType = function () { - return "auth"; - }; - AuthListener.prototype.handle = function (message) { - if (DEBUG) { - console.log("[MAR] Received auth response"); - } - if (message.m === "ok") { - if (DEBUG) { - console.log("[MAR] Auth successful"); - } - mar.client.requestUserInfo(); - } else if (message.m == "forbidden") { - alert("Authentication failed. Guest accounts are blocked on this server"); - } else { - alert("Authentication failed. Please make sure you are logged in and reload the page."); - } - }; - return AuthListener; -}()); -var TerrainListener = (function () { - function TerrainListener() { - } - TerrainListener.prototype.getListenedMessageType = function () { - return "terrain"; - }; - TerrainListener.prototype.handle = function (message) { - if (DEBUG) { - console.log("[MAR] Received terrain"); - } - if (mar.world) { - mar.world.removeBigMessage(); - } - if (message.ok) { - var worldSize = message.size; - if (worldSize == undefined) { - worldSize = config.world.defaultSize; - } - if (DEBUG) { - console.log("[MAR] World is available"); - } - if (mar.world != null) { - if (DEBUG) { - console.log("[MAR] Updating World terrain"); - } - mar.world.updateTerrain(message.terrain, worldSize); - } - else { - if (DEBUG) { - console.log("[MAR] Creating new World"); - } - mar.world = new World(message.terrain, worldSize); - } - } - else { - if (DEBUG) { - console.log("[MAR] World is not available"); - } - if (mar.world != null) { - if (DEBUG) { - console.log("[MAR] Updating World terrain"); - } - mar.world.updateTerrain([], config.world.defaultSize); - } - else { - if (DEBUG) { - console.log("[MAR] Creating new World"); - } - mar.world = new World([], config.world.defaultSize); - } - if (mar.world) { - mar.world.setBigMessage("[Uncharted World]"); - } - } - }; - return TerrainListener; -}()); -var CodeListener = (function () { - function CodeListener() { - } - CodeListener.prototype.getListenedMessageType = function () { - return "code"; - }; - CodeListener.prototype.handle = function (message) { - ace.edit("editor").setValue(message.code); - }; - return CodeListener; -}()); -var CodeResponseListener = (function () { - function CodeResponseListener() { - } - CodeResponseListener.prototype.getListenedMessageType = function () { - return "codeResponse"; - }; - CodeResponseListener.prototype.handle = function (message) { - alert("Uploaded and assembled " + message.bytes + " bytes (" + message.exceptions + " errors)"); - }; - return CodeResponseListener; -}()); -var DebugResponseListener = (function () { - function DebugResponseListener() { - } - DebugResponseListener.prototype.getListenedMessageType = function () { - return "debug"; - }; - DebugResponseListener.prototype.handle = function (message) { - console.log("> " + message.message); - }; - return DebugResponseListener; -}()); -var GameClient = (function () { - function GameClient() { - this.listeners = []; - this.getServerInfo(); - this.consoleScreen = new PlainTextConsole(defaultText, "consoleText", "colorButton", "scrollButton", "resetButton"); - } - GameClient.prototype.requestUserInfo = function () { - if (DEBUG) { - console.log("[MAR] Requesting user info"); - } - this.socket.send(JSON.stringify({ t: "userInfo" })); - }; - GameClient.prototype.requestTerrain = function () { - if (DEBUG) { - console.log("[MAR] Requesting terrain for world (" + this.worldX + ", " + this.worldY + ")"); - } - this.socket.send(JSON.stringify({ t: "terrain", x: this.worldX, y: this.worldY, dimension: this.dimension })); - this.requestObjects(); - }; - GameClient.prototype.uploadCode = function (code) { - if (DEBUG) { - console.log("[MAR] Uploaded code"); - } - this.socket.send(JSON.stringify({ t: "uploadCode", code: code })); - }; - GameClient.prototype.reloadCode = function () { - if (DEBUG) { - console.log("[MAR] Reloading code"); - } - this.socket.send(JSON.stringify({ t: "codeRequest" })); - }; - GameClient.prototype.sendKeyPress = function (key) { - if (DEBUG) { - console.log("[MAR] Sent KeyPress: " + key); - } - if (key !== 0) { - this.socket.send(JSON.stringify({ t: "k", k: key })); - } - }; - GameClient.prototype.requestObjects = function () { - if (DEBUG) { - console.log("[MAR] Requesting game objects"); - } - this.socket.send(JSON.stringify({ t: "object", x: this.worldX, y: this.worldY, dimension: this.dimension })); - }; - GameClient.prototype.sendDebugCommand = function (json) { - this.socket.send(JSON.stringify(json)); - }; - GameClient.prototype.getServerInfo = function () { - var self = this; - if (DEBUG) { - console.log("[MAR] Getting server info... "); - } - var xhr = new XMLHttpRequest(); - xhr.open("GET", "./server_info", true); - xhr.onreadystatechange = function () { - if (xhr.readyState === 4 && xhr.status === 200) { - if (DEBUG) { - console.log("[MAR] Received server info " + xhr.responseText); - } - setTimeout(function () { - return self.connectToGameServer(JSON.parse(xhr.responseText)); - }, 100); - } - }; - xhr.send(null); - }; - GameClient.prototype.connectToGameServer = function (info) { - var self = this; - if (DEBUG) { - console.log("[MAR] Connecting to " + info.address); - } - this.socket = new WebSocket(info.address); - this.username = info.username; - this.tickLength = info.tickLength; - this.serverName = info.serverName; - this.socket.binaryType = 'arraybuffer'; - this.socket.onopen = function () { - if (DEBUG) { - console.log("[MAR] Connected. Sent auth request"); - } - self.socket.send(info.token); - self.listeners.push(new UserInfoListener()); - self.listeners.push(new AuthListener()); - self.listeners.push(new TickListener()); - self.listeners.push(new TerrainListener()); - self.listeners.push(new ObjectsListener()); - self.listeners.push(new CodeResponseListener()); - self.listeners.push(new CodeListener()); - self.listeners.push(new DebugResponseListener()); - self.socket.onmessage = function (received) { - var message; - if (DEBUG) { - console.log("[MAR] Received: " + received.data); - } - message = JSON.parse(received.data); - for (var i = 0; i < self.listeners.length; i++) { - if (self.listeners[i].getListenedMessageType() === message.t) { - self.listeners[i].handle(message); - } - } - }; - self.reloadCode(); - }; - this.socket.onerror = function (e) { - alert("Can't connect to game server at address " + info.address); - console.log(e); - }; - this.socket.onclose = function (e) { - mar.world.setBigMessage("Disconnected from server :("); - console.log(e); - }; - this.initGame(); - }; - GameClient.prototype.initGame = function () { - if (this.username != "guest") { - var self_1 = this; - this.keyboardBuffer = new KeyboardBuffer(config.kbBuffer.x, config.kbBuffer.y); - mar.addDebugMessage(this.keyboardBuffer); - mar.game.input.keyboard.onDownCallback = function (event) { - if (document.activeElement === document.getElementById("game")) { - if ((event.keyCode >= 37 && event.keyCode <= 40) || event.keyCode === 116 || event.keyCode === 32) { - event.preventDefault(); - } - if (self_1.username !== "guest" && self_1.keyboardBuffer.keys.length <= 16) { - self_1.sendKeyPress(event.keyCode); - self_1.keyboardBuffer.keys.push(event.keyCode); - } - } - }; - } - }; - GameClient.prototype.findMyRobot = function () { - if (this.username == "guest") { - alert("You are not logged in!"); - } - else { - this.requestUserInfo(); - } - }; - return GameClient; -}()); -var ObjectType; -(function (ObjectType) { - ObjectType["CUBOT"] = "net.simon987.cubotplugin.Cubot"; - ObjectType["BIOMASS"] = "net.simon987.biomassplugin.BiomassBlob"; - ObjectType["HARVESTER_NPC"] = "net.simon987.npcplugin.HarvesterNPC"; - ObjectType["FACTORY"] = "net.simon987.npcplugin.Factory"; - ObjectType["RADIO_TOWER"] = "net.simon987.npcplugin.RadioTower"; - ObjectType["VAULT_DOOR"] = "net.simon987.npcplugin.VaultDoor"; - ObjectType["OBSTACLE"] = "net.simon987.npcplugin.Obstacle"; - ObjectType["ELECTRIC_BOX"] = "net.simon987.npcplugin.ElectricBox"; - ObjectType["PORTAL"] = "net.simon987.npcplugin.Portal"; - ObjectType["HACKED_NPC"] = "net.simon987.npcplugin.HackedNPC"; -})(ObjectType || (ObjectType = {})); -var ItemType; -(function (ItemType) { - ItemType[ItemType["BIOMASS"] = 1] = "BIOMASS"; - ItemType[ItemType["IRON"] = 3] = "IRON"; - ItemType[ItemType["COPPER"] = 4] = "COPPER"; -})(ItemType || (ItemType = {})); -var Action; -(function (Action) { - Action[Action["IDLE"] = 0] = "IDLE"; - Action[Action["DIGGING"] = 1] = "DIGGING"; - Action[Action["WALKING"] = 2] = "WALKING"; - Action[Action["WITHDRAWING"] = 3] = "WITHDRAWING"; - Action[Action["DEPOSITING"] = 4] = "DEPOSITING"; - Action[Action["LISTENING"] = 5] = "LISTENING"; - Action[Action["JUMPING"] = 6] = "JUMPING"; - Action[Action["ATTACKING"] = 7] = "ATTACKING"; -})(Action || (Action = {})); -var GameObject = (function (_super) { - __extends(GameObject, _super); - function GameObject(x, y, z, key, frame) { - return _super.call(this, mar.game, x, y, z, key, frame) || this; - } - GameObject.createObject = function (json) { - switch (json.t) { - case ObjectType.CUBOT: - return new Cubot(json); - case ObjectType.BIOMASS: - return new BiomassBlob(json); - case ObjectType.HARVESTER_NPC: - return new HarvesterNPC(json); - case ObjectType.FACTORY: - return new Factory(json); - case ObjectType.RADIO_TOWER: - return new RadioTower(json); - case ObjectType.VAULT_DOOR: - return new VaultDoor(json); - case ObjectType.OBSTACLE: - return null; - case ObjectType.ELECTRIC_BOX: - return new ElectricBox(json); - case ObjectType.PORTAL: - return new Portal(json); - case ObjectType.HACKED_NPC: - return new HackedNPC(json); - default: - return null; - } - }; - GameObject.prototype.setText = function (text) { - this.text = mar.game.make.text(0, 0, text, { - fontSize: 22, - fill: config.text.textFill, - stroke: config.text.textStroke, - strokeThickness: 2, - font: "fixedsys" - }); - this.text.anchor.set(0.5, 0); - this.addChild(this.text); - }; - GameObject.prototype.isAt = function (x, y) { - return x == this.tileX && y == this.tileY; - }; - return GameObject; -}(Phaser.Plugin.Isometric.IsoSprite)); -var HologramMode; -(function (HologramMode) { - HologramMode[HologramMode["CLEARED"] = 0] = "CLEARED"; - HologramMode[HologramMode["HEX"] = 1] = "HEX"; - HologramMode[HologramMode["STRING"] = 2] = "STRING"; - HologramMode[HologramMode["DEC"] = 3] = "DEC"; -})(HologramMode || (HologramMode = {})); -var Cubot = (function (_super) { - __extends(Cubot, _super); - function Cubot(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/blankCubot") || this; - _this.queuedAnimations = []; - _this.hovered = false; - _this.anchor.setTo(0.5, 0); - if (DEBUG) { - console.log("Creating Cubot object"); - } - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - _this.username = json.parent; - _this.heldItem = json.heldItem; - _this.direction = json.direction; - _this.action = json.action; - _this.energy = _this.getEnergy(json); - _this.baseTint = config.cubot.tint; - _this.cubotSprite = mar.game.make.sprite(0, 0, "sheet", null); - _this.cubotSprite.anchor.set(0.5, 0); - _this.addChild(_this.cubotSprite); - _this.cubotSprite.animations.add("walk_w", mar.animationFrames.walk_w); - _this.cubotSprite.animations.add("walk_s", mar.animationFrames.walk_s); - _this.cubotSprite.animations.add("walk_e", mar.animationFrames.walk_e); - _this.cubotSprite.animations.add("walk_n", mar.animationFrames.walk_n); - _this.cubotSprite.animations.add("dig_w", mar.animationFrames.dig_w); - _this.cubotSprite.animations.add("dig_s", mar.animationFrames.dig_s); - _this.cubotSprite.animations.add("dig_e", mar.animationFrames.dig_e); - _this.cubotSprite.animations.add("dig_n", mar.animationFrames.dig_n); - _this.createUsername(); - _this.updateDirection(); - _this.tint = _this.getTint(); - _this.laserEmitter = mar.game.make.emitter(0, 20, 100); - _this.addChild(_this.laserEmitter); - _this.laserEmitter.makeParticles("sheet", ["effects/beam"], 100); - _this.laserEmitter.gravity = new Phaser.Point(0, 0); - _this.shieldBackSprite = mar.game.add.sprite(0, 0, "sheet", "objects/shieldBack"); - _this.shieldBackSprite.anchor.setTo(0.5, 0.1); - _this.shieldBackSprite.alpha = 0.4; - mar.game.add.tween(_this.shieldBackSprite).to({ alpha: 0.8 }, 1500, Phaser.Easing.Linear.None, true, 0, -1, true); - _this.addChildAt(_this.shieldBackSprite, 0); - _this.shieldFrontSprite = mar.game.add.sprite(0, 0, "sheet", "objects/shieldFront"); - _this.shieldFrontSprite.anchor.setTo(0.5, 0.1); - _this.shieldFrontSprite.alpha = 0.4; - mar.game.add.tween(_this.shieldFrontSprite).to({ alpha: 0.8 }, 1500, Phaser.Easing.Linear.None, true, 0, -1, true); - _this.addChild(_this.shieldFrontSprite); - _this.setShield(false); - return _this; - } - Cubot.prototype.getEnergy = function (json) { - return json["net.simon987.cubotplugin.CubotBattery"].energy; - }; - Cubot.prototype.setShield = function (shield) { - this.shieldBackSprite.visible = shield; - this.shieldFrontSprite.visible = shield; - }; - Cubot.prototype.onTileHover = function () { - mar.game.add.tween(this).to({ isoZ: 45 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.2, y: 1.2 }, 200, Phaser.Easing.Linear.None, true); - if (this.text !== undefined) { - this.text.visible = true; - } - this.hovered = true; - this.cubotSprite.tint = this.getTint(); - }; - Cubot.prototype.onTileExit = function () { - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - if (this.text !== undefined) { - this.text.visible = false; - } - this.hovered = false; - this.cubotSprite.tint = this.getTint(); - }; - Cubot.prototype.makeLaserAttack = function () { - var dX, dY, angle; - switch (this.direction) { - case Direction.NORTH: - angle = 333.4; - break; - case Direction.SOUTH: - angle = 153.4; - break; - case Direction.WEST: - angle = 206.6; - break; - case Direction.EAST: - angle = 26.6; - break; - } - this.laserEmitter.minParticleSpeed.setTo(1000, 1000); - this.laserEmitter.maxParticleSpeed.setTo(1700, 1700); - this.laserEmitter.minAngle = angle; - this.laserEmitter.maxAngle = angle; - this.laserEmitter.maxRotation = 0; - this.laserEmitter.start(true, 1000, null, 3); - }; - Cubot.prototype.getTint = function () { - if (!this.hovered) { - if (this.energy <= config.cubot.lowEnergy) { - return config.cubot.lowEnergyTint; - } - else { - return this.baseTint; - } - } - else { - return config.cubot.hoverTint; - } - }; - Cubot.prototype.updateObject = function (json) { - if (DEBUG) { - console.log("Updating Cubot object"); - } - this.action = json.action; - this.energy = this.getEnergy(json); - this.direction = json.direction; - this.shield = json.shield; - this.createInventory([json.heldItem]); - this.heldItem = json.heldItem; - this.cubotSprite.tint = this.getTint(); - if (!this.isAt(json.x, json.y)) { - if (this.action == Action.WALKING) { - this.tileX = json.x; - this.tileY = json.y; - this.walk(); - } - } - if (this.action == Action.DIGGING) { - switch (this.direction) { - case Direction.NORTH: - this.cubotSprite.animations.play("dig_n", 60); - break; - case Direction.SOUTH: - this.cubotSprite.animations.play("dig_s", 60); - break; - case Direction.EAST: - this.cubotSprite.animations.play("dig_e", 60); - break; - case Direction.WEST: - this.cubotSprite.animations.play("dig_w", 60); - break; - } - } - else if (this.action == Action.ATTACKING) { - this.makeLaserAttack(); - } - this.updateDirection(); - var holoHw = json["net.simon987.cubotplugin.CubotHologram"]; - this.updateHologram(holoHw.mode, holoHw.color, holoHw.value, holoHw.string); - this.setShield(this.shield > 0); - }; - Cubot.prototype.updateHologram = function (holoMode, holoColor, holoValue, holoStr) { - var fillColor = (holoColor & 0xFFFFFF).toString(16); - fillColor = "#" + ("000000".substr(fillColor.length) + fillColor); - if (this.hologram == undefined) { - this.hologram = mar.game.make.text(0, 32, ""); - this.hologram.anchor.set(0.5, 0); - this.addChild(this.hologram); - this.hologram.setStyle(config.text.holoStyle(fillColor)); - } - else { - this.hologram.setStyle(config.text.holoStyle(fillColor)); - } - switch (holoMode) { - case HologramMode.CLEARED: - this.hologram.text = ""; - break; - case HologramMode.DEC: - this.hologram.text = Number(holoValue).toString(); - break; - case HologramMode.HEX: - this.hologram.text = "0x" + ("0000" + Number(holoValue).toString(16).toUpperCase()).slice(-4); - break; - case HologramMode.STRING: - this.hologram.text = holoStr.replace(/[\n|\t]/g, ''); - break; - } - }; - Cubot.prototype.updateDirection = function () { - switch (this.direction) { - case Direction.NORTH: - this.cubotSprite.animations.frameName = "cubot/walk_n/0001"; - break; - case Direction.EAST: - this.cubotSprite.animations.frameName = "cubot/walk_e/0001"; - break; - case Direction.SOUTH: - this.cubotSprite.animations.frameName = "cubot/walk_s/0001"; - break; - case Direction.WEST: - this.cubotSprite.animations.frameName = "cubot/walk_w/0001"; - break; - } - }; - Cubot.prototype.walk = function () { - var self = this; - var walkAnimation = function (duration) { - var tween = mar.game.add.tween(self).to({ isoX: Util.getIsoX(self.tileX), isoY: Util.getIsoY(self.tileY) }, duration, Phaser.Easing.Linear.None, true); - switch (self.direction) { - case Direction.NORTH: - self.cubotSprite.animations.play("walk_n", 60, true); - break; - case Direction.SOUTH: - self.cubotSprite.animations.play("walk_s", 60, true); - break; - case Direction.EAST: - self.cubotSprite.animations.play("walk_e", 60, true); - break; - case Direction.WEST: - self.cubotSprite.animations.play("walk_w", 60, true); - break; - } - tween.onComplete.add(function () { - self.cubotSprite.animations.stop(); - self.updateDirection(); - self.isoX = Util.getIsoX(self.tileX); - self.isoY = Util.getIsoY(self.tileY); - self.onTileExit(); - for (var i = 0; i < self.queuedAnimations.length; i++) { - self.queuedAnimations[i](config.cubot.walkDuration / 2); - self.queuedAnimations.splice(i, 1); - } - }); - }; - if (this.cubotSprite.animations.currentAnim.isPlaying) { - this.queuedAnimations.push(walkAnimation); - } - else { - walkAnimation(config.cubot.walkDuration); - } - }; - Cubot.prototype.createUsername = function () { - var username = mar.game.make.text(0, -24, this.username, { - fontSize: 22, - fill: config.text.textFill, - stroke: config.text.textStroke, - strokeThickness: 2, - font: "fixedsys" - }); - username.alpha = 0.85; - username.anchor.set(0.5, 0); - if (this.username === mar.client.username) { - username.tint = config.text.selfUsername; - } - else { - this.alpha = config.cubot.otherCubotAlpha; - } - this.addChild(username); - }; - Cubot.prototype.createInventory = function (items) { - if (this.inventory != undefined) { - this.inventory.destroy(); - } - var inventory = mar.game.make.group(); - switch (items.length) { - case 0: - this.inventory = inventory; - this.addChild(inventory); - break; - case 1: - if (items[0] !== 0) { - var shadow = mar.game.make.sprite(0, 0, "sheet", "inventory/inv1x1"); - shadow.anchor.set(0.5, 0.1); - shadow.alpha = 0.5; - var item = mar.game.make.sprite(0, 0, "sheet", "inventory/item"); - item.anchor.set(0.5, 0.1); - item.tint = Util.itemColor(items[0]); - inventory.addChild(shadow); - inventory.addChild(item); - } - this.inventory = inventory; - this.addChild(inventory); - break; - } - }; - return Cubot; -}(GameObject)); -var HarvesterNPC = (function (_super) { - __extends(HarvesterNPC, _super); - function HarvesterNPC(json) { - var _this = _super.call(this, json) || this; - _this.cubotSprite.animations.add("walk_w", mar.animationFrames.harvester_walk_w); - _this.cubotSprite.animations.add("walk_s", mar.animationFrames.harvester_walk_s); - _this.cubotSprite.animations.add("walk_e", mar.animationFrames.harvester_walk_e); - _this.cubotSprite.animations.add("walk_n", mar.animationFrames.harvester_walk_n); - _this.updateDirection(); - _this.setText("Harvester NPC"); - _this.text.visible = false; - return _this; - } - HarvesterNPC.prototype.updateDirection = function () { - switch (this.direction) { - case Direction.NORTH: - this.cubotSprite.animations.frameName = "harvester/walk_n/0001"; - break; - case Direction.EAST: - this.cubotSprite.animations.frameName = "harvester/walk_e/0001"; - break; - case Direction.SOUTH: - this.cubotSprite.animations.frameName = "harvester/walk_s/0001"; - break; - case Direction.WEST: - this.cubotSprite.animations.frameName = "harvester/walk_w/0001"; - break; - } - }; - HarvesterNPC.prototype.getEnergy = function (json) { - if (json.hasOwnProperty("net.simon987.npcplugin.NpcBattery")) { - return json["net.simon987.npcplugin.NpcBattery"].energy; - } else { - return 1000; - } - }; - HarvesterNPC.prototype.updateObject = function (json) { - if (DEBUG) { - console.log("Updating Harvester NPC object"); - } - this.action = json.action; - this.direction = json.direction; - if (!this.isAt(json.x, json.y)) { - if (this.action == Action.WALKING) { - this.tileX = json.x; - this.tileY = json.y; - this.walk(); - } - } - this.updateDirection(); - }; - HarvesterNPC.prototype.createUsername = function () { - }; - return HarvesterNPC; -}(Cubot)); -var HackedNPC = (function (_super) { - __extends(HackedNPC, _super); - function HackedNPC(json) { - var _this = _super.call(this, json) || this; - _this.updateDirection(); - _this.setText("Hacked NPC"); - _this.text.visible = false; - _this.baseTint = config.hackedNpc.tint; - _this.cubotSprite.tint = _this.baseTint; - return _this; - } - HackedNPC.prototype.updateObject = function (json) { - _super.prototype.updateObject.call(this, json); - var holoHw = json["net.simon987.cubotplugin.CubotHologram"]; - this.updateHologram(holoHw.mode, holoHw.color, holoHw.value, holoHw.string); - }; - return HackedNPC; -}(HarvesterNPC)); -var BiomassBlob = (function (_super) { - __extends(BiomassBlob, _super); - function BiomassBlob(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 10, "sheet", 1) || this; - if (DEBUG) { - console.log("Creating Biomass object"); - } - _this.anchor.set(0.5, 0); - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - _this.tint = config.biomass.tint; - _this.animations.add("idle", mar.animationFrames.biomassIdle); - _this.animations.play("idle", 45, true); - _this.setText("Biomass"); - _this.text.visible = false; - return _this; - } - BiomassBlob.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 45 }, 200, Phaser.Easing.Quadratic.InOut, true); - this.tint = config.biomass.tintHover; - mar.game.add.tween(this.scale).to({ x: 1.2, y: 1.2 }, 200, Phaser.Easing.Linear.None, true); - this.text.visible = true; - }; - BiomassBlob.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.biomass.tintHover; - this.text.visible = false; - }; - BiomassBlob.prototype.updateObject = function (json) { - if (DEBUG) { - console.log("Updating Biomass object"); - } - }; - return BiomassBlob; -}(GameObject)); -var Factory = (function (_super) { - __extends(Factory, _super); - function Factory(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/factory") || this; - _this.anchor.set(0.5, .25); - _this.setText("Factory"); - _this.text.visible = false; - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - return _this; - } - Factory.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 25 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.06, y: 1.06 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.hoverTint; - this.text.visible = true; - }; - Factory.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.tint; - this.text.visible = false; - }; - Factory.prototype.updateObject = function (json) { - }; - Factory.prototype.isAt = function (x, y) { - return (this.tileX === x || this.tileX + 1 === x) && (this.tileY + 1 === y || this.tileY === y); - }; - ; - return Factory; -}(GameObject)); -var RadioTower = (function (_super) { - __extends(RadioTower, _super); - function RadioTower(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/RadioTower") || this; - _this.anchor.set(0.48, 0.65); - _this.setText("Radio Tower"); - _this.text.visible = false; - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - return _this; - } - RadioTower.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 25 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.06, y: 1.06 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.hoverTint; - this.text.visible = true; - }; - RadioTower.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.tint; - this.text.visible = false; - }; - RadioTower.prototype.updateObject = function (json) { - }; - return RadioTower; -}(GameObject)); -var VaultDoor = (function (_super) { - __extends(VaultDoor, _super); - function VaultDoor(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 0, "sheet", "objects/VaultDoor1") || this; - _this.anchor.set(0.55, 0.55); - _this.inputEnabled = true; - _this.events.onInputDown.add(function (self) { - Debug.goToHex("7FFF", "7FFF", "v" + self.id); - document.body.style.cursor = 'default'; - document.body.setAttribute("title", ""); - }, _this); - _this.setText("Vault"); - _this.text.visible = false; - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - var screen = mar.game.make.sprite(-76, 4, "sheet", "objects/VaultDoorScreen/1"); - screen.animations.add("idle", mar.animationFrames.vaultDoorScreen); - screen.animations.play("idle", 11, true); - _this.addChild(screen); - return _this; - } - VaultDoor.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.06, y: 1.06 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.hoverTint; - this.text.visible = true; - document.body.style.cursor = 'pointer'; - document.body.setAttribute("title", "Click to visit Vault"); - }; - VaultDoor.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 0 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.tint; - this.text.visible = false; - document.body.style.cursor = 'default'; - document.body.setAttribute("title", ""); - }; - VaultDoor.prototype.updateObject = function (json) { - }; - return VaultDoor; -}(GameObject)); -var ElectricBox = (function (_super) { - __extends(ElectricBox, _super); - function ElectricBox(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/ElectricBox") || this; - _this.anchor.set(0.5, 0.3); - _this.setText("Electric Box"); - _this.text.visible = false; - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - _this.sparkEmitter = mar.game.make.emitter(0, 0, 10); - _this.addChild(_this.sparkEmitter); - _this.sparkEmitter.makeParticles("sheet", ["effects/spark"], 10); - _this.sparkEmitter.minParticleSpeed.setTo(-250, -200); - _this.sparkEmitter.maxParticleSpeed.setTo(250, 0); - _this.sparkEmitter.gravity = new Phaser.Point(0, 500); - window.setTimeout(_this.makeSparks, mar.game.rnd.between(5000, 25000), _this); - return _this; - } - ElectricBox.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 25 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.06, y: 1.06 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.hoverTint; - this.text.visible = true; - }; - ElectricBox.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.tint; - this.text.visible = false; - }; - ElectricBox.prototype.makeSparks = function (self) { - self.sparkEmitter.start(true, 450, null, 10); - window.setTimeout(self.makeSparks, mar.game.rnd.between(5000, 25000), self); - }; - ElectricBox.prototype.updateObject = function (json) { - }; - return ElectricBox; -}(GameObject)); -var Portal = (function (_super) { - __extends(Portal, _super); - function Portal(json) { - var _this = _super.call(this, Util.getIsoX(json.x), Util.getIsoY(json.y), 15, "sheet", "objects/portal") || this; - _this.anchor.set(0.5, 0.3); - _this.tint = config.portal.tint; - _this.setText("Portal"); - _this.text.visible = false; - _this.id = json.i; - _this.tileX = json.x; - _this.tileY = json.y; - return _this; - } - Portal.prototype.onTileHover = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 25 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.game.add.tween(this.scale).to({ x: 1.06, y: 1.06 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.cubot.hoverTint; - this.text.visible = true; - }; - Portal.prototype.onTileExit = function () { - mar.game.tweens.removeFrom(this); - mar.game.add.tween(this).to({ isoZ: 15 }, 400, Phaser.Easing.Bounce.Out, true); - mar.game.add.tween(this.scale).to({ x: 1, y: 1 }, 200, Phaser.Easing.Linear.None, true); - this.tint = config.portal.tint; - this.text.visible = false; - }; - Portal.prototype.updateObject = function (json) { - }; - return Portal; -}(GameObject)); -var Direction; -(function (Direction) { - Direction[Direction["NORTH"] = 0] = "NORTH"; - Direction[Direction["EAST"] = 1] = "EAST"; - Direction[Direction["SOUTH"] = 2] = "SOUTH"; - Direction[Direction["WEST"] = 3] = "WEST"; -})(Direction || (Direction = {})); -var TileType; -(function (TileType) { - TileType[TileType["PLAIN"] = 0] = "PLAIN"; - TileType[TileType["WALL"] = 1] = "WALL"; - TileType[TileType["IRON"] = 2] = "IRON"; - TileType[TileType["COPPER"] = 3] = "COPPER"; - TileType[TileType["VAULT_FLOOR"] = 4] = "VAULT_FLOOR"; - TileType[TileType["VAULT_WALL"] = 5] = "VAULT_WALL"; - TileType[TileType["FLUID"] = 6] = "FLUID"; - TileType[TileType["MAGNETIC"] = 7] = "MAGNETIC"; -})(TileType || (TileType = {})); -var Tile = (function (_super) { - __extends(Tile, _super); - function Tile(x, y, sprite, anchorY) { - var _this = _super.call(this, mar.game, Util.getIsoX(x), Util.getIsoY(y), 0, 'sheet', sprite) || this; - _this.baseZ = 0; - _this.tileX = x; - _this.tileY = y; - _this.anchor.set(0.5, anchorY); - return _this; - } - Tile.createTile = function (type, x, y) { - switch (type) { - case TileType.WALL: - return new WallTile(x, y); - case TileType.IRON: - return new IronTile(x, y); - case TileType.COPPER: - return new CopperTile(x, y); - case TileType.VAULT_FLOOR: - return new VaultFloorTile(x, y); - case TileType.VAULT_WALL: - return new VaultWallTile(x, y); - case -1: - return new VoidTile(x, y); - case TileType.FLUID: - return new FluidTile(x, y); - case TileType.MAGNETIC: - return new MagneticTile(x, y); - case TileType.PLAIN: - default: - return new PlainTile(x, y); - } - }; - Tile.prototype.onHover = function () { - this.tint = config.tile.hover; - mar.game.add.tween(this).to({ isoZ: this.baseZ + 8 }, 200, Phaser.Easing.Quadratic.InOut, true); - mar.tileIndicator.tileX = this.tileX; - mar.tileIndicator.tileY = this.tileY; - mar.tileIndicator.tileType = this.tileType; - }; - Tile.prototype.onExit = function () { - this.tint = this.baseTint; - mar.game.add.tween(this).to({ isoZ: this.baseZ }, 200, Phaser.Easing.Quadratic.InOut, true); - }; - Tile.prototype.setText = function (text, fillColor) { - if (this.textSprite !== undefined) { - this.textSprite.destroy(); - } - this.textSprite = mar.game.make.text(0, 16, text, { - fontSize: 22, - fill: fillColor, - stroke: "#FFFFFF", - strokeThickness: 1, - font: "fixedsys" - }); - this.textSprite.alpha = 0.6; - this.textSprite.anchor.set(0.5, 0); - this.addChild(this.textSprite); - }; - return Tile; -}(Phaser.Plugin.Isometric.IsoSprite)); -var PlainTile = (function (_super) { - __extends(PlainTile, _super); - function PlainTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.plain; - _this.tint = _this.baseTint; - _this.tileType = "plain"; - return _this; - } - return PlainTile; -}(Tile)); -var WallTile = (function (_super) { - __extends(WallTile, _super); - function WallTile(x, y) { - var _this = _super.call(this, x, y, config.tile.wallSprite, 0.2) || this; - _this.baseTint = config.tile.wall; - _this.tint = _this.baseTint; - _this.tileType = "wall"; - return _this; - } - return WallTile; -}(Tile)); -var VaultWallTile = (function (_super) { - __extends(VaultWallTile, _super); - function VaultWallTile(x, y) { - var _this = _super.call(this, x, y, config.tile.wallSprite2, 0.29) || this; - _this.baseTint = config.tile.vaultWall; - _this.tint = _this.baseTint; - _this.tileType = "vault wall"; - return _this; - } - return VaultWallTile; -}(Tile)); -var VaultFloorTile = (function (_super) { - __extends(VaultFloorTile, _super); - function VaultFloorTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.vaultFloor; - _this.tint = _this.baseTint; - _this.tileType = "vault floor"; - return _this; - } - return VaultFloorTile; -}(Tile)); -var VoidTile = (function (_super) { - __extends(VoidTile, _super); - function VoidTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.vaultFloor; - _this.tileType = "void"; - _this.alpha = 0; - return _this; - } - VoidTile.prototype.onHover = function () { - mar.tileIndicator.tileX = this.tileX; - mar.tileIndicator.tileY = this.tileY; - mar.tileIndicator.tileType = this.tileType; - }; - VoidTile.prototype.onExit = function () { - }; - return VoidTile; -}(Tile)); -var FluidTile = (function (_super) { - __extends(FluidTile, _super); - function FluidTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.fluid; - _this.tint = _this.baseTint; - _this.alpha = 0.6; - _this.baseZ = -10; - _this.isoZ = _this.baseZ; - _this.tileType = "fluid"; - return _this; - } - return FluidTile; -}(Tile)); -var MagneticTile = (function (_super) { - __extends(MagneticTile, _super); - function MagneticTile(x, y) { - var _this = _super.call(this, x, y, config.tile.magneticSprite, 0) || this; - _this.baseTint = 0xFFFFFF; - _this.tint = _this.baseTint; - _this.setText("Magnetic", config.text.textIron); - _this.tileType = "Magnetic tile"; - return _this; - } - MagneticTile.prototype.onHover = function () { - mar.game.add.tween(this).to({isoZ: this.baseZ + 30}, 200, Phaser.Easing.Quadratic.InOut, true); - mar.tileIndicator.tileX = this.tileX; - mar.tileIndicator.tileY = this.tileY; - mar.tileIndicator.tileType = this.tileType; - }; - return MagneticTile; -}(Tile)); -var IronTile = (function (_super) { - __extends(IronTile, _super); - function IronTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.ore; - _this.tint = _this.baseTint; - _this.setText("Iron", config.text.textIron); - _this.tileType = "iron"; - return _this; - } - return IronTile; -}(Tile)); -var CopperTile = (function (_super) { - __extends(CopperTile, _super); - function CopperTile(x, y) { - var _this = _super.call(this, x, y, config.tile.plainSprite, 0) || this; - _this.baseTint = config.tile.ore; - _this.tint = _this.baseTint; - _this.setText("Copper", config.text.textCopper); - _this.tileType = "copper"; - return _this; - } - return CopperTile; -}(Tile)); -var World = (function () { - function World(terrain, size) { - this.tiles = []; - this.objects = []; - this.northArrow = new WorldArrow(528, -20, "ui/arrow_north", Direction.NORTH); - mar.isoGroup.add(this.northArrow); - this.eastArrow = new WorldArrow(1115, 587, "ui/arrow_east", Direction.EAST); - mar.isoGroup.add(this.eastArrow); - this.southArrow = new WorldArrow(0, 0, "ui/arrow_south", Direction.SOUTH); - mar.isoGroup.add(this.southArrow); - this.westArrow = new WorldArrow(-70, 587, "ui/arrow_west", Direction.WEST); - mar.isoGroup.add(this.westArrow); - this.setTerrain(terrain, size); - } - World.prototype.setTerrain = function (terrain, size) { - if (DEBUG) { - console.log("[MAR] Creating tilemap of size " + size); - } - for (var x = 0; x < size; x++) { - for (var y = 0; y < size; y++) { - var tile = Tile.createTile(terrain[x * size + y], x, y); - this.tiles.push(tile); - mar.isoGroup.add(tile); - } - } - this.eastArrow.isoX = 72.5 * (size) - 20; - this.eastArrow.isoY = 32 * (size + 2); - this.southArrow.isoX = 32 * (size + 1); - this.southArrow.isoY = 72.5 * (size) + 20; - this.northArrow.isoX = 32 * (size + 1); - this.northArrow.isoY = -20; - this.westArrow.isoX = -70; - this.westArrow.isoY = 32 * (size + 2); - mar.game.world.width = (size + 2) * 128; - mar.game.world.height = (size + 2) * 64; - }; - World.prototype.setBigMessage = function (msg) { - this.bigMessage = mar.game.add.text(908, 450, msg, { - fontSize: 46, - fill: config.text.bigMessageFill, - stroke: config.text.textStroke, - strokeThickness: 2, - font: "fixedsys" - }, mar.textGroup); - }; - World.prototype.removeBigMessage = function () { - if (this.bigMessage != undefined) { - this.bigMessage.destroy(); - if (DEBUG) { - console.log("[MAR] Destroyed big message"); - } - } - }; - World.prototype.getObject = function (id) { - for (var i = 0; i < this.objects.length; i++) { - if (this.objects[i].id === id) { - return this.objects[i]; - } - } - return null; - }; - World.prototype.handleObjectsUpdate = function (objects) { - for (var i = 0; i < this.objects.length; i++) { - this.objects[i].updated = false; - } - for (var i = 0; i < objects.length; i++) { - var existingObject = this.getObject(objects[i].i); - if (existingObject !== null) { - existingObject.updated = true; - existingObject.updateObject(objects[i]); - } - else { - var newObj = GameObject.createObject(objects[i]); - if (newObj != null) { - newObj.updated = true; - this.objects.push(newObj); - mar.isoGroup.add(newObj); - } - else { - if (DEBUG) { - console.log("Couldn't create object with objType " + objects[i].t); - } - } - } - } - for (var i = 0; i < this.objects.length; i++) { - if (!this.objects[i].updated) { - if (mar.client.username !== "guest") { - if (this.objects[i] instanceof Cubot && this.objects[i].username === mar.client.username) { - mar.client.findMyRobot(); - if (DEBUG) { - console.log("[MAR] Following Cubot " + mar.client.username); - } - } - } - this.objects[i].destroy(); - this.objects.splice(i, 1); - } - } - }; - World.prototype.updateTerrain = function (terrain, size) { - for (var i = 0; i < this.objects.length; i++) { - this.objects[i].destroy(); - } - for (var i = 0; i < this.tiles.length; i++) { - this.tiles[i].destroy(); - } - this.objects = []; - this.tiles = []; - this.setTerrain(terrain, size); - mar.game.iso.topologicalSort(mar.isoGroup); - }; - return World; -}()); -var WorldArrow = (function (_super) { - __extends(WorldArrow, _super); - function WorldArrow(x, y, frame, direction) { - var _this = _super.call(this, mar.game, x, y, 10, "sheet", frame) || this; - var self = _this; - _this.hoverText = mar.game.make.text(10, 10, Direction[direction], config.arrowTextStyle); - _this.addChild(_this.hoverText); - _this.hoverText.visible = false; - _this.hoverText.anchor.set(0, 0); - _this.inputEnabled = true; - _this.events.onInputDown.add(function () { - var newX = mar.client.worldX + Util.getDeltaX(direction); - var newY = mar.client.worldY + Util.getDeltaY(direction); - mar.client.worldX = newX % mar.client.maxWidth; - mar.client.worldY = newY % mar.client.maxWidth; - mar.client.requestTerrain(); - }); - _this.events.onInputOver.add(function () { - self.tint = config.arrow.tintHover; - self.hoverText.visible = true; - document.body.style.cursor = "pointer"; - }); - _this.events.onInputOut.add(function () { - self.tint = config.arrow.tint; - self.hoverText.visible = false; - document.body.style.cursor = "default"; - }); - return _this; - } - return WorldArrow; -}(Phaser.Plugin.Isometric.IsoSprite)); -var defaultText = " _______ __ __\n" + - "| _ |.-----.---.-.----.| |--.|__|.----.-----.----.-----.\n" + - "| || _ | _ | __|| || || __| _ | _| _ |\n" + - "|___|___|| __|___._|____||__|__||__||____|_____|__| | __|\n" + - " |__| |__|\n" + - "\n" + - "Version 1.5A, 1985-05-17\n" + - "Initialising Universal Communication Port connection...Done\n" + - "Current date is 2790-04-28\n" + - "Cubot Status: Much Assembly Required"; -var ConsoleMode; -(function (ConsoleMode) { - ConsoleMode[ConsoleMode["CLEAR"] = 0] = "CLEAR"; - ConsoleMode[ConsoleMode["NORMAL"] = 1] = "NORMAL"; -})(ConsoleMode || (ConsoleMode = {})); -var PlainTextConsoleMode = (function () { - function PlainTextConsoleMode(lineWidth, dialImage) { - this.width = lineWidth; - this.dialImage = dialImage; - } - return PlainTextConsoleMode; -}()); -var PlainTextConsole = (function () { - function PlainTextConsole(text, id, colorId, scrollId, resetID) { - this.colorToggled = false; - this.autoScroll = false; - this.modes = []; - this.lastLineLength = 0; - this.txtDiv = document.getElementById(id); - this.colorButton = document.getElementById(colorId); - this.scrollButton = document.getElementById(scrollId); - this.resetButton = document.getElementById(resetID); - var self = this; - this.colorButton.onclick = function () { - self.toggleColor(self); - }; - this.scrollButton.onclick = function () { - self.toggleScrolling(self); - }; - this.resetButton.onclick = function () { - self.reset(self); - }; - this.txtDiv.innerHTML = text; - this.consoleText = text; - this.modes.push(new PlainTextConsoleMode(16, "./images/knob-170.png")); - this.modes.push(new PlainTextConsoleMode(24, "./images/knob-123.png")); - this.modes.push(new PlainTextConsoleMode(40, "./images/knob-90.png")); - this.modes.push(new PlainTextConsoleMode(56, "./images/knob-65.png")); - this.modes.push(new PlainTextConsoleMode(64, "./images/knob-10.png")); - this.mode = 3; - } - PlainTextConsole.prototype.toggleColor = function (self) { - if (self.colorToggled) { - self.colorToggled = false; - self.colorButton.classList.remove("btn-info"); - self.colorButton.classList.add("btn-outline-info"); - self.txtDiv.classList.remove("ctr-selection-inverted"); - self.txtDiv.classList.remove("ctr-text-inverted"); - self.txtDiv.classList.add("ctr-selection"); - self.txtDiv.classList.add("ctr-text"); - } - else { - self.colorToggled = true; - self.colorButton.classList.remove("btn-outline-info"); - self.colorButton.classList.add("btn-info"); - self.txtDiv.classList.add("ctr-selection-inverted"); - self.txtDiv.classList.add("ctr-text-inverted"); - self.txtDiv.classList.remove("ctr-selection"); - self.txtDiv.classList.remove("ctr-text"); - } - }; - PlainTextConsole.prototype.toggleScrolling = function (self) { - if (self.autoScroll) { - self.autoScroll = false; - self.scrollButton.classList.add("btn-outline-info"); - self.scrollButton.classList.remove("btn-info"); - } - else { - self.autoScroll = true; - self.scrollButton.classList.add("btn-info"); - self.scrollButton.classList.remove("btn-outline-info"); - self.txtDiv.scrollTop = self.txtDiv.scrollHeight; - } - }; - PlainTextConsole.prototype.reset = function (self) { - self.txtDiv.innerHTML = ""; - self.consoleText = ""; - self.lastLineLength = 0; - }; - PlainTextConsole.prototype.setMode = function (mode) { - this.mode = mode; - }; - PlainTextConsole.prototype.handleConsoleBufferUpdate = function (consoleBuffer, mode) { - if (mode == ConsoleMode.CLEAR) { - this.reset(this); - } - for (var i = 0; i < consoleBuffer.length; i++) { - var zeroIndex = consoleBuffer[i].indexOf("\0"); - var message = consoleBuffer[i].substring(0, zeroIndex == -1 ? undefined : zeroIndex); - for (var j = 0; j < message.length; j++) { - if (message[j] == "\n") { - this.consoleText += "\n"; - this.lastLineLength = 0; - } - else { - if (this.lastLineLength < this.modes[this.mode].width) { - this.consoleText += message[j]; - this.lastLineLength++; - } - else { - this.consoleText += "\n"; - this.consoleText += message[j]; - this.lastLineLength = 1; - } - } - } - } - this.txtDiv.innerText = this.consoleText; - if (this.autoScroll) { - this.txtDiv.scrollTop = this.txtDiv.scrollHeight; - } - }; - return PlainTextConsole; -}()); diff --git a/Server/src/test/java/net/simon987/server/assembly/CPUTest.java b/Server/src/test/java/net/simon987/server/assembly/CPUTest.java deleted file mode 100644 index 42139f6..0000000 --- a/Server/src/test/java/net/simon987/server/assembly/CPUTest.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.simon987.server.assembly; - -public class CPUTest { - - -} \ No newline at end of file diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/CallInstructionTest.java b/Server/src/test/java/net/simon987/server/assembly/instruction/CallInstructionTest.java deleted file mode 100644 index 18c194a..0000000 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/CallInstructionTest.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.simon987.server.assembly.instruction; - -public class CallInstructionTest { - - - -} \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index ad776f1..0000000 --- a/Vagrantfile +++ /dev/null @@ -1,5 +0,0 @@ -Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/trusty64" - config.vm.provision :shell, path: "bootstrap.sh" - config.vm.network "forwarded_port", guest: 4567, host: 4567 -end \ No newline at end of file diff --git a/bootstrap.sh b/bootstrap.sh deleted file mode 100644 index 16aa4f5..0000000 --- a/bootstrap.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash -# This file is ran during vagrant provision -add-apt-repository ppa:webupd8team/java -apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 -echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.6 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.6.list -apt-get update -echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections -apt-get install -y git maven oracle-java8-installer mongodb-org-server -cd /vagrant/ -mvn clean -mvn install -cd target -java -jar server-1.4a.jar \ No newline at end of file diff --git a/plugin-contruction/pom.xml b/plugin-contruction/pom.xml deleted file mode 100644 index 36a5e46..0000000 --- a/plugin-contruction/pom.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - 4.0.0 - - - net.simon987.server - server_root - 1.4a - - - net.simon987.plugincontruction - plugin-construction - 1.4a - - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - net.simon987.server - server - 1.4a - - - \ No newline at end of file diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java b/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java deleted file mode 100644 index d11666c..0000000 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionPlugin.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.simon987.constructionplugin; - -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.logging.LogManager; -import net.simon987.server.plugin.ServerPlugin; - -public class ConstructionPlugin extends ServerPlugin { - - @Override - public void init(GameServer gameServer) { - - BluePrintUtil.setSecretKey(gameServer.getSecretKey()); - GameRegistry gameRegistry = gameServer.getRegistry(); - - gameRegistry.registerItem(ItemBluePrint.ID, ItemBluePrint.class); - gameRegistry.registerGameObject(Obstacle.class); - gameRegistry.registerGameObject(ConstructionSite.class); - - BluePrintRegistry.INSTANCE.registerBluePrint(ObstacleBlueprint.class); - - LogManager.LOGGER.info("(Construction Plugin) Initialized construction plugin"); - } -} diff --git a/plugin-contruction/src/main/resources/plugin.properties b/plugin-contruction/src/main/resources/plugin.properties deleted file mode 100644 index 49ad00f..0000000 --- a/plugin-contruction/src/main/resources/plugin.properties +++ /dev/null @@ -1,3 +0,0 @@ -classpath=net.simon987.constructionplugin.ConstructionPlugin -name=Construction Plugin -version=1.0 diff --git a/pom.xml b/pom.xml index fad6323..de4f82f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,13 +4,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.simon987.server - server_root - 1.4a - pom + net.simon987.mar + muchassemblyrequired + 1.6a + + org.codehaus.mojo + exec-maven-plugin + 3.0.0 + + + generate-sources + + exec + + + + + tsc + ./src/main/typescript/ + + + org.apache.maven.plugins 3.6.2 @@ -20,36 +37,119 @@ 1.8 + + maven-resources-plugin + 3.0.2 + + + default-resources + prepare-package + + resources + + + ./target/ + + + ./src/main/resources + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ./target/libs + + + + + org.apache.maven.plugins maven-jar-plugin 3.0.2 - ../target/plugins + ./target - false - net.simon987.server.Main + net.simon987.mar.server.Main + true + libs/ + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7.2 + + never + ./src/main/resources + + - - Server - Plugin Plant - Plugin NPC - Plugin Misc HW - Plugin Cubot - Plugin Radioactive Cloud - plugin-contruction - + + + junit + junit + 4.12 + test + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.apache.commons + commons-text + 1.6 + + + org.mongodb + mongodb-driver-sync + 3.9.1 + + + + org.springframework.security + spring-security-core + 5.1.11.RELEASE + + + com.sparkjava + spark-core + 2.8.0 + + + com.sparkjava + spark-template-velocity + 2.7.1 + + + org.slf4j + slf4j-simple + 1.7.25 + + - UTF-8 - - \ No newline at end of file + diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassBlob.java b/src/main/java/net/simon987/mar/biomass/BiomassBlob.java similarity index 90% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassBlob.java rename to src/main/java/net/simon987/mar/biomass/BiomassBlob.java index 59ff076..8a1d8f1 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/BiomassBlob.java +++ b/src/main/java/net/simon987/mar/biomass/BiomassBlob.java @@ -1,8 +1,8 @@ -package net.simon987.biomassplugin; +package net.simon987.mar.biomass; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.InventoryHolder; +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; diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java b/src/main/java/net/simon987/mar/biomass/ItemBiomass.java similarity index 61% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java rename to src/main/java/net/simon987/mar/biomass/ItemBiomass.java index 7a02155..b00a9e4 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/ItemBiomass.java +++ b/src/main/java/net/simon987/mar/biomass/ItemBiomass.java @@ -1,9 +1,8 @@ -package net.simon987.biomassplugin; +package net.simon987.mar.biomass; -import net.simon987.server.GameServer; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.Rechargeable; +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 { @@ -27,9 +26,7 @@ public class ItemBiomass extends Item { @Override public void clear(ControllableUnit unit) { - if (unit instanceof Rechargeable) { - ((Rechargeable) unit).storeEnergy(energy); - } + unit.storeEnergy(energy); } @Override diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/WorldUtils.java b/src/main/java/net/simon987/mar/biomass/WorldUtils.java similarity index 92% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/WorldUtils.java rename to src/main/java/net/simon987/mar/biomass/WorldUtils.java index 61dda4b..19321a4 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/WorldUtils.java +++ b/src/main/java/net/simon987/mar/biomass/WorldUtils.java @@ -1,8 +1,8 @@ -package net.simon987.biomassplugin; +package net.simon987.mar.biomass; -import net.simon987.server.game.world.TileMap; -import net.simon987.server.game.world.TilePlain; -import net.simon987.server.game.world.World; +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.*; diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java b/src/main/java/net/simon987/mar/biomass/event/ObjectDeathListener.java similarity index 77% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java rename to src/main/java/net/simon987/mar/biomass/event/ObjectDeathListener.java index eb7d9b1..ef0c3b8 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/ObjectDeathListener.java +++ b/src/main/java/net/simon987/mar/biomass/event/ObjectDeathListener.java @@ -1,12 +1,12 @@ -package net.simon987.biomassplugin.event; +package net.simon987.mar.biomass.event; -import net.simon987.biomassplugin.BiomassBlob; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.event.ObjectDeathEvent; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; +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; /** @@ -14,7 +14,7 @@ import org.bson.types.ObjectId; */ public class ObjectDeathListener implements GameEventListener { - private int biomassDropCount; + private final int biomassDropCount; public ObjectDeathListener(IServerConfiguration config) { biomassDropCount = config.getInt("harvester_biomass_drop_count"); @@ -28,9 +28,9 @@ public class ObjectDeathListener implements GameEventListener { @Override public void handle(GameEvent event) { - if (event.getSource().getClass().getCanonicalName().equals("net.simon987.npcplugin.HarvesterNPC")) { + if (event.getSource().getClass().getCanonicalName().equals("net.simon987.mar.npcplugin.HarvesterNPC")) { //An HarvesterNPC ObjectDeathEvent is received - GameObject dyingHarvesterNPC = (GameObject)event.getSource(); + GameObject dyingHarvesterNPC = (GameObject) event.getSource(); //Don't spawn biomass on World border if (dyingHarvesterNPC.getX() != 0 && dyingHarvesterNPC.getX() != dyingHarvesterNPC.getWorld().getWorldSize() - 1 && diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldCreationListener.java b/src/main/java/net/simon987/mar/biomass/event/WorldCreationListener.java similarity index 70% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldCreationListener.java rename to src/main/java/net/simon987/mar/biomass/event/WorldCreationListener.java index e48b43f..f6ecced 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldCreationListener.java +++ b/src/main/java/net/simon987/mar/biomass/event/WorldCreationListener.java @@ -1,11 +1,11 @@ -package net.simon987.biomassplugin.event; +package net.simon987.mar.biomass.event; -import net.simon987.biomassplugin.BiomassBlob; -import net.simon987.biomassplugin.WorldUtils; -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.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; diff --git a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldUpdateListener.java b/src/main/java/net/simon987/mar/biomass/event/WorldUpdateListener.java similarity index 81% rename from Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldUpdateListener.java rename to src/main/java/net/simon987/mar/biomass/event/WorldUpdateListener.java index 62b77cb..a46552d 100644 --- a/Plugin Plant/src/main/java/net/simon987/biomassplugin/event/WorldUpdateListener.java +++ b/src/main/java/net/simon987/mar/biomass/event/WorldUpdateListener.java @@ -1,13 +1,13 @@ -package net.simon987.biomassplugin.event; +package net.simon987.mar.biomass.event; -import net.simon987.biomassplugin.BiomassBlob; -import net.simon987.biomassplugin.WorldUtils; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.event.WorldUpdateEvent; -import net.simon987.server.game.world.World; +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; @@ -15,7 +15,7 @@ import java.util.HashMap; public class WorldUpdateListener implements GameEventListener { - private HashMap worldWaitMap = new HashMap<>(200); + private final HashMap worldWaitMap = new HashMap<>(200); private static int minBlobCount; private static int maxBlobCount; @@ -72,4 +72,4 @@ public class WorldUpdateListener implements GameEventListener { } } } -} \ No newline at end of file +} diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java b/src/main/java/net/simon987/mar/construction/BluePrint.java similarity index 89% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java rename to src/main/java/net/simon987/mar/construction/BluePrint.java index b4620f6..1561801 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrint.java +++ b/src/main/java/net/simon987/mar/construction/BluePrint.java @@ -1,10 +1,10 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.InventoryHolder; -import net.simon987.server.io.JSONSerializable; -import net.simon987.server.io.MongoSerializable; +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; diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java b/src/main/java/net/simon987/mar/construction/BluePrintRegistry.java similarity index 89% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java rename to src/main/java/net/simon987/mar/construction/BluePrintRegistry.java index 15e57ba..785bf91 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintRegistry.java +++ b/src/main/java/net/simon987/mar/construction/BluePrintRegistry.java @@ -1,6 +1,6 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.lang.reflect.InvocationTargetException; @@ -11,8 +11,8 @@ public class BluePrintRegistry { public static final BluePrintRegistry INSTANCE = new BluePrintRegistry(); - private Map> blueprints; - private Map digitizedBlueprints; + private final Map> blueprints; + private final Map digitizedBlueprints; private BluePrintRegistry() { blueprints = new HashMap<>(); diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java b/src/main/java/net/simon987/mar/construction/BluePrintUtil.java similarity index 98% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java rename to src/main/java/net/simon987/mar/construction/BluePrintUtil.java index f3052d7..5d82bfc 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/BluePrintUtil.java +++ b/src/main/java/net/simon987/mar/construction/BluePrintUtil.java @@ -1,4 +1,4 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/src/main/java/net/simon987/mar/construction/ConstructionPlugin.java b/src/main/java/net/simon987/mar/construction/ConstructionPlugin.java new file mode 100644 index 0000000..6e9a2ca --- /dev/null +++ b/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); + } +} diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java b/src/main/java/net/simon987/mar/construction/ConstructionSite.java similarity index 83% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java rename to src/main/java/net/simon987/mar/construction/ConstructionSite.java index 84dc8bb..4346d0b 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ConstructionSite.java +++ b/src/main/java/net/simon987/mar/construction/ConstructionSite.java @@ -1,10 +1,10 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.GameServer; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.InventoryHolder; -import net.simon987.server.game.objects.Structure; -import net.simon987.server.game.objects.Updatable; +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; @@ -14,7 +14,7 @@ public class ConstructionSite extends Structure implements Updatable, InventoryH public static final int LIFETIME = GameServer.INSTANCE.getConfig().getInt("construction_site_ttl"); private int age; - private BluePrint bluePrint; + private final BluePrint bluePrint; public ConstructionSite(BluePrint bluePrint) { super(1, 1); diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ItemBluePrint.java b/src/main/java/net/simon987/mar/construction/ItemBluePrint.java similarity index 90% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/ItemBluePrint.java rename to src/main/java/net/simon987/mar/construction/ItemBluePrint.java index bcbfd5c..756df25 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ItemBluePrint.java +++ b/src/main/java/net/simon987/mar/construction/ItemBluePrint.java @@ -1,7 +1,7 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.assembly.Memory; -import net.simon987.server.game.item.Item; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.game.item.Item; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/Obstacle.java b/src/main/java/net/simon987/mar/construction/Obstacle.java similarity index 88% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/Obstacle.java rename to src/main/java/net/simon987/mar/construction/Obstacle.java index 9c4d765..07f7e0e 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/Obstacle.java +++ b/src/main/java/net/simon987/mar/construction/Obstacle.java @@ -1,9 +1,9 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.Attackable; -import net.simon987.server.game.objects.Structure; -import net.simon987.server.game.objects.Updatable; +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; diff --git a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ObstacleBlueprint.java b/src/main/java/net/simon987/mar/construction/ObstacleBlueprint.java similarity index 82% rename from plugin-contruction/src/main/java/net/simon987/constructionplugin/ObstacleBlueprint.java rename to src/main/java/net/simon987/mar/construction/ObstacleBlueprint.java index d1967c0..d6777bc 100644 --- a/plugin-contruction/src/main/java/net/simon987/constructionplugin/ObstacleBlueprint.java +++ b/src/main/java/net/simon987/mar/construction/ObstacleBlueprint.java @@ -1,6 +1,6 @@ -package net.simon987.constructionplugin; +package net.simon987.mar.construction; -import net.simon987.server.game.item.ItemIron; +import net.simon987.mar.server.game.item.ItemIron; import org.bson.Document; public class ObstacleBlueprint extends BluePrint { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java b/src/main/java/net/simon987/mar/cubot/Cubot.java similarity index 93% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java rename to src/main/java/net/simon987/mar/cubot/Cubot.java index 97710bc..7ddad9f 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/Cubot.java +++ b/src/main/java/net/simon987/mar/cubot/Cubot.java @@ -1,19 +1,19 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.cubotplugin.event.CubotWalkEvent; -import net.simon987.cubotplugin.event.DeathEvent; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.assembly.CPU; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Memory; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.exception.CancelledException; -import net.simon987.server.event.GameEvent; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.item.ItemVoid; -import net.simon987.server.game.objects.*; -import net.simon987.server.user.User; +import net.simon987.mar.cubot.event.CubotWalkEvent; +import net.simon987.mar.cubot.event.DeathEvent; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.item.ItemVoid; +import net.simon987.mar.server.game.objects.*; +import net.simon987.mar.server.user.User; import org.bson.Document; import org.json.simple.JSONObject; @@ -74,7 +74,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me /** * Buffer of console messages (also called 'internal buffer') that was set during the current tick */ - private ArrayList consoleMessagesBuffer = new ArrayList<>(CONSOLE_BUFFER_MAX_SIZE); + private final ArrayList consoleMessagesBuffer = new ArrayList<>(CONSOLE_BUFFER_MAX_SIZE); /** * Buffer of console messages (also called 'internal buffer') at the end of the last tick */ @@ -101,8 +101,8 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me /** * List of attached hardware, 'modules' */ - private Map hardwareAddresses = new HashMap<>(); - private Map, Integer> hardwareModules = new HashMap<>(); + private final Map hardwareAddresses = new HashMap<>(); + private final Map, Integer> hardwareModules = new HashMap<>(); /** * Cubot's brain box @@ -395,7 +395,7 @@ public class Cubot extends GameObject implements Updatable, ControllableUnit, Me /** * Damages shield by amount. - * + * * Return damage that broke through the shield. */ public int damageShield(int amount) { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotBattery.java b/src/main/java/net/simon987/mar/cubot/CubotBattery.java similarity index 91% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotBattery.java rename to src/main/java/net/simon987/mar/cubot/CubotBattery.java index 4c8b80a..d837095 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotBattery.java +++ b/src/main/java/net/simon987/mar/cubot/CubotBattery.java @@ -1,9 +1,9 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotComPort.java b/src/main/java/net/simon987/mar/cubot/CubotComPort.java similarity index 93% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotComPort.java rename to src/main/java/net/simon987/mar/cubot/CubotComPort.java index 65efed4..6a04e6e 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotComPort.java +++ b/src/main/java/net/simon987/mar/cubot/CubotComPort.java @@ -1,10 +1,10 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.MessageReceiver; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.MessageReceiver; import org.bson.Document; import java.awt.*; @@ -39,7 +39,7 @@ public class CubotComPort extends HardwareModule { if (a == COMPORT_BUFFER_CLEAR) { unit.getConsoleMessagesBuffer().clear(); - + } else if (a == COMPORT_CONSOLE_CLEAR) { if (unit instanceof Cubot) { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotCore.java b/src/main/java/net/simon987/mar/cubot/CubotCore.java similarity index 84% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotCore.java rename to src/main/java/net/simon987/mar/cubot/CubotCore.java index 6a8996a..28732a6 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotCore.java +++ b/src/main/java/net/simon987/mar/cubot/CubotCore.java @@ -1,8 +1,8 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; public class CubotCore extends HardwareModule { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java b/src/main/java/net/simon987/mar/cubot/CubotDrill.java similarity index 79% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java rename to src/main/java/net/simon987/mar/cubot/CubotDrill.java index 88dc0b9..615c979 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java +++ b/src/main/java/net/simon987/mar/cubot/CubotDrill.java @@ -1,11 +1,11 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.Action; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.world.Tile; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.Action; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.world.Tile; import org.bson.Document; public class CubotDrill extends HardwareModule { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotFloppyDrive.java b/src/main/java/net/simon987/mar/cubot/CubotFloppyDrive.java similarity index 93% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotFloppyDrive.java rename to src/main/java/net/simon987/mar/cubot/CubotFloppyDrive.java index e042828..30215dc 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotFloppyDrive.java +++ b/src/main/java/net/simon987/mar/cubot/CubotFloppyDrive.java @@ -1,7 +1,7 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; public class CubotFloppyDrive extends CubotHardwareModule { @@ -17,7 +17,7 @@ public class CubotFloppyDrive extends CubotHardwareModule { private static final int FLOPPY_READ_SECTOR = 2; private static final int FLOPPY_WRITE_SECTOR = 3; - private FloppyDisk floppyDisk; + private final FloppyDisk floppyDisk; public CubotFloppyDrive(Cubot cubot) { super(cubot); diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHardwareModule.java b/src/main/java/net/simon987/mar/cubot/CubotHardwareModule.java similarity index 68% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHardwareModule.java rename to src/main/java/net/simon987/mar/cubot/CubotHardwareModule.java index 0df894b..23644ea 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHardwareModule.java +++ b/src/main/java/net/simon987/mar/cubot/CubotHardwareModule.java @@ -1,7 +1,7 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; public abstract class CubotHardwareModule extends HardwareModule { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHologram.java b/src/main/java/net/simon987/mar/cubot/CubotHologram.java similarity index 95% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHologram.java rename to src/main/java/net/simon987/mar/cubot/CubotHologram.java index f19e88c..42bfaa3 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotHologram.java +++ b/src/main/java/net/simon987/mar/cubot/CubotHologram.java @@ -1,8 +1,8 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java b/src/main/java/net/simon987/mar/cubot/CubotInventory.java similarity index 91% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java rename to src/main/java/net/simon987/mar/cubot/CubotInventory.java index 0a344a4..d143118 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotInventory.java +++ b/src/main/java/net/simon987/mar/cubot/CubotInventory.java @@ -1,10 +1,10 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import java.util.HashMap; @@ -25,7 +25,7 @@ public class CubotInventory extends HardwareModule { private static final int INV_SCAN = 3; private int inventorySize = 4; //TODO: load from config - private Map inventory; + private final Map inventory; private int position = 0; diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotKeyboard.java b/src/main/java/net/simon987/mar/cubot/CubotKeyboard.java similarity index 89% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotKeyboard.java rename to src/main/java/net/simon987/mar/cubot/CubotKeyboard.java index b1ff947..2ca0914 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotKeyboard.java +++ b/src/main/java/net/simon987/mar/cubot/CubotKeyboard.java @@ -1,7 +1,7 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; public class CubotKeyboard extends CubotHardwareModule { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java b/src/main/java/net/simon987/mar/cubot/CubotLaser.java similarity index 92% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java rename to src/main/java/net/simon987/mar/cubot/CubotLaser.java index 040c3ad..5fa9d26 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLaser.java +++ b/src/main/java/net/simon987/mar/cubot/CubotLaser.java @@ -1,9 +1,9 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.*; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.*; import org.bson.Document; import java.awt.*; diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLeg.java b/src/main/java/net/simon987/mar/cubot/CubotLeg.java similarity index 85% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLeg.java rename to src/main/java/net/simon987/mar/cubot/CubotLeg.java index f91c329..0ec25be 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLeg.java +++ b/src/main/java/net/simon987/mar/cubot/CubotLeg.java @@ -1,10 +1,10 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.Action; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.Direction; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.Action; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.Direction; import org.bson.Document; public class CubotLeg extends HardwareModule { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java b/src/main/java/net/simon987/mar/cubot/CubotLidar.java similarity index 92% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java rename to src/main/java/net/simon987/mar/cubot/CubotLidar.java index 0386f37..ee7fa6f 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotLidar.java +++ b/src/main/java/net/simon987/mar/cubot/CubotLidar.java @@ -1,11 +1,11 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Memory; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.pathfinding.Node; -import net.simon987.server.game.pathfinding.Pathfinder; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.pathfinding.Node; +import net.simon987.mar.server.game.pathfinding.Pathfinder; import org.bson.Document; import java.util.ArrayList; @@ -125,7 +125,7 @@ public class CubotLidar extends HardwareModule { getCpu().getRegisterSet().getRegister("X").setValue(unit.getWorld().getX()); getCpu().getRegisterSet().getRegister("Y").setValue(unit.getWorld().getY()); break; - + default: break; diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotShield.java b/src/main/java/net/simon987/mar/cubot/CubotShield.java similarity index 85% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotShield.java rename to src/main/java/net/simon987/mar/cubot/CubotShield.java index 8353256..bf1fc83 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotShield.java +++ b/src/main/java/net/simon987/mar/cubot/CubotShield.java @@ -1,8 +1,8 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; public class CubotShield extends CubotHardwareModule { @@ -41,4 +41,4 @@ public class CubotShield extends CubotHardwareModule { getCpu().getRegisterSet().getRegister("B").setValue(shield); } } -} \ No newline at end of file +} diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotStatus.java b/src/main/java/net/simon987/mar/cubot/CubotStatus.java similarity index 87% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotStatus.java rename to src/main/java/net/simon987/mar/cubot/CubotStatus.java index 1fd0318..6f79391 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotStatus.java +++ b/src/main/java/net/simon987/mar/cubot/CubotStatus.java @@ -1,4 +1,4 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; /** * Status of a Cubot (Special buff or debuff) diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/FloppyDisk.java b/src/main/java/net/simon987/mar/cubot/FloppyDisk.java similarity index 94% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/FloppyDisk.java rename to src/main/java/net/simon987/mar/cubot/FloppyDisk.java index 33a065d..71144e5 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/FloppyDisk.java +++ b/src/main/java/net/simon987/mar/cubot/FloppyDisk.java @@ -1,8 +1,8 @@ -package net.simon987.cubotplugin; +package net.simon987.mar.cubot; -import net.simon987.server.assembly.Memory; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; /** @@ -15,7 +15,7 @@ public class FloppyDisk implements MongoSerializable { /** * Contents of the disk */ - private Memory memory; + private final Memory memory; /** * Current location of the read/write head. diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/ChargeShieldCommandListener.java b/src/main/java/net/simon987/mar/cubot/event/ChargeShieldCommandListener.java similarity index 78% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/ChargeShieldCommandListener.java rename to src/main/java/net/simon987/mar/cubot/event/ChargeShieldCommandListener.java index 5645871..ef047aa 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/ChargeShieldCommandListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/ChargeShieldCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.event; -import net.simon987.cubotplugin.Cubot; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.cubot.Cubot; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; /** * Debug command to add shield points to a Cubot diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CpuInitialisationListener.java b/src/main/java/net/simon987/mar/cubot/event/CpuInitialisationListener.java similarity index 89% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CpuInitialisationListener.java rename to src/main/java/net/simon987/mar/cubot/event/CpuInitialisationListener.java index 2e8d715..d716134 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CpuInitialisationListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/CpuInitialisationListener.java @@ -1,10 +1,10 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.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.mar.cubot.*; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.event.CpuInitialisationEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; public class CpuInitialisationListener implements GameEventListener { @Override diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CubotWalkEvent.java b/src/main/java/net/simon987/mar/cubot/event/CubotWalkEvent.java similarity index 61% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CubotWalkEvent.java rename to src/main/java/net/simon987/mar/cubot/event/CubotWalkEvent.java index e183f1c..595bd83 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/CubotWalkEvent.java +++ b/src/main/java/net/simon987/mar/cubot/event/CubotWalkEvent.java @@ -1,17 +1,17 @@ -package net.simon987.cubotplugin.event; - -import net.simon987.cubotplugin.Cubot; -import net.simon987.server.event.GameEvent; - -public class CubotWalkEvent extends GameEvent { - - public CubotWalkEvent(Cubot cubot) { - setSource(cubot); - } - - @Override - public Cubot getSource() { - return (Cubot) super.getSource(); - } - -} \ No newline at end of file +package net.simon987.mar.cubot.event; + +import net.simon987.mar.cubot.Cubot; +import net.simon987.mar.server.event.GameEvent; + +public class CubotWalkEvent extends GameEvent { + + public CubotWalkEvent(Cubot cubot) { + setSource(cubot); + } + + @Override + public Cubot getSource() { + return (Cubot) super.getSource(); + } + +} diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathEvent.java b/src/main/java/net/simon987/mar/cubot/event/DeathEvent.java similarity index 59% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathEvent.java rename to src/main/java/net/simon987/mar/cubot/event/DeathEvent.java index 9d25837..0ba1bb3 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathEvent.java +++ b/src/main/java/net/simon987/mar/cubot/event/DeathEvent.java @@ -1,16 +1,16 @@ -package net.simon987.cubotplugin.event; - -import net.simon987.server.event.GameEvent; -import net.simon987.server.game.objects.GameObject; - -public class DeathEvent extends GameEvent { - - public DeathEvent(GameObject object) { - setSource(object); - } - - @Override - public GameObject getSource() { - return (GameObject) super.getSource(); - } -} \ No newline at end of file +package net.simon987.mar.cubot.event; + +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.game.objects.GameObject; + +public class DeathEvent extends GameEvent { + + public DeathEvent(GameObject object) { + setSource(object); + } + + @Override + public GameObject getSource() { + return (GameObject) super.getSource(); + } +} diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathListener.java b/src/main/java/net/simon987/mar/cubot/event/DeathListener.java similarity index 63% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathListener.java rename to src/main/java/net/simon987/mar/cubot/event/DeathListener.java index cf438c9..0e997a8 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/DeathListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/DeathListener.java @@ -1,23 +1,23 @@ -package net.simon987.cubotplugin.event; - -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.GameObject; - -public class DeathListener implements GameEventListener { - - @Override - public Class getListenedEventType() { - return DeathEvent.class; - } - - @Override - public void handle(GameEvent event) { - DeathEvent DeathEvent = (DeathEvent) event; - GameObject object = DeathEvent.getSource(); - if (object instanceof ControllableUnit) { - ((ControllableUnit) object).getParent().getStats().incrementStat("death", 1); - } - } -} \ No newline at end of file +package net.simon987.mar.cubot.event; + +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.GameObject; + +public class DeathListener implements GameEventListener { + + @Override + public Class getListenedEventType() { + return DeathEvent.class; + } + + @Override + public void handle(GameEvent event) { + DeathEvent DeathEvent = (DeathEvent) event; + GameObject object = DeathEvent.getSource(); + if (object instanceof ControllableUnit) { + ((ControllableUnit) object).getParent().getStats().incrementStat("death", 1); + } + } +} diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PopItemCommandListener.java b/src/main/java/net/simon987/mar/cubot/event/PopItemCommandListener.java similarity index 71% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PopItemCommandListener.java rename to src/main/java/net/simon987/mar/cubot/event/PopItemCommandListener.java index 8e1f088..04c9b54 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PopItemCommandListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/PopItemCommandListener.java @@ -1,12 +1,12 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.event; -import net.simon987.cubotplugin.Cubot; -import net.simon987.cubotplugin.CubotInventory; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.cubot.Cubot; +import net.simon987.mar.cubot.CubotInventory; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; public class PopItemCommandListener implements GameEventListener { @@ -40,4 +40,4 @@ public class PopItemCommandListener implements GameEventListener { } } } -} \ No newline at end of file +} diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PutItemCommandListener.java b/src/main/java/net/simon987/mar/cubot/event/PutItemCommandListener.java similarity index 75% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PutItemCommandListener.java rename to src/main/java/net/simon987/mar/cubot/event/PutItemCommandListener.java index 9a4a2bb..d296147 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/PutItemCommandListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/PutItemCommandListener.java @@ -1,13 +1,13 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.event; -import net.simon987.cubotplugin.Cubot; -import net.simon987.cubotplugin.CubotInventory; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.cubot.Cubot; +import net.simon987.mar.cubot.CubotInventory; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.GameObject; import org.bson.Document; public class PutItemCommandListener implements GameEventListener { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/SetInventoryPosition.java b/src/main/java/net/simon987/mar/cubot/event/SetInventoryPosition.java similarity index 73% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/SetInventoryPosition.java rename to src/main/java/net/simon987/mar/cubot/event/SetInventoryPosition.java index 1f9c90b..4c43949 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/SetInventoryPosition.java +++ b/src/main/java/net/simon987/mar/cubot/event/SetInventoryPosition.java @@ -1,12 +1,12 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.event; -import net.simon987.cubotplugin.Cubot; -import net.simon987.cubotplugin.CubotInventory; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.cubot.Cubot; +import net.simon987.mar.cubot.CubotInventory; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; public class SetInventoryPosition implements GameEventListener { diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/UserCreationListener.java b/src/main/java/net/simon987/mar/cubot/event/UserCreationListener.java similarity index 75% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/UserCreationListener.java rename to src/main/java/net/simon987/mar/cubot/event/UserCreationListener.java index 7a0e359..ad74e6d 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/UserCreationListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/UserCreationListener.java @@ -1,18 +1,18 @@ -package net.simon987.cubotplugin.event; +package net.simon987.mar.cubot.event; -import net.simon987.cubotplugin.Cubot; -import net.simon987.cubotplugin.CubotStatus; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -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.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 net.simon987.mar.cubot.Cubot; +import net.simon987.mar.cubot.CubotStatus; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.Assembler; +import net.simon987.mar.server.assembly.AssemblyResult; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.event.UserCreationEvent; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.User; import org.bson.types.ObjectId; import java.awt.*; @@ -78,6 +78,6 @@ public class UserCreationListener implements GameEventListener { cubot.setMaxHp(config.getInt("cubot_max_hp")); cubot.setMaxShield(config.getInt("cubot_max_shield")); - LogManager.LOGGER.fine("(Plugin) Handled User creation event (Cubot Plugin)"); + LogManager.LOGGER.fine("Handled User creation event"); } } diff --git a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkListener.java b/src/main/java/net/simon987/mar/cubot/event/WalkListener.java similarity index 70% rename from Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkListener.java rename to src/main/java/net/simon987/mar/cubot/event/WalkListener.java index fd2e96e..11f09d0 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/event/WalkListener.java +++ b/src/main/java/net/simon987/mar/cubot/event/WalkListener.java @@ -1,18 +1,18 @@ -package net.simon987.cubotplugin.event; - -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; - -public class WalkListener implements GameEventListener { - - @Override - public Class getListenedEventType() { - return CubotWalkEvent.class; - } - - @Override - public void handle(GameEvent event) { - CubotWalkEvent walkEvent = (CubotWalkEvent) event; - walkEvent.getSource().getParent().getStats().incrementStat("walkDistance", 1); - } -} \ No newline at end of file +package net.simon987.mar.cubot.event; + +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; + +public class WalkListener implements GameEventListener { + + @Override + public Class getListenedEventType() { + return CubotWalkEvent.class; + } + + @Override + public void handle(GameEvent event) { + CubotWalkEvent walkEvent = (CubotWalkEvent) event; + walkEvent.getSource().getParent().getStats().incrementStat("walkDistance", 1); + } +} diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/Clock.java b/src/main/java/net/simon987/mar/mischwplugin/Clock.java similarity index 77% rename from Plugin Misc HW/src/main/java/net/simon987/mischwplugin/Clock.java rename to src/main/java/net/simon987/mar/mischwplugin/Clock.java index 43f59b5..e80b23b 100644 --- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/Clock.java +++ b/src/main/java/net/simon987/mar/mischwplugin/Clock.java @@ -1,10 +1,10 @@ -package net.simon987.mischwplugin; +package net.simon987.mar.mischwplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; /** diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/RandomNumberGenerator.java b/src/main/java/net/simon987/mar/mischwplugin/RandomNumberGenerator.java similarity index 79% rename from Plugin Misc HW/src/main/java/net/simon987/mischwplugin/RandomNumberGenerator.java rename to src/main/java/net/simon987/mar/mischwplugin/RandomNumberGenerator.java index df4f2f0..96555bc 100644 --- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/RandomNumberGenerator.java +++ b/src/main/java/net/simon987/mar/mischwplugin/RandomNumberGenerator.java @@ -1,8 +1,8 @@ -package net.simon987.mischwplugin; +package net.simon987.mar.mischwplugin; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import java.util.Random; @@ -16,7 +16,7 @@ public class RandomNumberGenerator extends HardwareModule { public static final char DEFAULT_ADDRESS = 0x0007; - private Random random; + private final Random random; public RandomNumberGenerator() { random = new Random(); diff --git a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java b/src/main/java/net/simon987/mar/mischwplugin/event/CpuInitialisationListener.java similarity index 56% rename from Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java rename to src/main/java/net/simon987/mar/mischwplugin/event/CpuInitialisationListener.java index 3675b3f..55569b3 100644 --- a/Plugin Misc HW/src/main/java/net/simon987/mischwplugin/event/CpuInitialisationListener.java +++ b/src/main/java/net/simon987/mar/mischwplugin/event/CpuInitialisationListener.java @@ -1,12 +1,12 @@ -package net.simon987.mischwplugin.event; +package net.simon987.mar.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; -import net.simon987.server.game.objects.HardwareHost; +import net.simon987.mar.mischwplugin.Clock; +import net.simon987.mar.mischwplugin.RandomNumberGenerator; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.event.CpuInitialisationEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.HardwareHost; public class CpuInitialisationListener implements GameEventListener { @@ -19,7 +19,7 @@ public class CpuInitialisationListener implements GameEventListener { public void handle(GameEvent event) { CPU cpu = (CPU) event.getSource(); - HardwareHost cubot = (HardwareHost) ((CpuInitialisationEvent) event).getUnit(); + HardwareHost cubot = ((CpuInitialisationEvent) event).getUnit(); cpu.setHardwareHost(cubot); RandomNumberGenerator rngHW = new RandomNumberGenerator(); @@ -30,4 +30,4 @@ public class CpuInitialisationListener implements GameEventListener { cpu.getHardwareHost().attachHardware(rngHW, RandomNumberGenerator.DEFAULT_ADDRESS); cpu.getHardwareHost().attachHardware(clock, Clock.DEFAULT_ADDRESS); } -} \ No newline at end of file +} diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/ElectricBox.java b/src/main/java/net/simon987/mar/npcplugin/ElectricBox.java similarity index 88% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/ElectricBox.java rename to src/main/java/net/simon987/mar/npcplugin/ElectricBox.java index 5c0dffb..5af5f87 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/ElectricBox.java +++ b/src/main/java/net/simon987/mar/npcplugin/ElectricBox.java @@ -1,11 +1,11 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.objects.Attackable; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Rechargeable; -import net.simon987.server.game.objects.Updatable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.objects.Attackable; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Rechargeable; +import net.simon987.mar.server.game.objects.Updatable; import org.bson.Document; import org.json.simple.JSONObject; @@ -37,7 +37,7 @@ public class ElectricBox extends GameObject implements Updatable, Attackable { /** * List of nearby objects. Is updated every tick */ - private ArrayList nearObjects = new ArrayList<>(); + private final ArrayList nearObjects = new ArrayList<>(); public ElectricBox() { hp = maxHp; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/ExecuteCpuTask.java b/src/main/java/net/simon987/mar/npcplugin/ExecuteCpuTask.java similarity index 87% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/ExecuteCpuTask.java rename to src/main/java/net/simon987/mar/npcplugin/ExecuteCpuTask.java index 3cde56d..a680c15 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/ExecuteCpuTask.java +++ b/src/main/java/net/simon987/mar/npcplugin/ExecuteCpuTask.java @@ -1,7 +1,7 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.Action; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.Action; public class ExecuteCpuTask extends NPCTask { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java b/src/main/java/net/simon987/mar/npcplugin/Factory.java similarity index 93% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java rename to src/main/java/net/simon987/mar/npcplugin/Factory.java index b1ae4cb..6d85093 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/Factory.java +++ b/src/main/java/net/simon987/mar/npcplugin/Factory.java @@ -1,9 +1,9 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.MessageReceiver; -import net.simon987.server.game.objects.Structure; -import net.simon987.server.game.objects.Updatable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.MessageReceiver; +import net.simon987.mar.server.game.objects.Structure; +import net.simon987.mar.server.game.objects.Updatable; import org.bson.Document; import org.bson.types.ObjectId; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java b/src/main/java/net/simon987/mar/npcplugin/HackedNPC.java similarity index 91% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java rename to src/main/java/net/simon987/mar/npcplugin/HackedNPC.java index cf93d9d..befd122 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HackedNPC.java +++ b/src/main/java/net/simon987/mar/npcplugin/HackedNPC.java @@ -1,15 +1,15 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.*; -import net.simon987.server.event.ObjectDeathEvent; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.item.ItemVoid; -import net.simon987.server.game.objects.Action; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.Direction; -import net.simon987.server.logging.LogManager; -import net.simon987.server.user.User; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.*; +import net.simon987.mar.server.event.ObjectDeathEvent; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.item.ItemVoid; +import net.simon987.mar.server.game.objects.Action; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.Direction; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.User; import org.bson.Document; import org.json.simple.JSONObject; @@ -23,16 +23,16 @@ public class HackedNPC extends NonPlayerCharacter implements ControllableUnit { private static final int MEM_SIZE = GameServer.INSTANCE.getConfig().getInt("hacked_npc_mem_size"); private static final boolean DIE_ON_NO_ENERGY = GameServer.INSTANCE.getConfig().getInt("hacked_npc_die_on_no_energy") != 0; - private CPU cpu; + private final CPU cpu; /** * List of attached hardware, 'modules' */ - private Map hardwareAddresses = new HashMap<>(); - private Map, Integer> hardwareModules = new HashMap<>(); + private final Map hardwareAddresses = new HashMap<>(); + private final Map, Integer> hardwareModules = new HashMap<>(); private Action currentAction = Action.IDLE; private Action lastAction = Action.IDLE; - private ArrayList consoleMessagesBuffer = new ArrayList<>(30); //todo load from conf + private final List consoleMessagesBuffer = new ArrayList<>(30); //todo load from conf private ArrayList lastConsoleMessagesBuffer = new ArrayList<>(30); HackedNPC(char[] program) { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvestTask.java b/src/main/java/net/simon987/mar/npcplugin/HarvestTask.java similarity index 86% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/HarvestTask.java rename to src/main/java/net/simon987/mar/npcplugin/HarvestTask.java index 2029168..770f886 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvestTask.java +++ b/src/main/java/net/simon987/mar/npcplugin/HarvestTask.java @@ -1,11 +1,11 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.objects.Direction; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.InventoryHolder; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.objects.Direction; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.InventoryHolder; +import net.simon987.mar.server.logging.LogManager; import java.util.ArrayList; import java.util.Random; @@ -15,7 +15,7 @@ import java.util.Random; */ public class HarvestTask extends NPCTask { - private Random random; + private final Random random; /** * Number of ticks to wait before continuing @@ -45,7 +45,7 @@ public class HarvestTask extends NPCTask { if (pause == 0) { //Get biomass - ArrayList biomass = npc.getWorld().findGameObjects("net.simon987.biomassplugin.BiomassBlob"); + ArrayList biomass = npc.getWorld().findGameObjects("net.simon987.mar.biomassplugin.BiomassBlob"); //Get closest one int minDist = Integer.MAX_VALUE; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java b/src/main/java/net/simon987/mar/npcplugin/HarvesterNPC.java similarity index 92% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java rename to src/main/java/net/simon987/mar/npcplugin/HarvesterNPC.java index b78673e..6f88c90 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/HarvesterNPC.java +++ b/src/main/java/net/simon987/mar/npcplugin/HarvesterNPC.java @@ -1,8 +1,8 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.event.ObjectDeathEvent; -import net.simon987.server.game.objects.Direction; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.ObjectDeathEvent; +import net.simon987.mar.server.game.objects.Direction; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NPCTask.java b/src/main/java/net/simon987/mar/npcplugin/NPCTask.java similarity index 79% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/NPCTask.java rename to src/main/java/net/simon987/mar/npcplugin/NPCTask.java index 9e6b2b7..c542e49 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NPCTask.java +++ b/src/main/java/net/simon987/mar/npcplugin/NPCTask.java @@ -1,4 +1,4 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; public abstract class NPCTask { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NonPlayerCharacter.java b/src/main/java/net/simon987/mar/npcplugin/NonPlayerCharacter.java similarity index 94% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/NonPlayerCharacter.java rename to src/main/java/net/simon987/mar/npcplugin/NonPlayerCharacter.java index ddabc73..076d856 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NonPlayerCharacter.java +++ b/src/main/java/net/simon987/mar/npcplugin/NonPlayerCharacter.java @@ -1,11 +1,11 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.objects.*; -import net.simon987.server.game.pathfinding.Node; -import net.simon987.server.game.pathfinding.Pathfinder; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.objects.*; +import net.simon987.mar.server.game.pathfinding.Node; +import net.simon987.mar.server.game.pathfinding.Pathfinder; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.util.ArrayList; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcBattery.java b/src/main/java/net/simon987/mar/npcplugin/NpcBattery.java similarity index 90% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/NpcBattery.java rename to src/main/java/net/simon987/mar/npcplugin/NpcBattery.java index d5eb401..e77acf7 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcBattery.java +++ b/src/main/java/net/simon987/mar/npcplugin/NpcBattery.java @@ -1,9 +1,9 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcInventory.java b/src/main/java/net/simon987/mar/npcplugin/NpcInventory.java similarity index 88% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/NpcInventory.java rename to src/main/java/net/simon987/mar/npcplugin/NpcInventory.java index 43477eb..de7cedd 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcInventory.java +++ b/src/main/java/net/simon987/mar/npcplugin/NpcInventory.java @@ -1,10 +1,10 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; @@ -106,4 +106,4 @@ public class NpcInventory extends HardwareModule { public String toString() { return String.format("{NpcInventory [%s]}", item); } -} \ No newline at end of file +} diff --git a/src/main/java/net/simon987/mar/npcplugin/NpcPlugin.java b/src/main/java/net/simon987/mar/npcplugin/NpcPlugin.java new file mode 100644 index 0000000..0d0ef07 --- /dev/null +++ b/src/main/java/net/simon987/mar/npcplugin/NpcPlugin.java @@ -0,0 +1,27 @@ +package net.simon987.mar.npcplugin; + +import net.simon987.mar.server.GameServer; +import org.bson.Document; + +import java.io.InputStream; +import java.util.Map; +import java.util.Scanner; +import java.util.concurrent.ConcurrentHashMap; + +public class NpcPlugin { + + public static Map settlementMap; + + public static Document DEFAULT_HACKED_NPC; + + public void init(GameServer gameServer) { + // TODO: save this in GameUniverse.store + settlementMap = new ConcurrentHashMap<>(); + + // TODO: load from file relpath + InputStream is = getClass().getClassLoader().getResourceAsStream("defaultHackedCubotHardware.json"); + Scanner scanner = new Scanner(is).useDelimiter("\\A"); + String json = scanner.next(); + DEFAULT_HACKED_NPC = Document.parse(json); + } +} diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/Obstacle.java b/src/main/java/net/simon987/mar/npcplugin/Obstacle.java similarity index 92% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/Obstacle.java rename to src/main/java/net/simon987/mar/npcplugin/Obstacle.java index 322f29e..9f48758 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/Obstacle.java +++ b/src/main/java/net/simon987/mar/npcplugin/Obstacle.java @@ -1,7 +1,7 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.game.objects.Attackable; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Attackable; +import net.simon987.mar.server.game.objects.GameObject; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/Portal.java b/src/main/java/net/simon987/mar/npcplugin/Portal.java similarity index 84% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/Portal.java rename to src/main/java/net/simon987/mar/npcplugin/Portal.java index 331b5c2..d2947c7 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/Portal.java +++ b/src/main/java/net/simon987/mar/npcplugin/Portal.java @@ -1,12 +1,12 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.Enterable; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Structure; -import net.simon987.server.game.objects.Updatable; -import net.simon987.server.game.world.Location; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.Enterable; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Structure; +import net.simon987.mar.server.game.objects.Updatable; +import net.simon987.mar.server.game.world.Location; +import net.simon987.mar.server.game.world.World; import org.bson.Document; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/RadioReceiverHardware.java b/src/main/java/net/simon987/mar/npcplugin/RadioReceiverHardware.java similarity index 86% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/RadioReceiverHardware.java rename to src/main/java/net/simon987/mar/npcplugin/RadioReceiverHardware.java index 415d248..4a0d46b 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/RadioReceiverHardware.java +++ b/src/main/java/net/simon987/mar/npcplugin/RadioReceiverHardware.java @@ -1,10 +1,10 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.objects.Action; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.objects.Action; +import net.simon987.mar.server.game.objects.ControllableUnit; import org.bson.Document; import java.util.ArrayList; @@ -18,7 +18,7 @@ public class RadioReceiverHardware extends HardwareModule { public static final int DEFAULT_ADDRESS = 0xC; - private ControllableUnit cubot; + private final ControllableUnit cubot; public RadioReceiverHardware(ControllableUnit cubot) { this.cubot = cubot; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/RadioTower.java b/src/main/java/net/simon987/mar/npcplugin/RadioTower.java similarity index 83% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/RadioTower.java rename to src/main/java/net/simon987/mar/npcplugin/RadioTower.java index 0a66b7a..846f74d 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/RadioTower.java +++ b/src/main/java/net/simon987/mar/npcplugin/RadioTower.java @@ -1,9 +1,9 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.MessageReceiver; -import net.simon987.server.game.objects.Structure; -import net.simon987.server.game.objects.Updatable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.MessageReceiver; +import net.simon987.mar.server.game.objects.Structure; +import net.simon987.mar.server.game.objects.Updatable; import org.bson.Document; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -34,7 +34,7 @@ public class RadioTower extends Structure implements MessageReceiver, Updatable /** * Messages from the current tick */ - private ArrayList messages = new ArrayList<>(4); + private final ArrayList messages = new ArrayList<>(4); /** * Messages from the last tick diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/Settlement.java b/src/main/java/net/simon987/mar/npcplugin/Settlement.java similarity index 92% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/Settlement.java rename to src/main/java/net/simon987/mar/npcplugin/Settlement.java index 4f7a1ba..71ed311 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/Settlement.java +++ b/src/main/java/net/simon987/mar/npcplugin/Settlement.java @@ -1,10 +1,10 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.world.TilePlain; -import net.simon987.server.game.world.World; -import net.simon987.server.game.world.WorldGenerationException; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.world.TilePlain; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.game.world.WorldGenerationException; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; import org.bson.types.ObjectId; @@ -17,12 +17,12 @@ public class Settlement implements MongoSerializable { private Factory factory = null; private RadioTower radioTower = null; private VaultDoor vaultDoor = null; - private World world; - private DifficultyLevel difficultyLevel; + private final World world; + private final DifficultyLevel difficultyLevel; - private List npcs = new ArrayList<>(); + private final List npcs = new ArrayList<>(); - private char[] password; + private final char[] password; public Settlement(Document document) { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDimension.java b/src/main/java/net/simon987/mar/npcplugin/VaultDimension.java similarity index 95% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDimension.java rename to src/main/java/net/simon987/mar/npcplugin/VaultDimension.java index 59cdebc..73daca5 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDimension.java +++ b/src/main/java/net/simon987/mar/npcplugin/VaultDimension.java @@ -1,12 +1,12 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.npcplugin.world.TileVaultFloor; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.game.objects.Direction; -import net.simon987.server.game.world.Location; -import net.simon987.server.game.world.World; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.npcplugin.world.TileVaultFloor; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.game.objects.Direction; +import net.simon987.mar.server.game.world.Location; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.logging.LogManager; import org.bson.types.ObjectId; import java.awt.*; @@ -20,7 +20,7 @@ public class VaultDimension { /** * Name of the dimension */ - private String name; + private final String name; private World homeWorld; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDoor.java b/src/main/java/net/simon987/mar/npcplugin/VaultDoor.java similarity index 91% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDoor.java rename to src/main/java/net/simon987/mar/npcplugin/VaultDoor.java index ad58009..4e32364 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultDoor.java +++ b/src/main/java/net/simon987/mar/npcplugin/VaultDoor.java @@ -1,9 +1,9 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.*; -import net.simon987.server.game.world.World; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.*; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.util.Arrays; @@ -26,7 +26,7 @@ public class VaultDoor extends Structure implements MessageReceiver, Enterable, /** * Number of ticks to remain the door open */ - private int OPEN_TIME = GameServer.INSTANCE.getConfig().getInt("vault_door_open_time"); + private final int OPEN_TIME = GameServer.INSTANCE.getConfig().getInt("vault_door_open_time"); private int openedTimer = 0; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultExitPortal.java b/src/main/java/net/simon987/mar/npcplugin/VaultExitPortal.java similarity index 84% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/VaultExitPortal.java rename to src/main/java/net/simon987/mar/npcplugin/VaultExitPortal.java index dba3101..739daaf 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultExitPortal.java +++ b/src/main/java/net/simon987/mar/npcplugin/VaultExitPortal.java @@ -1,7 +1,7 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.Location; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.Location; import org.bson.Document; /** diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldGenerator.java b/src/main/java/net/simon987/mar/npcplugin/VaultWorldGenerator.java similarity index 97% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldGenerator.java rename to src/main/java/net/simon987/mar/npcplugin/VaultWorldGenerator.java index 1911054..d9c07ce 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldGenerator.java +++ b/src/main/java/net/simon987/mar/npcplugin/VaultWorldGenerator.java @@ -1,9 +1,9 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.server.game.objects.Direction; -import net.simon987.server.game.world.TileMap; -import net.simon987.server.game.world.TileVoid; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.game.objects.Direction; +import net.simon987.mar.server.game.world.TileMap; +import net.simon987.mar.server.game.world.TileVoid; +import net.simon987.mar.server.game.world.World; import java.awt.*; import java.util.ArrayList; @@ -157,8 +157,8 @@ public class VaultWorldGenerator { roomCenters.add(new Point(1, worldSize / 2 - 1)); break; default: - - break; + + break; } } diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldUtils.java b/src/main/java/net/simon987/mar/npcplugin/VaultWorldUtils.java similarity index 92% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldUtils.java rename to src/main/java/net/simon987/mar/npcplugin/VaultWorldUtils.java index ee7c038..9b4364d 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/VaultWorldUtils.java +++ b/src/main/java/net/simon987/mar/npcplugin/VaultWorldUtils.java @@ -1,8 +1,8 @@ -package net.simon987.npcplugin; +package net.simon987.mar.npcplugin; -import net.simon987.npcplugin.world.TileVaultFloor; -import net.simon987.server.game.world.TileMap; -import net.simon987.server.game.world.World; +import net.simon987.mar.npcplugin.world.TileVaultFloor; +import net.simon987.mar.server.game.world.TileMap; +import net.simon987.mar.server.game.world.World; import org.bson.types.ObjectId; import java.awt.*; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java b/src/main/java/net/simon987/mar/npcplugin/event/CpuInitialisationListener.java similarity index 56% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java rename to src/main/java/net/simon987/mar/npcplugin/event/CpuInitialisationListener.java index c47ddb7..0108f9e 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/CpuInitialisationListener.java +++ b/src/main/java/net/simon987/mar/npcplugin/event/CpuInitialisationListener.java @@ -1,12 +1,11 @@ -package net.simon987.npcplugin.event; +package net.simon987.mar.npcplugin.event; -import net.simon987.npcplugin.RadioReceiverHardware; -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.game.objects.ControllableUnit; -import net.simon987.server.game.objects.HardwareHost; +import net.simon987.mar.npcplugin.RadioReceiverHardware; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.event.CpuInitialisationEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.ControllableUnit; public class CpuInitialisationListener implements GameEventListener { @Override @@ -19,7 +18,7 @@ public class CpuInitialisationListener implements GameEventListener { public void handle(GameEvent event) { CPU cpu = (CPU) event.getSource(); ControllableUnit controllableUnit = ((CpuInitialisationEvent) event).getUnit(); - cpu.setHardwareHost((HardwareHost) controllableUnit); + cpu.setHardwareHost(controllableUnit); RadioReceiverHardware radioHw = new RadioReceiverHardware(controllableUnit); radioHw.setCpu(cpu); diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteEvent.java b/src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteEvent.java similarity index 63% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteEvent.java rename to src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteEvent.java index 3afbe39..eb6d72e 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteEvent.java +++ b/src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteEvent.java @@ -1,12 +1,12 @@ -package net.simon987.npcplugin.event; +package net.simon987.mar.npcplugin.event; -import net.simon987.npcplugin.VaultExitPortal; -import net.simon987.server.event.GameEvent; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.npcplugin.VaultExitPortal; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.game.objects.GameObject; public class VaultCompleteEvent extends GameEvent { - private VaultExitPortal portal; + private final VaultExitPortal portal; public VaultCompleteEvent(GameObject object, VaultExitPortal portal) { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteListener.java b/src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteListener.java similarity index 71% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteListener.java rename to src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteListener.java index 1c69919..0abff71 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultCompleteListener.java +++ b/src/main/java/net/simon987/mar/npcplugin/event/VaultCompleteListener.java @@ -1,10 +1,10 @@ -package net.simon987.npcplugin.event; +package net.simon987.mar.npcplugin.event; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.logging.LogManager; public class VaultCompleteListener implements GameEventListener { @Override diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultWorldUpdateListener.java b/src/main/java/net/simon987/mar/npcplugin/event/VaultWorldUpdateListener.java similarity index 83% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultWorldUpdateListener.java rename to src/main/java/net/simon987/mar/npcplugin/event/VaultWorldUpdateListener.java index dc7594e..e2d9657 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/VaultWorldUpdateListener.java +++ b/src/main/java/net/simon987/mar/npcplugin/event/VaultWorldUpdateListener.java @@ -1,13 +1,13 @@ -package net.simon987.npcplugin.event; +package net.simon987.mar.npcplugin.event; -import net.simon987.npcplugin.ElectricBox; -import net.simon987.npcplugin.VaultWorldUtils; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.event.WorldUpdateEvent; -import net.simon987.server.game.world.World; +import net.simon987.mar.npcplugin.ElectricBox; +import net.simon987.mar.npcplugin.VaultWorldUtils; +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; @@ -17,7 +17,7 @@ public class VaultWorldUpdateListener implements GameEventListener { /** * Map of worlds and their time to wait until next respawn event */ - private HashMap worldWaitMap = new HashMap<>(200); + private final HashMap worldWaitMap = new HashMap<>(200); /** * Lower bound of ElectricBox to be created on a respawn event diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/WorldCreationListener.java b/src/main/java/net/simon987/mar/npcplugin/event/WorldCreationListener.java similarity index 66% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/event/WorldCreationListener.java rename to src/main/java/net/simon987/mar/npcplugin/event/WorldCreationListener.java index aae031c..48f970e 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/event/WorldCreationListener.java +++ b/src/main/java/net/simon987/mar/npcplugin/event/WorldCreationListener.java @@ -1,13 +1,13 @@ -package net.simon987.npcplugin.event; +package net.simon987.mar.npcplugin.event; -import net.simon987.npcplugin.NpcPlugin; -import net.simon987.npcplugin.Settlement; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.event.WorldGenerationEvent; -import net.simon987.server.game.world.World; -import net.simon987.server.game.world.WorldGenerationException; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.npcplugin.NpcPlugin; +import net.simon987.mar.npcplugin.Settlement; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.event.WorldGenerationEvent; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.game.world.WorldGenerationException; +import net.simon987.mar.server.logging.LogManager; import java.util.Random; @@ -18,7 +18,7 @@ public class WorldCreationListener implements GameEventListener { */ private static int FACTORY_SPAWN_RATE = 0; - private Random random = new Random(); + private final Random random = new Random(); public WorldCreationListener(int factorySpawnRate) { FACTORY_SPAWN_RATE = factorySpawnRate; diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultFloor.java b/src/main/java/net/simon987/mar/npcplugin/world/TileVaultFloor.java similarity index 62% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultFloor.java rename to src/main/java/net/simon987/mar/npcplugin/world/TileVaultFloor.java index 194c13b..2beb5d2 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultFloor.java +++ b/src/main/java/net/simon987/mar/npcplugin/world/TileVaultFloor.java @@ -1,6 +1,6 @@ -package net.simon987.npcplugin.world; +package net.simon987.mar.npcplugin.world; -import net.simon987.server.game.world.Tile; +import net.simon987.mar.server.game.world.Tile; public class TileVaultFloor extends Tile { diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultWall.java b/src/main/java/net/simon987/mar/npcplugin/world/TileVaultWall.java similarity index 69% rename from Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultWall.java rename to src/main/java/net/simon987/mar/npcplugin/world/TileVaultWall.java index e88b54d..7478719 100644 --- a/Plugin NPC/src/main/java/net/simon987/npcplugin/world/TileVaultWall.java +++ b/src/main/java/net/simon987/mar/npcplugin/world/TileVaultWall.java @@ -1,7 +1,7 @@ -package net.simon987.npcplugin.world; +package net.simon987.mar.npcplugin.world; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.Tile; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.Tile; public class TileVaultWall extends Tile { diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloud.java b/src/main/java/net/simon987/mar/radioactivecloud/RadioactiveCloud.java similarity index 70% rename from Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloud.java rename to src/main/java/net/simon987/mar/radioactivecloud/RadioactiveCloud.java index 3999d86..1f63ca2 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveCloud.java +++ b/src/main/java/net/simon987/mar/radioactivecloud/RadioactiveCloud.java @@ -1,10 +1,10 @@ -package net.simon987.pluginradioactivecloud; +package net.simon987.mar.radioactivecloud; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.Enterable; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Radioactive; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.Enterable; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Radioactive; public class RadioactiveCloud extends GameObject implements Radioactive, Enterable { private final static int CORRUPTION_BLOCK_SIZE = diff --git a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveObstacle.java b/src/main/java/net/simon987/mar/radioactivecloud/RadioactiveObstacle.java similarity index 62% rename from Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveObstacle.java rename to src/main/java/net/simon987/mar/radioactivecloud/RadioactiveObstacle.java index 5576e5f..b1ed5ed 100644 --- a/Plugin Radioactive Cloud/src/main/java/net/simon987/pluginradioactivecloud/RadioactiveObstacle.java +++ b/src/main/java/net/simon987/mar/radioactivecloud/RadioactiveObstacle.java @@ -1,16 +1,16 @@ -package net.simon987.pluginradioactivecloud; +package net.simon987.mar.radioactivecloud; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.game.objects.Enterable; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Radioactive; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.Enterable; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Radioactive; public class RadioactiveObstacle extends GameObject implements Radioactive, Enterable { private final static int corruptionBlockSize = GameServer.INSTANCE.getConfig().getInt("radioactive_obstacle_corruption_block_size"); private final static int MAP_INFO = 0x0A01; //10 - + @Override public char getMapInfo() { return MAP_INFO; @@ -23,4 +23,4 @@ public class RadioactiveObstacle extends GameObject implements Radioactive, Ente } return false; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/GameServer.java b/src/main/java/net/simon987/mar/server/GameServer.java similarity index 57% rename from Server/src/main/java/net/simon987/server/GameServer.java rename to src/main/java/net/simon987/mar/server/GameServer.java index ddafded..1f8c521 100644 --- a/Server/src/main/java/net/simon987/server/GameServer.java +++ b/src/main/java/net/simon987/mar/server/GameServer.java @@ -1,55 +1,71 @@ -package net.simon987.server; +package net.simon987.mar.server; import com.mongodb.MongoClientException; import com.mongodb.client.*; import com.mongodb.client.model.ReplaceOptions; -import net.simon987.server.crypto.CryptoProvider; -import net.simon987.server.crypto.SecretKeyGenerator; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventDispatcher; -import net.simon987.server.event.TickEvent; -import net.simon987.server.game.GameUniverse; -import net.simon987.server.game.debug.*; -import net.simon987.server.game.item.ItemCopper; -import net.simon987.server.game.item.ItemIron; -import net.simon987.server.game.objects.GameRegistry; -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.user.UserManager; -import net.simon987.server.user.UserStatsHelper; -import net.simon987.server.websocket.SocketServer; +import net.simon987.mar.biomass.BiomassBlob; +import net.simon987.mar.biomass.ItemBiomass; +import net.simon987.mar.biomass.event.ObjectDeathListener; +import net.simon987.mar.biomass.event.WorldCreationListener; +import net.simon987.mar.biomass.event.WorldUpdateListener; +import net.simon987.mar.construction.ConstructionSite; +import net.simon987.mar.construction.ItemBluePrint; +import net.simon987.mar.construction.Obstacle; +import net.simon987.mar.cubot.*; +import net.simon987.mar.cubot.event.*; +import net.simon987.mar.mischwplugin.Clock; +import net.simon987.mar.mischwplugin.RandomNumberGenerator; +import net.simon987.mar.npcplugin.*; +import net.simon987.mar.npcplugin.event.VaultCompleteListener; +import net.simon987.mar.npcplugin.event.VaultWorldUpdateListener; +import net.simon987.mar.npcplugin.world.TileVaultFloor; +import net.simon987.mar.npcplugin.world.TileVaultWall; +import net.simon987.mar.server.crypto.CryptoProvider; +import net.simon987.mar.server.crypto.SecretKeyGenerator; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventDispatcher; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.event.TickEvent; +import net.simon987.mar.server.game.GameUniverse; +import net.simon987.mar.server.game.debug.*; +import net.simon987.mar.server.game.item.ItemCopper; +import net.simon987.mar.server.game.item.ItemIron; +import net.simon987.mar.server.game.objects.GameRegistry; +import net.simon987.mar.server.game.world.*; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.User; +import net.simon987.mar.server.user.UserManager; +import net.simon987.mar.server.user.UserStatsHelper; +import net.simon987.mar.server.websocket.SocketServer; import org.bson.Document; import java.util.ArrayList; +import java.util.List; public class GameServer implements Runnable { public final static GameServer INSTANCE = new GameServer(); - private GameUniverse gameUniverse; - private GameEventDispatcher eventDispatcher; - private PluginManager pluginManager; + private final GameUniverse gameUniverse; + private final GameEventDispatcher eventDispatcher; - private IServerConfiguration config; + private final IServerConfiguration config; private SocketServer socketServer; - private int maxExecutionTime; + private final int maxExecutionTime; - private DayNightCycle dayNightCycle; + private final DayNightCycle dayNightCycle; - private CryptoProvider cryptoProvider; + private final CryptoProvider cryptoProvider; - private MongoClient mongo; + private final MongoClient mongo; - private UserManager userManager; + private final UserManager userManager; - private UserStatsHelper userStatsHelper; + private final UserStatsHelper userStatsHelper; - private GameRegistry gameRegistry; + private final GameRegistry gameRegistry; private String secretKey; @@ -69,7 +85,6 @@ public class GameServer implements Runnable { gameUniverse = new GameUniverse(config); gameUniverse.setMongo(mongo); gameRegistry = new GameRegistry(); - pluginManager = new PluginManager(this); maxExecutionTime = config.getInt("user_timeout"); @@ -84,28 +99,63 @@ public class GameServer implements Runnable { config.setString("secret_key", secretKey); } - if (!pluginManager.loadInFolder("plugins/")) { - System.exit(-1); - } + eventDispatcher = new GameEventDispatcher(); - eventDispatcher = new GameEventDispatcher(pluginManager); - eventDispatcher.getListeners().add(dayNightCycle); + registerEventListeners(); + registerGameObjects(); + + + } + + private void registerEventListeners() { + + List listeners = eventDispatcher.getListeners(); + + listeners.add(dayNightCycle); //Debug command Listeners - eventDispatcher.getListeners().add(new ComPortMsgCommandListener()); - eventDispatcher.getListeners().add(new CreateWorldCommandListener()); - eventDispatcher.getListeners().add(new KillAllCommandListener()); - eventDispatcher.getListeners().add(new MoveObjCommandListener()); - eventDispatcher.getListeners().add(new ObjInfoCommandListener()); - eventDispatcher.getListeners().add(new SetTileAtCommandListener()); - eventDispatcher.getListeners().add(new SpawnObjCommandListener()); - eventDispatcher.getListeners().add(new TpObjectCommandListener()); - eventDispatcher.getListeners().add(new UserInfoCommandListener()); - eventDispatcher.getListeners().add(new HealObjCommandListener()); - eventDispatcher.getListeners().add(new DamageObjCommandListener()); - eventDispatcher.getListeners().add(new SetEnergyCommandListener()); - eventDispatcher.getListeners().add(new SaveGameCommandListener()); + listeners.add(new ComPortMsgCommandListener()); + listeners.add(new CreateWorldCommandListener()); + listeners.add(new KillAllCommandListener()); + listeners.add(new MoveObjCommandListener()); + listeners.add(new ObjInfoCommandListener()); + listeners.add(new SetTileAtCommandListener()); + listeners.add(new SpawnObjCommandListener()); + listeners.add(new TpObjectCommandListener()); + listeners.add(new UserInfoCommandListener()); + listeners.add(new HealObjCommandListener()); + listeners.add(new DamageObjCommandListener()); + listeners.add(new SetEnergyCommandListener()); + listeners.add(new SaveGameCommandListener()); + + // Biomass + listeners.add(new WorldCreationListener()); + listeners.add(new WorldUpdateListener(config)); + listeners.add(new ObjectDeathListener(config)); + + // Cubot + listeners.add(new CpuInitialisationListener()); + listeners.add(new UserCreationListener()); + + listeners.add(new ChargeShieldCommandListener()); + listeners.add(new SetInventoryPosition()); + listeners.add(new PutItemCommandListener()); + listeners.add(new PopItemCommandListener()); + + listeners.add(new DeathListener()); + listeners.add(new WalkListener()); + + // NPC + + listeners.add(new net.simon987.mar.npcplugin.event.WorldCreationListener(config.getInt("settlement_spawn_rate"))); + listeners.add(new net.simon987.mar.npcplugin.event.CpuInitialisationListener()); + listeners.add(new VaultWorldUpdateListener(config)); + listeners.add(new VaultCompleteListener()); + + } + + private void registerGameObjects() { gameRegistry.registerItem(ItemCopper.ID, ItemCopper.class); gameRegistry.registerItem(ItemIron.ID, ItemIron.class); @@ -115,6 +165,52 @@ public class GameServer implements Runnable { gameRegistry.registerTile(TileCopper.ID, TileCopper.class); gameRegistry.registerTile(TileIron.ID, TileIron.class); gameRegistry.registerTile(TileFluid.ID, TileFluid.class); + + // Biomass + gameRegistry.registerGameObject(BiomassBlob.class); + gameRegistry.registerItem(ItemBiomass.ID, ItemBiomass.class); + + // Construction + gameRegistry.registerItem(ItemBluePrint.ID, ItemBluePrint.class); + gameRegistry.registerGameObject(Obstacle.class); + gameRegistry.registerGameObject(ConstructionSite.class); + + // Cubot + gameRegistry.registerGameObject(Cubot.class); + gameRegistry.registerHardware(CubotLeg.class); + gameRegistry.registerHardware(CubotLaser.class); + gameRegistry.registerHardware(CubotLidar.class); + gameRegistry.registerHardware(CubotDrill.class); + gameRegistry.registerHardware(CubotInventory.class); + gameRegistry.registerHardware(CubotKeyboard.class); + gameRegistry.registerHardware(CubotHologram.class); + gameRegistry.registerHardware(CubotBattery.class); + gameRegistry.registerHardware(CubotFloppyDrive.class); + gameRegistry.registerHardware(CubotComPort.class); + gameRegistry.registerHardware(CubotShield.class); + gameRegistry.registerHardware(CubotCore.class); + + // Misc HW + gameRegistry.registerHardware(RandomNumberGenerator.class); + gameRegistry.registerHardware(Clock.class); + + // NPC + gameRegistry.registerGameObject(HarvesterNPC.class); + gameRegistry.registerGameObject(Factory.class); + gameRegistry.registerGameObject(RadioTower.class); + gameRegistry.registerGameObject(VaultDoor.class); + gameRegistry.registerGameObject(net.simon987.mar.npcplugin.Obstacle.class); + gameRegistry.registerGameObject(ElectricBox.class); + gameRegistry.registerGameObject(Portal.class); + gameRegistry.registerGameObject(VaultExitPortal.class); + gameRegistry.registerGameObject(HackedNPC.class); + + gameRegistry.registerHardware(RadioReceiverHardware.class); + gameRegistry.registerHardware(NpcBattery.class); + gameRegistry.registerHardware(NpcInventory.class); + + gameRegistry.registerTile(TileVaultFloor.ID, TileVaultFloor.class); + gameRegistry.registerTile(TileVaultWall.ID, TileVaultWall.class); } public GameUniverse getGameUniverse() { @@ -224,18 +320,13 @@ public class GameServer implements Runnable { universe.addUser(user); } - //Load server & plugin data + //Load server data cursor = server.find().iterator(); if (cursor.hasNext()) { Document serverObj = cursor.next(); gameUniverse.setTime((long) serverObj.get("time")); - Document plugins = (Document) serverObj.get("plugins"); - - for (String pluginName : plugins.keySet()) { - ServerPlugin plugin = pluginManager.getPluginByName(pluginName); - plugin.load((Document) plugins.get(pluginName)); - } + // TODO: load gameUniverse.store data } LogManager.LOGGER.info("Done loading! W:" + GameServer.INSTANCE.getGameUniverse().getWorldCount() + @@ -288,12 +379,6 @@ public class GameServer implements Runnable { Document serverObj = new Document(); serverObj.put("time", gameUniverse.getTime()); - Document plugins = new Document(); - for (ServerPlugin plugin : pluginManager.getPlugins()) { - plugins.put(plugin.getName(), plugin.mongoSerialise()); - } - serverObj.put("plugins", plugins); - //A constant id ensures only one entry is kept and updated, instead of a new entry created every save. server.replaceOne(new Document("_id", "serverinfo"), serverObj, updateOptions); if (session != null) { @@ -315,10 +400,6 @@ public class GameServer implements Runnable { return config; } - public PluginManager getPluginManager() { - return pluginManager; - } - public void setSocketServer(SocketServer socketServer) { this.socketServer = socketServer; } diff --git a/Server/src/main/java/net/simon987/server/IServerConfiguration.java b/src/main/java/net/simon987/mar/server/IServerConfiguration.java similarity index 85% rename from Server/src/main/java/net/simon987/server/IServerConfiguration.java rename to src/main/java/net/simon987/mar/server/IServerConfiguration.java index 7696862..845f96a 100644 --- a/Server/src/main/java/net/simon987/server/IServerConfiguration.java +++ b/src/main/java/net/simon987/mar/server/IServerConfiguration.java @@ -1,4 +1,4 @@ -package net.simon987.server; +package net.simon987.mar.server; public interface IServerConfiguration { diff --git a/Server/src/main/java/net/simon987/server/Main.java b/src/main/java/net/simon987/mar/server/Main.java similarity index 77% rename from Server/src/main/java/net/simon987/server/Main.java rename to src/main/java/net/simon987/mar/server/Main.java index ca351a4..96bbf2b 100644 --- a/Server/src/main/java/net/simon987/server/Main.java +++ b/src/main/java/net/simon987/mar/server/Main.java @@ -1,20 +1,17 @@ -package net.simon987.server; +package net.simon987.mar.server; -import net.simon987.server.logging.LogManager; -import net.simon987.server.web.WebServer; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.web.WebServer; import spark.Spark; public class Main { public static void main(String[] args) { - - ServerConfiguration config = new ServerConfiguration("config.properties"); LogManager.initialize(config); GameServer.INSTANCE.load(); - //Web server WebServer webServer = new WebServer(GameServer.INSTANCE.getConfig()); Spark.awaitInitialization(); diff --git a/Server/src/main/java/net/simon987/server/ServerConfiguration.java b/src/main/java/net/simon987/mar/server/ServerConfiguration.java similarity index 94% rename from Server/src/main/java/net/simon987/server/ServerConfiguration.java rename to src/main/java/net/simon987/mar/server/ServerConfiguration.java index 61eac06..786476f 100644 --- a/Server/src/main/java/net/simon987/server/ServerConfiguration.java +++ b/src/main/java/net/simon987/mar/server/ServerConfiguration.java @@ -1,7 +1,7 @@ -package net.simon987.server; +package net.simon987.mar.server; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.logging.LogManager; import java.io.*; import java.util.Properties; diff --git a/Server/src/main/java/net/simon987/server/assembly/Assembler.java b/src/main/java/net/simon987/mar/server/assembly/Assembler.java similarity index 97% rename from Server/src/main/java/net/simon987/server/assembly/Assembler.java rename to src/main/java/net/simon987/mar/server/assembly/Assembler.java index c5088f6..de8b119 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Assembler.java +++ b/src/main/java/net/simon987/mar/server/assembly/Assembler.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.assembly.exception.*; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.exception.*; +import net.simon987.mar.server.logging.LogManager; import org.apache.commons.text.StringEscapeUtils; import java.io.ByteArrayOutputStream; @@ -18,15 +18,13 @@ import java.util.regex.Pattern; */ public class Assembler { - private IServerConfiguration config; - - private InstructionSet instructionSet; - - private RegisterSet registerSet; + private static final String labelPattern = "^\\s*[a-zA-Z_]\\w*:"; + private static final Pattern commentPattern = Pattern.compile("\"[^\"]*\"|(;)"); + private final IServerConfiguration config; private static int MEM_SIZE; - private static String labelPattern = "^\\s*[a-zA-Z_]\\w*:"; - private static Pattern commentPattern = Pattern.compile("\"[^\"]*\"|(;)"); + private final InstructionSet instructionSet; + private final RegisterSet registerSet; public Assembler(InstructionSet instructionSet, RegisterSet registerSet, IServerConfiguration config) { this.instructionSet = instructionSet; diff --git a/Server/src/main/java/net/simon987/server/assembly/AssemblyResult.java b/src/main/java/net/simon987/mar/server/assembly/AssemblyResult.java similarity index 91% rename from Server/src/main/java/net/simon987/server/assembly/AssemblyResult.java rename to src/main/java/net/simon987/mar/server/assembly/AssemblyResult.java index 3268fbb..7f3a16c 100755 --- a/Server/src/main/java/net/simon987/server/assembly/AssemblyResult.java +++ b/src/main/java/net/simon987/mar/server/assembly/AssemblyResult.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.assembly.exception.AssemblyException; -import net.simon987.server.assembly.exception.DuplicateSectionException; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.exception.AssemblyException; +import net.simon987.mar.server.assembly.exception.DuplicateSectionException; +import net.simon987.mar.server.logging.LogManager; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/Server/src/main/java/net/simon987/server/assembly/CPU.java b/src/main/java/net/simon987/mar/server/assembly/CPU.java similarity index 96% rename from Server/src/main/java/net/simon987/server/assembly/CPU.java rename to src/main/java/net/simon987/mar/server/assembly/CPU.java index 1867e65..5f6a16f 100755 --- a/Server/src/main/java/net/simon987/server/assembly/CPU.java +++ b/src/main/java/net/simon987/mar/server/assembly/CPU.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -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.game.objects.ControllableUnit; -import net.simon987.server.game.objects.HardwareHost; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.assembly.instruction.*; +import net.simon987.mar.server.event.CpuInitialisationEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.game.objects.HardwareHost; +import net.simon987.mar.server.io.MongoSerializable; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; /** @@ -22,7 +22,7 @@ public class CPU implements MongoSerializable { /** * */ - private Status status; + private final Status status; /** * Memory associated with the CPU, 64kb max @@ -32,7 +32,7 @@ public class CPU implements MongoSerializable { /** * set of instructions of this CPU */ - private InstructionSet instructionSet; + private final InstructionSet instructionSet; /** * set of registers of this CPU diff --git a/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java b/src/main/java/net/simon987/mar/server/assembly/DefaultInstructionSet.java similarity index 90% rename from Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java rename to src/main/java/net/simon987/mar/server/assembly/DefaultInstructionSet.java index b7288a6..25181ba 100755 --- a/Server/src/main/java/net/simon987/server/assembly/DefaultInstructionSet.java +++ b/src/main/java/net/simon987/mar/server/assembly/DefaultInstructionSet.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.assembly.instruction.*; +import net.simon987.mar.server.assembly.instruction.*; import java.util.HashMap; import java.util.Map; @@ -13,14 +13,14 @@ public class DefaultInstructionSet implements InstructionSet { /** * Map of instructions, stored in opcode : Instruction format */ - private Map instructionMap = new HashMap<>(32); + private final Map instructionMap = new HashMap<>(32); /** * Map of aliasses, stored in mnemonic : Instruction format */ - private Map aliasesMap = new HashMap<>(16); + private final Map aliasesMap = new HashMap<>(16); - private Instruction defaultInstruction; + private final Instruction defaultInstruction; /** * Create an empty instruction set @@ -116,11 +116,7 @@ public class DefaultInstructionSet implements InstructionSet { } Instruction aliasedInstruction = aliasesMap.get(mnemonic.toLowerCase()); - if (aliasedInstruction != null) { - return aliasedInstruction; - } - - return null; + return aliasedInstruction; } /** * Add a new instruction to the instructionSet diff --git a/Server/src/main/java/net/simon987/server/assembly/DefaultRegisterSet.java b/src/main/java/net/simon987/mar/server/assembly/DefaultRegisterSet.java similarity index 92% rename from Server/src/main/java/net/simon987/server/assembly/DefaultRegisterSet.java rename to src/main/java/net/simon987/mar/server/assembly/DefaultRegisterSet.java index 7526df1..8ae4cec 100755 --- a/Server/src/main/java/net/simon987/server/assembly/DefaultRegisterSet.java +++ b/src/main/java/net/simon987/mar/server/assembly/DefaultRegisterSet.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * RegisterSet with default values diff --git a/Server/src/main/java/net/simon987/server/assembly/HardwareModule.java b/src/main/java/net/simon987/mar/server/assembly/HardwareModule.java similarity index 85% rename from Server/src/main/java/net/simon987/server/assembly/HardwareModule.java rename to src/main/java/net/simon987/mar/server/assembly/HardwareModule.java index b352e6d..019db40 100644 --- a/Server/src/main/java/net/simon987/server/assembly/HardwareModule.java +++ b/src/main/java/net/simon987/mar/server/assembly/HardwareModule.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.io.JSONSerializable; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.io.JSONSerializable; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/assembly/Instruction.java b/src/main/java/net/simon987/mar/server/assembly/Instruction.java similarity index 95% rename from Server/src/main/java/net/simon987/server/assembly/Instruction.java rename to src/main/java/net/simon987/mar/server/assembly/Instruction.java index 8a521cd..2989cf7 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Instruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/Instruction.java @@ -1,7 +1,7 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.assembly.exception.AssemblyException; -import net.simon987.server.assembly.exception.IllegalOperandException; +import net.simon987.mar.server.assembly.exception.AssemblyException; +import net.simon987.mar.server.assembly.exception.IllegalOperandException; import java.io.ByteArrayOutputStream; @@ -15,12 +15,12 @@ public abstract class Instruction { /** * Symbolic name of the instruction */ - private String mnemonic; + private final String mnemonic; /** * Opcode of the instruction (6-bit signed integer) */ - private int opCode; + private final int opCode; /** * Create a new Instruction diff --git a/Server/src/main/java/net/simon987/server/assembly/InstructionSet.java b/src/main/java/net/simon987/mar/server/assembly/InstructionSet.java similarity index 94% rename from Server/src/main/java/net/simon987/server/assembly/InstructionSet.java rename to src/main/java/net/simon987/mar/server/assembly/InstructionSet.java index ef36146..3de5e12 100755 --- a/Server/src/main/java/net/simon987/server/assembly/InstructionSet.java +++ b/src/main/java/net/simon987/mar/server/assembly/InstructionSet.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * A set of instructions for a CPU. diff --git a/Server/src/main/java/net/simon987/server/assembly/MachineCode.java b/src/main/java/net/simon987/mar/server/assembly/MachineCode.java similarity index 93% rename from Server/src/main/java/net/simon987/server/assembly/MachineCode.java rename to src/main/java/net/simon987/mar/server/assembly/MachineCode.java index d90edb6..38b66ab 100755 --- a/Server/src/main/java/net/simon987/server/assembly/MachineCode.java +++ b/src/main/java/net/simon987/mar/server/assembly/MachineCode.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.logging.LogManager; import java.io.ByteArrayOutputStream; import java.util.ArrayList; @@ -20,7 +20,7 @@ public class MachineCode { /** * Appended words after the instruction bytes. Used to store immediate values */ - private ArrayList additionalWords = new ArrayList<>(2); + private final ArrayList additionalWords = new ArrayList<>(2); /** * Write the opCode in the 6 least significant bit diff --git a/Server/src/main/java/net/simon987/server/assembly/Memory.java b/src/main/java/net/simon987/mar/server/assembly/Memory.java similarity index 95% rename from Server/src/main/java/net/simon987/server/assembly/Memory.java rename to src/main/java/net/simon987/mar/server/assembly/Memory.java index 29374fe..1d2a9d5 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Memory.java +++ b/src/main/java/net/simon987/mar/server/assembly/Memory.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.GameServer; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.io.MongoSerializable; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.io.ByteArrayOutputStream; @@ -114,7 +114,7 @@ public class Memory implements Target, MongoSerializable { /** * Configurably corrupt memory - * + * * @param blockSize Block size (in words) in which to randomly flip one bit */ public void corrupt(int blockSize) { @@ -132,7 +132,7 @@ public class Memory implements Target, MongoSerializable { // Calculate bitmask by left-shifting 1 by a random value between 0 and 15 int bitmask = 1 << rand.nextInt(16); - // Flip the bit with XOR + // Flip the bit with XOR words[address] ^= bitmask; } } diff --git a/Server/src/main/java/net/simon987/server/assembly/Operand.java b/src/main/java/net/simon987/mar/server/assembly/Operand.java similarity index 98% rename from Server/src/main/java/net/simon987/server/assembly/Operand.java rename to src/main/java/net/simon987/mar/server/assembly/Operand.java index b2ad770..869b5dd 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Operand.java +++ b/src/main/java/net/simon987/mar/server/assembly/Operand.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.assembly.exception.InvalidOperandException; +import net.simon987.mar.server.assembly.exception.InvalidOperandException; import java.util.HashMap; diff --git a/Server/src/main/java/net/simon987/server/assembly/OperandType.java b/src/main/java/net/simon987/mar/server/assembly/OperandType.java similarity index 86% rename from Server/src/main/java/net/simon987/server/assembly/OperandType.java rename to src/main/java/net/simon987/mar/server/assembly/OperandType.java index 39c6e90..f868fd2 100755 --- a/Server/src/main/java/net/simon987/server/assembly/OperandType.java +++ b/src/main/java/net/simon987/mar/server/assembly/OperandType.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * Types of an operand @@ -14,7 +14,7 @@ public enum OperandType { /** * Description of the Operand type */ - private String description; + private final String description; public String getDescription() { return description; diff --git a/Server/src/main/java/net/simon987/server/assembly/Register.java b/src/main/java/net/simon987/mar/server/assembly/Register.java similarity index 91% rename from Server/src/main/java/net/simon987/server/assembly/Register.java rename to src/main/java/net/simon987/mar/server/assembly/Register.java index 9a240f7..2171c5d 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Register.java +++ b/src/main/java/net/simon987/mar/server/assembly/Register.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * Represents a register in a cpu @@ -8,7 +8,7 @@ public class Register { /** * Name of the register */ - private String name; + private final String name; /** * 16-bit value of the register diff --git a/Server/src/main/java/net/simon987/server/assembly/RegisterSet.java b/src/main/java/net/simon987/mar/server/assembly/RegisterSet.java similarity index 95% rename from Server/src/main/java/net/simon987/server/assembly/RegisterSet.java rename to src/main/java/net/simon987/mar/server/assembly/RegisterSet.java index 40277cf..f0ca554 100755 --- a/Server/src/main/java/net/simon987/server/assembly/RegisterSet.java +++ b/src/main/java/net/simon987/mar/server/assembly/RegisterSet.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.io.MongoSerializable; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -19,7 +19,7 @@ public class RegisterSet implements Target, MongoSerializable { /** * List of registers */ - private HashMap registers = new HashMap<>(8); + private final HashMap registers = new HashMap<>(8); /** diff --git a/Server/src/main/java/net/simon987/server/assembly/Section.java b/src/main/java/net/simon987/mar/server/assembly/Section.java similarity index 88% rename from Server/src/main/java/net/simon987/server/assembly/Section.java rename to src/main/java/net/simon987/mar/server/assembly/Section.java index 90ade87..278da58 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Section.java +++ b/src/main/java/net/simon987/mar/server/assembly/Section.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * Section of a user-created program. diff --git a/Server/src/main/java/net/simon987/server/assembly/Status.java b/src/main/java/net/simon987/mar/server/assembly/Status.java similarity index 96% rename from Server/src/main/java/net/simon987/server/assembly/Status.java rename to src/main/java/net/simon987/mar/server/assembly/Status.java index f812e80..6393282 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Status.java +++ b/src/main/java/net/simon987/mar/server/assembly/Status.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * Represents the state of the processor @@ -134,18 +134,18 @@ public class Status { } public char toByte() { - char stat = 0; + char stat = 0; stat = (char) (stat | ((signFlag ? 1 : 0) << 3)); stat = (char) (stat | ((zeroFlag ? 1 : 0) << 2)); stat = (char) (stat | ((carryFlag ? 1 : 0) << 1)); stat = (char) (stat | (overflowFlag ? 1 : 0)); return stat; } - + public void fromByte(char stat) { setSignFlag((stat & (1 << 3)) != 0); setZeroFlag((stat & (1 << 2)) != 0); setCarryFlag((stat & (1 << 1)) != 0); - setOverflowFlag((stat & 1) != 0); + setOverflowFlag((stat & 1) != 0); } } diff --git a/Server/src/main/java/net/simon987/server/assembly/Target.java b/src/main/java/net/simon987/mar/server/assembly/Target.java similarity index 94% rename from Server/src/main/java/net/simon987/server/assembly/Target.java rename to src/main/java/net/simon987/mar/server/assembly/Target.java index 9c8ce58..9bb1b45 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Target.java +++ b/src/main/java/net/simon987/mar/server/assembly/Target.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * A Target is a location that can be read and written to during diff --git a/Server/src/main/java/net/simon987/server/assembly/Util.java b/src/main/java/net/simon987/mar/server/assembly/Util.java similarity index 98% rename from Server/src/main/java/net/simon987/server/assembly/Util.java rename to src/main/java/net/simon987/mar/server/assembly/Util.java index 437033a..4680afd 100755 --- a/Server/src/main/java/net/simon987/server/assembly/Util.java +++ b/src/main/java/net/simon987/mar/server/assembly/Util.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; /** * Set of utility functions related to assembly language parsing and execution diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/AssemblyException.java b/src/main/java/net/simon987/mar/server/assembly/exception/AssemblyException.java similarity index 87% rename from Server/src/main/java/net/simon987/server/assembly/exception/AssemblyException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/AssemblyException.java index 0ada13c..eec2dcc 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/AssemblyException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/AssemblyException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when a problem is encountered while parsing a line @@ -10,7 +10,7 @@ public class AssemblyException extends Exception { /** * Line offset in the user's code. */ - private int line; + private final int line; /** * Create a new Assembly Exception diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/CancelledException.java b/src/main/java/net/simon987/mar/server/assembly/exception/CancelledException.java similarity index 73% rename from Server/src/main/java/net/simon987/server/assembly/exception/CancelledException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/CancelledException.java index a3aafaf..119845f 100644 --- a/Server/src/main/java/net/simon987/server/assembly/exception/CancelledException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/CancelledException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; public class CancelledException extends Exception { public CancelledException() { diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/DuplicateSectionException.java b/src/main/java/net/simon987/mar/server/assembly/exception/DuplicateSectionException.java similarity index 88% rename from Server/src/main/java/net/simon987/server/assembly/exception/DuplicateSectionException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/DuplicateSectionException.java index af0777d..d7afd4c 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/DuplicateSectionException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/DuplicateSectionException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when a user attempts to define the same section twice diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/EmptyLineException.java b/src/main/java/net/simon987/mar/server/assembly/exception/EmptyLineException.java similarity index 80% rename from Server/src/main/java/net/simon987/server/assembly/exception/EmptyLineException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/EmptyLineException.java index e2d7b83..ddf9bd2 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/EmptyLineException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/EmptyLineException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when the parser encounters an empty line diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/FatalAssemblyException.java b/src/main/java/net/simon987/mar/server/assembly/exception/FatalAssemblyException.java similarity index 89% rename from Server/src/main/java/net/simon987/server/assembly/exception/FatalAssemblyException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/FatalAssemblyException.java index 6dec273..25ba45a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/exception/FatalAssemblyException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/FatalAssemblyException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Class of exceptions that should stop assembly immediately diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/IllegalOperandException.java b/src/main/java/net/simon987/mar/server/assembly/exception/IllegalOperandException.java similarity index 75% rename from Server/src/main/java/net/simon987/server/assembly/exception/IllegalOperandException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/IllegalOperandException.java index a6c3dd5..112043c 100644 --- a/Server/src/main/java/net/simon987/server/assembly/exception/IllegalOperandException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/IllegalOperandException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; public class IllegalOperandException extends AssemblyException { diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/InvalidMnemonicException.java b/src/main/java/net/simon987/mar/server/assembly/exception/InvalidMnemonicException.java similarity index 83% rename from Server/src/main/java/net/simon987/server/assembly/exception/InvalidMnemonicException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/InvalidMnemonicException.java index ed0d787..6bfa7ec 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/InvalidMnemonicException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/InvalidMnemonicException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when the parse encounters an invalid mnemonic diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/InvalidOperandException.java b/src/main/java/net/simon987/mar/server/assembly/exception/InvalidOperandException.java similarity index 89% rename from Server/src/main/java/net/simon987/server/assembly/exception/InvalidOperandException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/InvalidOperandException.java index 04d730d..2ab61d8 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/InvalidOperandException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/InvalidOperandException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when the Assembler attempts to parse a malformed or invalid operand diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/OffsetOverflowException.java b/src/main/java/net/simon987/mar/server/assembly/exception/OffsetOverflowException.java similarity index 90% rename from Server/src/main/java/net/simon987/server/assembly/exception/OffsetOverflowException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/OffsetOverflowException.java index dc72d12..27aca88 100644 --- a/Server/src/main/java/net/simon987/server/assembly/exception/OffsetOverflowException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/OffsetOverflowException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when offset for stored instruction/data overflows the size of memory diff --git a/Server/src/main/java/net/simon987/server/assembly/exception/PseudoInstructionException.java b/src/main/java/net/simon987/mar/server/assembly/exception/PseudoInstructionException.java similarity index 85% rename from Server/src/main/java/net/simon987/server/assembly/exception/PseudoInstructionException.java rename to src/main/java/net/simon987/mar/server/assembly/exception/PseudoInstructionException.java index a0b76c8..eb6fd75 100755 --- a/Server/src/main/java/net/simon987/server/assembly/exception/PseudoInstructionException.java +++ b/src/main/java/net/simon987/mar/server/assembly/exception/PseudoInstructionException.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.exception; +package net.simon987.mar.server.assembly.exception; /** * Threw when the parser encounters a pseudo instruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/AddInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/AddInstruction.java similarity index 82% rename from Server/src/main/java/net/simon987/server/assembly/instruction/AddInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/AddInstruction.java index 8457c9b..1a85a60 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/AddInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/AddInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; /** * Add two numbers together, the result is stored in the destination operand diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/AndInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/AndInstruction.java similarity index 83% rename from Server/src/main/java/net/simon987/server/assembly/instruction/AndInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/AndInstruction.java index d8ba84a..975c1a7 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/AndInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/AndInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; /** * AND two numbers together, the result is stored in the destination operand diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/BrkInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/BrkInstruction.java index e0c4ed0..05dcb71 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/BrkInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/BrkInstruction.java @@ -1,7 +1,7 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; /** * BRK (Break) Instruction. Will set the break flag and stop the CPU diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/CallInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/CallInstruction.java similarity index 80% rename from Server/src/main/java/net/simon987/server/assembly/instruction/CallInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/CallInstruction.java index 5091bee..593b54a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/CallInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/CallInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Move the execution (Jump) to an address, and save the current IP value, the execution will return to this value @@ -15,7 +15,7 @@ public class CallInstruction extends Instruction { public static final int OPCODE = 21; - private CPU cpu; + private final CPU cpu; public CallInstruction(CPU cpu) { super("call", OPCODE); @@ -46,4 +46,4 @@ public class CallInstruction extends Instruction { return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/CmpInstruction.java similarity index 83% rename from Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/CmpInstruction.java index ea6676e..f92746e 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/CmpInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/CmpInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; /** * Compare two numbers. Same as SUB instruction, but the result isn't stored diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/DecInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/DecInstruction.java index d04cd59..12dff61 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/DecInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/DecInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class DecInstruction extends Instruction { @@ -18,13 +18,13 @@ public class DecInstruction extends Instruction { char a = (char) dst.get(dstIndex); int result = a - 1; - // Like x86 Carry flag is preserved during INC/DEC + // Like x86 Carry flag is preserved during INC/DEC // (Use ADD x, 1 to have carry flag change) // Other flags set according to result status.setSignFlag(Util.checkSign16(result)); status.setZeroFlag((char) result == 0); status.setOverflowFlag(Util.checkOverFlowSub16(a, 1)); - + dst.set(dstIndex, result); return status; } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/DivInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/DivInstruction.java similarity index 85% rename from Server/src/main/java/net/simon987/server/assembly/instruction/DivInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/DivInstruction.java index 4290230..fd73645 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/DivInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/DivInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Divide instruction. @@ -17,7 +17,7 @@ public class DivInstruction extends Instruction { public static final int OPCODE = 24; - private CPU cpu; + private final CPU cpu; public DivInstruction(CPU cpu) { super("div", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/HwiInstruction.java similarity index 71% rename from Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/HwiInstruction.java index f9a65d6..8a057ac 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/HwiInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/HwiInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Send hardware interrupt @@ -13,7 +13,7 @@ public class HwiInstruction extends Instruction { public static final int OPCODE = 9; - private CPU cpu; + private final CPU cpu; public HwiInstruction(CPU cpu) { super("hwi", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/HwqInstruction.java similarity index 79% rename from Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/HwqInstruction.java index e882c34..1e16bc0 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/HwqInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/HwqInstruction.java @@ -1,13 +1,13 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.*; +import net.simon987.mar.server.assembly.*; public class HwqInstruction extends Instruction { private static final int OPCODE = 28; - private CPU cpu; - private Register b; + private final CPU cpu; + private final Register b; public HwqInstruction(CPU cpu) { super("hwq", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/IncInstruction.java similarity index 73% rename from Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/IncInstruction.java index 23a5403..fb92758 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/IncInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/IncInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class IncInstruction extends Instruction { @@ -24,7 +24,7 @@ public class IncInstruction extends Instruction { status.setSignFlag(Util.checkSign16(result)); status.setZeroFlag((char) result == 0); status.setOverflowFlag(Util.checkOverFlowAdd16(a, 1)); - + dst.set(dstIndex, result); return status; } diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JaInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JaInstruction.java similarity index 70% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JaInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JaInstruction.java index 20dca0f..e385328 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JaInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JaInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Jump if above @@ -12,7 +12,7 @@ public class JaInstruction extends Instruction { public static final int OPCODE = 46; - private CPU cpu; + private final CPU cpu; public JaInstruction(CPU cpu) { super("ja", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JcInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JcInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JcInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JcInstruction.java index b9b1713..bbce273 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JcInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JcInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JcInstruction extends Instruction { private static final int OPCODE = 33; - private CPU cpu; + private final CPU cpu; public JcInstruction(CPU cpu) { super("jc", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JgInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JgInstruction.java similarity index 71% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JgInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JgInstruction.java index a64722c..5c48430 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JgInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JgInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JgInstruction extends Instruction { public static final int OPCODE = 15; - private CPU cpu; + private final CPU cpu; public JgInstruction(CPU cpu) { super("jg", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JgeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JgeInstruction.java similarity index 71% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JgeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JgeInstruction.java index 267134b..830d0a4 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JgeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JgeInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Conditional jump: jump if greater or equal @@ -12,7 +12,7 @@ public class JgeInstruction extends Instruction { public static final int OPCODE = 16; - private CPU cpu; + private final CPU cpu; public JgeInstruction(CPU cpu) { super("jge", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JlInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JlInstruction.java similarity index 69% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JlInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JlInstruction.java index 184c2e7..7f7d099 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JlInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JlInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JlInstruction extends Instruction { public static final int OPCODE = 17; - private CPU cpu; + private final CPU cpu; public JlInstruction(CPU cpu) { super("jl", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JleInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JleInstruction.java similarity index 71% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JleInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JleInstruction.java index d692162..d608b26 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JleInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JleInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JleInstruction extends Instruction { public static final int OPCODE = 18; - private CPU cpu; + private final CPU cpu; public JleInstruction(CPU cpu) { super("jle", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JmpInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JmpInstruction.java similarity index 63% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JmpInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JmpInstruction.java index 2310e37..6886548 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JmpInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JmpInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JmpInstruction extends Instruction { public static final int OPCODE = 10; - private CPU cpu; + private final CPU cpu; public JmpInstruction(CPU cpu) { super("jmp", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JnaInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JnaInstruction.java similarity index 70% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JnaInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JnaInstruction.java index e143f7e..4d8d5f3 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JnaInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JnaInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Jump if not above @@ -12,7 +12,7 @@ public class JnaInstruction extends Instruction { public static final int OPCODE = 47; - private CPU cpu; + private final CPU cpu; public JnaInstruction(CPU cpu) { super("jna", OPCODE); @@ -35,4 +35,4 @@ public class JnaInstruction extends Instruction { } return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JncInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JncInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JncInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JncInstruction.java index dc24476..da1d808 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JncInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JncInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JncInstruction extends Instruction { private static final int OPCODE = 34; - private CPU cpu; + private final CPU cpu; public JncInstruction(CPU cpu) { super("jnc", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JnoInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JnoInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JnoInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JnoInstruction.java index 8c1a653..53a914b 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JnoInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JnoInstruction.java @@ -1,16 +1,16 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JnoInstruction extends Instruction { private static final int OPCODE = 37; - private CPU cpu; + private final CPU cpu; public JnoInstruction(CPU cpu) { super("jno", OPCODE); @@ -32,4 +32,4 @@ public class JnoInstruction extends Instruction { } return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JnsInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JnsInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JnsInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JnsInstruction.java index fb3df90..f97e666 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JnsInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JnsInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JnsInstruction extends Instruction { public static final int OPCODE = 27; - private CPU cpu; + private final CPU cpu; public JnsInstruction(CPU cpu) { super("jns", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JnzInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JnzInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JnzInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JnzInstruction.java index 7642677..66fe8b0 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JnzInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JnzInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JnzInstruction extends Instruction { public static final int OPCODE = 13; - private CPU cpu; + private final CPU cpu; public JnzInstruction(CPU cpu) { super("jnz", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JoInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JoInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JoInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JoInstruction.java index d9ad1d6..ae64f5a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JoInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JoInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JoInstruction extends Instruction { private static final int OPCODE = 36; - private CPU cpu; + private final CPU cpu; public JoInstruction(CPU cpu) { super("jo", OPCODE); @@ -31,4 +31,4 @@ public class JoInstruction extends Instruction { } return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JsInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JsInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JsInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JsInstruction.java index a3cd5b0..35bc891 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JsInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JsInstruction.java @@ -1,15 +1,15 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JsInstruction extends Instruction { public static final int OPCODE = 26; - private CPU cpu; + private final CPU cpu; public JsInstruction(CPU cpu) { super("js", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/JzInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/JzInstruction.java similarity index 69% rename from Server/src/main/java/net/simon987/server/assembly/instruction/JzInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/JzInstruction.java index aa29e05..8ca3c80 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/JzInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/JzInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class JzInstruction extends Instruction { @@ -12,7 +12,7 @@ public class JzInstruction extends Instruction { */ public static final int OPCODE = 14; - private CPU cpu; + private final CPU cpu; public JzInstruction(CPU cpu) { super("jz", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/LeaInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/LeaInstruction.java similarity index 60% rename from Server/src/main/java/net/simon987/server/assembly/instruction/LeaInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/LeaInstruction.java index b18bd2e..3dc4c05 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/LeaInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/LeaInstruction.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Instruction; public class LeaInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/MovInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/MovInstruction.java similarity index 82% rename from Server/src/main/java/net/simon987/server/assembly/instruction/MovInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/MovInstruction.java index 91b2471..f7dc7c9 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/MovInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/MovInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * The MOV instruction copies data from a source to a destination. diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/MulInstruction.java similarity index 92% rename from Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/MulInstruction.java index 62747e1..a34372e 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/MulInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/MulInstruction.java @@ -1,13 +1,13 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.*; +import net.simon987.mar.server.assembly.*; public class MulInstruction extends Instruction { public static final int OPCODE = 23; - private CPU cpu; + private final CPU cpu; public MulInstruction(CPU cpu) { super("mul", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/NegInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/NegInstruction.java similarity index 81% rename from Server/src/main/java/net/simon987/server/assembly/instruction/NegInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/NegInstruction.java index c9638b0..8672cf7 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/NegInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/NegInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class NegInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/NopInstruction.java similarity index 67% rename from Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/NopInstruction.java index be687bd..abd2b84 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/NopInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/NopInstruction.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Instruction; /** * NOP (No operation instruction). diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/NotInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/NotInstruction.java similarity index 61% rename from Server/src/main/java/net/simon987/server/assembly/instruction/NotInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/NotInstruction.java index 453e51e..87cf018 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/NotInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/NotInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class NotInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/OrInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/OrInstruction.java similarity index 81% rename from Server/src/main/java/net/simon987/server/assembly/instruction/OrInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/OrInstruction.java index 48e5fd5..fd99c4c 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/OrInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/OrInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class OrInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/PopInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/PopInstruction.java similarity index 68% rename from Server/src/main/java/net/simon987/server/assembly/instruction/PopInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/PopInstruction.java index 4c7b1d8..aa44494 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/PopInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/PopInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** * Created by simon on 02/06/17. @@ -12,7 +12,7 @@ public class PopInstruction extends Instruction { public static final int OPCODE = 20; - private CPU cpu; + private final CPU cpu; public PopInstruction(CPU cpu) { super("pop", OPCODE); @@ -28,4 +28,4 @@ public class PopInstruction extends Instruction { return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/PopfInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/PopfInstruction.java similarity index 72% rename from Server/src/main/java/net/simon987/server/assembly/instruction/PopfInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/PopfInstruction.java index 3bcd909..909bc9a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/PopfInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/PopfInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.CPU; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.Status; /** * Pops a single word off the top of the stack and sets the CPU flags to it. @@ -12,7 +12,7 @@ public class PopfInstruction extends Instruction { public static final int OPCODE = 44; - private CPU cpu; + private final CPU cpu; public PopfInstruction(CPU cpu) { super("popf", OPCODE); @@ -33,11 +33,11 @@ public class PopfInstruction extends Instruction { // Increment SP sp.setValue(sp.getValue() + 1); - + return status; } public boolean noOperandsValid() { return true; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/PushInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/PushInstruction.java similarity index 86% rename from Server/src/main/java/net/simon987/server/assembly/instruction/PushInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/PushInstruction.java index c2b0244..e29a18f 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/PushInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/PushInstruction.java @@ -1,12 +1,12 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.*; +import net.simon987.mar.server.assembly.*; public class PushInstruction extends Instruction { public static final int OPCODE = 19; - private CPU cpu; + private final CPU cpu; public PushInstruction(CPU cpu) { super("push", OPCODE); @@ -34,4 +34,4 @@ public class PushInstruction extends Instruction { return status; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/PushfInstruction.java similarity index 69% rename from Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/PushfInstruction.java index 52faabc..0f2e06c 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/PushfInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/PushfInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.CPU; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.Status; /** * Pushes the current CPU flags onto the stack. @@ -12,7 +12,7 @@ public class PushfInstruction extends Instruction { public static final int OPCODE = 45; - private CPU cpu; + private final CPU cpu; public PushfInstruction(CPU cpu) { super("pushf", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/RclInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/RclInstruction.java similarity index 89% rename from Server/src/main/java/net/simon987/server/assembly/instruction/RclInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/RclInstruction.java index 7ff1b36..3146b65 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/RclInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/RclInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** *
+---------------------+ diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/RcrInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/RcrInstruction.java similarity index 88% rename from Server/src/main/java/net/simon987/server/assembly/instruction/RcrInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/RcrInstruction.java index c3e6a74..2b953be 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/RcrInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/RcrInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** *
+---------------------+ diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/RetInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/RetInstruction.java similarity index 78% rename from Server/src/main/java/net/simon987/server/assembly/instruction/RetInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/RetInstruction.java index 10f1659..fc0275a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/RetInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/RetInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.CPU; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; public class RetInstruction extends Instruction { @@ -11,7 +11,7 @@ public class RetInstruction extends Instruction { */ public static final int OPCODE = 22; - private CPU cpu; + private final CPU cpu; public RetInstruction(CPU cpu) { super("ret", OPCODE); @@ -39,4 +39,4 @@ public class RetInstruction extends Instruction { public boolean noOperandsValid() { return true; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/RolInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/RolInstruction.java similarity index 87% rename from Server/src/main/java/net/simon987/server/assembly/instruction/RolInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/RolInstruction.java index 8fe1719..20e3d8f 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/RolInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/RolInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** *
+-----------------+ diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/RorInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/RorInstruction.java similarity index 87% rename from Server/src/main/java/net/simon987/server/assembly/instruction/RorInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/RorInstruction.java index 28e1010..bde2904 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/RorInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/RorInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** *
+-----------------+ diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SalInstruction.java similarity index 73% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SalInstruction.java index 8d3a405..67230e6 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SalInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SalInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * Alias of SHL instruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SarInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SarInstruction.java similarity index 87% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SarInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SarInstruction.java index b2ff10c..6570389 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SarInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SarInstruction.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; public class SarInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetaInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetaInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetaInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetaInstruction.java index 1df5af0..b1f5b90 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetaInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetaInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetaeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetaeInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetaeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetaeInstruction.java index 3bf4a3e..7e7a246 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetaeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetaeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetbInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetbInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetbInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetbInstruction.java index 7cbaae3..a76eead 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetbInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetbInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetbeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetbeInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetbeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetbeInstruction.java index d3cb95f..39830e0 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetbeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetbeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetcInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetcInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetcInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetcInstruction.java index 844e348..e5f170c 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetcInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetcInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetccInstruction.java similarity index 95% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetccInstruction.java index 14af27e..00e5f67 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetccInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetccInstruction.java @@ -1,20 +1,13 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Operand; -import net.simon987.server.assembly.OperandType; -import net.simon987.server.assembly.MachineCode; - -import net.simon987.server.assembly.exception.AssemblyException; -import net.simon987.server.assembly.exception.IllegalOperandException; -import net.simon987.server.assembly.exception.InvalidMnemonicException; +import net.simon987.mar.server.assembly.*; +import net.simon987.mar.server.assembly.exception.AssemblyException; +import net.simon987.mar.server.assembly.exception.IllegalOperandException; +import net.simon987.mar.server.assembly.exception.InvalidMnemonicException; import java.io.ByteArrayOutputStream; - -import java.util.Map; import java.util.HashMap; +import java.util.Map; /** * Implementation of the SETcc family of instructions diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SeteInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SeteInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SeteInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SeteInstruction.java index ea02ad8..69971bf 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SeteInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SeteInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetgInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetgInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetgInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetgInstruction.java index 39deb1d..0d9eb1e 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetgInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetgInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetgeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetgeInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetgeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetgeInstruction.java index 463cb7e..a1b3cce 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetgeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetgeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetlInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetlInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetlInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetlInstruction.java index 164c73d..5fb5083 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetlInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetlInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetleInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetleInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetleInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetleInstruction.java index d88ec0c..86fbae7 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetleInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetleInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnaInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnaInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnaInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnaInstruction.java index 1107308..45f0003 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnaInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnaInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnaeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnaeInstruction.java similarity index 75% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnaeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnaeInstruction.java index 14c39e9..c29cc06 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnaeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnaeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnbInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnbInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnbInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnbInstruction.java index 0fe4d80..021df11 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnbInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnbInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnbeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnbeInstruction.java similarity index 75% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnbeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnbeInstruction.java index 9e7ba90..26a5373 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnbeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnbeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetncInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetncInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetncInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetncInstruction.java index bc127b3..518a13d 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetncInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetncInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetneInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetneInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetneInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetneInstruction.java index 5800e43..98240c7 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetneInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetneInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetngInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetngInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetngInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetngInstruction.java index 0f5cb8c..33898f0 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetngInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetngInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetngeInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetngeInstruction.java similarity index 75% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetngeInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetngeInstruction.java index a305e78..f39368e 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetngeInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetngeInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnlInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnlInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnlInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnlInstruction.java index 5857c78..1d4a681 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnlInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnlInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnleInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnleInstruction.java similarity index 75% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnleInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnleInstruction.java index e7211a7..80ae800 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnleInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnleInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnoInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnoInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnoInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnoInstruction.java index 3517e4a..3e17c4a 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnoInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnoInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnsInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnsInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnsInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnsInstruction.java index 4097552..0622f61 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnsInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnsInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnzInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnzInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetnzInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetnzInstruction.java index 8099b74..35bf341 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetnzInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetnzInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetoInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetoInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetoInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetoInstruction.java index 8f5b477..bd17631 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetoInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetoInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetsInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetsInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetsInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetsInstruction.java index 5b370da..e8fceed 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetsInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetsInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SetzInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SetzInstruction.java similarity index 74% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SetzInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SetzInstruction.java index bca3a53..d807d79 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SetzInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SetzInstruction.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; /** * alias of SetccInstruction diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/ShlInstruction.java similarity index 83% rename from Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/ShlInstruction.java index 2f473f8..05f422c 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/ShlInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/ShlInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class ShlInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/ShrInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/ShrInstruction.java similarity index 86% rename from Server/src/main/java/net/simon987/server/assembly/instruction/ShrInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/ShrInstruction.java index bd2187d..fecc926 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/ShrInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/ShrInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class ShrInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/SubInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/SubInstruction.java similarity index 82% rename from Server/src/main/java/net/simon987/server/assembly/instruction/SubInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/SubInstruction.java index 634de22..c399ebe 100755 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/SubInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/SubInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class SubInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/TestInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/TestInstruction.java similarity index 80% rename from Server/src/main/java/net/simon987/server/assembly/instruction/TestInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/TestInstruction.java index 4d2b08c..7ef9417 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/TestInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/TestInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class TestInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/XchgInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/XchgInstruction.java similarity index 64% rename from Server/src/main/java/net/simon987/server/assembly/instruction/XchgInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/XchgInstruction.java index 29b875b..6f71a67 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/XchgInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/XchgInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.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; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; /** @@ -13,7 +13,7 @@ public class XchgInstruction extends Instruction { public static final int OPCODE = 31; - private CPU cpu; + private final CPU cpu; public XchgInstruction(CPU cpu) { super("xchg", OPCODE); diff --git a/Server/src/main/java/net/simon987/server/assembly/instruction/XorInstruction.java b/src/main/java/net/simon987/mar/server/assembly/instruction/XorInstruction.java similarity index 81% rename from Server/src/main/java/net/simon987/server/assembly/instruction/XorInstruction.java rename to src/main/java/net/simon987/mar/server/assembly/instruction/XorInstruction.java index 7f3d827..530770d 100644 --- a/Server/src/main/java/net/simon987/server/assembly/instruction/XorInstruction.java +++ b/src/main/java/net/simon987/mar/server/assembly/instruction/XorInstruction.java @@ -1,9 +1,9 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Instruction; -import net.simon987.server.assembly.Status; -import net.simon987.server.assembly.Target; -import net.simon987.server.assembly.Util; +import net.simon987.mar.server.assembly.Instruction; +import net.simon987.mar.server.assembly.Status; +import net.simon987.mar.server.assembly.Target; +import net.simon987.mar.server.assembly.Util; public class XorInstruction extends Instruction { diff --git a/Server/src/main/java/net/simon987/server/crypto/AutokeyCypher.java b/src/main/java/net/simon987/mar/server/crypto/AutokeyCypher.java similarity index 94% rename from Server/src/main/java/net/simon987/server/crypto/AutokeyCypher.java rename to src/main/java/net/simon987/mar/server/crypto/AutokeyCypher.java index ede4ee3..2c3f57e 100644 --- a/Server/src/main/java/net/simon987/server/crypto/AutokeyCypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/AutokeyCypher.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class AutokeyCypher extends ShiftSubstitutionCypher { @@ -29,5 +29,5 @@ public class AutokeyCypher extends ShiftSubstitutionCypher { // } return 0; } - -} \ No newline at end of file + +} diff --git a/Server/src/main/java/net/simon987/server/crypto/CaesarCypher.java b/src/main/java/net/simon987/mar/server/crypto/CaesarCypher.java similarity index 94% rename from Server/src/main/java/net/simon987/server/crypto/CaesarCypher.java rename to src/main/java/net/simon987/mar/server/crypto/CaesarCypher.java index fa6b448..4683a4a 100644 --- a/Server/src/main/java/net/simon987/server/crypto/CaesarCypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/CaesarCypher.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class CaesarCypher extends ShiftSubstitutionCypher { @@ -26,4 +26,4 @@ public class CaesarCypher extends ShiftSubstitutionCypher { return key[0]; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/CryptoException.java b/src/main/java/net/simon987/mar/server/crypto/CryptoException.java similarity index 89% rename from Server/src/main/java/net/simon987/server/crypto/CryptoException.java rename to src/main/java/net/simon987/mar/server/crypto/CryptoException.java index bc7bb89..02d9d9f 100644 --- a/Server/src/main/java/net/simon987/server/crypto/CryptoException.java +++ b/src/main/java/net/simon987/mar/server/crypto/CryptoException.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class CryptoException extends Exception { @@ -19,4 +19,4 @@ public class CryptoException extends Exception { super (message, cause); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/CryptoProvider.java b/src/main/java/net/simon987/mar/server/crypto/CryptoProvider.java similarity index 77% rename from Server/src/main/java/net/simon987/server/crypto/CryptoProvider.java rename to src/main/java/net/simon987/mar/server/crypto/CryptoProvider.java index 777ca2f..7c48bba 100644 --- a/Server/src/main/java/net/simon987/server/crypto/CryptoProvider.java +++ b/src/main/java/net/simon987/mar/server/crypto/CryptoProvider.java @@ -1,6 +1,6 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; -public class CryptoProvider{ +public class CryptoProvider { public static final int NO_CYPHER = 0x0000; public static final int CAESAR_CYPHER = 0x0001; @@ -9,15 +9,15 @@ public class CryptoProvider{ public static final int PASSWORD_LENGTH = 8; //Same as CubotComPort.MESSAGE_LENGTH - private String charset; - private RandomStringGenerator passwordGenerator; + private final String charset; + private final RandomStringGenerator passwordGenerator; - public CryptoProvider(String charset){ + public CryptoProvider(String charset) { this.charset = charset; this.passwordGenerator = new RandomStringGenerator(PASSWORD_LENGTH, charset); } - public CryptoProvider(){ + public CryptoProvider() { this(RandomStringGenerator.ALPHANUMERIC_CHARSET); } @@ -36,4 +36,4 @@ public class CryptoProvider{ } } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/Cypher.java b/src/main/java/net/simon987/mar/server/crypto/Cypher.java similarity index 83% rename from Server/src/main/java/net/simon987/server/crypto/Cypher.java rename to src/main/java/net/simon987/mar/server/crypto/Cypher.java index f156042..a30fa05 100644 --- a/Server/src/main/java/net/simon987/server/crypto/Cypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/Cypher.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public interface Cypher { @@ -10,4 +10,4 @@ public interface Cypher { String keyCharset(); -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/InvalidCharsetException.java b/src/main/java/net/simon987/mar/server/crypto/InvalidCharsetException.java similarity index 90% rename from Server/src/main/java/net/simon987/server/crypto/InvalidCharsetException.java rename to src/main/java/net/simon987/mar/server/crypto/InvalidCharsetException.java index f4f7fd4..466bcab 100644 --- a/Server/src/main/java/net/simon987/server/crypto/InvalidCharsetException.java +++ b/src/main/java/net/simon987/mar/server/crypto/InvalidCharsetException.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class InvalidCharsetException extends CryptoException { @@ -19,4 +19,4 @@ public class InvalidCharsetException extends CryptoException { super (message, cause); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/InvalidKeyException.java b/src/main/java/net/simon987/mar/server/crypto/InvalidKeyException.java similarity index 89% rename from Server/src/main/java/net/simon987/server/crypto/InvalidKeyException.java rename to src/main/java/net/simon987/mar/server/crypto/InvalidKeyException.java index 095b167..820cbb7 100644 --- a/Server/src/main/java/net/simon987/server/crypto/InvalidKeyException.java +++ b/src/main/java/net/simon987/mar/server/crypto/InvalidKeyException.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class InvalidKeyException extends CryptoException { @@ -19,4 +19,4 @@ public class InvalidKeyException extends CryptoException { super (message, cause); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/NoCypher.java b/src/main/java/net/simon987/mar/server/crypto/NoCypher.java similarity index 86% rename from Server/src/main/java/net/simon987/server/crypto/NoCypher.java rename to src/main/java/net/simon987/mar/server/crypto/NoCypher.java index 2f6028c..072950f 100644 --- a/Server/src/main/java/net/simon987/server/crypto/NoCypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/NoCypher.java @@ -1,12 +1,12 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class NoCypher implements Cypher { - private String charset; + private final String charset; - public NoCypher(String charset){ - this.charset = charset; - } + public NoCypher(String charset) { + this.charset = charset; + } public NoCypher() { this(RandomStringGenerator.ALPHANUMERIC_CHARSET); @@ -46,8 +46,8 @@ public class NoCypher implements Cypher { public String textCharset(){ return charset; } - - public String keyCharset(){ + + public String keyCharset(){ return charset; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/RandomStringGenerator.java b/src/main/java/net/simon987/mar/server/crypto/RandomStringGenerator.java similarity index 98% rename from Server/src/main/java/net/simon987/server/crypto/RandomStringGenerator.java rename to src/main/java/net/simon987/mar/server/crypto/RandomStringGenerator.java index 3c61b1c..fb23136 100644 --- a/Server/src/main/java/net/simon987/server/crypto/RandomStringGenerator.java +++ b/src/main/java/net/simon987/mar/server/crypto/RandomStringGenerator.java @@ -1,5 +1,5 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; import java.security.SecureRandom; import java.util.Locale; @@ -73,4 +73,4 @@ public class RandomStringGenerator { this(8); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/SecretKeyGenerator.java b/src/main/java/net/simon987/mar/server/crypto/SecretKeyGenerator.java similarity index 90% rename from Server/src/main/java/net/simon987/server/crypto/SecretKeyGenerator.java rename to src/main/java/net/simon987/mar/server/crypto/SecretKeyGenerator.java index a40dd27..5a0e922 100644 --- a/Server/src/main/java/net/simon987/server/crypto/SecretKeyGenerator.java +++ b/src/main/java/net/simon987/mar/server/crypto/SecretKeyGenerator.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; @@ -9,7 +9,7 @@ import java.util.Base64; public class SecretKeyGenerator { private static final String KEY_GENERATION_ALGORITHM = "HmacSHA1"; - private KeyGenerator keyGen; + private final KeyGenerator keyGen; public SecretKeyGenerator() { try { diff --git a/Server/src/main/java/net/simon987/server/crypto/ShiftSubstitutionCypher.java b/src/main/java/net/simon987/mar/server/crypto/ShiftSubstitutionCypher.java similarity index 90% rename from Server/src/main/java/net/simon987/server/crypto/ShiftSubstitutionCypher.java rename to src/main/java/net/simon987/mar/server/crypto/ShiftSubstitutionCypher.java index cb9b023..534081a 100644 --- a/Server/src/main/java/net/simon987/server/crypto/ShiftSubstitutionCypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/ShiftSubstitutionCypher.java @@ -1,14 +1,14 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public abstract class ShiftSubstitutionCypher implements Cypher { - private String charset; + private final String charset; - public ShiftSubstitutionCypher(String charset){ - this.charset = charset; - } + public ShiftSubstitutionCypher(String charset) { + this.charset = charset; + } - public ShiftSubstitutionCypher(){ + public ShiftSubstitutionCypher() { this(RandomStringGenerator.ALPHANUMERIC_CHARSET); } @@ -81,8 +81,8 @@ public abstract class ShiftSubstitutionCypher implements Cypher { public String textCharset(){ return charset; } - - public String keyCharset(){ + + public String keyCharset(){ return charset; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/crypto/VigenereCypher.java b/src/main/java/net/simon987/mar/server/crypto/VigenereCypher.java similarity index 93% rename from Server/src/main/java/net/simon987/server/crypto/VigenereCypher.java rename to src/main/java/net/simon987/mar/server/crypto/VigenereCypher.java index 77a2879..d40e148 100644 --- a/Server/src/main/java/net/simon987/server/crypto/VigenereCypher.java +++ b/src/main/java/net/simon987/mar/server/crypto/VigenereCypher.java @@ -1,4 +1,4 @@ -package net.simon987.server.crypto; +package net.simon987.mar.server.crypto; public class VigenereCypher extends ShiftSubstitutionCypher { @@ -25,5 +25,5 @@ public class VigenereCypher extends ShiftSubstitutionCypher { return 0; } - -} \ No newline at end of file + +} diff --git a/Server/src/main/java/net/simon987/server/event/CpuInitialisationEvent.java b/src/main/java/net/simon987/mar/server/event/CpuInitialisationEvent.java similarity index 57% rename from Server/src/main/java/net/simon987/server/event/CpuInitialisationEvent.java rename to src/main/java/net/simon987/mar/server/event/CpuInitialisationEvent.java index c35a7b5..67daa2e 100644 --- a/Server/src/main/java/net/simon987/server/event/CpuInitialisationEvent.java +++ b/src/main/java/net/simon987/mar/server/event/CpuInitialisationEvent.java @@ -1,11 +1,11 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; -import net.simon987.server.assembly.CPU; -import net.simon987.server.game.objects.ControllableUnit; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.game.objects.ControllableUnit; public class CpuInitialisationEvent extends GameEvent { - private ControllableUnit unit; + private final ControllableUnit unit; public CpuInitialisationEvent(CPU cpu, ControllableUnit unit) { setSource(cpu); diff --git a/Server/src/main/java/net/simon987/server/event/DebugCommandEvent.java b/src/main/java/net/simon987/mar/server/event/DebugCommandEvent.java similarity index 90% rename from Server/src/main/java/net/simon987/server/event/DebugCommandEvent.java rename to src/main/java/net/simon987/mar/server/event/DebugCommandEvent.java index 00a9c71..fd320c7 100644 --- a/Server/src/main/java/net/simon987/server/event/DebugCommandEvent.java +++ b/src/main/java/net/simon987/mar/server/event/DebugCommandEvent.java @@ -1,6 +1,6 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; -import net.simon987.server.websocket.OnlineUser; +import net.simon987.mar.server.websocket.OnlineUser; import org.bson.types.ObjectId; import org.json.simple.JSONObject; @@ -8,7 +8,7 @@ import java.io.IOException; public class DebugCommandEvent extends GameEvent { - private JSONObject command; + private final JSONObject command; public DebugCommandEvent(JSONObject json, OnlineUser user) { this.command = json; diff --git a/Server/src/main/java/net/simon987/server/event/GameEvent.java b/src/main/java/net/simon987/mar/server/event/GameEvent.java similarity index 93% rename from Server/src/main/java/net/simon987/server/event/GameEvent.java rename to src/main/java/net/simon987/mar/server/event/GameEvent.java index 1416f97..47acd86 100644 --- a/Server/src/main/java/net/simon987/server/event/GameEvent.java +++ b/src/main/java/net/simon987/mar/server/event/GameEvent.java @@ -1,4 +1,4 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; public class GameEvent { diff --git a/src/main/java/net/simon987/mar/server/event/GameEventDispatcher.java b/src/main/java/net/simon987/mar/server/event/GameEventDispatcher.java new file mode 100644 index 0000000..aad7901 --- /dev/null +++ b/src/main/java/net/simon987/mar/server/event/GameEventDispatcher.java @@ -0,0 +1,27 @@ +package net.simon987.mar.server.event; + + +import java.util.ArrayList; + + +public class GameEventDispatcher { + + private final ArrayList listeners; + + public GameEventDispatcher() { + listeners = new ArrayList<>(); + } + + public void dispatch(GameEvent event) { + + for (GameEventListener listener : listeners) { + if (event.getClass().equals(listener.getListenedEventType())) { + listener.handle(event); + } + } + } + + public ArrayList getListeners() { + return listeners; + } +} diff --git a/Server/src/main/java/net/simon987/server/event/GameEventListener.java b/src/main/java/net/simon987/mar/server/event/GameEventListener.java similarity index 81% rename from Server/src/main/java/net/simon987/server/event/GameEventListener.java rename to src/main/java/net/simon987/mar/server/event/GameEventListener.java index 6218556..fdc32d2 100644 --- a/Server/src/main/java/net/simon987/server/event/GameEventListener.java +++ b/src/main/java/net/simon987/mar/server/event/GameEventListener.java @@ -1,4 +1,4 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; /** * Listens for and handles a single type of event diff --git a/Server/src/main/java/net/simon987/server/event/ObjectDeathEvent.java b/src/main/java/net/simon987/mar/server/event/ObjectDeathEvent.java similarity index 84% rename from Server/src/main/java/net/simon987/server/event/ObjectDeathEvent.java rename to src/main/java/net/simon987/mar/server/event/ObjectDeathEvent.java index a2ea5f1..5858963 100644 --- a/Server/src/main/java/net/simon987/server/event/ObjectDeathEvent.java +++ b/src/main/java/net/simon987/mar/server/event/ObjectDeathEvent.java @@ -1,4 +1,4 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; /** * Event dispatched by a GameObject who has needed callbacks on death diff --git a/Server/src/main/java/net/simon987/server/event/TickEvent.java b/src/main/java/net/simon987/mar/server/event/TickEvent.java similarity index 82% rename from Server/src/main/java/net/simon987/server/event/TickEvent.java rename to src/main/java/net/simon987/mar/server/event/TickEvent.java index 55bab2e..c9aa273 100644 --- a/Server/src/main/java/net/simon987/server/event/TickEvent.java +++ b/src/main/java/net/simon987/mar/server/event/TickEvent.java @@ -1,4 +1,4 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; public class TickEvent extends GameEvent { diff --git a/Server/src/main/java/net/simon987/server/event/UserCreationEvent.java b/src/main/java/net/simon987/mar/server/event/UserCreationEvent.java similarity index 61% rename from Server/src/main/java/net/simon987/server/event/UserCreationEvent.java rename to src/main/java/net/simon987/mar/server/event/UserCreationEvent.java index 9688eae..a7fa1c9 100644 --- a/Server/src/main/java/net/simon987/server/event/UserCreationEvent.java +++ b/src/main/java/net/simon987/mar/server/event/UserCreationEvent.java @@ -1,6 +1,6 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; -import net.simon987.server.user.User; +import net.simon987.mar.server.user.User; public class UserCreationEvent extends GameEvent { diff --git a/Server/src/main/java/net/simon987/server/event/WorldGenerationEvent.java b/src/main/java/net/simon987/mar/server/event/WorldGenerationEvent.java similarity index 70% rename from Server/src/main/java/net/simon987/server/event/WorldGenerationEvent.java rename to src/main/java/net/simon987/mar/server/event/WorldGenerationEvent.java index 636b401..572f2fc 100644 --- a/Server/src/main/java/net/simon987/server/event/WorldGenerationEvent.java +++ b/src/main/java/net/simon987/mar/server/event/WorldGenerationEvent.java @@ -1,6 +1,6 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.game.world.World; public class WorldGenerationEvent extends GameEvent { diff --git a/Server/src/main/java/net/simon987/server/event/WorldUpdateEvent.java b/src/main/java/net/simon987/mar/server/event/WorldUpdateEvent.java similarity index 61% rename from Server/src/main/java/net/simon987/server/event/WorldUpdateEvent.java rename to src/main/java/net/simon987/mar/server/event/WorldUpdateEvent.java index 77efdee..d245a4f 100644 --- a/Server/src/main/java/net/simon987/server/event/WorldUpdateEvent.java +++ b/src/main/java/net/simon987/mar/server/event/WorldUpdateEvent.java @@ -1,10 +1,10 @@ -package net.simon987.server.event; +package net.simon987.mar.server.event; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.game.world.World; public class WorldUpdateEvent extends GameEvent { - private World world; + private final World world; public WorldUpdateEvent(World world) { this.world = world; diff --git a/Server/src/main/java/net/simon987/server/game/GameUniverse.java b/src/main/java/net/simon987/mar/server/game/GameUniverse.java similarity index 86% rename from Server/src/main/java/net/simon987/server/game/GameUniverse.java rename to src/main/java/net/simon987/mar/server/game/GameUniverse.java index 4afb1ca..5441020 100644 --- a/Server/src/main/java/net/simon987/server/game/GameUniverse.java +++ b/src/main/java/net/simon987/mar/server/game/GameUniverse.java @@ -1,41 +1,44 @@ -package net.simon987.server.game; +package net.simon987.mar.server.game; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.MongoDatabase; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.assembly.exception.CancelledException; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; -import net.simon987.server.game.world.WorldGenerator; -import net.simon987.server.logging.LogManager; -import net.simon987.server.user.User; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.game.world.WorldGenerator; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.User; import org.bson.Document; import org.bson.types.ObjectId; import java.util.Collection; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; public class GameUniverse { - private ConcurrentHashMap worlds; + private final Map worlds; //username:user - private ConcurrentHashMap users; - private WorldGenerator worldGenerator; + private final Map users; + private final WorldGenerator worldGenerator; private MongoClient mongo = null; - private long time; - private int maxWidth = 0xFFFF; + private final int maxWidth = 0xFFFF; + + private final Map store; public GameUniverse(IServerConfiguration config) { worlds = new ConcurrentHashMap<>(256); users = new ConcurrentHashMap<>(16); + store = new ConcurrentHashMap<>(); worldGenerator = new WorldGenerator(config); } @@ -74,12 +77,11 @@ public class GameUniverse { /** * Get a world by coordinates, attempts to load from mongoDB if not found. - * - * @param x the x coordinate of the world - * @param y the y coordinate of the world - * @param createNew if true, a new world is created when a world with given coordinates is not found * - * @return World, null if not found and not created. + * @param x the x coordinate of the world + * @param y the y coordinate of the world + * @param createNew if true, a new world is created when a world with given coordinates is not found + * @return World, null if not found and not created. */ @SuppressWarnings("SuspiciousNameCombination") public World getWorld(int x, int y, boolean createNew, String dimension) { @@ -128,11 +130,11 @@ public class GameUniverse { y %= maxWidth; return worlds.get(World.idFromCoordinates(x, y, dimension)); - } + } /** * Adds a new or freshly loaded world to the universe (if not already present). - * + * * @param world the world to be added */ public void addWorld(World world){ @@ -145,7 +147,7 @@ public class GameUniverse { /** * Removes the world with given coordinates from the universe. - * + * * @param x the x coordinate of the world to be removed * @param y the y coordinate of the world to be removed */ @@ -158,7 +160,7 @@ public class GameUniverse { /** * Removes the given world from the universe. - * + * * @param world the world to be removed. */ public void removeWorld(World world){ @@ -288,5 +290,4 @@ public class GameUniverse { public void setTime(long time) { this.time = time; } - } diff --git a/Server/src/main/java/net/simon987/server/game/debug/ComPortMsgCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/ComPortMsgCommandListener.java similarity index 72% rename from Server/src/main/java/net/simon987/server/game/debug/ComPortMsgCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/ComPortMsgCommandListener.java index 33e42fa..c383d0f 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/ComPortMsgCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/ComPortMsgCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.MessageReceiver; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.MessageReceiver; import org.bson.types.ObjectId; public class ComPortMsgCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/CreateWorldCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/CreateWorldCommandListener.java similarity index 69% rename from Server/src/main/java/net/simon987/server/game/debug/CreateWorldCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/CreateWorldCommandListener.java index 7fee741..2a7da96 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/CreateWorldCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/CreateWorldCommandListener.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.world.World; public class CreateWorldCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/DamageObjCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/DamageObjCommandListener.java similarity index 75% rename from Server/src/main/java/net/simon987/server/game/debug/DamageObjCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/DamageObjCommandListener.java index 4967fb5..e3b4bea 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/DamageObjCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/DamageObjCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.Attackable; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.Attackable; +import net.simon987.mar.server.game.objects.GameObject; public class DamageObjCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/HealObjCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/HealObjCommandListener.java similarity index 74% rename from Server/src/main/java/net/simon987/server/game/debug/HealObjCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/HealObjCommandListener.java index 1e76a9c..a89db69 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/HealObjCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/HealObjCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.Attackable; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.Attackable; +import net.simon987.mar.server.game.objects.GameObject; public class HealObjCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/KillAllCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/KillAllCommandListener.java similarity index 74% rename from Server/src/main/java/net/simon987/server/game/debug/KillAllCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/KillAllCommandListener.java index 6045d8f..4cc0d9a 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/KillAllCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/KillAllCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.World; import java.util.ArrayList; import java.util.Arrays; diff --git a/Server/src/main/java/net/simon987/server/game/debug/MoveObjCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/MoveObjCommandListener.java similarity index 70% rename from Server/src/main/java/net/simon987/server/game/debug/MoveObjCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/MoveObjCommandListener.java index 323c66d..bec6dcb 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/MoveObjCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/MoveObjCommandListener.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; public class MoveObjCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/ObjInfoCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/ObjInfoCommandListener.java similarity index 79% rename from Server/src/main/java/net/simon987/server/game/debug/ObjInfoCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/ObjInfoCommandListener.java index f4ea865..5e6bb46 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/ObjInfoCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/ObjInfoCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.World; import java.util.Arrays; import java.util.Collection; diff --git a/Server/src/main/java/net/simon987/server/game/debug/SaveGameCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/SaveGameCommandListener.java similarity index 63% rename from Server/src/main/java/net/simon987/server/game/debug/SaveGameCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/SaveGameCommandListener.java index 3181ee2..27980a3 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/SaveGameCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/SaveGameCommandListener.java @@ -1,9 +1,9 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; public class SaveGameCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/SetEnergyCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/SetEnergyCommandListener.java similarity index 73% rename from Server/src/main/java/net/simon987/server/game/debug/SetEnergyCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/SetEnergyCommandListener.java index 158341b..ab6d25c 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/SetEnergyCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/SetEnergyCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Rechargeable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Rechargeable; public class SetEnergyCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/SetTileAtCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/SetTileAtCommandListener.java similarity index 72% rename from Server/src/main/java/net/simon987/server/game/debug/SetTileAtCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/SetTileAtCommandListener.java index b757919..eb6dc1a 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/SetTileAtCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/SetTileAtCommandListener.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.world.World; public class SetTileAtCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/SpawnObjCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/SpawnObjCommandListener.java similarity index 80% rename from Server/src/main/java/net/simon987/server/game/debug/SpawnObjCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/SpawnObjCommandListener.java index ce17107..aa2bef5 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/SpawnObjCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/SpawnObjCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.World; import org.bson.Document; import org.bson.types.ObjectId; diff --git a/Server/src/main/java/net/simon987/server/game/debug/TpObjectCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/TpObjectCommandListener.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/debug/TpObjectCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/TpObjectCommandListener.java index a94250a..7ca2edb 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/TpObjectCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/TpObjectCommandListener.java @@ -1,12 +1,12 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Updatable; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Updatable; +import net.simon987.mar.server.game.world.World; public class TpObjectCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/debug/UserInfoCommandListener.java b/src/main/java/net/simon987/mar/server/game/debug/UserInfoCommandListener.java similarity index 75% rename from Server/src/main/java/net/simon987/server/game/debug/UserInfoCommandListener.java rename to src/main/java/net/simon987/mar/server/game/debug/UserInfoCommandListener.java index d1a7d23..040681f 100644 --- a/Server/src/main/java/net/simon987/server/game/debug/UserInfoCommandListener.java +++ b/src/main/java/net/simon987/mar/server/game/debug/UserInfoCommandListener.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.debug; +package net.simon987.mar.server.game.debug; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.user.User; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.user.User; public class UserInfoCommandListener implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/item/Item.java b/src/main/java/net/simon987/mar/server/game/item/Item.java similarity index 82% rename from Server/src/main/java/net/simon987/server/game/item/Item.java rename to src/main/java/net/simon987/mar/server/game/item/Item.java index eadd070..c593f06 100644 --- a/Server/src/main/java/net/simon987/server/game/item/Item.java +++ b/src/main/java/net/simon987/mar/server/game/item/Item.java @@ -1,9 +1,9 @@ -package net.simon987.server.game.item; +package net.simon987.mar.server.game.item; -import net.simon987.server.assembly.Memory; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.io.JSONSerializable; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.io.JSONSerializable; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java b/src/main/java/net/simon987/mar/server/game/item/ItemCopper.java similarity index 89% rename from Server/src/main/java/net/simon987/server/game/item/ItemCopper.java rename to src/main/java/net/simon987/mar/server/game/item/ItemCopper.java index d7c6bef..64d3a28 100644 --- a/Server/src/main/java/net/simon987/server/game/item/ItemCopper.java +++ b/src/main/java/net/simon987/mar/server/game/item/ItemCopper.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.item; +package net.simon987.mar.server.game.item; import org.bson.Document; diff --git a/Server/src/main/java/net/simon987/server/game/item/ItemIron.java b/src/main/java/net/simon987/mar/server/game/item/ItemIron.java similarity index 89% rename from Server/src/main/java/net/simon987/server/game/item/ItemIron.java rename to src/main/java/net/simon987/mar/server/game/item/ItemIron.java index 3b27b3a..827a60c 100644 --- a/Server/src/main/java/net/simon987/server/game/item/ItemIron.java +++ b/src/main/java/net/simon987/mar/server/game/item/ItemIron.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.item; +package net.simon987.mar.server.game.item; import org.bson.Document; diff --git a/Server/src/main/java/net/simon987/server/game/item/ItemVoid.java b/src/main/java/net/simon987/mar/server/game/item/ItemVoid.java similarity index 85% rename from Server/src/main/java/net/simon987/server/game/item/ItemVoid.java rename to src/main/java/net/simon987/mar/server/game/item/ItemVoid.java index 982f0f8..cfaec25 100644 --- a/Server/src/main/java/net/simon987/server/game/item/ItemVoid.java +++ b/src/main/java/net/simon987/mar/server/game/item/ItemVoid.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.item; +package net.simon987.mar.server.game.item; /** * Invalid/empty item diff --git a/Server/src/main/java/net/simon987/server/game/objects/Action.java b/src/main/java/net/simon987/mar/server/game/objects/Action.java similarity index 75% rename from Server/src/main/java/net/simon987/server/game/objects/Action.java rename to src/main/java/net/simon987/mar/server/game/objects/Action.java index 3d8d7b8..913b3d6 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Action.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Action.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; public enum Action { IDLE, diff --git a/Server/src/main/java/net/simon987/server/game/objects/Attackable.java b/src/main/java/net/simon987/mar/server/game/objects/Attackable.java similarity index 85% rename from Server/src/main/java/net/simon987/server/game/objects/Attackable.java rename to src/main/java/net/simon987/mar/server/game/objects/Attackable.java index 72c280d..90f320a 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Attackable.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Attackable.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; /** * Objects that can be attacked or healed diff --git a/Server/src/main/java/net/simon987/server/game/objects/ControllableUnit.java b/src/main/java/net/simon987/mar/server/game/objects/ControllableUnit.java similarity index 74% rename from Server/src/main/java/net/simon987/server/game/objects/ControllableUnit.java rename to src/main/java/net/simon987/mar/server/game/objects/ControllableUnit.java index 3e6504a..3ab7421 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/ControllableUnit.java +++ b/src/main/java/net/simon987/mar/server/game/objects/ControllableUnit.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.assembly.CPU; -import net.simon987.server.assembly.Memory; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.world.World; -import net.simon987.server.user.User; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.user.User; import org.bson.types.ObjectId; import java.awt.*; diff --git a/Server/src/main/java/net/simon987/server/game/objects/Direction.java b/src/main/java/net/simon987/mar/server/game/objects/Direction.java similarity index 97% rename from Server/src/main/java/net/simon987/server/game/objects/Direction.java rename to src/main/java/net/simon987/mar/server/game/objects/Direction.java index 584bd5d..9b3d9f0 100755 --- a/Server/src/main/java/net/simon987/server/game/objects/Direction.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Direction.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; /** * Direction of a game object in a 4-direction grid-based diff --git a/Server/src/main/java/net/simon987/server/game/objects/Enterable.java b/src/main/java/net/simon987/mar/server/game/objects/Enterable.java similarity index 86% rename from Server/src/main/java/net/simon987/server/game/objects/Enterable.java rename to src/main/java/net/simon987/mar/server/game/objects/Enterable.java index f6a47c7..2a74b1a 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Enterable.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Enterable.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; public interface Enterable { diff --git a/Server/src/main/java/net/simon987/server/game/objects/GameObject.java b/src/main/java/net/simon987/mar/server/game/objects/GameObject.java similarity index 95% rename from Server/src/main/java/net/simon987/server/game/objects/GameObject.java rename to src/main/java/net/simon987/mar/server/game/objects/GameObject.java index eac119a..4b081c9 100755 --- a/Server/src/main/java/net/simon987/server/game/objects/GameObject.java +++ b/src/main/java/net/simon987/mar/server/game/objects/GameObject.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.GameServer; -import net.simon987.server.game.world.Tile; -import net.simon987.server.game.world.World; -import net.simon987.server.io.JSONSerializable; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.world.Tile; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.io.JSONSerializable; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; import org.bson.types.ObjectId; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/game/objects/GameRegistry.java b/src/main/java/net/simon987/mar/server/game/objects/GameRegistry.java similarity index 89% rename from Server/src/main/java/net/simon987/server/game/objects/GameRegistry.java rename to src/main/java/net/simon987/mar/server/game/objects/GameRegistry.java index add111d..2f62e9d 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/GameRegistry.java +++ b/src/main/java/net/simon987/mar/server/game/objects/GameRegistry.java @@ -1,9 +1,9 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.world.Tile; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.world.Tile; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.lang.reflect.InvocationTargetException; @@ -11,10 +11,10 @@ import java.util.HashMap; public class GameRegistry { - private HashMap> gameObjects; - private HashMap> hardware; - private HashMap> items; - private HashMap> tiles; + private final HashMap> gameObjects; + private final HashMap> hardware; + private final HashMap> items; + private final HashMap> tiles; public GameRegistry() { diff --git a/Server/src/main/java/net/simon987/server/game/objects/HardwareHost.java b/src/main/java/net/simon987/mar/server/game/objects/HardwareHost.java similarity index 61% rename from Server/src/main/java/net/simon987/server/game/objects/HardwareHost.java rename to src/main/java/net/simon987/mar/server/game/objects/HardwareHost.java index 09060d3..01946d8 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/HardwareHost.java +++ b/src/main/java/net/simon987/mar/server/game/objects/HardwareHost.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.assembly.HardwareModule; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.HardwareModule; +import net.simon987.mar.server.assembly.Status; public interface HardwareHost { diff --git a/Server/src/main/java/net/simon987/server/game/objects/InventoryHolder.java b/src/main/java/net/simon987/mar/server/game/objects/InventoryHolder.java similarity index 80% rename from Server/src/main/java/net/simon987/server/game/objects/InventoryHolder.java rename to src/main/java/net/simon987/mar/server/game/objects/InventoryHolder.java index 505b968..2aa3788 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/InventoryHolder.java +++ b/src/main/java/net/simon987/mar/server/game/objects/InventoryHolder.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.game.item.Item; +import net.simon987.mar.server.game.item.Item; public interface InventoryHolder { diff --git a/Server/src/main/java/net/simon987/server/game/objects/ItemsContainer.java b/src/main/java/net/simon987/mar/server/game/objects/ItemsContainer.java similarity index 94% rename from Server/src/main/java/net/simon987/server/game/objects/ItemsContainer.java rename to src/main/java/net/simon987/mar/server/game/objects/ItemsContainer.java index 7d9e275..19a9564 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/ItemsContainer.java +++ b/src/main/java/net/simon987/mar/server/game/objects/ItemsContainer.java @@ -1,6 +1,6 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.game.item.Item; +import net.simon987.mar.server.game.item.Item; import org.bson.Document; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/game/objects/MessageReceiver.java b/src/main/java/net/simon987/mar/server/game/objects/MessageReceiver.java similarity index 63% rename from Server/src/main/java/net/simon987/server/game/objects/MessageReceiver.java rename to src/main/java/net/simon987/mar/server/game/objects/MessageReceiver.java index c329496..ac2b272 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/MessageReceiver.java +++ b/src/main/java/net/simon987/mar/server/game/objects/MessageReceiver.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; public interface MessageReceiver { diff --git a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java b/src/main/java/net/simon987/mar/server/game/objects/Radioactive.java similarity index 66% rename from Server/src/main/java/net/simon987/server/game/objects/Radioactive.java rename to src/main/java/net/simon987/mar/server/game/objects/Radioactive.java index dc1fcf1..e26aafc 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Radioactive.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Radioactive.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; //Alpha: ±5cm //Beta: 10-20 feet diff --git a/Server/src/main/java/net/simon987/server/game/objects/Rechargeable.java b/src/main/java/net/simon987/mar/server/game/objects/Rechargeable.java similarity index 83% rename from Server/src/main/java/net/simon987/server/game/objects/Rechargeable.java rename to src/main/java/net/simon987/mar/server/game/objects/Rechargeable.java index f6a5e78..f286738 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Rechargeable.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Rechargeable.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; public interface Rechargeable { diff --git a/Server/src/main/java/net/simon987/server/game/objects/Structure.java b/src/main/java/net/simon987/mar/server/game/objects/Structure.java similarity index 94% rename from Server/src/main/java/net/simon987/server/game/objects/Structure.java rename to src/main/java/net/simon987/mar/server/game/objects/Structure.java index 65f48d1..5dcca8a 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Structure.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Structure.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; import org.bson.Document; @@ -12,12 +12,12 @@ public abstract class Structure extends GameObject { /** * Length of the structure in tiles for the x axis */ - private int width; + private final int width; /** * Length of the structure in tiles for the y axis */ - private int height; + private final int height; public Structure(Document document, int width, int height) { super(document); diff --git a/Server/src/main/java/net/simon987/server/game/objects/Updatable.java b/src/main/java/net/simon987/mar/server/game/objects/Updatable.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/objects/Updatable.java rename to src/main/java/net/simon987/mar/server/game/objects/Updatable.java index 1df79f3..e06d3fc 100644 --- a/Server/src/main/java/net/simon987/server/game/objects/Updatable.java +++ b/src/main/java/net/simon987/mar/server/game/objects/Updatable.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; /** * Updatable objects needs to be updated each tick diff --git a/Server/src/main/java/net/simon987/server/game/pathfinding/Node.java b/src/main/java/net/simon987/mar/server/game/pathfinding/Node.java similarity index 95% rename from Server/src/main/java/net/simon987/server/game/pathfinding/Node.java rename to src/main/java/net/simon987/mar/server/game/pathfinding/Node.java index 0c06440..1942375 100755 --- a/Server/src/main/java/net/simon987/server/game/pathfinding/Node.java +++ b/src/main/java/net/simon987/mar/server/game/pathfinding/Node.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.pathfinding; +package net.simon987.mar.server.game.pathfinding; /** * A single node in the search graph diff --git a/Server/src/main/java/net/simon987/server/game/pathfinding/Pathfinder.java b/src/main/java/net/simon987/mar/server/game/pathfinding/Pathfinder.java similarity index 96% rename from Server/src/main/java/net/simon987/server/game/pathfinding/Pathfinder.java rename to src/main/java/net/simon987/mar/server/game/pathfinding/Pathfinder.java index 23a3ce8..395d823 100755 --- a/Server/src/main/java/net/simon987/server/game/pathfinding/Pathfinder.java +++ b/src/main/java/net/simon987/mar/server/game/pathfinding/Pathfinder.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.pathfinding; +package net.simon987.mar.server.game.pathfinding; -import net.simon987.server.assembly.Util; -import net.simon987.server.game.world.World; +import net.simon987.mar.server.assembly.Util; +import net.simon987.mar.server.game.world.World; import java.util.ArrayList; import java.util.Collections; diff --git a/Server/src/main/java/net/simon987/server/game/pathfinding/SortedArrayList.java b/src/main/java/net/simon987/mar/server/game/pathfinding/SortedArrayList.java similarity index 93% rename from Server/src/main/java/net/simon987/server/game/pathfinding/SortedArrayList.java rename to src/main/java/net/simon987/mar/server/game/pathfinding/SortedArrayList.java index 61372e2..c7a56d1 100755 --- a/Server/src/main/java/net/simon987/server/game/pathfinding/SortedArrayList.java +++ b/src/main/java/net/simon987/mar/server/game/pathfinding/SortedArrayList.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.pathfinding; +package net.simon987.mar.server.game.pathfinding; import java.util.ArrayList; import java.util.Collections; diff --git a/Server/src/main/java/net/simon987/server/game/world/DayNightCycle.java b/src/main/java/net/simon987/mar/server/game/world/DayNightCycle.java similarity index 81% rename from Server/src/main/java/net/simon987/server/game/world/DayNightCycle.java rename to src/main/java/net/simon987/mar/server/game/world/DayNightCycle.java index 3f9aad7..b69fb99 100644 --- a/Server/src/main/java/net/simon987/server/game/world/DayNightCycle.java +++ b/src/main/java/net/simon987/mar/server/game/world/DayNightCycle.java @@ -1,8 +1,8 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.GameEventListener; -import net.simon987.server.event.TickEvent; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.GameEventListener; +import net.simon987.mar.server.event.TickEvent; public class DayNightCycle implements GameEventListener { diff --git a/Server/src/main/java/net/simon987/server/game/world/Location.java b/src/main/java/net/simon987/mar/server/game/world/Location.java similarity index 92% rename from Server/src/main/java/net/simon987/server/game/world/Location.java rename to src/main/java/net/simon987/mar/server/game/world/Location.java index df2069a..ab4d6a5 100644 --- a/Server/src/main/java/net/simon987/server/game/world/Location.java +++ b/src/main/java/net/simon987/mar/server/game/world/Location.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; /** * Represents a location in the game universe diff --git a/Server/src/main/java/net/simon987/server/game/world/Tile.java b/src/main/java/net/simon987/mar/server/game/world/Tile.java similarity index 82% rename from Server/src/main/java/net/simon987/server/game/world/Tile.java rename to src/main/java/net/simon987/mar/server/game/world/Tile.java index a3604a8..a082413 100644 --- a/Server/src/main/java/net/simon987/server/game/world/Tile.java +++ b/src/main/java/net/simon987/mar/server/game/world/Tile.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.GameObject; public abstract class Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileCopper.java b/src/main/java/net/simon987/mar/server/game/world/TileCopper.java similarity index 60% rename from Server/src/main/java/net/simon987/server/game/world/TileCopper.java rename to src/main/java/net/simon987/mar/server/game/world/TileCopper.java index 53acbd4..5bfa80e 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TileCopper.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileCopper.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.item.ItemCopper; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.item.ItemCopper; public class TileCopper extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileFluid.java b/src/main/java/net/simon987/mar/server/game/world/TileFluid.java similarity index 73% rename from Server/src/main/java/net/simon987/server/game/world/TileFluid.java rename to src/main/java/net/simon987/mar/server/game/world/TileFluid.java index b7788ae..d6b1ad5 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TileFluid.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileFluid.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.objects.GameObject; public class TileFluid extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileIron.java b/src/main/java/net/simon987/mar/server/game/world/TileIron.java similarity index 60% rename from Server/src/main/java/net/simon987/server/game/world/TileIron.java rename to src/main/java/net/simon987/mar/server/game/world/TileIron.java index 6b555f9..fbf5db3 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TileIron.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileIron.java @@ -1,7 +1,7 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.item.Item; -import net.simon987.server.game.item.ItemIron; +import net.simon987.mar.server.game.item.Item; +import net.simon987.mar.server.game.item.ItemIron; public class TileIron extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileMap.java b/src/main/java/net/simon987/mar/server/game/world/TileMap.java similarity index 92% rename from Server/src/main/java/net/simon987/server/game/world/TileMap.java rename to src/main/java/net/simon987/mar/server/game/world/TileMap.java index 5d91007..ff7afd3 100755 --- a/Server/src/main/java/net/simon987/server/game/world/TileMap.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileMap.java @@ -1,11 +1,11 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameRegistry; -import net.simon987.server.io.JSONSerializable; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.GameRegistry; +import net.simon987.mar.server.io.JSONSerializable; +import net.simon987.mar.server.io.MongoSerializable; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -22,17 +22,17 @@ public class TileMap implements JSONSerializable, MongoSerializable { /** * The map of tile */ - private Tile[][] tiles; + private final Tile[][] tiles; /** * width, in tiles */ - private int width; + private final int width; /** * Height, in tiles */ - private int height; + private final int height; /** * Create a blank (All 0s) map diff --git a/Server/src/main/java/net/simon987/server/game/world/TilePlain.java b/src/main/java/net/simon987/mar/server/game/world/TilePlain.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/world/TilePlain.java rename to src/main/java/net/simon987/mar/server/game/world/TilePlain.java index 7ad073d..1417aa8 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TilePlain.java +++ b/src/main/java/net/simon987/mar/server/game/world/TilePlain.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; public class TilePlain extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileVoid.java b/src/main/java/net/simon987/mar/server/game/world/TileVoid.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/world/TileVoid.java rename to src/main/java/net/simon987/mar/server/game/world/TileVoid.java index 92872a9..9dc8667 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TileVoid.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileVoid.java @@ -1,6 +1,6 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.GameObject; public class TileVoid extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/TileWall.java b/src/main/java/net/simon987/mar/server/game/world/TileWall.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/world/TileWall.java rename to src/main/java/net/simon987/mar/server/game/world/TileWall.java index e451d5a..5db4fc7 100644 --- a/Server/src/main/java/net/simon987/server/game/world/TileWall.java +++ b/src/main/java/net/simon987/mar/server/game/world/TileWall.java @@ -1,6 +1,6 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.GameObject; public class TileWall extends Tile { diff --git a/Server/src/main/java/net/simon987/server/game/world/World.java b/src/main/java/net/simon987/mar/server/game/world/World.java similarity index 95% rename from Server/src/main/java/net/simon987/server/game/world/World.java rename to src/main/java/net/simon987/mar/server/game/world/World.java index 3e73cb2..c4b272c 100644 --- a/Server/src/main/java/net/simon987/server/game/world/World.java +++ b/src/main/java/net/simon987/mar/server/game/world/World.java @@ -1,13 +1,13 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.GameServer; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.WorldUpdateEvent; -import net.simon987.server.game.GameUniverse; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.objects.Updatable; -import net.simon987.server.game.pathfinding.Pathfinder; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.WorldUpdateEvent; +import net.simon987.mar.server.game.GameUniverse; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.objects.Updatable; +import net.simon987.mar.server.game.pathfinding.Pathfinder; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; import org.bson.types.ObjectId; @@ -23,7 +23,7 @@ public class World implements MongoSerializable { /** * Size of the side of this world */ - private int worldSize; + private final int worldSize; private int x; private int y; @@ -32,7 +32,7 @@ public class World implements MongoSerializable { private String dimension; - private ConcurrentHashMap gameObjects = new ConcurrentHashMap<>(8); + private final ConcurrentHashMap gameObjects = new ConcurrentHashMap<>(8); /** * If this number is greater than 0, the World will be updated. diff --git a/Server/src/main/java/net/simon987/server/game/world/WorldGenerationException.java b/src/main/java/net/simon987/mar/server/game/world/WorldGenerationException.java similarity index 76% rename from Server/src/main/java/net/simon987/server/game/world/WorldGenerationException.java rename to src/main/java/net/simon987/mar/server/game/world/WorldGenerationException.java index bac7ee8..5e5d89a 100644 --- a/Server/src/main/java/net/simon987/server/game/world/WorldGenerationException.java +++ b/src/main/java/net/simon987/mar/server/game/world/WorldGenerationException.java @@ -1,4 +1,4 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; public class WorldGenerationException extends Exception { public WorldGenerationException(String message) { diff --git a/Server/src/main/java/net/simon987/server/game/world/WorldGenerator.java b/src/main/java/net/simon987/mar/server/game/world/WorldGenerator.java similarity index 90% rename from Server/src/main/java/net/simon987/server/game/world/WorldGenerator.java rename to src/main/java/net/simon987/mar/server/game/world/WorldGenerator.java index 980acf4..aa99a0e 100755 --- a/Server/src/main/java/net/simon987/server/game/world/WorldGenerator.java +++ b/src/main/java/net/simon987/mar/server/game/world/WorldGenerator.java @@ -1,10 +1,10 @@ -package net.simon987.server.game.world; +package net.simon987.mar.server.game.world; -import net.simon987.server.GameServer; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.assembly.exception.CancelledException; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.WorldGenerationEvent; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.WorldGenerationEvent; import java.awt.*; import java.util.HashMap; @@ -18,27 +18,27 @@ public class WorldGenerator { /** * Minimum number of center points. */ - private int centerPointCountMin; + private final int centerPointCountMin; /** * Maximum number of center points. */ - private int centerPointCountMax; + private final int centerPointCountMax; /** * Number of plain Tiles for each wall Tile */ - private int wallPlainRatio; + private final int wallPlainRatio; - private int fluidCenterPointMin; - private int fluidCenterPointMax; + private final int fluidCenterPointMin; + private final int fluidCenterPointMax; - private int minIronCount; - private int maxIronCount; - private int minCopperCount; - private int maxCopperCount; + private final int minIronCount; + private final int maxIronCount; + private final int minCopperCount; + private final int maxCopperCount; - private String dimension; + private final String dimension; private static final int DEFAULT_WORLD_SIZE = 16; diff --git a/Server/src/main/java/net/simon987/server/io/JSONSerializable.java b/src/main/java/net/simon987/mar/server/io/JSONSerializable.java similarity index 80% rename from Server/src/main/java/net/simon987/server/io/JSONSerializable.java rename to src/main/java/net/simon987/mar/server/io/JSONSerializable.java index 2747198..4ca1d48 100644 --- a/Server/src/main/java/net/simon987/server/io/JSONSerializable.java +++ b/src/main/java/net/simon987/mar/server/io/JSONSerializable.java @@ -1,4 +1,4 @@ -package net.simon987.server.io; +package net.simon987.mar.server.io; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/io/MongoSerializable.java b/src/main/java/net/simon987/mar/server/io/MongoSerializable.java similarity index 73% rename from Server/src/main/java/net/simon987/server/io/MongoSerializable.java rename to src/main/java/net/simon987/mar/server/io/MongoSerializable.java index 74556a0..135f1ff 100644 --- a/Server/src/main/java/net/simon987/server/io/MongoSerializable.java +++ b/src/main/java/net/simon987/mar/server/io/MongoSerializable.java @@ -1,4 +1,4 @@ -package net.simon987.server.io; +package net.simon987.mar.server.io; import org.bson.Document; diff --git a/Server/src/main/java/net/simon987/server/logging/GenericFormatter.java b/src/main/java/net/simon987/mar/server/logging/GenericFormatter.java similarity index 94% rename from Server/src/main/java/net/simon987/server/logging/GenericFormatter.java rename to src/main/java/net/simon987/mar/server/logging/GenericFormatter.java index dc8924e..59c68fc 100755 --- a/Server/src/main/java/net/simon987/server/logging/GenericFormatter.java +++ b/src/main/java/net/simon987/mar/server/logging/GenericFormatter.java @@ -1,4 +1,4 @@ -package net.simon987.server.logging; +package net.simon987.mar.server.logging; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/Server/src/main/java/net/simon987/server/logging/LogManager.java b/src/main/java/net/simon987/mar/server/logging/LogManager.java similarity index 94% rename from Server/src/main/java/net/simon987/server/logging/LogManager.java rename to src/main/java/net/simon987/mar/server/logging/LogManager.java index 80b73db..a29a752 100755 --- a/Server/src/main/java/net/simon987/server/logging/LogManager.java +++ b/src/main/java/net/simon987/mar/server/logging/LogManager.java @@ -1,6 +1,6 @@ -package net.simon987.server.logging; +package net.simon987.mar.server.logging; -import net.simon987.server.ServerConfiguration; +import net.simon987.mar.server.ServerConfiguration; import java.io.IOException; import java.util.logging.*; diff --git a/Server/src/main/java/net/simon987/server/user/RegistrationException.java b/src/main/java/net/simon987/mar/server/user/RegistrationException.java similarity index 78% rename from Server/src/main/java/net/simon987/server/user/RegistrationException.java rename to src/main/java/net/simon987/mar/server/user/RegistrationException.java index 7c5cbb1..e6c45a7 100644 --- a/Server/src/main/java/net/simon987/server/user/RegistrationException.java +++ b/src/main/java/net/simon987/mar/server/user/RegistrationException.java @@ -1,9 +1,8 @@ -package net.simon987.server.user; +package net.simon987.mar.server.user; public class RegistrationException extends Exception { public RegistrationException(String message) { super(message); } - } diff --git a/Server/src/main/java/net/simon987/server/user/User.java b/src/main/java/net/simon987/mar/server/user/User.java similarity index 88% rename from Server/src/main/java/net/simon987/server/user/User.java rename to src/main/java/net/simon987/mar/server/user/User.java index 10e4b79..5645684 100755 --- a/Server/src/main/java/net/simon987/server/user/User.java +++ b/src/main/java/net/simon987/mar/server/user/User.java @@ -1,16 +1,13 @@ -package net.simon987.server.user; +package net.simon987.mar.server.user; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.exception.CancelledException; -import net.simon987.server.event.GameEvent; -import net.simon987.server.event.UserCreationEvent; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.io.MongoSerializable; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.event.GameEvent; +import net.simon987.mar.server.event.UserCreationEvent; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.io.MongoSerializable; import org.bson.Document; -/** - * Represents a User (or player) of the game - */ public class User implements MongoSerializable { private String username; @@ -54,7 +51,6 @@ public class User implements MongoSerializable { dbObject.put("stats", stats.mongoSerialise()); return dbObject; - } public static User deserialize(Document obj) throws CancelledException { diff --git a/Server/src/main/java/net/simon987/server/user/UserManager.java b/src/main/java/net/simon987/mar/server/user/UserManager.java similarity index 93% rename from Server/src/main/java/net/simon987/server/user/UserManager.java rename to src/main/java/net/simon987/mar/server/user/UserManager.java index 7884a11..d61138f 100644 --- a/Server/src/main/java/net/simon987/server/user/UserManager.java +++ b/src/main/java/net/simon987/mar/server/user/UserManager.java @@ -1,10 +1,10 @@ -package net.simon987.server.user; +package net.simon987.mar.server.user; import com.mongodb.client.MongoCollection; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.exception.CancelledException; -import net.simon987.server.crypto.RandomStringGenerator; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.exception.CancelledException; +import net.simon987.mar.server.crypto.RandomStringGenerator; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import org.springframework.security.crypto.bcrypt.BCrypt; @@ -12,7 +12,7 @@ import java.util.ArrayList; public class UserManager { - private MongoCollection userCollection; + private final MongoCollection userCollection; public UserManager(MongoCollection userCollection) { diff --git a/Server/src/main/java/net/simon987/server/user/UserStats.java b/src/main/java/net/simon987/mar/server/user/UserStats.java similarity index 93% rename from Server/src/main/java/net/simon987/server/user/UserStats.java rename to src/main/java/net/simon987/mar/server/user/UserStats.java index 1c3fc5e..f2f68bf 100644 --- a/Server/src/main/java/net/simon987/server/user/UserStats.java +++ b/src/main/java/net/simon987/mar/server/user/UserStats.java @@ -1,14 +1,14 @@ -package net.simon987.server.user; +package net.simon987.mar.server.user; -import net.simon987.server.io.MongoSerializable; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.io.MongoSerializable; +import net.simon987.mar.server.logging.LogManager; import org.bson.Document; import java.util.ArrayList; public class UserStats implements MongoSerializable { - private Document stats; + private final Document stats; UserStats() { this.stats = new Document(); @@ -120,4 +120,4 @@ public class UserStats implements MongoSerializable { return (ArrayList) stats.get(name); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/user/UserStatsHelper.java b/src/main/java/net/simon987/mar/server/user/UserStatsHelper.java similarity index 96% rename from Server/src/main/java/net/simon987/server/user/UserStatsHelper.java rename to src/main/java/net/simon987/mar/server/user/UserStatsHelper.java index 3c8cca0..7375771 100644 --- a/Server/src/main/java/net/simon987/server/user/UserStatsHelper.java +++ b/src/main/java/net/simon987/mar/server/user/UserStatsHelper.java @@ -1,7 +1,7 @@ -package net.simon987.server.user; +package net.simon987.mar.server.user; import com.mongodb.client.MongoCollection; -import net.simon987.server.GameServer; +import net.simon987.mar.server.GameServer; import org.bson.Document; import java.util.*; @@ -14,7 +14,7 @@ public class UserStatsHelper { /** * Database collection of users */ - private MongoCollection users; + private final MongoCollection users; /** * @param users Database collection of users diff --git a/Server/src/main/java/net/simon987/server/web/AccountPage.java b/src/main/java/net/simon987/mar/server/web/AccountPage.java similarity index 89% rename from Server/src/main/java/net/simon987/server/web/AccountPage.java rename to src/main/java/net/simon987/mar/server/web/AccountPage.java index b0e036a..ca6c295 100644 --- a/Server/src/main/java/net/simon987/server/web/AccountPage.java +++ b/src/main/java/net/simon987/mar/server/web/AccountPage.java @@ -1,6 +1,6 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; +import net.simon987.mar.server.GameServer; import spark.ModelAndView; import spark.Request; import spark.Response; diff --git a/Server/src/main/java/net/simon987/server/web/AlertMessage.java b/src/main/java/net/simon987/mar/server/web/AlertMessage.java similarity index 72% rename from Server/src/main/java/net/simon987/server/web/AlertMessage.java rename to src/main/java/net/simon987/mar/server/web/AlertMessage.java index 1df5581..29cde80 100644 --- a/Server/src/main/java/net/simon987/server/web/AlertMessage.java +++ b/src/main/java/net/simon987/mar/server/web/AlertMessage.java @@ -1,9 +1,9 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; public class AlertMessage { - private String message; - private AlertType type; + private final String message; + private final AlertType type; public AlertMessage(String message, AlertType type) { this.message = message; diff --git a/Server/src/main/java/net/simon987/server/web/AlertType.java b/src/main/java/net/simon987/mar/server/web/AlertType.java similarity index 91% rename from Server/src/main/java/net/simon987/server/web/AlertType.java rename to src/main/java/net/simon987/mar/server/web/AlertType.java index c4706be..5e2ced1 100644 --- a/Server/src/main/java/net/simon987/server/web/AlertType.java +++ b/src/main/java/net/simon987/mar/server/web/AlertType.java @@ -1,4 +1,4 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; public enum AlertType { diff --git a/Server/src/main/java/net/simon987/server/web/ChangePasswordRoute.java b/src/main/java/net/simon987/mar/server/web/ChangePasswordRoute.java similarity index 92% rename from Server/src/main/java/net/simon987/server/web/ChangePasswordRoute.java rename to src/main/java/net/simon987/mar/server/web/ChangePasswordRoute.java index be164d7..6105353 100644 --- a/Server/src/main/java/net/simon987/server/web/ChangePasswordRoute.java +++ b/src/main/java/net/simon987/mar/server/web/ChangePasswordRoute.java @@ -1,7 +1,7 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; -import net.simon987.server.user.RegistrationException; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.user.RegistrationException; import spark.ModelAndView; import spark.Request; import spark.Response; diff --git a/Server/src/main/java/net/simon987/server/web/FloppyDownloadRoute.java b/src/main/java/net/simon987/mar/server/web/FloppyDownloadRoute.java similarity index 87% rename from Server/src/main/java/net/simon987/server/web/FloppyDownloadRoute.java rename to src/main/java/net/simon987/mar/server/web/FloppyDownloadRoute.java index 765407e..960cdf8 100644 --- a/Server/src/main/java/net/simon987/server/web/FloppyDownloadRoute.java +++ b/src/main/java/net/simon987/mar/server/web/FloppyDownloadRoute.java @@ -1,7 +1,7 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.logging.LogManager; import spark.Request; import spark.Response; import spark.Route; diff --git a/Server/src/main/java/net/simon987/server/web/FloppyUploadRoute.java b/src/main/java/net/simon987/mar/server/web/FloppyUploadRoute.java similarity index 94% rename from Server/src/main/java/net/simon987/server/web/FloppyUploadRoute.java rename to src/main/java/net/simon987/mar/server/web/FloppyUploadRoute.java index c985f3f..73a1d0c 100644 --- a/Server/src/main/java/net/simon987/server/web/FloppyUploadRoute.java +++ b/src/main/java/net/simon987/mar/server/web/FloppyUploadRoute.java @@ -1,7 +1,7 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.logging.LogManager; import spark.Request; import spark.Response; import spark.Route; diff --git a/Server/src/main/java/net/simon987/server/web/GuestPolicy.java b/src/main/java/net/simon987/mar/server/web/GuestPolicy.java similarity index 81% rename from Server/src/main/java/net/simon987/server/web/GuestPolicy.java rename to src/main/java/net/simon987/mar/server/web/GuestPolicy.java index 4a675f7..4a6930b 100644 --- a/Server/src/main/java/net/simon987/server/web/GuestPolicy.java +++ b/src/main/java/net/simon987/mar/server/web/GuestPolicy.java @@ -1,4 +1,4 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; public enum GuestPolicy { /** diff --git a/Server/src/main/java/net/simon987/server/web/HomePage.java b/src/main/java/net/simon987/mar/server/web/HomePage.java similarity index 92% rename from Server/src/main/java/net/simon987/server/web/HomePage.java rename to src/main/java/net/simon987/mar/server/web/HomePage.java index 7d39467..840d598 100644 --- a/Server/src/main/java/net/simon987/server/web/HomePage.java +++ b/src/main/java/net/simon987/mar/server/web/HomePage.java @@ -1,4 +1,4 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; import spark.ModelAndView; import spark.Request; diff --git a/Server/src/main/java/net/simon987/server/web/LeaderBoardPage.java b/src/main/java/net/simon987/mar/server/web/LeaderBoardPage.java similarity index 87% rename from Server/src/main/java/net/simon987/server/web/LeaderBoardPage.java rename to src/main/java/net/simon987/mar/server/web/LeaderBoardPage.java index 66c5e89..12ffc1c 100644 --- a/Server/src/main/java/net/simon987/server/web/LeaderBoardPage.java +++ b/src/main/java/net/simon987/mar/server/web/LeaderBoardPage.java @@ -1,6 +1,6 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; +import net.simon987.mar.server.GameServer; import spark.ModelAndView; import spark.Request; import spark.Response; @@ -19,4 +19,4 @@ public class LeaderBoardPage implements TemplateViewRoute { model.put("stats", GameServer.INSTANCE.getUserStatsHelper().getLeaderboardStats(25)); return new ModelAndView(model, "leaderboard.vm"); } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/web/LoginRoute.java b/src/main/java/net/simon987/mar/server/web/LoginRoute.java similarity index 89% rename from Server/src/main/java/net/simon987/server/web/LoginRoute.java rename to src/main/java/net/simon987/mar/server/web/LoginRoute.java index e61059b..2fcf269 100644 --- a/Server/src/main/java/net/simon987/server/web/LoginRoute.java +++ b/src/main/java/net/simon987/mar/server/web/LoginRoute.java @@ -1,7 +1,7 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.logging.LogManager; import spark.ModelAndView; import spark.Request; import spark.Response; diff --git a/Server/src/main/java/net/simon987/server/web/LogoutRoute.java b/src/main/java/net/simon987/mar/server/web/LogoutRoute.java similarity index 92% rename from Server/src/main/java/net/simon987/server/web/LogoutRoute.java rename to src/main/java/net/simon987/mar/server/web/LogoutRoute.java index 08f2201..63e0242 100644 --- a/Server/src/main/java/net/simon987/server/web/LogoutRoute.java +++ b/src/main/java/net/simon987/mar/server/web/LogoutRoute.java @@ -1,4 +1,4 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; import spark.ModelAndView; import spark.Request; diff --git a/Server/src/main/java/net/simon987/server/web/PlayPage.java b/src/main/java/net/simon987/mar/server/web/PlayPage.java similarity index 92% rename from Server/src/main/java/net/simon987/server/web/PlayPage.java rename to src/main/java/net/simon987/mar/server/web/PlayPage.java index c752f94..f9ad76e 100644 --- a/Server/src/main/java/net/simon987/server/web/PlayPage.java +++ b/src/main/java/net/simon987/mar/server/web/PlayPage.java @@ -1,6 +1,6 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; +import net.simon987.mar.server.GameServer; import spark.ModelAndView; import spark.Request; import spark.Response; diff --git a/Server/src/main/java/net/simon987/server/web/RegisterRoute.java b/src/main/java/net/simon987/mar/server/web/RegisterRoute.java similarity index 85% rename from Server/src/main/java/net/simon987/server/web/RegisterRoute.java rename to src/main/java/net/simon987/mar/server/web/RegisterRoute.java index d2a7f10..3bc2940 100644 --- a/Server/src/main/java/net/simon987/server/web/RegisterRoute.java +++ b/src/main/java/net/simon987/mar/server/web/RegisterRoute.java @@ -1,8 +1,8 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; -import net.simon987.server.user.RegistrationException; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.RegistrationException; import spark.ModelAndView; import spark.Request; import spark.Response; diff --git a/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java b/src/main/java/net/simon987/mar/server/web/ServerInfoRoute.java similarity index 88% rename from Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java rename to src/main/java/net/simon987/mar/server/web/ServerInfoRoute.java index 89522d2..7c47319 100644 --- a/Server/src/main/java/net/simon987/server/web/ServerInfoRoute.java +++ b/src/main/java/net/simon987/mar/server/web/ServerInfoRoute.java @@ -1,6 +1,6 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.GameServer; +import net.simon987.mar.server.GameServer; import org.json.simple.JSONObject; import spark.Request; import spark.Response; @@ -8,9 +8,9 @@ import spark.Route; public class ServerInfoRoute implements Route { - private String address; - private String serverName; - private int tickLength; + private final String address; + private final String serverName; + private final int tickLength; public ServerInfoRoute() { diff --git a/Server/src/main/java/net/simon987/server/web/WebServer.java b/src/main/java/net/simon987/mar/server/web/WebServer.java similarity index 92% rename from Server/src/main/java/net/simon987/server/web/WebServer.java rename to src/main/java/net/simon987/mar/server/web/WebServer.java index 475bd9a..f8ef7dd 100644 --- a/Server/src/main/java/net/simon987/server/web/WebServer.java +++ b/src/main/java/net/simon987/mar/server/web/WebServer.java @@ -1,8 +1,8 @@ -package net.simon987.server.web; +package net.simon987.mar.server.web; -import net.simon987.server.IServerConfiguration; -import net.simon987.server.logging.LogManager; -import net.simon987.server.websocket.SocketServer; +import net.simon987.mar.server.IServerConfiguration; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.websocket.SocketServer; import org.apache.velocity.app.VelocityEngine; import spark.Spark; import spark.template.velocity.VelocityTemplateEngine; @@ -11,7 +11,7 @@ import java.util.Properties; public class WebServer { - private SocketServer socketServer; + private final SocketServer socketServer; private GuestPolicy guestPolicy; public WebServer(IServerConfiguration config) { diff --git a/Server/src/main/java/net/simon987/server/websocket/CodeRequestHandler.java b/src/main/java/net/simon987/mar/server/websocket/CodeRequestHandler.java similarity index 88% rename from Server/src/main/java/net/simon987/server/websocket/CodeRequestHandler.java rename to src/main/java/net/simon987/mar/server/websocket/CodeRequestHandler.java index 5bc43cb..4936298 100644 --- a/Server/src/main/java/net/simon987/server/websocket/CodeRequestHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/CodeRequestHandler.java @@ -1,7 +1,7 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONObject; import java.io.IOException; @@ -32,8 +32,6 @@ public class CodeRequestHandler implements MessageHandler { user.getWebSocket().getRemote().sendString(response.toJSONString()); } - - } } } diff --git a/Server/src/main/java/net/simon987/server/websocket/CodeUploadHandler.java b/src/main/java/net/simon987/mar/server/websocket/CodeUploadHandler.java similarity index 87% rename from Server/src/main/java/net/simon987/server/websocket/CodeUploadHandler.java rename to src/main/java/net/simon987/mar/server/websocket/CodeUploadHandler.java index 98353e4..929580a 100644 --- a/Server/src/main/java/net/simon987/server/websocket/CodeUploadHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/CodeUploadHandler.java @@ -1,10 +1,10 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.assembly.Assembler; -import net.simon987.server.assembly.AssemblyResult; -import net.simon987.server.assembly.CPU; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.assembly.Assembler; +import net.simon987.mar.server.assembly.AssemblyResult; +import net.simon987.mar.server.assembly.CPU; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONObject; import java.io.IOException; diff --git a/Server/src/main/java/net/simon987/server/websocket/DebugCommandHandler.java b/src/main/java/net/simon987/mar/server/websocket/DebugCommandHandler.java similarity index 75% rename from Server/src/main/java/net/simon987/server/websocket/DebugCommandHandler.java rename to src/main/java/net/simon987/mar/server/websocket/DebugCommandHandler.java index c083c28..1ef29b4 100644 --- a/Server/src/main/java/net/simon987/server/websocket/DebugCommandHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/DebugCommandHandler.java @@ -1,7 +1,7 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.event.DebugCommandEvent; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.event.DebugCommandEvent; import org.json.simple.JSONObject; public class DebugCommandHandler implements MessageHandler { diff --git a/Server/src/main/java/net/simon987/server/websocket/KeypressHandler.java b/src/main/java/net/simon987/mar/server/websocket/KeypressHandler.java similarity index 93% rename from Server/src/main/java/net/simon987/server/websocket/KeypressHandler.java rename to src/main/java/net/simon987/mar/server/websocket/KeypressHandler.java index 17e2cff..df16784 100644 --- a/Server/src/main/java/net/simon987/server/websocket/KeypressHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/KeypressHandler.java @@ -1,4 +1,4 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; import org.json.simple.JSONObject; diff --git a/Server/src/main/java/net/simon987/server/websocket/MessageDispatcher.java b/src/main/java/net/simon987/mar/server/websocket/MessageDispatcher.java similarity index 88% rename from Server/src/main/java/net/simon987/server/websocket/MessageDispatcher.java rename to src/main/java/net/simon987/mar/server/websocket/MessageDispatcher.java index 554acd9..bf6ae2c 100644 --- a/Server/src/main/java/net/simon987/server/websocket/MessageDispatcher.java +++ b/src/main/java/net/simon987/mar/server/websocket/MessageDispatcher.java @@ -1,7 +1,7 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -11,7 +11,7 @@ import java.util.ArrayList; public class MessageDispatcher { - private ArrayList handlers = new ArrayList<>(10); + private final ArrayList handlers = new ArrayList<>(10); public MessageDispatcher() { diff --git a/Server/src/main/java/net/simon987/server/websocket/MessageHandler.java b/src/main/java/net/simon987/mar/server/websocket/MessageHandler.java similarity index 80% rename from Server/src/main/java/net/simon987/server/websocket/MessageHandler.java rename to src/main/java/net/simon987/mar/server/websocket/MessageHandler.java index b492b85..2b59dc4 100644 --- a/Server/src/main/java/net/simon987/server/websocket/MessageHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/MessageHandler.java @@ -1,4 +1,4 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; import org.json.simple.JSONObject; @@ -7,5 +7,4 @@ import java.io.IOException; public interface MessageHandler { void handle(OnlineUser user, JSONObject json) throws IOException; - } diff --git a/Server/src/main/java/net/simon987/server/websocket/ObjectsRequestHandler.java b/src/main/java/net/simon987/mar/server/websocket/ObjectsRequestHandler.java similarity index 87% rename from Server/src/main/java/net/simon987/server/websocket/ObjectsRequestHandler.java rename to src/main/java/net/simon987/mar/server/websocket/ObjectsRequestHandler.java index e1f9834..22d4b08 100644 --- a/Server/src/main/java/net/simon987/server/websocket/ObjectsRequestHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/ObjectsRequestHandler.java @@ -1,9 +1,9 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.game.world.World; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -11,7 +11,6 @@ import java.io.IOException; public class ObjectsRequestHandler implements MessageHandler { - @Override public void handle(OnlineUser user, JSONObject json) throws IllegalStateException, IOException { if (json.get("t").equals("object")) { diff --git a/Server/src/main/java/net/simon987/server/websocket/OnlineUser.java b/src/main/java/net/simon987/mar/server/websocket/OnlineUser.java similarity index 84% rename from Server/src/main/java/net/simon987/server/websocket/OnlineUser.java rename to src/main/java/net/simon987/mar/server/websocket/OnlineUser.java index de0cf96..a07e7a7 100644 --- a/Server/src/main/java/net/simon987/server/websocket/OnlineUser.java +++ b/src/main/java/net/simon987/mar/server/websocket/OnlineUser.java @@ -1,14 +1,13 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.user.User; +import net.simon987.mar.server.user.User; import org.eclipse.jetty.websocket.api.Session; public class OnlineUser { - private boolean authenticated = false; - private Session webSocket; + private final Session webSocket; /** * Associated game user (if authenticated) @@ -39,5 +38,4 @@ public class OnlineUser { public void setAuthenticated(boolean authenticated) { this.authenticated = authenticated; } - } diff --git a/Server/src/main/java/net/simon987/server/websocket/OnlineUserManager.java b/src/main/java/net/simon987/mar/server/websocket/OnlineUserManager.java similarity index 72% rename from Server/src/main/java/net/simon987/server/websocket/OnlineUserManager.java rename to src/main/java/net/simon987/mar/server/websocket/OnlineUserManager.java index a7798a5..6ad852c 100644 --- a/Server/src/main/java/net/simon987/server/websocket/OnlineUserManager.java +++ b/src/main/java/net/simon987/mar/server/websocket/OnlineUserManager.java @@ -1,20 +1,18 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; import org.eclipse.jetty.websocket.api.Session; import java.util.ArrayList; +import java.util.List; public class OnlineUserManager { - /** - * List of online users. - */ - private ArrayList onlineUsers = new ArrayList<>(10); + private final List onlineUsers = new ArrayList<>(10); public OnlineUser getUser(Session socket) { - ArrayList _onlineUsers = new ArrayList<>(onlineUsers); + List _onlineUsers = new ArrayList<>(onlineUsers); for (OnlineUser user : _onlineUsers) { if (user.getWebSocket().equals(socket)) { @@ -43,7 +41,7 @@ public class OnlineUserManager { onlineUsers.remove(user); } - public ArrayList getOnlineUsers() { + public List getOnlineUsers() { return onlineUsers; } } diff --git a/Server/src/main/java/net/simon987/server/websocket/SocketServer.java b/src/main/java/net/simon987/mar/server/websocket/SocketServer.java similarity index 92% rename from Server/src/main/java/net/simon987/server/websocket/SocketServer.java rename to src/main/java/net/simon987/mar/server/websocket/SocketServer.java index bec46e4..53c0d1e 100644 --- a/Server/src/main/java/net/simon987/server/websocket/SocketServer.java +++ b/src/main/java/net/simon987/mar/server/websocket/SocketServer.java @@ -1,10 +1,10 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.ControllableUnit; -import net.simon987.server.logging.LogManager; -import net.simon987.server.user.User; -import net.simon987.server.web.GuestPolicy; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.ControllableUnit; +import net.simon987.mar.server.logging.LogManager; +import net.simon987.mar.server.user.User; +import net.simon987.mar.server.web.GuestPolicy; import org.eclipse.jetty.websocket.api.Session; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose; import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect; @@ -20,15 +20,15 @@ import java.util.List; @WebSocket public class SocketServer { - private OnlineUserManager onlineUserManager = new OnlineUserManager(); + private final OnlineUserManager onlineUserManager = new OnlineUserManager(); - private MessageDispatcher messageDispatcher = new MessageDispatcher(); + private final MessageDispatcher messageDispatcher = new MessageDispatcher(); private static final String AUTH_OK_MESSAGE = "{\"t\":\"auth\", \"m\":\"ok\"}"; private static final String FORBIDDEN_MESSAGE = "{\"t\":\"auth\", \"m\":\"forbidden\"}"; private static final int AUTH_TOKEN_LEN = 128; - private GuestPolicy guestPolicy; + private final GuestPolicy guestPolicy; public SocketServer(GuestPolicy guestPolicy) { @@ -41,7 +41,6 @@ public class SocketServer { messageDispatcher.addHandler(new CodeRequestHandler()); messageDispatcher.addHandler(new KeypressHandler()); messageDispatcher.addHandler(new DebugCommandHandler()); - } @OnWebSocketConnect @@ -184,4 +183,4 @@ public class SocketServer { return jsonInts; } -} \ No newline at end of file +} diff --git a/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java b/src/main/java/net/simon987/mar/server/websocket/TerrainRequestHandler.java similarity index 69% rename from Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java rename to src/main/java/net/simon987/mar/server/websocket/TerrainRequestHandler.java index 8036815..41d121e 100644 --- a/Server/src/main/java/net/simon987/server/websocket/TerrainRequestHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/TerrainRequestHandler.java @@ -1,8 +1,8 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.game.world.World; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.world.World; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONObject; import java.io.IOException; @@ -14,7 +14,7 @@ public class TerrainRequestHandler implements MessageHandler { if (json.get("t").equals("terrain") && json.containsKey("x") && json.containsKey("y") && json.containsKey("dimension")) { -// LogManager.LOGGER.fine("Terrain request from " + user.getUser().getUsername()); + LogManager.LOGGER.fine("Terrain request from " + user.getUser().getUsername()); World world; try { world = GameServer.INSTANCE.getGameUniverse().getWorld( @@ -26,24 +26,23 @@ public class TerrainRequestHandler implements MessageHandler { return; } - //todo It might be a good idea to cache this + JSONObject response; if (world != null) { - JSONObject response = world.getTileMap().jsonSerialise(); + response = world.getTileMap().jsonSerialise(); response.put("t", "terrain"); response.put("ok", true); response.put("size", world.getWorldSize()); - user.getWebSocket().getRemote().sendString(response.toJSONString()); } else { //Uncharted World - JSONObject response = new JSONObject(); + response = new JSONObject(); response.put("t", "terrain"); response.put("ok", false); - - user.getWebSocket().getRemote().sendString((response.toJSONString())); } + + user.getWebSocket().getRemote().sendString(response.toJSONString()); } } } diff --git a/Server/src/main/java/net/simon987/server/websocket/UserInfoRequestHandler.java b/src/main/java/net/simon987/mar/server/websocket/UserInfoRequestHandler.java similarity index 87% rename from Server/src/main/java/net/simon987/server/websocket/UserInfoRequestHandler.java rename to src/main/java/net/simon987/mar/server/websocket/UserInfoRequestHandler.java index a541b70..c764b14 100644 --- a/Server/src/main/java/net/simon987/server/websocket/UserInfoRequestHandler.java +++ b/src/main/java/net/simon987/mar/server/websocket/UserInfoRequestHandler.java @@ -1,15 +1,14 @@ -package net.simon987.server.websocket; +package net.simon987.mar.server.websocket; -import net.simon987.server.GameServer; -import net.simon987.server.game.objects.GameObject; -import net.simon987.server.logging.LogManager; +import net.simon987.mar.server.GameServer; +import net.simon987.mar.server.game.objects.GameObject; +import net.simon987.mar.server.logging.LogManager; import org.json.simple.JSONObject; import java.io.IOException; public class UserInfoRequestHandler implements MessageHandler { - @Override public void handle(OnlineUser user, JSONObject message) throws IOException { @@ -35,7 +34,6 @@ public class UserInfoRequestHandler implements MessageHandler { json.put("t", "userInfo"); json.put("maxWidth", GameServer.INSTANCE.getGameUniverse().getMaxWidth()); user.getWebSocket().getRemote().sendString(json.toJSONString()); - } } } diff --git a/Server/src/main/resources/config.properties b/src/main/resources/config.properties similarity index 98% rename from Server/src/main/resources/config.properties rename to src/main/resources/config.properties index 7bf0cf6..d281405 100644 --- a/Server/src/main/resources/config.properties +++ b/src/main/resources/config.properties @@ -12,10 +12,10 @@ server_name=MAR dev # ALLOW | BLOCK guest_policy=ALLOW # DEBUG -#autologin=simon +autologin=simon987 #Database -mongo_dbname=mar_beta +mongo_dbname=mar_beta3 #Change to 'mongodb' to use in docker mongo_address=localhost mongo_port=27017 diff --git a/Plugin NPC/src/main/resources/defaultHackedCubotHardware.json b/src/main/resources/defaultHackedCubotHardware.json similarity index 100% rename from Plugin NPC/src/main/resources/defaultHackedCubotHardware.json rename to src/main/resources/defaultHackedCubotHardware.json diff --git a/Server/src/main/resources/static/css/bootstrap-grid.min.css b/src/main/resources/static/css/bootstrap-grid.min.css similarity index 100% rename from Server/src/main/resources/static/css/bootstrap-grid.min.css rename to src/main/resources/static/css/bootstrap-grid.min.css diff --git a/Server/src/main/resources/static/css/bootstrap-reboot.min.css b/src/main/resources/static/css/bootstrap-reboot.min.css similarity index 100% rename from Server/src/main/resources/static/css/bootstrap-reboot.min.css rename to src/main/resources/static/css/bootstrap-reboot.min.css diff --git a/Server/src/main/resources/static/css/bootstrap4-neon-glow.min.css b/src/main/resources/static/css/bootstrap4-neon-glow.min.css similarity index 100% rename from Server/src/main/resources/static/css/bootstrap4-neon-glow.min.css rename to src/main/resources/static/css/bootstrap4-neon-glow.min.css diff --git a/Server/src/main/resources/static/css/mar.css b/src/main/resources/static/css/mar.css similarity index 100% rename from Server/src/main/resources/static/css/mar.css rename to src/main/resources/static/css/mar.css diff --git a/Server/src/main/resources/static/favicon.ico b/src/main/resources/static/favicon.ico similarity index 100% rename from Server/src/main/resources/static/favicon.ico rename to src/main/resources/static/favicon.ico diff --git a/Server/src/main/resources/static/images/GitHub-Mark-32px.png b/src/main/resources/static/images/GitHub-Mark-32px.png similarity index 100% rename from Server/src/main/resources/static/images/GitHub-Mark-32px.png rename to src/main/resources/static/images/GitHub-Mark-32px.png diff --git a/Server/src/main/resources/static/images/code.png b/src/main/resources/static/images/code.png similarity index 100% rename from Server/src/main/resources/static/images/code.png rename to src/main/resources/static/images/code.png diff --git a/Server/src/main/resources/static/images/cubot.png b/src/main/resources/static/images/cubot.png similarity index 100% rename from Server/src/main/resources/static/images/cubot.png rename to src/main/resources/static/images/cubot.png diff --git a/Server/src/main/resources/static/images/github-logo.png b/src/main/resources/static/images/github-logo.png similarity index 100% rename from Server/src/main/resources/static/images/github-logo.png rename to src/main/resources/static/images/github-logo.png diff --git a/Server/src/main/resources/static/images/hsizegrip.png b/src/main/resources/static/images/hsizegrip.png similarity index 100% rename from Server/src/main/resources/static/images/hsizegrip.png rename to src/main/resources/static/images/hsizegrip.png diff --git a/Server/src/main/resources/static/images/icon.png b/src/main/resources/static/images/icon.png similarity index 100% rename from Server/src/main/resources/static/images/icon.png rename to src/main/resources/static/images/icon.png diff --git a/Server/src/main/resources/static/images/ng-background-dot.png b/src/main/resources/static/images/ng-background-dot.png similarity index 100% rename from Server/src/main/resources/static/images/ng-background-dot.png rename to src/main/resources/static/images/ng-background-dot.png diff --git a/Server/src/main/resources/static/images/sprites.json b/src/main/resources/static/images/sprites.json similarity index 100% rename from Server/src/main/resources/static/images/sprites.json rename to src/main/resources/static/images/sprites.json diff --git a/Server/src/main/resources/static/images/sprites.png b/src/main/resources/static/images/sprites.png similarity index 100% rename from Server/src/main/resources/static/images/sprites.png rename to src/main/resources/static/images/sprites.png diff --git a/Server/src/main/resources/static/images/world.png b/src/main/resources/static/images/world.png similarity index 100% rename from Server/src/main/resources/static/images/world.png rename to src/main/resources/static/images/world.png diff --git a/Server/src/main/resources/static/js/ace/ace.js b/src/main/resources/static/js/ace/ace.js similarity index 99% rename from Server/src/main/resources/static/js/ace/ace.js rename to src/main/resources/static/js/ace/ace.js index a3b1a03..68c1a68 100644 --- a/Server/src/main/resources/static/js/ace/ace.js +++ b/src/main/resources/static/js/ace/ace.js @@ -2284,7 +2284,7 @@ define("ace/keyboard/textinput", ["require", "exports", "module", "ace/lib/event timer = null; var str = text.value.replace(/\x01/g, ""); if (inComposition) - return; + else if (str == c.lastValue) resetValue(); else if (!c.lastValue && str) { @@ -9819,7 +9819,7 @@ define("ace/edit_session", ["require", "exports", "module", "ace/lib/oop", "ace/ else if (token == TAB) indentation += tabSize; else if (token == TAB_SPACE) - continue; + else break; } @@ -19381,4 +19381,3 @@ define("ace/ace", ["require", "exports", "module", "ace/lib/fixoldbrowsers", "ac window.ace[key] = a[key]; }); })(); - \ No newline at end of file diff --git a/Server/src/main/resources/static/js/ace/ext-searchbox.js b/src/main/resources/static/js/ace/ext-searchbox.js similarity index 100% rename from Server/src/main/resources/static/js/ace/ext-searchbox.js rename to src/main/resources/static/js/ace/ext-searchbox.js diff --git a/Server/src/main/resources/static/js/ace/mode-mar.js b/src/main/resources/static/js/ace/mode-mar.js similarity index 100% rename from Server/src/main/resources/static/js/ace/mode-mar.js rename to src/main/resources/static/js/ace/mode-mar.js diff --git a/Server/src/main/resources/static/js/ace/theme-ambiance.js b/src/main/resources/static/js/ace/theme-ambiance.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-ambiance.js rename to src/main/resources/static/js/ace/theme-ambiance.js diff --git a/Server/src/main/resources/static/js/ace/theme-chaos.js b/src/main/resources/static/js/ace/theme-chaos.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-chaos.js rename to src/main/resources/static/js/ace/theme-chaos.js diff --git a/Server/src/main/resources/static/js/ace/theme-chrome.js b/src/main/resources/static/js/ace/theme-chrome.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-chrome.js rename to src/main/resources/static/js/ace/theme-chrome.js diff --git a/Server/src/main/resources/static/js/ace/theme-clouds.js b/src/main/resources/static/js/ace/theme-clouds.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-clouds.js rename to src/main/resources/static/js/ace/theme-clouds.js diff --git a/Server/src/main/resources/static/js/ace/theme-clouds_midnight.js b/src/main/resources/static/js/ace/theme-clouds_midnight.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-clouds_midnight.js rename to src/main/resources/static/js/ace/theme-clouds_midnight.js diff --git a/Server/src/main/resources/static/js/ace/theme-cobalt.js b/src/main/resources/static/js/ace/theme-cobalt.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-cobalt.js rename to src/main/resources/static/js/ace/theme-cobalt.js diff --git a/Server/src/main/resources/static/js/ace/theme-crimson_editor.js b/src/main/resources/static/js/ace/theme-crimson_editor.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-crimson_editor.js rename to src/main/resources/static/js/ace/theme-crimson_editor.js diff --git a/Server/src/main/resources/static/js/ace/theme-dawn.js b/src/main/resources/static/js/ace/theme-dawn.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-dawn.js rename to src/main/resources/static/js/ace/theme-dawn.js diff --git a/Server/src/main/resources/static/js/ace/theme-dracula.js b/src/main/resources/static/js/ace/theme-dracula.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-dracula.js rename to src/main/resources/static/js/ace/theme-dracula.js diff --git a/Server/src/main/resources/static/js/ace/theme-dreamweaver.js b/src/main/resources/static/js/ace/theme-dreamweaver.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-dreamweaver.js rename to src/main/resources/static/js/ace/theme-dreamweaver.js diff --git a/Server/src/main/resources/static/js/ace/theme-eclipse.js b/src/main/resources/static/js/ace/theme-eclipse.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-eclipse.js rename to src/main/resources/static/js/ace/theme-eclipse.js diff --git a/Server/src/main/resources/static/js/ace/theme-github.js b/src/main/resources/static/js/ace/theme-github.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-github.js rename to src/main/resources/static/js/ace/theme-github.js diff --git a/Server/src/main/resources/static/js/ace/theme-gob.js b/src/main/resources/static/js/ace/theme-gob.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-gob.js rename to src/main/resources/static/js/ace/theme-gob.js diff --git a/Server/src/main/resources/static/js/ace/theme-gruvbox.js b/src/main/resources/static/js/ace/theme-gruvbox.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-gruvbox.js rename to src/main/resources/static/js/ace/theme-gruvbox.js diff --git a/Server/src/main/resources/static/js/ace/theme-idle_fingers.js b/src/main/resources/static/js/ace/theme-idle_fingers.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-idle_fingers.js rename to src/main/resources/static/js/ace/theme-idle_fingers.js diff --git a/Server/src/main/resources/static/js/ace/theme-iplastic.js b/src/main/resources/static/js/ace/theme-iplastic.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-iplastic.js rename to src/main/resources/static/js/ace/theme-iplastic.js diff --git a/Server/src/main/resources/static/js/ace/theme-katzenmilch.js b/src/main/resources/static/js/ace/theme-katzenmilch.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-katzenmilch.js rename to src/main/resources/static/js/ace/theme-katzenmilch.js diff --git a/Server/src/main/resources/static/js/ace/theme-kr_theme.js b/src/main/resources/static/js/ace/theme-kr_theme.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-kr_theme.js rename to src/main/resources/static/js/ace/theme-kr_theme.js diff --git a/Server/src/main/resources/static/js/ace/theme-kuroir.js b/src/main/resources/static/js/ace/theme-kuroir.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-kuroir.js rename to src/main/resources/static/js/ace/theme-kuroir.js diff --git a/Server/src/main/resources/static/js/ace/theme-merbivore.js b/src/main/resources/static/js/ace/theme-merbivore.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-merbivore.js rename to src/main/resources/static/js/ace/theme-merbivore.js diff --git a/Server/src/main/resources/static/js/ace/theme-merbivore_soft.js b/src/main/resources/static/js/ace/theme-merbivore_soft.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-merbivore_soft.js rename to src/main/resources/static/js/ace/theme-merbivore_soft.js diff --git a/Server/src/main/resources/static/js/ace/theme-mono_industrial.js b/src/main/resources/static/js/ace/theme-mono_industrial.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-mono_industrial.js rename to src/main/resources/static/js/ace/theme-mono_industrial.js diff --git a/Server/src/main/resources/static/js/ace/theme-monokai.js b/src/main/resources/static/js/ace/theme-monokai.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-monokai.js rename to src/main/resources/static/js/ace/theme-monokai.js diff --git a/Server/src/main/resources/static/js/ace/theme-pastel_on_dark.js b/src/main/resources/static/js/ace/theme-pastel_on_dark.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-pastel_on_dark.js rename to src/main/resources/static/js/ace/theme-pastel_on_dark.js diff --git a/Server/src/main/resources/static/js/ace/theme-solarized_dark.js b/src/main/resources/static/js/ace/theme-solarized_dark.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-solarized_dark.js rename to src/main/resources/static/js/ace/theme-solarized_dark.js diff --git a/Server/src/main/resources/static/js/ace/theme-solarized_light.js b/src/main/resources/static/js/ace/theme-solarized_light.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-solarized_light.js rename to src/main/resources/static/js/ace/theme-solarized_light.js diff --git a/Server/src/main/resources/static/js/ace/theme-sqlserver.js b/src/main/resources/static/js/ace/theme-sqlserver.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-sqlserver.js rename to src/main/resources/static/js/ace/theme-sqlserver.js diff --git a/Server/src/main/resources/static/js/ace/theme-terminal.js b/src/main/resources/static/js/ace/theme-terminal.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-terminal.js rename to src/main/resources/static/js/ace/theme-terminal.js diff --git a/Server/src/main/resources/static/js/ace/theme-textmate.js b/src/main/resources/static/js/ace/theme-textmate.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-textmate.js rename to src/main/resources/static/js/ace/theme-textmate.js diff --git a/Server/src/main/resources/static/js/ace/theme-tomorrow.js b/src/main/resources/static/js/ace/theme-tomorrow.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-tomorrow.js rename to src/main/resources/static/js/ace/theme-tomorrow.js diff --git a/Server/src/main/resources/static/js/ace/theme-tomorrow_night.js b/src/main/resources/static/js/ace/theme-tomorrow_night.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-tomorrow_night.js rename to src/main/resources/static/js/ace/theme-tomorrow_night.js diff --git a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_blue.js b/src/main/resources/static/js/ace/theme-tomorrow_night_blue.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-tomorrow_night_blue.js rename to src/main/resources/static/js/ace/theme-tomorrow_night_blue.js diff --git a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_bright.js b/src/main/resources/static/js/ace/theme-tomorrow_night_bright.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-tomorrow_night_bright.js rename to src/main/resources/static/js/ace/theme-tomorrow_night_bright.js diff --git a/Server/src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js b/src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js rename to src/main/resources/static/js/ace/theme-tomorrow_night_eighties.js diff --git a/Server/src/main/resources/static/js/ace/theme-twilight.js b/src/main/resources/static/js/ace/theme-twilight.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-twilight.js rename to src/main/resources/static/js/ace/theme-twilight.js diff --git a/Server/src/main/resources/static/js/ace/theme-vibrant_ink.js b/src/main/resources/static/js/ace/theme-vibrant_ink.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-vibrant_ink.js rename to src/main/resources/static/js/ace/theme-vibrant_ink.js diff --git a/Server/src/main/resources/static/js/ace/theme-xcode.js b/src/main/resources/static/js/ace/theme-xcode.js similarity index 100% rename from Server/src/main/resources/static/js/ace/theme-xcode.js rename to src/main/resources/static/js/ace/theme-xcode.js diff --git a/Server/src/main/resources/static/js/bootstrap.min.js b/src/main/resources/static/js/bootstrap.min.js similarity index 100% rename from Server/src/main/resources/static/js/bootstrap.min.js rename to src/main/resources/static/js/bootstrap.min.js diff --git a/Server/src/main/resources/static/js/editor.js b/src/main/resources/static/js/editor.js similarity index 100% rename from Server/src/main/resources/static/js/editor.js rename to src/main/resources/static/js/editor.js diff --git a/Server/src/main/resources/static/js/jquery-resizable.min.js b/src/main/resources/static/js/jquery-resizable.min.js similarity index 100% rename from Server/src/main/resources/static/js/jquery-resizable.min.js rename to src/main/resources/static/js/jquery-resizable.min.js diff --git a/Server/src/main/resources/static/js/jquery.min.js b/src/main/resources/static/js/jquery.min.js similarity index 100% rename from Server/src/main/resources/static/js/jquery.min.js rename to src/main/resources/static/js/jquery.min.js diff --git a/Server/src/main/resources/static/js/phaser-plugin-isometric.js b/src/main/resources/static/js/phaser-plugin-isometric.js similarity index 100% rename from Server/src/main/resources/static/js/phaser-plugin-isometric.js rename to src/main/resources/static/js/phaser-plugin-isometric.js diff --git a/Server/src/main/resources/static/js/phaser.js b/src/main/resources/static/js/phaser.js similarity index 100% rename from Server/src/main/resources/static/js/phaser.js rename to src/main/resources/static/js/phaser.js diff --git a/Server/src/main/resources/static/js/popper.min.js b/src/main/resources/static/js/popper.min.js similarity index 100% rename from Server/src/main/resources/static/js/popper.min.js rename to src/main/resources/static/js/popper.min.js diff --git a/Server/src/main/resources/static/webfonts/FSEX301-L2.ttf b/src/main/resources/static/webfonts/FSEX301-L2.ttf similarity index 100% rename from Server/src/main/resources/static/webfonts/FSEX301-L2.ttf rename to src/main/resources/static/webfonts/FSEX301-L2.ttf diff --git a/Server/src/main/resources/static/webfonts/MaterialIcons-Regular.ttf b/src/main/resources/static/webfonts/MaterialIcons-Regular.ttf similarity index 100% rename from Server/src/main/resources/static/webfonts/MaterialIcons-Regular.ttf rename to src/main/resources/static/webfonts/MaterialIcons-Regular.ttf diff --git a/Server/src/main/resources/static/webfonts/MaterialIcons-Regular.woff b/src/main/resources/static/webfonts/MaterialIcons-Regular.woff similarity index 100% rename from Server/src/main/resources/static/webfonts/MaterialIcons-Regular.woff rename to src/main/resources/static/webfonts/MaterialIcons-Regular.woff diff --git a/Server/src/main/resources/static/webfonts/MaterialIcons-Regular.woff2 b/src/main/resources/static/webfonts/MaterialIcons-Regular.woff2 similarity index 100% rename from Server/src/main/resources/static/webfonts/MaterialIcons-Regular.woff2 rename to src/main/resources/static/webfonts/MaterialIcons-Regular.woff2 diff --git a/Server/src/main/resources/templates/account.vm b/src/main/resources/templates/account.vm similarity index 100% rename from Server/src/main/resources/templates/account.vm rename to src/main/resources/templates/account.vm diff --git a/Server/src/main/resources/templates/footer.vm b/src/main/resources/templates/footer.vm similarity index 100% rename from Server/src/main/resources/templates/footer.vm rename to src/main/resources/templates/footer.vm diff --git a/Server/src/main/resources/templates/head.vm b/src/main/resources/templates/head.vm similarity index 100% rename from Server/src/main/resources/templates/head.vm rename to src/main/resources/templates/head.vm diff --git a/Server/src/main/resources/templates/header.vm b/src/main/resources/templates/header.vm similarity index 100% rename from Server/src/main/resources/templates/header.vm rename to src/main/resources/templates/header.vm diff --git a/Server/src/main/resources/templates/home.vm b/src/main/resources/templates/home.vm similarity index 100% rename from Server/src/main/resources/templates/home.vm rename to src/main/resources/templates/home.vm diff --git a/Server/src/main/resources/templates/leaderboard.vm b/src/main/resources/templates/leaderboard.vm similarity index 100% rename from Server/src/main/resources/templates/leaderboard.vm rename to src/main/resources/templates/leaderboard.vm diff --git a/Server/src/main/resources/templates/play.vm b/src/main/resources/templates/play.vm similarity index 100% rename from Server/src/main/resources/templates/play.vm rename to src/main/resources/templates/play.vm diff --git a/Server/src/main/typescript/Console.ts b/src/main/typescript/Console.ts similarity index 100% rename from Server/src/main/typescript/Console.ts rename to src/main/typescript/Console.ts diff --git a/Server/src/main/typescript/GameClient.ts b/src/main/typescript/GameClient.ts similarity index 100% rename from Server/src/main/typescript/GameClient.ts rename to src/main/typescript/GameClient.ts diff --git a/Server/src/main/typescript/GameObject.ts b/src/main/typescript/GameObject.ts similarity index 96% rename from Server/src/main/typescript/GameObject.ts rename to src/main/typescript/GameObject.ts index c37c0a0..58f835a 100644 --- a/Server/src/main/typescript/GameObject.ts +++ b/src/main/typescript/GameObject.ts @@ -1,14 +1,14 @@ enum ObjectType { - CUBOT = "net.simon987.cubotplugin.Cubot", - BIOMASS = "net.simon987.biomassplugin.BiomassBlob", - HARVESTER_NPC = "net.simon987.npcplugin.HarvesterNPC", - FACTORY = "net.simon987.npcplugin.Factory", - RADIO_TOWER = "net.simon987.npcplugin.RadioTower", - VAULT_DOOR = "net.simon987.npcplugin.VaultDoor", - OBSTACLE = "net.simon987.npcplugin.Obstacle", - ELECTRIC_BOX = "net.simon987.npcplugin.ElectricBox", - PORTAL = "net.simon987.npcplugin.Portal", - HACKED_NPC = "net.simon987.npcplugin.HackedNPC" + CUBOT = "net.simon987.mar.cubot.Cubot", + BIOMASS = "net.simon987.mar.biomass.BiomassBlob", + HARVESTER_NPC = "net.simon987.mar.npc.HarvesterNPC", + FACTORY = "net.simon987.mar.npc.Factory", + RADIO_TOWER = "net.simon987.mar.npc.RadioTower", + VAULT_DOOR = "net.simon987.mar.npc.VaultDoor", + OBSTACLE = "net.simon987.mar.npc.Obstacle", + ELECTRIC_BOX = "net.simon987.mar.npc.ElectricBox", + PORTAL = "net.simon987.mar.npc.Portal", + HACKED_NPC = "net.simon987.mar.npc.HackedNPC" } enum ItemType { @@ -201,8 +201,67 @@ class Cubot extends GameObject { this.setShield(false); } - protected getEnergy(json): number { - return json["net.simon987.cubotplugin.CubotBattery"].energy + updateObject(json): void { + + if (DEBUG) { + console.log("Updating Cubot object") + } + + this.action = json.action; + this.energy = this.getEnergy(json); + this.direction = json.direction; + this.shield = json.shield; + + //Update Inventory + this.createInventory([json.heldItem]); + this.heldItem = json.heldItem; + + //Update color + this.cubotSprite.tint = this.getTint(); + + //Update Location + if (!this.isAt(json.x, json.y)) { + //Location changed + if (this.action == Action.WALKING) { + //Walking.. + this.tileX = json.x; + this.tileY = json.y; + + this.walk(); + + } + // else if (this.action == Action.JUMPING) { + // //TODO + // } + } + + if (this.action == Action.DIGGING) { + switch (this.direction) { + case Direction.NORTH: + this.cubotSprite.animations.play("dig_n", 60); + break; + case Direction.SOUTH: + this.cubotSprite.animations.play("dig_s", 60); + break; + case Direction.EAST: + this.cubotSprite.animations.play("dig_e", 60); + break; + case Direction.WEST: + this.cubotSprite.animations.play("dig_w", 60); + break; + } + } else if (this.action == Action.ATTACKING) { + + this.makeLaserAttack() + + } + + this.updateDirection(); + let holoHw = json["net.simon987.mar.cubot.CubotHologram"]; + this.updateHologram(holoHw.mode, holoHw.color, holoHw.value, holoHw.string); + + //Update shield + this.setShield(this.shield > 0) } public setShield(shield: boolean) { @@ -277,67 +336,8 @@ class Cubot extends GameObject { } } - updateObject(json): void { - - if (DEBUG) { - console.log("Updating Cubot object") - } - - this.action = json.action; - this.energy = this.getEnergy(json); - this.direction = json.direction; - this.shield = json.shield; - - //Update Inventory - this.createInventory([json.heldItem]); - this.heldItem = json.heldItem; - - //Update color - this.cubotSprite.tint = this.getTint(); - - //Update Location - if (!this.isAt(json.x, json.y)) { - //Location changed - if (this.action == Action.WALKING) { - //Walking.. - this.tileX = json.x; - this.tileY = json.y; - - this.walk(); - - } - // else if (this.action == Action.JUMPING) { - // //TODO - // } - } - - if (this.action == Action.DIGGING) { - switch (this.direction) { - case Direction.NORTH: - this.cubotSprite.animations.play("dig_n", 60); - break; - case Direction.SOUTH: - this.cubotSprite.animations.play("dig_s", 60); - break; - case Direction.EAST: - this.cubotSprite.animations.play("dig_e", 60); - break; - case Direction.WEST: - this.cubotSprite.animations.play("dig_w", 60); - break; - } - } else if (this.action == Action.ATTACKING) { - - this.makeLaserAttack() - - } - - this.updateDirection(); - let holoHw = json["net.simon987.cubotplugin.CubotHologram"]; - this.updateHologram(holoHw.mode, holoHw.color, holoHw.value, holoHw.string); - - //Update shield - this.setShield(this.shield > 0) + protected getEnergy(json): number { + return json["net.simon987.mar.cubot.CubotBattery"].energy } protected updateHologram(holoMode: HologramMode, holoColor: number, holoValue: number, holoStr: string): void { @@ -549,8 +549,8 @@ class HarvesterNPC extends Cubot { } protected getEnergy(json): number { - if (json.hasOwnProperty("net.simon987.npcplugin.NpcBattery")) { - return json["net.simon987.npcplugin.NpcBattery"].energy; + if (json.hasOwnProperty("net.simon987.mar.npcplugin.NpcBattery")) { + return json["net.simon987.mar.npcplugin.NpcBattery"].energy; } else { return 1000; //arbitrary number so that the lowEnergy color thresh doesn't trigger } @@ -601,7 +601,7 @@ class HackedNPC extends HarvesterNPC { updateObject(json) { super.updateObject(json); - let holoHw = json["net.simon987.cubotplugin.CubotHologram"]; + let holoHw = json["net.simon987.mar.cubot.CubotHologram"]; this.updateHologram(holoHw.mode, holoHw.color, holoHw.value, holoHw.string); } } diff --git a/Server/src/main/typescript/MarGame.ts b/src/main/typescript/MarGame.ts similarity index 100% rename from Server/src/main/typescript/MarGame.ts rename to src/main/typescript/MarGame.ts diff --git a/Server/src/main/typescript/World.ts b/src/main/typescript/World.ts similarity index 100% rename from Server/src/main/typescript/World.ts rename to src/main/typescript/World.ts diff --git a/Server/src/main/typescript/mar.ts b/src/main/typescript/mar.ts similarity index 100% rename from Server/src/main/typescript/mar.ts rename to src/main/typescript/mar.ts diff --git a/Server/src/main/typescript/p2.d.ts b/src/main/typescript/p2.d.ts similarity index 100% rename from Server/src/main/typescript/p2.d.ts rename to src/main/typescript/p2.d.ts diff --git a/Server/src/main/typescript/phaser.d.ts b/src/main/typescript/phaser.d.ts similarity index 100% rename from Server/src/main/typescript/phaser.d.ts rename to src/main/typescript/phaser.d.ts diff --git a/Server/src/main/typescript/phaser.plugin.isometric.d.ts b/src/main/typescript/phaser.plugin.isometric.d.ts similarity index 100% rename from Server/src/main/typescript/phaser.plugin.isometric.d.ts rename to src/main/typescript/phaser.plugin.isometric.d.ts diff --git a/Server/src/main/typescript/pixi.d.ts b/src/main/typescript/pixi.d.ts similarity index 100% rename from Server/src/main/typescript/pixi.d.ts rename to src/main/typescript/pixi.d.ts diff --git a/Server/src/main/typescript/tsconfig.json b/src/main/typescript/tsconfig.json similarity index 100% rename from Server/src/main/typescript/tsconfig.json rename to src/main/typescript/tsconfig.json diff --git a/Server/src/test/java/net/simon987/server/ConfigHelper.java b/src/test/java/net/simon987/mar/server/ConfigHelper.java similarity index 71% rename from Server/src/test/java/net/simon987/server/ConfigHelper.java rename to src/test/java/net/simon987/mar/server/ConfigHelper.java index f01f210..c3fe51e 100644 --- a/Server/src/test/java/net/simon987/server/ConfigHelper.java +++ b/src/test/java/net/simon987/mar/server/ConfigHelper.java @@ -1,4 +1,4 @@ -package net.simon987.server; +package net.simon987.mar.server; import java.io.File; @@ -8,12 +8,12 @@ public class ConfigHelper { File file = new File(workingDir.getAbsolutePath(), "config.properties"); if (!file.exists()) { - File fallback = new File("Server/src/main/resources/", file.getName()); + File fallback = new File("src/main/resources/", file.getName()); if (fallback.exists()) { file = fallback; } else { throw new AssertionError("'config.properties' and " + - "'Server/src/main/resources/config.properties' cannot be found with working directory: " + + "'src/main/resources/config.properties' cannot be found with working directory: " + workingDir.getAbsolutePath()); } } diff --git a/Server/src/test/java/net/simon987/server/FakeConfiguration.java b/src/test/java/net/simon987/mar/server/FakeConfiguration.java similarity index 89% rename from Server/src/test/java/net/simon987/server/FakeConfiguration.java rename to src/test/java/net/simon987/mar/server/FakeConfiguration.java index 5c30572..be37091 100644 --- a/Server/src/test/java/net/simon987/server/FakeConfiguration.java +++ b/src/test/java/net/simon987/mar/server/FakeConfiguration.java @@ -1,10 +1,10 @@ -package net.simon987.server; +package net.simon987.mar.server; import java.util.Properties; public class FakeConfiguration implements IServerConfiguration { - private Properties properties; + private final Properties properties; public FakeConfiguration() { diff --git a/src/test/java/net/simon987/mar/server/assembly/CPUTest.java b/src/test/java/net/simon987/mar/server/assembly/CPUTest.java new file mode 100644 index 0000000..32cd8ea --- /dev/null +++ b/src/test/java/net/simon987/mar/server/assembly/CPUTest.java @@ -0,0 +1,6 @@ +package net.simon987.mar.server.assembly; + +public class CPUTest { + + +} diff --git a/Server/src/test/java/net/simon987/server/assembly/DWTest.java b/src/test/java/net/simon987/mar/server/assembly/DWTest.java similarity index 79% rename from Server/src/test/java/net/simon987/server/assembly/DWTest.java rename to src/test/java/net/simon987/mar/server/assembly/DWTest.java index a8f15bb..ed07f89 100644 --- a/Server/src/test/java/net/simon987/server/assembly/DWTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/DWTest.java @@ -1,7 +1,7 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.FakeConfiguration; -import net.simon987.server.IServerConfiguration; +import net.simon987.mar.server.FakeConfiguration; +import net.simon987.mar.server.IServerConfiguration; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/Server/src/test/java/net/simon987/server/assembly/LabelTest.java b/src/test/java/net/simon987/mar/server/assembly/LabelTest.java similarity index 93% rename from Server/src/test/java/net/simon987/server/assembly/LabelTest.java rename to src/test/java/net/simon987/mar/server/assembly/LabelTest.java index 30c043b..8058306 100644 --- a/Server/src/test/java/net/simon987/server/assembly/LabelTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/LabelTest.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; import org.junit.Test; diff --git a/Server/src/test/java/net/simon987/server/assembly/MemoryTest.java b/src/test/java/net/simon987/mar/server/assembly/MemoryTest.java similarity index 93% rename from Server/src/test/java/net/simon987/server/assembly/MemoryTest.java rename to src/test/java/net/simon987/mar/server/assembly/MemoryTest.java index 1273bf8..74143d5 100644 --- a/Server/src/test/java/net/simon987/server/assembly/MemoryTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/MemoryTest.java @@ -1,12 +1,12 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.ConfigHelper; +import net.simon987.mar.server.ConfigHelper; import org.junit.Test; import static org.junit.Assert.*; public class MemoryTest { - + @Test public void getSet() { int memorySize = ConfigHelper.getConfig().getInt("memory_size"); @@ -42,4 +42,4 @@ public class MemoryTest { } -} \ No newline at end of file +} diff --git a/Server/src/test/java/net/simon987/server/assembly/OperandTest.java b/src/test/java/net/simon987/mar/server/assembly/OperandTest.java similarity index 98% rename from Server/src/test/java/net/simon987/server/assembly/OperandTest.java rename to src/test/java/net/simon987/mar/server/assembly/OperandTest.java index e89de92..838f1e3 100644 --- a/Server/src/test/java/net/simon987/server/assembly/OperandTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/OperandTest.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.assembly.exception.InvalidOperandException; +import net.simon987.mar.server.assembly.exception.InvalidOperandException; import org.junit.Test; import java.util.HashMap; diff --git a/Server/src/test/java/net/simon987/server/assembly/RegisterSetTest.java b/src/test/java/net/simon987/mar/server/assembly/RegisterSetTest.java similarity index 97% rename from Server/src/test/java/net/simon987/server/assembly/RegisterSetTest.java rename to src/test/java/net/simon987/mar/server/assembly/RegisterSetTest.java index c14c98a..d69cd1a 100644 --- a/Server/src/test/java/net/simon987/server/assembly/RegisterSetTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/RegisterSetTest.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; import org.junit.Test; @@ -75,4 +75,4 @@ public class RegisterSetTest { registerSet.set(3, 10); } -} \ No newline at end of file +} diff --git a/Server/src/test/java/net/simon987/server/assembly/TestComment.java b/src/test/java/net/simon987/mar/server/assembly/TestComment.java similarity index 95% rename from Server/src/test/java/net/simon987/server/assembly/TestComment.java rename to src/test/java/net/simon987/mar/server/assembly/TestComment.java index 3633a7b..c57e3f1 100644 --- a/Server/src/test/java/net/simon987/server/assembly/TestComment.java +++ b/src/test/java/net/simon987/mar/server/assembly/TestComment.java @@ -1,4 +1,4 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; import org.junit.Test; diff --git a/Server/src/test/java/net/simon987/server/assembly/TestHelper.java b/src/test/java/net/simon987/mar/server/assembly/TestHelper.java similarity index 70% rename from Server/src/test/java/net/simon987/server/assembly/TestHelper.java rename to src/test/java/net/simon987/mar/server/assembly/TestHelper.java index e035b73..570d590 100644 --- a/Server/src/test/java/net/simon987/server/assembly/TestHelper.java +++ b/src/test/java/net/simon987/mar/server/assembly/TestHelper.java @@ -1,7 +1,7 @@ -package net.simon987.server.assembly; +package net.simon987.mar.server.assembly; -import net.simon987.server.FakeConfiguration; -import net.simon987.server.IServerConfiguration; +import net.simon987.mar.server.FakeConfiguration; +import net.simon987.mar.server.IServerConfiguration; class TestHelper { diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/AddInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/AddInstructionTest.java similarity index 94% rename from Server/src/test/java/net/simon987/server/assembly/instruction/AddInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/AddInstructionTest.java index 8a9d229..58b2ab0 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/AddInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/AddInstructionTest.java @@ -1,10 +1,10 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.ConfigHelper; -import net.simon987.server.assembly.Memory; -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.ConfigHelper; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; import static org.junit.Assert.*; @@ -154,4 +154,4 @@ public class AddInstructionTest { } -} \ No newline at end of file +} diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/AndInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/AndInstructionTest.java similarity index 91% rename from Server/src/test/java/net/simon987/server/assembly/instruction/AndInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/AndInstructionTest.java index 5822944..e66bed3 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/AndInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/AndInstructionTest.java @@ -1,8 +1,8 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.ConfigHelper; -import net.simon987.server.assembly.Memory; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.ConfigHelper; +import net.simon987.mar.server.assembly.Memory; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -75,4 +75,4 @@ public class AndInstructionTest { assertEquals(false, status.isCarryFlag()); } -} \ No newline at end of file +} diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/BrkInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/BrkInstructionTest.java similarity index 79% rename from Server/src/test/java/net/simon987/server/assembly/instruction/BrkInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/BrkInstructionTest.java index 5224503..17b7603 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/BrkInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/BrkInstructionTest.java @@ -1,6 +1,6 @@ -package net.simon987.server.assembly.instruction; +package net.simon987.mar.server.assembly.instruction; -import net.simon987.server.assembly.Status; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; import static org.junit.Assert.assertTrue; @@ -20,4 +20,4 @@ public class BrkInstructionTest { assertTrue(status.isBreakFlag()); } -} \ No newline at end of file +} diff --git a/src/test/java/net/simon987/mar/server/assembly/instruction/CallInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/CallInstructionTest.java new file mode 100644 index 0000000..9fd19cf --- /dev/null +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/CallInstructionTest.java @@ -0,0 +1,6 @@ +package net.simon987.mar.server.assembly.instruction; + +public class CallInstructionTest { + + +} diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetaInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetaInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetaInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetaInstructionTest.java index a4825e0..44ce537 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetaInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetaInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetaInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETA; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETA; public SetaInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetaInstructionTest { instruction = new SetaInstruction(); } - + /** * SETA, SETNBE Above, Not Below or Equal CF=0 AND ZF=0 */ @@ -35,7 +34,7 @@ public class SetaInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setCarryFlag(true); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetaeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetaeInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetaeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetaeInstructionTest.java index 10d70c3..c864389 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetaeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetaeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetaeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETAE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETAE; public SetaeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetaeInstructionTest { instruction = new SetaeInstruction(); } - + /** * SETAE,SETNB,SETNC Above or Equal, Not Below, No Carry CF=0 */ @@ -34,7 +33,7 @@ public class SetaeInstructionTest { status.setCarryFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setCarryFlag(true); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetbInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetbInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetbInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetbInstructionTest.java index c0f464b..d281fcf 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetbInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetbInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetbInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETB; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETB; public SetbInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetbInstructionTest { instruction = new SetbInstruction(); } - + /** * SETB, SETC,SETNAE Below, Carry, Not Above or Equal CF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetbeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetbeInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetbeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetbeInstructionTest.java index c23d5d8..b41180d 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetbeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetbeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetbeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETBE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETBE; public SetbeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetbeInstructionTest { instruction = new SetbeInstruction(); } - + /** * SETBE, SETNA Below or Equal, Not Above CF=1 OR ZF=1 */ @@ -35,7 +34,7 @@ public class SetbeInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setCarryFlag(true); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetcInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetcInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetcInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetcInstructionTest.java index 2777442..2339e35 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetcInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetcInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetcInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETB; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETB; public SetcInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetcInstructionTest { instruction = new SetcInstruction(); } - + /** * SETB, SETC,SETNAE Below, Carry, Not Above or Equal CF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetccInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetccInstructionTest.java similarity index 83% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetccInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetccInstructionTest.java index 8d6e524..970f9e0 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetccInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetccInstructionTest.java @@ -1,16 +1,16 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Operand; -import net.simon987.server.assembly.OperandType; - -import net.simon987.server.assembly.exception.*; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Operand; +import net.simon987.mar.server.assembly.OperandType; +import net.simon987.mar.server.assembly.exception.AssemblyException; +import net.simon987.mar.server.assembly.exception.IllegalOperandException; +import net.simon987.mar.server.assembly.exception.InvalidMnemonicException; import org.junit.Test; -import static org.junit.Assert.*; - import java.io.ByteArrayOutputStream; +import static org.junit.Assert.assertTrue; + public class SetccInstructionTest { /** * Since SETCC is not an actual valid mnemonic, encoding the SetccInstruction class should throw an exception diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SeteInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SeteInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SeteInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SeteInstructionTest.java index cd5ec55..762cdea 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SeteInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SeteInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SeteInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETE; public SeteInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SeteInstructionTest { instruction = new SeteInstruction(); } - + /** * SETE, SETZ Equal, Zero ZF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetgInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetgInstructionTest.java similarity index 78% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetgInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetgInstructionTest.java index 2bd7e58..9301ec0 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetgInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetgInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetgInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETG; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETG; public SetgInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetgInstructionTest { instruction = new SetgInstruction(); } - + /** * SETG, SETNLE Greater, Not Less or Equal SF=OF AND ZF=0 */ @@ -36,7 +35,7 @@ public class SetgInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setSignFlag(true); status.setOverflowFlag(true); status.setZeroFlag(false); @@ -54,7 +53,7 @@ public class SetgInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setSignFlag(false); status.setOverflowFlag(true); status.setZeroFlag(false); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetgeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetgeInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetgeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetgeInstructionTest.java index f667877..15ca584 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetgeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetgeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetgeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETGE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETGE; public SetgeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetgeInstructionTest { instruction = new SetgeInstruction(); } - + /** * SETGE, SETNL Greater or Equal, Not Less SF=OF */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetlInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetlInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetlInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetlInstructionTest.java index 5f47b68..a69bd7f 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetlInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetlInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetlInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETL; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETL; public SetlInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetlInstructionTest { instruction = new SetlInstruction(); } - + /** * SETL, SETNGE Less, Not Greater or Equal SF<>OF */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetleInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetleInstructionTest.java similarity index 77% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetleInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetleInstructionTest.java index 2e37ea9..41126cd 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetleInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetleInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetleInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETLE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETLE; public SetleInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetleInstructionTest { instruction = new SetleInstruction(); } - + /** * SETL, SETNGE Less, Not Greater or Equal SF<>OF */ @@ -46,13 +45,13 @@ public class SetleInstructionTest { status.setZeroFlag(true); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setSignFlag(false); status.setOverflowFlag(false); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setSignFlag(true); status.setOverflowFlag(true); status.setZeroFlag(false); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnaInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnaInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnaInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnaInstructionTest.java index 49e9400..f369641 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnaInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnaInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnaInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETBE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETBE; public SetnaInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnaInstructionTest { instruction = new SetnaInstruction(); } - + /** * SETBE, SETNA Below or Equal, Not Above CF=1 OR ZF=1 */ @@ -35,7 +34,7 @@ public class SetnaInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setCarryFlag(true); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnaeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnaeInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnaeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnaeInstructionTest.java index c9ee249..38710a5 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnaeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnaeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnaeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETB; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETB; public SetnaeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnaeInstructionTest { instruction = new SetnaeInstruction(); } - + /** * SETB, SETC,SETNAE Below, Carry, Not Above or Equal CF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnbInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnbInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnbInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnbInstructionTest.java index 2be4102..791d01c 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnbInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnbInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnbInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETAE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETAE; public SetnbInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnbInstructionTest { instruction = new SetnbInstruction(); } - + /** * SETAE,SETNB,SETNC Above or Equal, Not Below, No Carry CF=0 */ @@ -34,7 +33,7 @@ public class SetnbInstructionTest { status.setCarryFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setCarryFlag(true); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnbeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnbeInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnbeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnbeInstructionTest.java index a501ee4..4e60550 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnbeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnbeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnbeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETA; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETA; public SetnbeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnbeInstructionTest { instruction = new SetnbeInstruction(); } - + /** * SETA, SETNBE Above, Not Below or Equal CF=0 AND ZF=0 */ @@ -35,7 +34,7 @@ public class SetnbeInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setCarryFlag(true); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetncInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetncInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetncInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetncInstructionTest.java index 84d0998..3998a14 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetncInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetncInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetncInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETAE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETAE; public SetncInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetncInstructionTest { instruction = new SetncInstruction(); } - + /** * SETAE,SETNB,SETNC Above or Equal, Not Below, No Carry CF=0 */ @@ -34,7 +33,7 @@ public class SetncInstructionTest { status.setCarryFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setCarryFlag(true); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetneInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetneInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetneInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetneInstructionTest.java index 4a21ab0..670c69b 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetneInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetneInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetneInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETNE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETNE; public SetneInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetneInstructionTest { instruction = new SetneInstruction(); } - + /** * SETNE, SETNZ Not Equal, Not Zero ZF=0 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetngInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetngInstructionTest.java similarity index 77% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetngInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetngInstructionTest.java index 8738be1..1e4b447 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetngInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetngInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetngInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETLE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETLE; public SetngInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetngInstructionTest { instruction = new SetngInstruction(); } - + /** * SETLE, SETNG Less or Equal, Not Greater SF<>OF OR ZF=1 */ @@ -46,14 +45,14 @@ public class SetngInstructionTest { status.setZeroFlag(true); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setSignFlag(false); status.setOverflowFlag(false); status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setSignFlag(true); status.setOverflowFlag(true); status.setZeroFlag(false); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetngeInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetngeInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetngeInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetngeInstructionTest.java index 9a9853e..74a81ca 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetngeInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetngeInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetngeInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETL; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETL; public SetngeInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetngeInstructionTest { instruction = new SetngeInstruction(); } - + /** * SETL, SETNGE Less, Not Greater or Equal SF<>OF */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnlInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnlInstructionTest.java similarity index 73% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnlInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnlInstructionTest.java index 9431a0f..4c02016 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnlInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnlInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnlInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETGE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETGE; public SetnlInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnlInstructionTest { instruction = new SetnlInstruction(); } - + /** * SETGE, SETNL Greater or Equal, Not Less SF=OF */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnleInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnleInstructionTest.java similarity index 78% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnleInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnleInstructionTest.java index fd0c8ba..55d85f6 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnleInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnleInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnleInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETG; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETG; public SetnleInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnleInstructionTest { instruction = new SetnleInstruction(); } - + /** * SETG, SETNLE Greater, Not Less or Equal SF=OF AND ZF=0 */ @@ -36,7 +35,7 @@ public class SetnleInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 1); - + status.setSignFlag(true); status.setOverflowFlag(true); status.setZeroFlag(false); @@ -54,7 +53,7 @@ public class SetnleInstructionTest { status.setZeroFlag(false); instruction.execute(registers, 1, SETCCOPCODE, status); assertEquals(registers.get(1), 0); - + status.setSignFlag(false); status.setOverflowFlag(true); status.setZeroFlag(false); diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnoInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnoInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnoInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnoInstructionTest.java index beae781..279281c 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnoInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnoInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnoInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETNO; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETNO; public SetnoInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnoInstructionTest { instruction = new SetnoInstruction(); } - + /** * SETNO No Overflow OF=0 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnsInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnsInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnsInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnsInstructionTest.java index 6b256b5..edba912 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnsInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnsInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetnsInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETNS; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETNS; public SetnsInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetnsInstructionTest { instruction = new SetnsInstruction(); } - + /** * SETS No Sign SF=0 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetnzInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetnzInstructionTest.java similarity index 100% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetnzInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetnzInstructionTest.java diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetoInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetoInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetoInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetoInstructionTest.java index eee4911..f2b3f5d 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetoInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetoInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetoInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETO; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETO; public SetoInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetoInstructionTest { instruction = new SetoInstruction(); } - + /** * SETO Overflow OF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetsInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetsInstructionTest.java similarity index 62% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetsInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetsInstructionTest.java index ca9be24..4d5bc35 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetsInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetsInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetsInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETS; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETS; public SetsInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetsInstructionTest { instruction = new SetsInstruction(); } - + /** * SETS Sign SF=1 */ diff --git a/Server/src/test/java/net/simon987/server/assembly/instruction/SetzInstructionTest.java b/src/test/java/net/simon987/mar/server/assembly/instruction/SetzInstructionTest.java similarity index 63% rename from Server/src/test/java/net/simon987/server/assembly/instruction/SetzInstructionTest.java rename to src/test/java/net/simon987/mar/server/assembly/instruction/SetzInstructionTest.java index 5ea4475..a2d2b48 100644 --- a/Server/src/test/java/net/simon987/server/assembly/instruction/SetzInstructionTest.java +++ b/src/test/java/net/simon987/mar/server/assembly/instruction/SetzInstructionTest.java @@ -1,19 +1,18 @@ -package net.simon987.server.assembly.instruction; - -import net.simon987.server.assembly.Register; -import net.simon987.server.assembly.RegisterSet; -import net.simon987.server.assembly.Status; +package net.simon987.mar.server.assembly.instruction; +import net.simon987.mar.server.assembly.Register; +import net.simon987.mar.server.assembly.RegisterSet; +import net.simon987.mar.server.assembly.Status; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; public class SetzInstructionTest { - private RegisterSet registers; - private Status status; - private SetccInstruction instruction; - private int SETCCOPCODE = SetccInstruction.SETE; + private final RegisterSet registers; + private final Status status; + private final SetccInstruction instruction; + private final int SETCCOPCODE = SetccInstruction.SETE; public SetzInstructionTest() { registers = new RegisterSet(); @@ -25,7 +24,7 @@ public class SetzInstructionTest { instruction = new SetzInstruction(); } - + /** * SETE, SETZ Equal, Zero ZF=1 */ diff --git a/Server/src/test/java/net/simon987/server/game/objects/ItemsContainerTest.java b/src/test/java/net/simon987/mar/server/game/objects/ItemsContainerTest.java similarity index 95% rename from Server/src/test/java/net/simon987/server/game/objects/ItemsContainerTest.java rename to src/test/java/net/simon987/mar/server/game/objects/ItemsContainerTest.java index b77b7e3..442fb4f 100644 --- a/Server/src/test/java/net/simon987/server/game/objects/ItemsContainerTest.java +++ b/src/test/java/net/simon987/mar/server/game/objects/ItemsContainerTest.java @@ -1,6 +1,6 @@ -package net.simon987.server.game.objects; +package net.simon987.mar.server.game.objects; -import net.simon987.server.game.item.ItemCopper; +import net.simon987.mar.server.game.item.ItemCopper; import org.bson.Document; import org.junit.Assert; import org.junit.Test;