mirror of
https://github.com/Samsuik/Sakura.git
synced 2026-01-03 14:12:23 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@914fb08 Fix Entity#updateFluidHeightAndDoFluidPushing inconsistency with Vanilla PaperMC/Paper@e9fa3a7 Use correct queue when blocking on futures PaperMC/Paper@0ff899d Prevent world mutation on copper golem spawn cancel (#13152) PaperMC/Paper@bae47d3 Update to 1.21.10 (#13127) PaperMC/Paper@8339bb3 Update DataConverter constants for 1.21.10 PaperMC/Paper@3982efa Sync Moonrise PaperMC/Paper@fa57d4b Remove Vanilla packet processing at start of tick PaperMC/Paper@fba780d Rebuild patches
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
--- a/paper-api/build.gradle.kts
|
||||
+++ b/paper-api/build.gradle.kts
|
||||
@@ -68,6 +_,7 @@
|
||||
@@ -67,6 +_,7 @@
|
||||
api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
|
||||
implementation("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
||||
implementation("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
|
||||
@@ -8,7 +8,7 @@
|
||||
|
||||
// Annotations - Slowly migrate to jspecify
|
||||
val annotations = "org.jetbrains:annotations:$annotationsVersion"
|
||||
@@ -90,7 +_,7 @@
|
||||
@@ -89,7 +_,7 @@
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||
}
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
idea {
|
||||
module {
|
||||
generatedSourceDirs.add(generatedDir.toFile())
|
||||
@@ -100,6 +_,18 @@
|
||||
@@ -99,6 +_,18 @@
|
||||
main {
|
||||
java {
|
||||
srcDir(generatedDir)
|
||||
@@ -36,7 +36,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -166,7 +_,7 @@
|
||||
@@ -165,7 +_,7 @@
|
||||
|
||||
tasks.withType<Javadoc>().configureEach {
|
||||
val options = options as StandardJavadocDocletOptions
|
||||
@@ -45,7 +45,7 @@
|
||||
options.use()
|
||||
options.isDocFilesSubDirs = true
|
||||
options.links(
|
||||
@@ -201,11 +_,11 @@
|
||||
@@ -198,11 +_,11 @@
|
||||
}
|
||||
|
||||
// workaround for https://github.com/gradle/gradle/issues/4046
|
||||
|
||||
@@ -25,6 +25,7 @@ public final class MechanicVersion {
|
||||
public static final short v1_21_5 = MinecraftVersionEncoding.v1xy(21, 5);
|
||||
public static final short v1_21_6 = MinecraftVersionEncoding.v1xy(21, 6);
|
||||
public static final short v1_21_9 = MinecraftVersionEncoding.v1xy(21, 9);
|
||||
public static final short v1_21_10 = MinecraftVersionEncoding.v1xy(21, 10);
|
||||
|
||||
public static String name(final short version) {
|
||||
if (version == LATEST) {
|
||||
|
||||
Reference in New Issue
Block a user