From b90b32ca54078768190b6cea0d5655b2d82bc3dd Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Sat, 10 Jun 2023 23:53:55 -0500
Subject: [PATCH] Final sendoff for 1.18.2

Update Paper and CI improvements
---
 Jenkinsfile       | 8 ++++++--
 README.md         | 6 ++++++
 gradle.properties | 2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a2132b6..d01f6e1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,7 +6,6 @@ pipeline {
     stages {
         stage('applyPatches') {
             steps {
-                scmSkip(deleteBuild: true)
                 withGradle {
                     sh './gradlew applyPatches --no-daemon --refresh-dependencies'
                 }
@@ -17,6 +16,11 @@ pipeline {
                 withGradle {
                     sh './gradlew createReobfPaperclipJar --no-daemon --refresh-dependencies'
                 }
+                sh """
+                    #!/bin/sh
+                    mv \${WORKSPACE}/build/libs/Scissors-paperclip-*.jar \${WORKSPACE}/build/libs/scissors-\${BRANCH_NAME}-\${BUILD_NUMBER}.jar
+                    rm \${WORKSPACE}/build/libs/Scissors-bundler-*.jar
+                    """
             }
         }
         stage('test') {
@@ -48,7 +52,7 @@ pipeline {
     }
     post {
         always {
-            archiveArtifacts artifacts: 'build/libs/Scissors-paperclip-*.jar', fingerprint: true
+            archiveArtifacts artifacts: 'build/libs/scissors-*.jar', fingerprint: true
             junit 'Scissors-Server/build/test-results/test/*.xml'
             junit 'Scissors-API/build/test-results/test/*.xml'
             cleanWs()
diff --git a/README.md b/README.md
index f4e44cb..c7e669d 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,12 @@
 Scissors is a fork of Paper that aims to fix exploits possible in Creative Mode. Many of these exploits are ones that
 Paper's own team has either refused to fix or would have.
 
+## Links
+### [Scissors Download](https://ci.plex.us.org/job/Scissors)
+### [Scissors Javadoc](https://javadoc.scissors.gg/1.18.2)
+### [Scissors Announcements](https://totalfreedom.me/forum/board/139)
+### [Scissors General Discussion](https://totalfreedom.me/forum/board/140)
+
 ## Tasks
 ```
 Paperweight tasks
diff --git a/gradle.properties b/gradle.properties
index c5bb7e3..ed2a3ae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.totalfreedom.scissors
 version=1.18.2-R0.1-SNAPSHOT
 
 mcVersion=1.18.2
-paperRef=df630a27cc2d0b3731bf5dd311c4119c9c5b43f6
+paperRef=fc9ee65a32622d03a91db39364b6f106cf88335b
 
 org.gradle.caching=true
 org.gradle.parallel=true