From 18792194f5d85ebfd8c88cf22635babbb102ca9c Mon Sep 17 00:00:00 2001
From: Camotoy <20743703+Camotoy@users.noreply.github.com>
Date: Thu, 4 Mar 2021 20:10:01 -0500
Subject: [PATCH] Jenkinsfile attempt 4

---
 Jenkinsfile                | 8 ++------
 copy_java_files_to_pack.sh | 9 +++++++++
 2 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100755 copy_java_files_to_pack.sh

diff --git a/Jenkinsfile b/Jenkinsfile
index 817cefd..a39cee0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -6,12 +6,8 @@ pipeline {
     stages {
         stage ('Build') {
             steps {
-                sh 'wget https://launcher.mojang.com/v1/objects/37fd3c903861eeff3bc24b71eed48f828b5269c8/client.jar'
-                sh 'unzip client.jar -d extracted/'
-                sh "while read p; do\nreadarray -d , -t filesToCopy<<< \"$p\"\nmkdir -p filesToCopy[1]\ncp filesToCopy[0] filesToCopy[1]\ndone <required_files.txt"
-                sh 'rm client.jar'
-                sh 'rm -r extracted'
-                sh 'zip GeyserOptionalPack.zip -r . -x ".*" Jenkinsfile'
+                sh './copy_java_files_to_pack.sh'
+                sh 'zip GeyserOptionalPack.zip -r . -x ".*" Jenkinsfile required_files.txt copy_java_files_to_pack.sh'
             }
             post {
                 success {
diff --git a/copy_java_files_to_pack.sh b/copy_java_files_to_pack.sh
new file mode 100755
index 0000000..45b3cfb
--- /dev/null
+++ b/copy_java_files_to_pack.sh
@@ -0,0 +1,9 @@
+wget https://launcher.mojang.com/v1/objects/37fd3c903861eeff3bc24b71eed48f828b5269c8/client.jar
+unzip client.jar -d extracted/
+while read p; do
+  readarray -d , -t filesToCopy<<< "$p"
+  mkdir -p filesToCopy[1]
+  cp filesToCopy[0] filesToCopy[1]
+done <required_files.txt
+rm client.jar
+rm -r extracted
\ No newline at end of file