Add back Pufferfish patch

PlazmaMC · May 14, 2024 · 63e37b3 · 63e37b3
1 parent 6e591f2
commit 63e37b3
Show file tree

Hide file tree

Showing 41 changed files with 5,472 additions and 525 deletions.
diff --git a/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/CheckUpstreamCommitTasks.kt b/buildSrc/src/main/kotlin/org/plazmamc/alwaysuptodate/tasks/CheckUpstreamCommitTasks.kt
@@ -46,7 +46,7 @@ fun Project.getLatest(repository: String, branch: String) : String {
     val regex = "[a-z0-9]{40}\trefs/heads/$branch".toRegex()
     val temp = Git(project.pathIO)("ls-remote", repository).readText()
 
-    return temp?.lines()?.first { regex.matches(it) }?.split("\t")?.first()
+    return temp?.lines()?.first(regex::matches)?.split("\t")?.first()
         ?: throw AlwaysUpToDateException("Failed to get latest commit of $repository")
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,10 +17,11 @@ jdkVersion = 21
 
 paperRepo = https://github.com/PaperMC/Paper
 paperBranch = master
-purpurRepo = https://github.com/PurpurMC/Purpur
+purpurRepo = https://github.com/PlazmaMC/Purpur
 purpurBranch = ver/1.20.6
+pufferfishRepo = https://github.com/PlazmaMC/Pufferfish
 pufferfishBranch = ver/1.20
-usePufferfish = false
+usePufferfish = true
 
 paperCommit = 3fc93581bb876e8149b2ca423375a98f5ca12d27
-purpurCommit = c637b74bade41e7be96ed3478bab7c3b923e7d84
+purpurCommit = 24b161b1be559e7f84d881f9cabe2830d693e621