changed so setup only sets up paperspigot so we can cache that and pa…

…nda patch on applies pandapaper

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
         with:
           # npm cache files are stored in `~/.npm` on Linux/macOS
           path: ~/base
-          key: cache-paper-base-${{ github.ref_name }}
+          key: cache-paper-base
       - if: ${{ steps.cache-base.outputs.cache-hit != 'true' }}
         name: Setup build environment
         run: ./panda setup

scripts/applyPatches.sh

@@ -105,18 +105,21 @@ if [ "$2" == "--setup" ] || [ "$2" == "--jar" ]; then
     echo "Importing MC Dev"
 
     ./scripts/importmcdev.sh "$basedir" || exit 1
+    if [ "$2" == "--setup" ]; then
+     exit 1
+     fi
 elif [ ! -d "base/Paper/PaperSpigot-Server" ]; then
     echo "Upstream directory does not exist. Did you forget to run 'panda setup'?"
     exit 1
+else
+    # Apply PandaSpigot
+    (
+        applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api &&
+        applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server
+        cd "$basedir"
+    ) || (
+        echo "Failed to apply Paper Patches"
+        exit 1
+    ) || exit 1
 fi
-
-# Apply PandaSpigot
-(
-    applyPatch "base/Paper/PaperSpigot-API" PandaSpigot-API HEAD patches/api &&
-    applyPatch "base/Paper/PaperSpigot-Server" PandaSpigot-Server HEAD patches/server
-    cd "$basedir"
-) || (
-    echo "Failed to apply Paper Patches"
-    exit 1
-) || exit 1
 ) || exit 1

scripts/build.sh

@@ -15,6 +15,7 @@ if [ "$2" == "--setup" ] || [ "$2" == "--jar" ]; then
     ./scripts/decompile.sh "$basedir"
     ./scripts/init.sh "$basedir"
 fi
+./scripts/applyPatches.sh "$basedir" "$2"
 
 if [ "$2" == "--jar" ]; then
     ./gradlew build && ./scripts/paperclip.sh "$basedir"