Updated upstream (Canvas)

Upstream has released updates that appear to apply and compile correctly.
The changes in this commit are automated, meaning there might be things missing.

Canvas Changes:
CraftCanvasMC/Canvas@b726918 - Add old pearl saved data migration, so saved-data parsing doesnt fail… (#276)
CraftCanvasMC/Canvas@3e7736f - Pull Folia changes from 26.2 update (#278)
CraftCanvasMC/Canvas@72cbf8f - [ci-skip] promote channel to BETA
CraftCanvasMC/Canvas@4920e98 - Fix ActivityArrayMap hashCode() (#279)

Author: surf-canvas-upstream-bot[bot]

gradle.properties

@@ -5,7 +5,7 @@ mcVersion=26.2
 channel=ALPHA
 
 canvasBranch=main
-canvasCommit=b348d591024dbbbfd400a4a23ebb4a65d609d654
+canvasCommit=4920e9860aee81d084d52b830c967aa208dd09c6
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true

surf-canvas-server/build.gradle.kts.patch

@@ -55,10 +55,10 @@
 
      updatingMinecraft {
          // oldPaperCommit = "d4fe85375af18bfa88f44d7c1e6a61904ae550cc"
-@@ -112,10 +_,16 @@
+@@ -110,10 +_,16 @@
+     main {
+         java { srcDir("../paper-server/src/main/java"); srcDir("../paper-server/src/generated/java") }
          resources { srcDir("../paper-server/src/main/resources") }
-         java { srcDir("/src/main/java"); }
-         resources { srcDir("/src/main/resources") }
 +        java { srcDir("../canvas-server/src/sources/java") }
 +        resources { srcDir("../canvas-server/src/sources/resources") }
 +        java { srcDir("../canvas-server/src/main/java") }
@@ -72,7 +72,7 @@
      }
  }
  val log4jPlugins = sourceSets.create("log4jPlugins") {
-@@ -143,7 +_,7 @@
+@@ -141,7 +_,7 @@
  }
 
  dependencies {
@@ -81,7 +81,7 @@
      implementation("ca.spottedleaf:leafpile:1.0.0")
      implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21
-@@ -202,24 +_,24 @@
+@@ -200,24 +_,24 @@
      manifest {
          val git = Git(rootProject.layout.projectDirectory.path)
          val mcVersion = rootProject.providers.gradleProperty("mcVersion").get()
@@ -113,7 +113,7 @@
              "Build-Number" to (build ?: ""),
              "Build-Time" to buildTime.toString(),
              "Git-Branch" to gitBranch,
-@@ -358,7 +_,7 @@
+@@ -356,7 +_,7 @@
  }
 
  /* fill {

surf-canvas-server/build.gradle.kts.patch.rej

@@ -0,0 +1,19 @@
+++++ REJECTED HUNK: 5
+@@ -112,10 +132,16 @@
+         resources { srcDir("../paper-server/src/main/resources") }
+         java { srcDir("/src/main/java"); }
+         resources { srcDir("/src/main/resources") }
++        java { srcDir("../canvas-server/src/sources/java") }
++        resources { srcDir("../canvas-server/src/sources/resources") }
++        java { srcDir("../canvas-server/src/main/java") }
++        resources { srcDir("../canvas-server/src/main/resources") }
+     }
+     test {
+         java { srcDir("../paper-server/src/test/java") }
+         resources { srcDir("../paper-server/src/test/resources") }
++        java { srcDir("../canvas-server/src/test/java") }
++        resources { srcDir("../canvas-server/src/test/resources") }
+     }
+ }
+ val log4jPlugins = sourceSets.create("log4jPlugins") {
+++++ END HUNK