Add Paperclip

Author: nkomarn

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "tools/yarn"]
-	path = tools/yarn
-	url = https://github.com/FabricMC/yarn.git
+[submodule "tools/Paperclip"]
+	path = tools/Paperclip
+	url = https://github.com/PaperMC/Paperclip

loom

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+mcVersion="20w45a"
+
 # resolve shell-specifics
 case "$(echo "$SHELL" | sed -E 's|/usr(/local)?||g')" in
     "/bin/zsh")
@@ -40,20 +42,18 @@ case "$1" in
         tools/scripts/applyPatches.sh "./tools/decomp/decompiled" || exit 1
     ) || failed=1
     ;;
-    "y" | "yarn")
-    (
-        set -e
-        cd "$basedir"
-        tools/scripts/decompile.sh "$basedir" || exit 1
-    ) || failed=1
-    ;;
     "s" | "setup")
         set -e
         cd "$basedir"
-        tools/scripts/decompile.sh "$basedir" || exit 1
+        tools/scripts/decompile.sh "$basedir" "$mcVersion" || exit 1
         cd "$basedir"
         tools/scripts/applyPatches.sh "./tools/decomp/decompiled" || exit 1
     ;;
+    "jar")
+        cd "$basedir/tools/Paperclip"
+        mvn clean package "-Dmcver=$mcVersion" "-Dpaperjar=$basedir/server/target/loom-$mcVersion.jar" "-Dvanillajar=$basedir/tools/decomp/server.jar" || exit 1
+        cp "$basedir/tools/Paperclip/assembly/target/paperclip-$mcVersion.jar" "$basedir/loom-$mcVersion.jar"
+    ;;
     *)
         echo "This tool provides a variety of commands to manage a Loom development environment."
         echo ""
@@ -63,6 +63,7 @@ case "$1" in
         echo "                      |"
         echo "  * p, patch          | Applies all Loom patches to NMS without building the project."
         echo "  * rb, rebuild       | Rebuilds and creates patches from your existing project source."
+        echo "  * jar               | Creates a distributable Loom server JAR."
     ;;
 esac
 

tools/Paperclip

@@ -8,15 +8,15 @@ toolsdir="$basedir/tools"
 yarndir="$toolsdir/yarn"
 decompdir="$toolsdir/decomp"
 
-mcVersion="20w45a"
+mcVersion="$2"
 mcServerJar="https://launcher.mojang.com/v1/objects/043ec38297d0ec58abd6f636bc92f5664a8ccecb/server.jar"
 mcServerMappings="https://launcher.mojang.com/v1/objects/e13520140ed6bdbe2ca05f59ce12700e9081a8cf/server.txt"
 
 function setup {
     git submodule update --init --recursive
 
     echo "Downloading vanilla server jar and Mojang mappings."
-    mkdir "$toolsdir/decomp"
+    mkdir -p "$toolsdir/decomp"
     cd "$toolsdir/decomp"
     curl -O $mcServerJar
     curl -O $mcServerMappings