From c5cc3d81713431d00862d4d10e4f971f67c5fffd Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Tue, 15 Aug 2023 15:09:41 +0800
Subject: [PATCH] Updated Upstream (Gale)

---
 .github/workflows/build-1201.yml            | 2 +-
 build.gradle.kts                            | 2 +-
 gradle.properties                           | 2 +-
 gradle/wrapper/gradle-wrapper.properties    | 2 +-
 patches/server/0012-Bump-Dependencies.patch | 4 ++--
 settings.gradle.kts                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-1201.yml b/.github/workflows/build-1201.yml
index 21825fb9..44267810 100644
--- a/.github/workflows/build-1201.yml
+++ b/.github/workflows/build-1201.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Create ReobfPaperclipJar
         run: ./gradlew -Dorg.gradle.jvmargs="-Dgraal.CompilerConfiguration=enterprise -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true --add-modules jdk.incubator.vector" createReobfPaperclipJar --stacktrace --no-daemon
       - name: Rename Paperclip Jar
-        run: mv build/libs/leaf-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.1.jar
+        run: mv build/libs/Leaf-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.1.jar
       - name: Upload Leaf
         uses: actions/upload-artifact@v3
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
index 33c1e124..bd07f87e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.7:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.8:fat")
     decompiler("org.vineflower:vineflower:1.9.2")
     paperclip("io.papermc:paperclip:3.0.4-SNAPSHOT")
 }
diff --git a/gradle.properties b/gradle.properties
index c9b11c61..a02b91bb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.20.1-R0.1-SNAPSHOT
 
-galeCommit = 5bffe0539b8c1e5ae37cdc7aec89507362d44a67
+galeCommit = f6e1bd84e832f42a0a217e6824cb6b03772262cf
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0fb28372..02606d1b 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.3-rc-3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-rc-4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/patches/server/0012-Bump-Dependencies.patch b/patches/server/0012-Bump-Dependencies.patch
index c4da7a84..d2c9a531 100644
--- a/patches/server/0012-Bump-Dependencies.patch
+++ b/patches/server/0012-Bump-Dependencies.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 1d6f67588aaf8ec22190f344bb9c7dea84b7e9e7..cff8440b5cf27d431e1e20d4bf04d5cc973ab6ab 100644
+index 44c9a53c347c88ed92ab1b516a5e04f7bdac6e7e..3f6eac098c7c22ecf08ae1bab5391a9c0cafe3e6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -22,7 +22,7 @@ dependencies {
@@ -88,7 +88,7 @@ index 1d6f67588aaf8ec22190f344bb9c7dea84b7e9e7..cff8440b5cf27d431e1e20d4bf04d5cc
  }
  
  val craftbukkitPackageVersion = "1_20_R1" // Paper
-@@ -244,3 +250,6 @@ tasks.registerRunTask("runDev") {
+@@ -241,3 +247,6 @@ tasks.registerRunTask("runDev") {
      description = "Spin up a non-relocated Mojang-mapped test server"
      classpath(sourceSets.main.map { it.runtimeClasspath })
  }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 10376435..d5d71301 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,7 +7,7 @@ pluginManagement {
     }
 }
 
-rootProject.name = "leaf"
+rootProject.name = "Leaf"
 for (name in listOf("Leaf-API", "Leaf-Server")) {
     val projName = name.lowercase(Locale.ENGLISH)
     include(projName)