Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-06 15:51:31 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

Browse Source 
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
2025-04-14 10:52:33 -04:00
parent 5f42d4c944
commit d08d6116f0
9 changed files with 69 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
leaf-server/build.gradle.kts.patch
View File

@@ -87,14 +87,14 @@
+ implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // Leaf - Bump Dependencies
+ implementation("org.jline:jline-terminal-jni:3.29.0") // fall back to jni on java 21 // Leaf - Bump Dependencies
implementation("net.minecrell:terminalconsoleappender:1.3.0")
implementation("net.kyori:adventure-text-serializer-ansi:4.18.0") // Keep in sync with adventureVersion from Paper-API build file
implementation("io.papermc.adventure:adventure-text-serializer-ansi:4.21.0-mc1215-SNAPSHOT") // Keep in sync with adventureVersion from Paper-API build file // FIXME back to release
runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath })
@@ -144,36 +_,53 @@
@@ -144,16 +_,20 @@
all its classes to check if they are plugins.
Scanning takes about 1-2 seconds so adding this speeds up the server start.
*/
- implementation("org.apache.logging.log4j:log4j-core:2.19.0")
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.19.0") // Needed to generate meta for our Log4j plugins
- implementation("org.apache.logging.log4j:log4j-core:2.24.1")
- log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.1") // Needed to generate meta for our Log4j plugins
+ // Leaf start - Bump Dependencies
+ implementation("org.apache.logging.log4j:log4j-core:2.24.3")
+ log4jPlugins.annotationProcessorConfigurationName("org.apache.logging.log4j:log4j-core:2.24.3") // Needed to generate meta for our Log4j plugins
@@ -105,38 +105,34 @@
implementation("com.velocitypowered:velocity-native:3.4.0-SNAPSHOT") {
isTransitive = false
}
- implementation("io.netty:netty-codec-haproxy:4.1.115.Final") // Add support for proxy protocol
- implementation("io.netty:netty-codec-haproxy:4.1.118.Final") // Add support for proxy protocol
- implementation("org.apache.logging.log4j:log4j-iostreams:2.24.1")
+ // Leaf start - Bump Dependencies
+ implementation("io.netty:netty-codec-haproxy:4.1.119.Final") // Add support for proxy protocol
+ implementation("org.apache.logging.log4j:log4j-iostreams:2.24.3")
+ // Leaf end - Bump Dependencies
implementation("org.ow2.asm:asm-commons:9.7.1")
implementation("org.ow2.asm:asm-commons:9.8")
implementation("org.spongepowered:configurate-yaml:4.2.0-20250225.064233-199")
implementation("org.spongepowered:configurate-core:4.2.0-20250225.064233-204") // Pinned dependency of above pinned yaml snapshot.
implementation("commons-lang:commons-lang:2.6")
- runtimeOnly("org.xerial:sqlite-jdbc:3.47.0.0")
- runtimeOnly("com.mysql:mysql-connector-j:9.1.0")
@@ -161,24 +_,37 @@
// Deps that were previously in the API but have now been moved here for backwards compat, eventually to be removed
runtimeOnly("commons-lang:commons-lang:2.6")
runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0")
- runtimeOnly("com.mysql:mysql-connector-j:9.2.0")
- runtimeOnly("com.lmax:disruptor:3.4.4")
-
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
-
- testImplementation("io.github.classgraph:classgraph:4.8.47") // For mob goal test
- testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
- testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0")
- testImplementation("org.hamcrest:hamcrest:2.2")
- testImplementation("org.mockito:mockito-core:5.14.1")
- mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
+ runtimeOnly("org.xerial:sqlite-jdbc:3.49.1.0") // Leaf - Bump Dependencies
+ runtimeOnly("com.mysql:mysql-connector-j:9.2.0") {
+ exclude("com.google.protobuf", "protobuf-java") // Leaf - Exclude outdated protobuf version
+ }
+ runtimeOnly("com.google.protobuf:protobuf-java:4.30.1")
+ // Leaf start - Bump Dependencies
+ runtimeOnly("com.lmax:disruptor:3.4.4") // Dreeam TODO - Waiting Log4j 3.x to support disruptor 4.0.0
+
implementation("com.googlecode.json-simple:json-simple:1.1.1") { // change to runtimeOnly once Timings is removed
isTransitive = false // includes junit
}
- runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.6")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
- runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
+ runtimeOnly("org.apache.maven:maven-resolver-provider:3.9.9")
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1
+ runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1
@@ -147,25 +143,28 @@
+ implementation("org.mozilla:rhino-engine:1.7.15")
+ implementation("dev.omega24:upnp4j:1.0")
+ // Purpur end
+
testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test
testImplementation("org.junit.jupiter:junit-jupiter:5.12.2")
testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.2")
- testImplementation("org.hamcrest:hamcrest:2.2")
- testImplementation("org.mockito:mockito-core:5.14.1")
- mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
+ // Leaf start - Bump Dependencies
+ testImplementation("io.github.classgraph:classgraph:4.8.179") // For mob goal test
+ testImplementation("org.junit.jupiter:junit-jupiter:5.12.1")
+ testImplementation("org.junit.platform:junit-platform-suite-engine:1.12.1")
+ testImplementation("org.hamcrest:hamcrest:3.0")
+ testImplementation("org.mockito:mockito-core:5.16.1")
+ mockitoAgent("org.mockito:mockito-core:5.16.1") { isTransitive = false } // Configure mockito agent that is needed in newer java versions
testImplementation("org.ow2.asm:asm-tree:9.7.1")
testImplementation("org.ow2.asm:asm-tree:9.8")
- testImplementation("org.junit-pioneer:junit-pioneer:2.2.0") // CartesianTest
+ testImplementation("org.junit-pioneer:junit-pioneer:2.3.0") // CartesianTest
+ // Leaf end - Bump Dependencies
implementation("net.neoforged:srgutils:1.0.9") // Mappings handling
implementation("net.neoforged:AutoRenamingTool:2.0.3") // Remap plugins
@@ -187,28 +_,40 @@
@@ -192,28 +_,40 @@
// Spark
implementation("me.lucko:spark-api:0.1-20240720.200737-2")
implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1")
implementation("me.lucko:spark-paper:1.10.133-20250413.112336-1")
-}
+
+ implementation("io.netty:netty-all:4.1.119.Final") // Leaf - Bump Dependencies // Dreeam TODO - Update to 4.2.0
@@ -210,7 +209,7 @@
"Build-Number" to (build ?: ""),
"Build-Time" to buildTime.toString(),
"Git-Branch" to gitBranch,
@@ -262,7 +_,7 @@
@@ -267,7 +_,7 @@
jvmArgumentProviders.add(provider)
}
@@ -219,7 +218,7 @@
idea {
module {
generatedSourceDirs.add(generatedDir.toFile())
@@ -320,6 +_,8 @@
@@ -325,6 +_,8 @@
val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"
@@ -228,7 +227,7 @@
doFirst {
workingDir.mkdirs()
@@ -365,3 +_,62 @@
@@ -370,3 +_,62 @@
classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
mainClass.set(null as String?)
}

4
leaf-server/minecraft-patches/features/0005-Remove-vanilla-profiler.patch
View File

@@ -1360,7 +1360,7 @@ index 9a0334134d8020e9d52e542859f29b5c6efad643..a8be25542f63d6166cbed065e5006cbf
}
}
diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
index 9129f87af75412bfeb43f9f55aee8fe253cc6251..07df62b79a4ee9c9da77cac8615fad5463628204 100644
index ef92dc4384f698cc6b5c4e67fe052a3d4af98f4c..79f499fea47a9c675da1aed718c713290bc008d0 100644
--- a/net/minecraft/world/entity/LivingEntity.java
+++ b/net/minecraft/world/entity/LivingEntity.java
@@ -70,8 +70,6 @@ import net.minecraft.tags.FluidTags;
@@ -1447,7 +1447,7 @@ index 9129f87af75412bfeb43f9f55aee8fe253cc6251..07df62b79a4ee9c9da77cac8615fad54
- profilerFiller.pop();
if (this.level() instanceof ServerLevel serverLevel) {
- profilerFiller.push("freezing");
if (!this.isInPowderSnow || !this.canFreeze() && !this.freezeLocked) { // Paper - Freeze Tick Lock API
if ((!this.isInPowderSnow || !this.canFreeze()) && !this.freezeLocked) { // Paper - Freeze Tick Lock API
this.setTicksFrozen(Math.max(0, this.getTicksFrozen() - 2));
}
@@ -3506,18 +3486,14 @@ public abstract class LivingEntity extends Entity implements Attackable {

10
leaf-server/minecraft-patches/features/0204-Remove-iterators-from-Inventory.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove iterators from Inventory
diff --git a/net/minecraft/world/entity/player/Inventory.java b/net/minecraft/world/entity/player/Inventory.java
index dd406c5becacbc2d05b062726a8af88a1d6faba9..4b46bc712e20bd5f841d2d7caaad52068969bdc1 100644
index d9cb4f0ed0c4f63362c837aeef3c4194911455c9..a31b6b8b56ecced421ead0119a4423b0229ae188 100644
--- a/net/minecraft/world/entity/player/Inventory.java
+++ b/net/minecraft/world/entity/player/Inventory.java
@@ -435,13 +435,16 @@ public class Inventory implements Container, Nameable {
@@ -439,13 +439,16 @@ public class Inventory implements Container, Nameable {
}
}
@@ -26,7 +26,7 @@ index dd406c5becacbc2d05b062726a8af88a1d6faba9..4b46bc712e20bd5f841d2d7caaad5206
}
@Override
@@ -500,17 +503,21 @@ public class Inventory implements Container, Nameable {
@@ -504,17 +507,21 @@ public class Inventory implements Container, Nameable {
@Override
public boolean isEmpty() {
@@ -50,7 +50,7 @@ index dd406c5becacbc2d05b062726a8af88a1d6faba9..4b46bc712e20bd5f841d2d7caaad5206
return true;
}
@@ -557,31 +564,61 @@ public class Inventory implements Container, Nameable {
@@ -561,31 +568,61 @@ public class Inventory implements Container, Nameable {
}
public boolean contains(ItemStack stack) {
@@ -115,7 +115,7 @@ index dd406c5becacbc2d05b062726a8af88a1d6faba9..4b46bc712e20bd5f841d2d7caaad5206
return false;
}
@@ -601,9 +638,12 @@ public class Inventory implements Container, Nameable {
@@ -605,9 +642,12 @@ public class Inventory implements Container, Nameable {
}
public void fillStackedContents(StackedItemContents contents) {

4
leaf-server/paper-patches/features/0001-Rebrand.patch
View File

@@ -429,10 +429,10 @@ index 1354ccfbf525e5e64483ac5f443cc2325ba63850..f6f787db016f4d1ac14648ebf2b8e162
// (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 41b2026c87dea247d39c73b0e3eae892fb729cd5..498a642d243925eefa11d5997dc999bb9aa2fcda 100644
index 060f0c5f1e54bf4809e28d1857965ff8254698a9..f318d4c8a3455f9acb1aff6fed04d4e0757624a0 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -481,7 +481,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -484,7 +484,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
@Override
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {

8
leaf-server/paper-patches/features/0009-Purpur-Server-Paper-Changes.patch
View File

@@ -893,7 +893,7 @@ index 4d5958405e1c86c289d24500705686e7da02c3f6..86541e322fcacb6c525af39ba2675b71
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 9e271f0e587be1ab9258937774121763b34e9e0f..8f9af0c5396abf25534eaee17b81982024eb9fcd 100644
index c8caeba7737c2386f7194207a5ea11b74c6179e4..8feb78c4d7fa793f01991756b618fc49de023db6 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -98,6 +98,25 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -930,7 +930,7 @@ index 9e271f0e587be1ab9258937774121763b34e9e0f..8f9af0c5396abf25534eaee17b819820
return false;
}
@@ -1281,4 +1301,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1293,4 +1313,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null;
}
@@ -1080,10 +1080,10 @@ index bd39ecac806a008583eaf041c75e1bb95a3912b7..5b74ca7c52fb0437726a2a0048313488
+ // Purpur end - API for any mob to burn daylight
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
index 845a0941fbaf6e1235526d93cacc5a7fcd858dce..cd78e48b8853fad1a31a56ef5ab6ffc5c222294b 100644
index 9aaaf2fc6a7bc49d1c3d0be68854e7fb2524fd25..a8e045af6b3b20027877d958d58dc09ca078aaf1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
@@ -89,4 +89,17 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
@@ -92,4 +92,17 @@ public class CraftLlama extends CraftChestedHorse implements Llama, com.destroys
public Llama getCaravanTail() {
return this.getHandle().caravanTail == null ? null : (Llama) this.getHandle().caravanTail.getBukkitEntity();
}