diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..ba30ee1 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,19 @@ +## General guide + +[Collaboration guide](https://github.com/simon987/Much-Assembly-Required/wiki/Collaboration-Guide) + +## Before creating a pull request + +Here small unordered list of guidelines to read before creating a pull request +- Use java <= 1.8 features +- Please follow [Google's Java style guide](https://google.github.io/styleguide/javaguide.html) +- Constants (e.g. the energy cost of an in-game action) should be loaded from config.properties +- 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 +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/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java index e8e749f..975deab 100644 --- a/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java +++ b/Plugin Cubot/src/main/java/net/simon987/cubotplugin/CubotDrill.java @@ -18,8 +18,7 @@ public class CubotDrill extends CpuHardware { public static final int DEFAULT_ADDRESS = 5; private static final int DRILL_POLL = 1; - private static final int DRILL_GATHER_SLOW = 2; - private static final int DRILL_GATHER_FAST = 3; + private static final int DRILL_GATHER = 2; // simplified gather private Cubot cubot; @@ -40,7 +39,7 @@ public class CubotDrill extends CpuHardware { getCpu().getRegisterSet().getRegister("B").setValue(0); - } else if (a == DRILL_GATHER_SLOW || a == DRILL_GATHER_FAST) { + } else if (a == DRILL_GATHER) { if (cubot.spendEnergy(1400)) { if (cubot.getCurrentAction() == Action.IDLE) {