diff --git a/gradle.properties b/gradle.properties index 59a1c9271..39488aa77 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = cn.dreeam.leaf mcVersion = 1.21.1 version = 1.21.1-R0.1-SNAPSHOT -galeCommit = 751637d4db10bf5e153dcd93b239ec5793811ad9 +galeCommit = 13ab1512e5de55c11e6e8b164cdfb6c645e22925 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0016-Bump-Dependencies.patch b/patches/server/0016-Bump-Dependencies.patch index cbb68dc24..5d7349865 100644 --- a/patches/server/0016-Bump-Dependencies.patch +++ b/patches/server/0016-Bump-Dependencies.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Bump Dependencies TODO - Dreeam: Bump & test dependencies, impl new features? diff --git a/build.gradle.kts b/build.gradle.kts -index 0d250a691a0f28770cbd9f847d8cd00af866b583..bde62a062732d93955f4d0f491d3ec5d9fd30842 100644 +index d1bcbd39120480b2e1e402040d20b8567019a4b0..e210eba6fffa984652134d39d2bc1020744667b0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -22,7 +22,7 @@ dependencies { @@ -82,12 +82,9 @@ index 0d250a691a0f28770cbd9f847d8cd00af866b583..bde62a062732d93955f4d0f491d3ec5d implementation("net.neoforged:srgutils:1.0.9") // Paper - mappings handling implementation("net.neoforged:AutoRenamingTool:2.0.3") // Paper - remap plugins // Paper start - Remap reflection -@@ -77,8 +81,10 @@ dependencies { - // Paper end - Remap reflection - // Paper start - spark +@@ -79,6 +83,8 @@ dependencies { implementation("me.lucko:spark-api:0.1-20240720.200737-2") -- implementation("me.lucko:spark-paper:1.10.105-SNAPSHOT") -+ implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT") // Leaf - Bump Dependencies + implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT") // Paper end - spark + + implementation("io.netty:netty-all:4.1.114.Final") // Leaf - Bump Dependencies // Dreeam TODO - Update to 4.2.0 diff --git a/patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch b/patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch index 1164b51df..b1ff791d4 100644 --- a/patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch +++ b/patches/server/0149-Use-faster-and-thread-safe-ban-list-date-format-pars.patch @@ -19,7 +19,7 @@ DateTimeFormatter: ~13,128ms apache commons-lang's FastDateFormat: ~23,514ms In the end, DateTimeFormatter is also fastest in three implementations in any ways, -Wether there is a high frequnently calls or not. And also thread-safe. So there is +Wether there is a high frequnently calls or not. And also thread-safe. So there is a better solution, why not using it? diff --git a/src/main/java/net/minecraft/server/players/BanListEntry.java b/src/main/java/net/minecraft/server/players/BanListEntry.java