Skip to content

Commit 0d1313b

Browse files
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@30600a3 - Update Upstream (Paper) CraftCanvasMC/Canvas@de20a49 - Allow saving configuration files at runtime CraftCanvasMC/Canvas@0b9141e - Expose region ID to API CraftCanvasMC/Canvas@3ebdce1 - Use time span utility for log cleaner CraftCanvasMC/Canvas@97d6fd4 - Use concurrent map (accessed by multiple threads) (#272) CraftCanvasMC/Canvas@0b6bf4f - Do not boost thread priority for region scheduler and remove chunk system config for thread priority CraftCanvasMC/Canvas@c9f3420 - Autosave configurations CraftCanvasMC/Canvas@2097f63 - Remove configs that we don't care about anymore CraftCanvasMC/Canvas@86b6f19 - Fix usages of unsafe random sources CraftCanvasMC/Canvas@0b867e6 - Fixup autosave changes and ensure if pearl fails to load from Vanilla data we dont place a pearl ticket CraftCanvasMC/Canvas@88f2d51 - Capitalize root project name CraftCanvasMC/Canvas@a4f352b - Update gradle CraftCanvasMC/Canvas@46cf8b4 - Try and add more signifiers to tell people to go to Canvas, not Paper CraftCanvasMC/Canvas@2e7ac27 - Expand watchdog output CraftCanvasMC/Canvas@4fee475 - Use uppercase abstract brand name for watchdog instead of literal "CANVAS" CraftCanvasMC/Canvas@9584ea5 - When enchant command is uncapped then cap to 255 to prevent oddities CraftCanvasMC/Canvas@b69f9c8 - Fixup usage of FQCN CraftCanvasMC/Canvas@3cda22c - Clean CraftCanvasMC/Canvas@87aa921 - Fix notifyTasks with affinity scheduler CraftCanvasMC/Canvas@68f14c1 - CAS instead of just set for task notify CraftCanvasMC/Canvas@5f5bb69 - Fix bstats not being updated with new internal versioning changes CraftCanvasMC/Canvas@23da0b1 - Update Upstream (Paper) CraftCanvasMC/Canvas@de00322 - Clean "io.canvasmc.canvas.command.*" CraftCanvasMC/Canvas@0cd2882 - Clarify package info more CraftCanvasMC/Canvas@893ae79 - Clean configuration package CraftCanvasMC/Canvas@25f4e7f - Reorder command package to match new ordering rules CraftCanvasMC/Canvas@1862e7f - Clean io.canvasmc.canvas.spark package CraftCanvasMC/Canvas@4de2c40 - Move CanvasRegionizedWorldData to MCB-0006 CraftCanvasMC/Canvas@42ab943 - Clean utility classes CraftCanvasMC/Canvas@c278180 - Update Upstream (Paper) CraftCanvasMC/Canvas@2106ac2 - Clean remaining files in "src/main" for Canvas CraftCanvasMC/Canvas@28321a4 - Cleanup server build file CraftCanvasMC/Canvas@b348d59 - Updated upstream (Paper) (#277)
1 parent 5ce0e4e commit 0d1313b

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ mcVersion=26.2
55
channel=STABLE
66

77
canvasBranch=main
8-
canvasCommit=2b498431060572e4d8b64369e9267c9c9f9765e1
8+
canvasCommit=b348d591024dbbbfd400a4a23ebb4a65d609d654
99

1010
org.gradle.configuration-cache=true
1111
org.gradle.caching=true

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/canvas-server/build.gradle.kts
22
+++ b/canvas-server/build.gradle.kts
3-
@@ -38,7 +_,29 @@
3+
@@ -39,7 +_,29 @@
44
}
55
}
66

@@ -31,7 +31,7 @@
3131

3232
updatingMinecraft {
3333
// oldPaperCommit = "d4fe85375af18bfa88f44d7c1e6a61904ae550cc"
34-
@@ -111,10 +_,16 @@
34+
@@ -112,10 +_,16 @@
3535
resources { srcDir("../paper-server/src/main/resources") }
3636
java { srcDir("/src/main/java"); }
3737
resources { srcDir("/src/main/resources") }
@@ -48,7 +48,7 @@
4848
}
4949
}
5050
val log4jPlugins = sourceSets.create("log4jPlugins") {
51-
@@ -142,7 +_,7 @@
51+
@@ -143,7 +_,7 @@
5252
}
5353

5454
dependencies {
@@ -57,7 +57,7 @@
5757
implementation("ca.spottedleaf:leafpile:1.0.0")
5858
implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+
5959
implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21
60-
@@ -209,16 +_,16 @@
60+
@@ -210,16 +_,16 @@
6161
val gitBranch = git.exec(providers, "rev-parse", "--abbrev-ref", "HEAD").get().trim()
6262
attributes(
6363
"Main-Class" to "org.bukkit.craftbukkit.Main",

0 commit comments

Comments
 (0)