From 84837bf60a6d04a9e46ca150828b0096db55b1da Mon Sep 17 00:00:00 2001
From: lexikiq <noellekiq@gmail.com>
Date: Tue, 4 May 2021 13:42:04 -0400
Subject: [PATCH] Properly bump to Java 15

---
 .gitmodules          | 3 +++
 scripts/paperclip.sh | 5 +++--
 work/Paperclip       | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 160000 work/Paperclip

diff --git a/.gitmodules b/.gitmodules
index 9e97d59..137ad3a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,3 +2,6 @@
 	path = Paper
 	url = https://github.com/PaperMC/Paper
 	branch = master
+[submodule "work/Paperclip"]
+	path = work/Paperclip
+	url = https://github.com/ProjectEdenGG/Paperclip
diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh
index 060d863..1599c53 100755
--- a/scripts/paperclip.sh
+++ b/scripts/paperclip.sh
@@ -7,15 +7,16 @@
 set -e
 basedir="$(cd "$1" && pwd -P)"
 workdir="$basedir/Paper/work"
+altworkdir="$basedir/work"
 mcver=$(cat "$workdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
 paperjar="$basedir/Parchment-Server/target/parchment-$mcver.jar"
 vanillajar="$workdir/Minecraft/$mcver/$mcver.jar"
 
 (
-    cd "$workdir/Paperclip"
+    cd "$altworkdir/Paperclip"
     mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$paperjar" "-Dvanillajar=$vanillajar"
 )
-cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/parchment-paperclip.jar"
+cp "$altworkdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/parchment-paperclip.jar"
 
 echo ""
 echo ""
diff --git a/work/Paperclip b/work/Paperclip
new file mode 160000
index 0000000..b067cb7
--- /dev/null
+++ b/work/Paperclip
@@ -0,0 +1 @@
+Subproject commit b067cb7bba7c46d57a641b82979bf9095c8afa76