From 4f1f98f58e2303feed427fda73296b82c7da301c Mon Sep 17 00:00:00 2001
From: Samsuik <kfian294ma4@gmail.com>
Date: Thu, 30 May 2024 23:17:28 +0100
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@d8d54d9 Only remove worldgen block entity on changed block (#10794)
PaperMC/Paper@ba31f41 [ci skip] Clean up paperclip build-pr workflow
---
 build.gradle.kts                         | 18 +++++++++---------
 gradle.properties                        |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 9e0a0b5..95730f6 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,12 +23,12 @@ subprojects {
     apply(plugin = "java")
 
     java {
-        toolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
+        toolchain { languageVersion = JavaLanguageVersion.of(17) }
     }
 
     tasks.withType<JavaCompile>().configureEach {
         options.encoding = "UTF-8"
-        options.release.set(17)
+        options.release = 17
     }
 
     repositories {
@@ -44,18 +44,18 @@ subprojects {
 }
 
 paperweight {
-    serverProject.set(project(":sakura-server"))
+    serverProject = project(":sakura-server")
 
-    remapRepo.set("https://maven.fabricmc.net/")
-    decompileRepo.set("https://files.minecraftforge.net/maven/")
+    remapRepo = "https://maven.fabricmc.net/"
+    decompileRepo = "https://files.minecraftforge.net/maven/"
 
     usePaperUpstream(providers.gradleProperty("paperRef")) {
         withPaperPatcher {
-            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
-            apiOutputDir.set(layout.projectDirectory.dir("sakura-api"))
+            apiPatchDir = layout.projectDirectory.dir("patches/api")
+            apiOutputDir = layout.projectDirectory.dir("sakura-api")
 
-            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
-            serverOutputDir.set(layout.projectDirectory.dir("sakura-server"))
+            serverPatchDir = layout.projectDirectory.dir("patches/server")
+            serverOutputDir = layout.projectDirectory.dir("sakura-server")
         }
         patchTasks.register("generatedApi") {
             isBareDirectory = true
diff --git a/gradle.properties b/gradle.properties
index 1693be0..e98a09f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=me.samsuik.sakura
 version=1.20.4-R0.1-SNAPSHOT
 
 mcVersion=1.20.4
-paperRef=7ac24a18940da12beb39a030113f6e459f348e2f
+paperRef=ba31f4128208e954d6648001724887352f71ece9
 
 org.gradle.jvmargs=-Xmx2G
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME