From 49de9d512ee3440cb35a11de9bdb6c8207864ea6 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 19 Mar 2020 00:38:24 -0500 Subject: [PATCH] Fork Paperclip for friendly Java version requirement error --- .gitmodules | 3 +++ Paperclip | 1 + scripts/purpurclip.sh | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 160000 Paperclip diff --git a/.gitmodules b/.gitmodules index fafe4f92f..60a2b8cf9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = Paper url = https://github.com/PaperMC/Paper.git branch = ver/1.14 +[submodule "Paperclip"] + path = Paperclip + url = https://github.com/pl3xgaming/Paperclip.git diff --git a/Paperclip b/Paperclip new file mode 160000 index 000000000..2956ff325 --- /dev/null +++ b/Paperclip @@ -0,0 +1 @@ +Subproject commit 2956ff325ee72b7a3f4aae6e94fabd62e8d134ed diff --git a/scripts/purpurclip.sh b/scripts/purpurclip.sh index 5c987ddde..f54d43a81 100755 --- a/scripts/purpurclip.sh +++ b/scripts/purpurclip.sh @@ -9,10 +9,10 @@ purpurjar="$basedir/Purpur-Server/target/purpur-$mcver.jar" vanillajar="$workdir/Minecraft/$mcver/$mcver.jar" ( - cd "$workdir/Paperclip" + cd "$basedir/Paperclip" mvn clean package "-Dmcver=$mcver" "-Dpaperjar=$purpurjar" "-Dvanillajar=$vanillajar" ) -cp "$workdir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/purpurclip.jar" +cp "$basedir/Paperclip/assembly/target/paperclip-${mcver}.jar" "$basedir/purpurclip.jar" echo "" echo ""