From 0af80abdcaa4c3edb3e09c692b750642f6ffa866 Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Sat, 27 Nov 2021 21:06:16 -0600
Subject: [PATCH] Bump Paperclip and fix configuration cache issue

---
 build.gradle.kts                                 | 2 +-
 patches/api/0001-Convert-project-to-Gradle.patch | 7 ++++---
 patches/api/0002-Build-system-changes.patch      | 4 ++--
 patches/api/0008-Adventure.patch                 | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 2e36928c96..26425f673a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,7 +49,7 @@ dependencies {
     paramMappings("net.fabricmc:yarn:1.18-rc3+build.1:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.7.0:fat")
     decompiler("net.minecraftforge:forgeflower:1.5.498.22")
-    paperclip("io.papermc:paperclip:3.0.0-SNAPSHOT")
+    paperclip("io.papermc:paperclip:3.0.1")
 }
 
 paperweight {
diff --git a/patches/api/0001-Convert-project-to-Gradle.patch b/patches/api/0001-Convert-project-to-Gradle.patch
index 6c9fd3f40b..07a7803f49 100644
--- a/patches/api/0001-Convert-project-to-Gradle.patch
+++ b/patches/api/0001-Convert-project-to-Gradle.patch
@@ -27,10 +27,10 @@ index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f21
 +/.factorypath
 diff --git a/build.gradle.kts b/build.gradle.kts
 new file mode 100644
-index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977dd49ce1d
+index 0000000000000000000000000000000000000000..1b16a242187079f80720fc1990ee09bb6a5c2768
 --- /dev/null
 +++ b/build.gradle.kts
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,66 @@
 +plugins {
 +    `java-library`
 +    `maven-publish`
@@ -72,8 +72,9 @@ index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977
 +    inputs.property("version", project.version)
 +    val pomProps = layout.buildDirectory.file("pom.properties")
 +    outputs.file(pomProps)
++    val projectVersion = project.version
 +    doLast {
-+        pomProps.get().asFile.writeText("version=${project.version}")
++        pomProps.get().asFile.writeText("version=$projectVersion")
 +    }
 +}
 +
diff --git a/patches/api/0002-Build-system-changes.patch b/patches/api/0002-Build-system-changes.patch
index 880b428a1e..b34052204b 100644
--- a/patches/api/0002-Build-system-changes.patch
+++ b/patches/api/0002-Build-system-changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build system changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3ccff060bcb816520a27ec2f34adc977dd49ce1d..1168642d832727af2173dfcae6d132a9d44132c1 100644
+index 1b16a242187079f80720fc1990ee09bb6a5c2768..b6ec62c00140a1e225e93c4b0413c0767f4ca5b8 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -15,15 +15,27 @@ dependencies {
@@ -37,7 +37,7 @@ index 3ccff060bcb816520a27ec2f34adc977dd49ce1d..1168642d832727af2173dfcae6d132a9
      testImplementation("junit:junit:4.13.1")
      testImplementation("org.hamcrest:hamcrest-library:1.3")
      testImplementation("org.ow2.asm:asm-tree:9.2")
-@@ -59,7 +71,7 @@ tasks.withType<Javadoc> {
+@@ -60,7 +72,7 @@ tasks.withType<Javadoc> {
      (options as StandardJavadocDocletOptions).links(
          "https://guava.dev/releases/31.0.1-jre/api/docs/",
          "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
diff --git a/patches/api/0008-Adventure.patch b/patches/api/0008-Adventure.patch
index 779b10050f..64ecd90162 100644
--- a/patches/api/0008-Adventure.patch
+++ b/patches/api/0008-Adventure.patch
@@ -7,7 +7,7 @@ Co-authored-by: zml <zml@stellardrift.ca>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index a1fd76a7a7fea04a67752ff60834b566fe6f5ec5..57c216660b86a35f3e182d90c2a107563eaf5cb1 100644
+index 0a202cb63769d68ecda1644cb259c17740e5b00e..c0279749aacf5735309545cd40d164676dcf75fc 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -8,6 +8,19 @@ java {
@@ -42,7 +42,7 @@ index a1fd76a7a7fea04a67752ff60834b566fe6f5ec5..57c216660b86a35f3e182d90c2a10756
      // Paper end
  
      compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
-@@ -69,10 +87,25 @@ tasks.jar {
+@@ -70,10 +88,25 @@ tasks.jar {
  }
  
  tasks.withType<Javadoc> {