mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 23:10:16 +01:00
Start update, apply API patches
This commit is contained in:
Nassim Jahnke
parent
881d616533
commit
3a8f9e0b6e
1088 changed files with 38 additions and 473 deletions
|
|
@ -67,7 +67,7 @@ repositories {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
paramMappings("net.fabricmc:yarn:1.21.3+build.1:mergedv2")
|
paramMappings("net.fabricmc:yarn:1.21.4+build.1:mergedv2")
|
||||||
remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
|
remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
|
||||||
decompiler("org.vineflower:vineflower:1.10.1")
|
decompiler("org.vineflower:vineflower:1.10.1")
|
||||||
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
|
spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
group=io.papermc.paper
|
group=io.papermc.paper
|
||||||
version=1.21.3-R0.1-SNAPSHOT
|
version=1.21.4-R0.1-SNAPSHOT
|
||||||
mcVersion=1.21.3
|
mcVersion=1.21.4
|
||||||
|
|
||||||
# Set to true while updating Minecraft version
|
# Set to true while updating Minecraft version
|
||||||
updatingMinecraft=false
|
updatingMinecraft=true
|
||||||
|
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
|
||||||
|
|
@ -169,7 +169,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
- public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
|
- public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
|
||||||
+ FeatureFlag UPDATE_121 = deprecated("update_1_21");
|
+ FeatureFlag UPDATE_121 = deprecated("update_1_21");
|
||||||
|
|
||||||
@ApiStatus.Experimental // Paper - add missing annotation
|
/**
|
||||||
|
* <strong>AVAILABLE BETWEEN VERSIONS:</strong> 1.21.2 - 1.21.3
|
||||||
|
@@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed {
|
||||||
|
* @deprecated not available since 1.21.4
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "1.21.4")
|
||||||
- public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
|
- public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
|
||||||
+ FeatureFlag WINTER_DROP = create("winter_drop");
|
+ FeatureFlag WINTER_DROP = create("winter_drop");
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,16 +32,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
val mockitoAgent = configurations.register("mockitoAgent")
|
val mockitoAgent = configurations.register("mockitoAgent")
|
||||||
@@ -0,0 +0,0 @@ dependencies {
|
@@ -0,0 +0,0 @@ dependencies {
|
||||||
// api dependencies are listed transitively to API consumers
|
// api dependencies are listed transitively to API consumers
|
||||||
api("com.google.guava:guava:32.1.2-jre")
|
api("com.google.guava:guava:33.3.1-jre")
|
||||||
api("com.google.code.gson:gson:2.10.1")
|
api("com.google.code.gson:gson:2.11.0")
|
||||||
- api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
- api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
||||||
+ // Paper start - adventure
|
+ // Paper start - adventure
|
||||||
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.18") {
|
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
|
||||||
+ exclude("com.google.guava", "guava")
|
+ exclude("com.google.guava", "guava")
|
||||||
+ }
|
+ }
|
||||||
+ // Paper - adventure
|
+ // Paper - adventure
|
||||||
api("org.yaml:snakeyaml:2.2")
|
api("org.yaml:snakeyaml:2.2")
|
||||||
api("org.joml:joml:1.10.5")
|
api("org.joml:joml:1.10.8")
|
||||||
// Paper start
|
// Paper start
|
||||||
@@ -0,0 +0,0 @@ dependencies {
|
@@ -0,0 +0,0 @@ dependencies {
|
||||||
isTransitive = false // includes junit
|
isTransitive = false // includes junit
|
||||||
|
|
@ -58,14 +58,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
|
|
||||||
compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
||||||
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
|
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
|
||||||
"https://guava.dev/releases/32.1.2-jre/api/docs/",
|
"https://guava.dev/releases/33.3.1-jre/api/docs/",
|
||||||
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
||||||
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
||||||
- "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
- "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
||||||
+ // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
|
+ // "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // Paper - don't link to bungee chat
|
||||||
// Paper start - add missing javadoc links
|
// Paper start - add missing javadoc links
|
||||||
"https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
|
"https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
|
||||||
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
|
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
|
||||||
"https://jspecify.dev/docs/api/",
|
"https://jspecify.dev/docs/api/",
|
||||||
// Paper end
|
// Paper end
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
dependencies {
|
dependencies {
|
||||||
+ api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
|
+ api("com.mojang:brigadier:1.2.9") // Paper - Brigadier command api
|
||||||
// api dependencies are listed transitively to API consumers
|
// api dependencies are listed transitively to API consumers
|
||||||
api("com.google.guava:guava:32.1.2-jre")
|
api("com.google.guava:guava:33.3.1-jre")
|
||||||
api("com.google.code.gson:gson:2.10.1")
|
api("com.google.code.gson:gson:2.11.0")
|
||||||
@@ -0,0 +0,0 @@ sourceSets {
|
@@ -0,0 +0,0 @@ sourceSets {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
@@ -0,0 +0,0 @@ dependencies {
|
@@ -0,0 +0,0 @@ dependencies {
|
||||||
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
||||||
api("org.yaml:snakeyaml:2.2")
|
api("org.yaml:snakeyaml:2.2")
|
||||||
api("org.joml:joml:1.10.5")
|
api("org.joml:joml:1.10.8")
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ api("com.googlecode.json-simple:json-simple:1.1.1") {
|
+ api("com.googlecode.json-simple:json-simple:1.1.1") {
|
||||||
+ isTransitive = false // includes junit
|
+ isTransitive = false // includes junit
|
||||||
|
|
@ -39,14 +39,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
testImplementation("org.hamcrest:hamcrest:2.2")
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
||||||
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
|
@@ -0,0 +0,0 @@ tasks.withType<Javadoc> {
|
||||||
options.links(
|
options.links(
|
||||||
"https://guava.dev/releases/32.1.2-jre/api/docs/",
|
"https://guava.dev/releases/33.3.1-jre/api/docs/",
|
||||||
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
"https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
||||||
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
- "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
||||||
+ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
+ "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations
|
||||||
"https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
"https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
||||||
+ // Paper start - add missing javadoc links
|
+ // Paper start - add missing javadoc links
|
||||||
+ "https://javadoc.io/doc/org.joml/joml/1.10.5/index.html",
|
+ "https://javadoc.io/doc/org.joml/joml/1.10.8/index.html",
|
||||||
+ "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1",
|
+ "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.1",
|
||||||
+ "https://jspecify.dev/docs/api/",
|
+ "https://jspecify.dev/docs/api/",
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -402,9 +402,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
--- a/src/main/java/org/bukkit/MinecraftExperimental.java
|
--- a/src/main/java/org/bukkit/MinecraftExperimental.java
|
||||||
+++ b/src/main/java/org/bukkit/MinecraftExperimental.java
|
+++ b/src/main/java/org/bukkit/MinecraftExperimental.java
|
||||||
@@ -0,0 +0,0 @@ public @interface MinecraftExperimental {
|
@@ -0,0 +0,0 @@ public @interface MinecraftExperimental {
|
||||||
|
@ApiStatus.Internal
|
||||||
public enum Requires {
|
public enum Requires {
|
||||||
|
|
||||||
WINTER_DROP,
|
|
||||||
+ // Paper start
|
+ // Paper start
|
||||||
+ TRADE_REBALANCE,
|
+ TRADE_REBALANCE,
|
||||||
+ REDSTONE_EXPERIMENTS,
|
+ REDSTONE_EXPERIMENTS,
|
||||||
|
|
|
||||||
|
|
@ -46,11 +46,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+
|
+
|
||||||
+dependencies {
|
+dependencies {
|
||||||
+ // api dependencies are listed transitively to API consumers
|
+ // api dependencies are listed transitively to API consumers
|
||||||
+ api("com.google.guava:guava:32.1.2-jre")
|
+ api("com.google.guava:guava:33.3.1-jre")
|
||||||
+ api("com.google.code.gson:gson:2.10.1")
|
+ api("com.google.code.gson:gson:2.11.0")
|
||||||
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
+ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion")
|
||||||
+ api("org.yaml:snakeyaml:2.2")
|
+ api("org.yaml:snakeyaml:2.2")
|
||||||
+ api("org.joml:joml:1.10.5")
|
+ api("org.joml:joml:1.10.8")
|
||||||
+
|
+
|
||||||
+ compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
+ compileOnly("org.apache.maven:maven-resolver-provider:3.9.6")
|
||||||
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
||||||
|
|
@ -100,7 +100,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+ options.use()
|
+ options.use()
|
||||||
+ options.isDocFilesSubDirs = true
|
+ options.isDocFilesSubDirs = true
|
||||||
+ options.links(
|
+ options.links(
|
||||||
+ "https://guava.dev/releases/32.1.2-jre/api/docs/",
|
+ "https://guava.dev/releases/33.3.1-jre/api/docs/",
|
||||||
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
+ "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
|
||||||
+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/$annotationsVersion/",
|
||||||
+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/",
|
||||||
|
|
@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
-
|
-
|
||||||
- <groupId>org.spigotmc</groupId>
|
- <groupId>org.spigotmc</groupId>
|
||||||
- <artifactId>spigot-api</artifactId>
|
- <artifactId>spigot-api</artifactId>
|
||||||
- <version>1.21.3-R0.1-SNAPSHOT</version>
|
- <version>1.21.4-R0.1-SNAPSHOT</version>
|
||||||
- <packaging>jar</packaging>
|
- <packaging>jar</packaging>
|
||||||
-
|
-
|
||||||
- <name>Spigot-API</name>
|
- <name>Spigot-API</name>
|
||||||
|
|
@ -164,21 +164,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
- <dependency>
|
- <dependency>
|
||||||
- <groupId>com.google.guava</groupId>
|
- <groupId>com.google.guava</groupId>
|
||||||
- <artifactId>guava</artifactId>
|
- <artifactId>guava</artifactId>
|
||||||
- <version>32.1.2-jre</version>
|
- <version>33.3.1-jre</version>
|
||||||
- <scope>compile</scope>
|
- <scope>compile</scope>
|
||||||
- </dependency>
|
- </dependency>
|
||||||
- <!-- bundled with Minecraft, should be kept in sync -->
|
- <!-- bundled with Minecraft, should be kept in sync -->
|
||||||
- <dependency>
|
- <dependency>
|
||||||
- <groupId>com.google.code.gson</groupId>
|
- <groupId>com.google.code.gson</groupId>
|
||||||
- <artifactId>gson</artifactId>
|
- <artifactId>gson</artifactId>
|
||||||
- <version>2.10.1</version>
|
- <version>2.11.0</version>
|
||||||
- <scope>compile</scope>
|
- <scope>compile</scope>
|
||||||
- </dependency>
|
- </dependency>
|
||||||
- <!-- bundled with Minecraft, should be kept in sync -->
|
- <!-- bundled with Minecraft, should be kept in sync -->
|
||||||
- <dependency>
|
- <dependency>
|
||||||
- <groupId>org.joml</groupId>
|
- <groupId>org.joml</groupId>
|
||||||
- <artifactId>joml</artifactId>
|
- <artifactId>joml</artifactId>
|
||||||
- <version>1.10.5</version>
|
- <version>1.10.8</version>
|
||||||
- <scope>compile</scope>
|
- <scope>compile</scope>
|
||||||
- </dependency>
|
- </dependency>
|
||||||
- <dependency>
|
- <dependency>
|
||||||
|
|
|
||||||
|
|
@ -17,10 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed {
|
@@ -0,0 +0,0 @@ public interface FeatureFlag extends Keyed {
|
||||||
@Deprecated(since = "1.21")
|
@Deprecated(since = "1.21.4")
|
||||||
public static final FeatureFlag UPDATE_121 = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("update_1_21"));
|
|
||||||
|
|
||||||
+ @ApiStatus.Experimental // Paper - add missing annotation
|
|
||||||
public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
|
public static final FeatureFlag WINTER_DROP = Bukkit.getUnsafe().getFeatureFlag(NamespacedKey.minecraft("winter_drop"));
|
||||||
|
|
||||||
+ @ApiStatus.Experimental // Paper - add missing annotation
|
+ @ApiStatus.Experimental // Paper - add missing annotation
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
+
|
+
|
||||||
dependencies {
|
dependencies {
|
||||||
// api dependencies are listed transitively to API consumers
|
// api dependencies are listed transitively to API consumers
|
||||||
api("com.google.guava:guava:32.1.2-jre")
|
api("com.google.guava:guava:33.3.1-jre")
|
||||||
@@ -0,0 +0,0 @@ dependencies {
|
@@ -0,0 +0,0 @@ dependencies {
|
||||||
testImplementation("org.hamcrest:hamcrest:2.2")
|
testImplementation("org.hamcrest:hamcrest:2.2")
|
||||||
testImplementation("org.mockito:mockito-core:5.14.1")
|
testImplementation("org.mockito:mockito-core:5.14.1")
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue