Properly bump to Java 15

This commit is contained in:
lexikiq
2021-05-04 13:42:04 -04:00
parent 4de5afeaf7
commit 84837bf60a
3 changed files with 7 additions and 2 deletions

3
.gitmodules vendored
View File

@@ -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

View File

@@ -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 ""

1
work/Paperclip Submodule

Submodule work/Paperclip added at b067cb7bba