Add waterfall command

BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch

@@ -6,7 +6,11 @@ Subject: [PATCH] Get rid of the security manager.
 There's a lot of opinions running on both sides of the debate, but we overwhelmingly feel that the security manager does not help the vast majority of BungeeCord users or plugin developers create correct code.
 
 diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
+<<<<<<< HEAD:BungeeCord-Patches/0007-Get-rid-of-the-security-manager.patch
 index e62b5259..8a4f747c 100644
+=======
+index a7dcc97..a0708a6 100644
+>>>>>>> a388864... Add waterfall command:BungeeCord-Patches/0006-Get-rid-of-the-security-manager.patch
 --- a/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 +++ b/proxy/src/main/java/net/md_5/bungee/BungeeCord.java
 @@ -185,8 +185,6 @@ public class BungeeCord extends ProxyServer

README.md

@@ -28,7 +28,7 @@ Waterfall requires **Java 8** or above.
 
 To compile Waterfall, you need JDK8, git, bash, maven, and an internet connection.
 
-Clone this repo, run `./build.sh` from *bash*, get jar from Waterfall-Proxy/bootstrap/target/
+Clone this repo, run `./waterfall b` from *bash*, get jar from Waterfall-Proxy/bootstrap/target/
 
 ## Join us
 

build.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-git submodule update --init && ./applyPatches.sh && pushd Waterfall-Proxy && mvn clean package && popd
-

scripts/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+git submodule update --init && ./scripts/applyPatches.sh && pushd Waterfall-Proxy && mvn clean package && popd

scripts/edit.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+pushd Waterfall-Proxy
+git rebase --interactive upstream/upstream
+popd

scripts/mergeUpstream.sh

@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
 
 PS1="$"
 basedir=`pwd`

waterfall

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+case "$1" in
+    "rb" | "rbp" | "rebuild")
+        scripts/rebuildPatches.sh
+    ;;
+    "p" | "patch")
+        scripts/applyPatches.sh
+    ;;
+    "m" | "up" | "merge")
+        scrips/mergeUpstream.sh
+    ;;
+    "b" | "build")
+        scripts/build.sh
+    ;;
+    "e" | "edit")
+        scripts/edit.sh
+    ;;
+    *)
+        echo "WaterfallMC build tool command. This provides a variety of commands to control the WaterfallMC"
+        echo "build. View below for details of the available commands."
+        echo ""
+        echo "Commands:"
+        echo "  * rb, rbp, rebuild | Rebuilds the patches."
+        echo "  * p, patch         | Applies all the patches to BungeeCord."
+        echo "  * m, merge         | Utility to aid in merging upstream"
+        echo "  * b, build         | Builds the project"
+        echo "                     | The bootstrap artifact can be found in Waterfall-Proxy/bootstrap/target/"
+    ;;
+esac