Merge master into nova-shrimpshuffler

Author: aelithron

.github/workflows/workflow.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/actions/wrapper-validation@v3
   build:
     if: (!startsWith(github.ref, 'refs/tags/v'))
     needs: validation
@@ -47,7 +47,7 @@ jobs:
       - name: Gradle build
         run: ./gradlew --build-cache --info --stacktrace build -Prelease.state=dev
       - name: Upload jar to build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: built-plugin
           path: build/libs/HCCore-Shadow-*.jar
@@ -93,7 +93,7 @@ jobs:
           (!contains(github.ref, '-rc.'))
         run: ./gradlew --build-cache --info --stacktrace -Prelease.useLastTag=true final
       - name: Upload jar to build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: built-plugin
           path: build/libs/HCCore-Shadow-*.jar
@@ -104,29 +104,29 @@ jobs:
           generate_release_notes: ${{ !(contains(github.ref, '-rc.')) }} # full releases only
           prerelease: ${{ contains(github.ref, '-rc.') }}
           files: "build/libs/HCCore-Shadow-*.jar"
-
-  deploy:
-    if: |
-      startsWith(github.ref, 'refs/tags/v') &&
-      (!contains(github.ref, '-rc.'))
-    needs: release
-    runs-on: ubuntu-latest
-    name: Deploy to Production Server
-    steps:
-      - name: Download released version
-        uses: actions/download-artifact@v3
-        with:
-          name: built-plugin
-      - name: SCP Deploy
-        env:
-          SSH_PRIVATE_KEY: ${{ secrets.MINECRAFT_DEPLOY_SSH_KEY }}
-        run: |
-          echo "$SSH_PRIVATE_KEY" > .ssh_private_key
-          chmod 700 .ssh_private_key
-          mkdir -p ~/.ssh/ && touch ~/.ssh/known_hosts
-          ssh-keyscan mc-admin.hackclub.com >> ~/.ssh/known_hosts
-          eval $(ssh-agent)
-          ssh-add - <<< "$SSH_PRIVATE_KEY"
-          scp -i .ssh_private_key HCCore-Shadow-*.jar [email protected]:/opt/minecraft/plugins/update
-          rm .ssh_private_key
 
+  # TODO: Rework to support Pterodactyl Panel
+  #deploy:
+  #  if: |
+  #    startsWith(github.ref, 'refs/tags/v') &&
+  #    (!contains(github.ref, '-rc.'))
+  #  needs: release
+  #  runs-on: ubuntu-latest
+  #  name: Deploy to Production Server
+  #  steps:
+  #    - name: Download released version
+  #      uses: actions/download-artifact@v4
+  #      with:
+  #        name: built-plugin
+  #    - name: SCP Deploy
+  #      env:
+  #        SSH_PRIVATE_KEY: ${{ secrets.MINECRAFT_DEPLOY_SSH_KEY }}
+  #      run: |
+  #        echo "$SSH_PRIVATE_KEY" > .ssh_private_key
+  #        chmod 700 .ssh_private_key
+  #        mkdir -p ~/.ssh/ && touch ~/.ssh/known_hosts
+  #        ssh-keyscan mc-admin.hackclub.com >> ~/.ssh/known_hosts
+  #        eval $(ssh-agent)
+  #        ssh-add - <<< "$SSH_PRIVATE_KEY"
+  #        scp -i .ssh_private_key HCCore-Shadow-*.jar [email protected]:/opt/minecraft/plugins/update
+  #        rm .ssh_private_key