mirror of
https://github.com/Winds-Studio/Leaf.git
synced 2025-12-19 15:09:25 +00:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@f00727c5 1.21.5 PaperMC/Paper@8eede4bb Fix AbstractHorse get/setSaddle PaperMC/Paper@93b6829e Also fix AbstractHorse getSize and isEmpty PaperMC/Paper@f517267c Add passthrough for air serialization PaperMC/Paper@4511edb8 [ci/skip] Don't promote checking enchantment by legacy lore (#12421) PaperMC/Paper@8f62e0fb Correctly order getArmorContents PaperMC/Paper@652cea57 Allow `getAsString()`-ing non-persistent entities (#12424) PaperMC/Paper@de64e704 Update spark PaperMC/Paper@1b889688 Add Entity#isTrackedBy (#12332) PaperMC/Paper@8ff94c63 Update a bunch of dependencies PaperMC/Paper@79036210 Remove json-simple imports from API, keep it as implementation in server PaperMC/Paper@dcb755ac Update log4j jd link PaperMC/Paper@91bfb6fb Fix freeze locked (#12434) PaperMC/Paper@121a7bf4 Make GameRule a FeatureDependant (#12429) PaperMC/Paper@7d5695d7 Improve ItemMeta#hasCustomModelData compatibility (#12414)
This commit is contained in:
Dreeam
@@ -1,15 +1,11 @@
|
||||
--- a/paper-api/build.gradle.kts
|
||||
+++ b/paper-api/build.gradle.kts
|
||||
@@ -9,11 +_,13 @@
|
||||
withJavadocJar()
|
||||
}
|
||||
|
||||
-val annotationsVersion = "26.0.1"
|
||||
+val annotationsVersion = "26.0.2" // Leaf - Bump Dependencies
|
||||
val adventureVersion = "4.20.0"
|
||||
@@ -14,8 +_,10 @@
|
||||
val adventureVersion = "4.21.0-mc1215-SNAPSHOT" // FIXME move to release asap
|
||||
val adventureJavadocVersion = "4.20.0" // Fixme remove me
|
||||
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
|
||||
-val slf4jVersion = "2.0.9"
|
||||
-val log4jVersion = "2.17.1"
|
||||
-val slf4jVersion = "2.0.16"
|
||||
-val log4jVersion = "2.24.1"
|
||||
+// Leaf start - Bump Dependencies
|
||||
+val slf4jVersion = "2.0.17"
|
||||
+val log4jVersion = "2.24.3"
|
||||
@@ -17,9 +13,9 @@
|
||||
|
||||
val apiAndDocs: Configuration by configurations.creating {
|
||||
attributes {
|
||||
@@ -41,9 +_,11 @@
|
||||
dependencies {
|
||||
@@ -42,9 +_,11 @@
|
||||
|
||||
dependencies {
|
||||
// api dependencies are listed transitively to API consumers
|
||||
- api("com.google.guava:guava:33.3.1-jre")
|
||||
- api("com.google.code.gson:gson:2.11.0")
|
||||
@@ -32,7 +28,7 @@
|
||||
api("org.joml:joml:1.10.8") {
|
||||
isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
|
||||
}
|
||||
@@ -54,6 +_,7 @@
|
||||
@@ -52,6 +_,7 @@
|
||||
api("org.apache.logging.log4j:log4j-api:$log4jVersion")
|
||||
api("org.slf4j:slf4j-api:$slf4jVersion")
|
||||
api("com.mojang:brigadier:1.3.10")
|
||||
@@ -40,9 +36,9 @@
|
||||
|
||||
// Deprecate bungeecord-chat in favor of adventure
|
||||
api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") {
|
||||
@@ -68,32 +_,42 @@
|
||||
apiAndDocs("net.kyori:adventure-text-serializer-plain")
|
||||
apiAndDocs("net.kyori:adventure-text-logger-slf4j")
|
||||
@@ -68,9 +_,11 @@
|
||||
apiAndDocs("$adventureGroup:adventure-text-serializer-plain")
|
||||
apiAndDocs("$adventureGroup:adventure-text-logger-slf4j")
|
||||
|
||||
- api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
|
||||
- compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
|
||||
@@ -55,28 +51,17 @@
|
||||
|
||||
// Annotations - Slowly migrate to jspecify
|
||||
val annotations = "org.jetbrains:annotations:$annotationsVersion"
|
||||
compileOnly(annotations)
|
||||
testCompileOnly(annotations)
|
||||
|
||||
- val checkerQual = "org.checkerframework:checker-qual:3.33.0"
|
||||
+ val checkerQual = "org.checkerframework:checker-qual:3.49.1" // Leaf - Bump Dependencies
|
||||
compileOnlyApi(checkerQual)
|
||||
testCompileOnly(checkerQual)
|
||||
|
||||
api("org.jspecify:jspecify:1.0.0")
|
||||
|
||||
@@ -86,14 +_,22 @@
|
||||
// Test dependencies
|
||||
- testImplementation("org.apache.commons:commons-lang3:3.12.0")
|
||||
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
|
||||
testImplementation("org.apache.commons:commons-lang3:3.17.0")
|
||||
testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
|
||||
- testImplementation("org.hamcrest:hamcrest:2.2")
|
||||
- testImplementation("org.mockito:mockito-core:5.14.1")
|
||||
+ // Leaf start - Bump Dependencies
|
||||
+ testImplementation("org.apache.commons:commons-lang3:3.17.0")
|
||||
+ testImplementation("org.junit.jupiter:junit-jupiter:5.12.1")
|
||||
+ testImplementation("org.hamcrest:hamcrest:3.0")
|
||||
+ testImplementation("org.mockito:mockito-core:5.16.1")
|
||||
+ // Leaf end - Bump Dependencies
|
||||
testImplementation("org.ow2.asm:asm-tree:9.7.1")
|
||||
testImplementation("org.ow2.asm:asm-tree:9.8")
|
||||
- mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions
|
||||
+ mockitoAgent("org.mockito:mockito-core:5.16.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions // Leaf - Bump Dependencies
|
||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||
@@ -159,13 +144,11 @@
|
||||
"https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
|
||||
"https://javadoc.io/doc/org.joml/joml/1.10.8/",
|
||||
"https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
|
||||
@@ -187,8 +_,8 @@
|
||||
"https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
|
||||
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
|
||||
@@ -188,7 +_,7 @@
|
||||
"https://jd.advntr.dev/text-logger-slf4j/$adventureJavadocVersion/",
|
||||
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
|
||||
- "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
|
||||
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
|
||||
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
|
||||
+ "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0/", // Leaf - Bump Dependencies
|
||||
+ "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // Leaf - Bump Dependencies
|
||||
)
|
||||
options.tags("apiNote:a:API Note:")
|
||||
|
||||
@@ -811,10 +811,10 @@ index 332c55fd6b4b3a8c0cad920a6e765ecc40e684e4..10a8d64ad2da0be2c14f34c3e7d1957c
|
||||
// Paper start
|
||||
/**
|
||||
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
|
||||
index 5a3a538c56892a1f3dd5bd437f77b1659da9bd99..5031e3b170af96c4aab85c0aea07f679d9711575 100644
|
||||
index bb6c6b3477c1d30a228ecb35ef7c4f6e54c083e5..bee034fd48b567a64a152196a0b80f2f1a9661e4 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Entity.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Entity.java
|
||||
@@ -1215,4 +1215,59 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
@@ -1224,4 +1224,59 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*/
|
||||
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
|
||||
// Paper end - broadcast hurt animation
|
||||
@@ -1329,7 +1329,7 @@ index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7
|
||||
+ // Purpur end
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
index 41d000b81a793277e330fb62c848ab4c8c56d657..1f524abf07666e325a877c90414d6838f485ca71 100644
|
||||
index 3179607e892b609160e9673df5745279a722ae95..1cc6f1a988715224d0168c97ae418037573e2204 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
||||
@@ -23,6 +23,13 @@ import org.bukkit.material.MaterialData;
|
||||
@@ -1346,7 +1346,7 @@ index 41d000b81a793277e330fb62c848ab4c8c56d657..1f524abf07666e325a877c90414d6838
|
||||
|
||||
/**
|
||||
* Represents a stack of items.
|
||||
@@ -1372,4 +1379,482 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
||||
@@ -1363,4 +1370,482 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
||||
return this.craftDelegate.matchesWithoutData(item, excludeTypes, ignoreCount);
|
||||
}
|
||||
// Paper end - data component API
|
||||
|
||||
@@ -2113,10 +2113,10 @@ index dae84243804b4b076cafb3e1b29bdcf614efc93f..00000000000000000000000000000000
|
||||
-}
|
||||
diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
|
||||
deleted file mode 100644
|
||||
index c105a1429ca58b37be265708ec345e00f0d43ed8..0000000000000000000000000000000000000000
|
||||
index 232bf09e1a7bc176bfd34b1acb5326a06a92fe79..0000000000000000000000000000000000000000
|
||||
--- a/src/main/java/co/aikar/util/JSONUtil.java
|
||||
+++ /dev/null
|
||||
@@ -1,141 +0,0 @@
|
||||
@@ -1,138 +0,0 @@
|
||||
-package co.aikar.util;
|
||||
-
|
||||
-import com.google.common.base.Function;
|
||||
@@ -2124,10 +2124,7 @@ index c105a1429ca58b37be265708ec345e00f0d43ed8..00000000000000000000000000000000
|
||||
-import com.google.common.collect.Maps;
|
||||
-import org.jetbrains.annotations.NotNull;
|
||||
-import org.jetbrains.annotations.Nullable;
|
||||
-import org.json.simple.JSONArray;
|
||||
-import org.json.simple.JSONObject;
|
||||
-
|
||||
-import java.util.ArrayList;
|
||||
-import java.util.LinkedHashMap;
|
||||
-import java.util.List;
|
||||
-import java.util.Map;
|
||||
|
||||
Reference in New Issue
Block a user