Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@fcb2e815 Clear lastSection on game event listener removal PaperMC/Paper@636ae0cd Add missing Paper comments to player movement patch PaperMC/Paper@9be4e07a Pin snapshot dependencies (#12185) PaperMC/Paper@f12d33f0 Track codec writing PaperMC/Paper@1d9b3994 Add config option for failed beehive release cooldowns (#12186) PaperMC/Paper@5f2ee83e Fix first execution of async delayed/repeating tasks being sync (#12166) PaperMC/Paper@b00875f8 Add a method on Registry to get the size (#12182) PaperMC/Paper@ca261090 Don't process empty rcon commands (#12188) PaperMC/Paper@a501c459 Deprecate server config getters (#12189) PaperMC/Paper@7f3d3591 Use MiniMessage#deserialize(String, Pointered) in sendRichMessage for send messages (#12177) PaperMC/Paper@9b9f046f Remove broken code (#12171) PaperMC/Paper@fc56c728 Add methods for Creaking (#12094) PaperMC/Paper@f63dbeaf Fix cancelled HangingPlaceEvent inventory desync (#12161)
2025-12-19 14:59:29 +00:00 · 2025-02-25 17:18:27 -05:00
parent 0b5fbea3d4
commit b2c1156468
9 changed files with 24 additions and 24 deletions
--- a/gale-api/paper-patches/features/0002-Gale-configuration.patch
+++ b/gale-api/paper-patches/features/0002-Gale-configuration.patch
@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
 Licensed under: MIT (https://opensource.org/licenses/MIT)

 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index fa6f9d50577059d99ee98662497f3fc049fa74ac..58d90c31ccb7af33aaa4b8b4a38ac17150bb5d02 100644
+index d7ebfcfc6a41b7e94a041f7faf3c2d8090fab3c4..7c62a77bd4d1108f537cb63a7ed206d52ab9a4fe 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2332,6 +2332,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2360,6 +2360,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
         {
             throw new UnsupportedOperationException("Not supported yet.");
         }
--- a/gale-api/paper-patches/features/0010-Last-tick-time-API.patch
+++ b/gale-api/paper-patches/features/0010-Last-tick-time-API.patch
@@ -23,7 +23,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index d23700abf825d29832ee99d091faf693d4c381e9..4d0ec80ace15ab46e888a3f6e7452842bda8c60c 100644
+index be4c4b204638a3783db54accab2f0d2fb185fa21..e4db2817be2411116ff29cc85ce97e515eb6e51f 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3032,6 +3032,20 @@ public final class Bukkit {
@@ -44,14 +44,14 @@ index d23700abf825d29832ee99d091faf693d4c381e9..4d0ec80ace15ab46e888a3f6e7452842
 +    }
 +    // Gale end - YAPFA - last tick time - API
 +
-     @NotNull
-     public static Server.Spigot spigot() {
-         return server.spigot();
+     /**
+      * @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
+      */
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index cbb77e090b6268407d43692a0f4ea521545c7585..f7cbfdfca459f9b42ec6bd7ae1b412ce2757c2fe 100644
+index a31eec6def3ccb1bd11fa2f0f1cb693b75756849..3446d5bb24fac345b65ac78927155f60fe437b2c 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2710,4 +2710,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2750,4 +2750,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
      */
     void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
     // Paper end - API to check if the server is sleeping
--- a/gale-server/build.gradle.kts.patch
+++ b/gale-server/build.gradle.kts.patch
@@ -53,8 +53,8 @@
     implementation("ca.spottedleaf:concurrentutil:0.0.3")
     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -176,26 +_,36 @@
-     implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
+@@ -177,26 +_,36 @@
+     implementation("me.lucko:spark-paper:1.10.119-20241121.092015-1")
 }
 
 +// Gale start - hide irrelevant compilation warnings
@@ -96,7 +96,7 @@
             "Build-Number" to (build ?: ""),
             "Build-Time" to buildTime.toString(),
             "Git-Branch" to gitBranch,
-@@ -281,6 +_,8 @@
+@@ -282,6 +_,8 @@
     val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
     minHeapSize = "${memoryGb}G"
     maxHeapSize = "${memoryGb}G"
@@ -105,7 +105,7 @@
 
     doFirst {
         workingDir.mkdirs()
-@@ -326,3 +_,62 @@
+@@ -327,3 +_,62 @@
     classpath(tasks.createReobfPaperclipJar.flatMap { it.outputZip })
     mainClass.set(null as String?)
 }
--- a/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
+++ b/gale-server/minecraft-patches/features/0004-Remove-vanilla-profiler.patch
@@ -681,10 +681,10 @@ index a3192400b37274620977e5a40d4283bfec3ab9b3..f23b17416eadc0e800ca34918ac78c03
         String string = String.format(
             Locale.ROOT, "%s-%s-%s", Util.getFilenameFormattedDateTime(), server.getWorldData().getLevelName(), SharedConstants.getCurrentVersion().getId()
 diff --git a/net/minecraft/server/dedicated/DedicatedServer.java b/net/minecraft/server/dedicated/DedicatedServer.java
-index f4a8c7fe830495434f06d45c1a4505e4ea536804..baa92ab485928b2e57adb14af00f7e6120694184 100644
+index 7b54f1842dd455ecf96aa1534b38d3b86b3bcc01..ba82d2e69d40feb834923c3d0980285d8d489359 100644
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -798,12 +798,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
+@@ -800,12 +800,6 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
         return this.settings.getProperties().serverResourcePackInfo;
     }
 
@@ -888,7 +888,7 @@ index 6540b2d6a1062d883811ce240c49d30d1925b291..9500fc2f841819b0d40e8a6e48353bb2
         }
 
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index c5395407ab506814232fb1f41fd02aa6d2d02377..99a6ca429e4c0749465d256d4228d9ee0c77dd7f 100644
+index 234c16344c325151d307ee19ca57739ecf73056c..4bc5a4f14a84364720c60fc91e9bf53ef1b1832c 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
@@ -77,8 +77,6 @@ import net.minecraft.util.ProgressListener;
--- a/gale-server/paper-patches/features/0004-Gale-configuration.patch
+++ b/gale-server/paper-patches/features/0004-Gale-configuration.patch
@@ -144,7 +144,7 @@ index 05339a176083af667c16f77d76dc1878dafce3f0..9ca55cba185b9de566f911b08d671bee
     }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cf5bcb0ebc79c318d106695e39ad2883a5734aa1..9094b8e3ff1d6d07e8a39d379e40a6da7e9888ed 100644
+index a0a1ed48f67f238c492d4acdd3b21147595df9e2..bdb674f238fb2d24774c6af96fe6a3828346a18f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1088,6 +1088,7 @@ public final class CraftServer implements Server {
@@ -169,4 +169,4 @@ index cf5bcb0ebc79c318d106695e39ad2883a5734aa1..9094b8e3ff1d6d07e8a39d379e40a6da
 +
         @Override
         public void restart() {
-             org.spigotmc.RestartCommand.restart();
+             CraftServer.this.restart();
--- a/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch
+++ b/gale-server/paper-patches/features/0016-Specific-interval-TPS-API.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 67afa3b0cf9295690461e2be49249fb6f80d7082..7aa6de4844f1d9c1a7a3b24e2b497a00db860202 100644
+index 7735a4190fc2338231304446f373346f24540984..c4d08fd27f1a2f6c902abaa8c88886ec216ffba3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3101,6 +3101,23 @@ public final class CraftServer implements Server {
+@@ -3106,6 +3106,23 @@ public final class CraftServer implements Server {
         };
     }
 
--- a/gale-server/paper-patches/features/0017-5-second-TPS-average.patch
+++ b/gale-server/paper-patches/features/0017-5-second-TPS-average.patch
@@ -58,10 +58,10 @@ index 12b327eea95e0de9e9c39b7d039badee8ec46508..6178f0212214a2a075cea60c758dca79
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7aa6de4844f1d9c1a7a3b24e2b497a00db860202..aee9c56ed76e6af7f1ae181a18db182819a89023 100644
+index c4d08fd27f1a2f6c902abaa8c88886ec216ffba3..19a14032a8f4ff937b1dea46c67806060204c558 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3101,7 +3101,26 @@ public final class CraftServer implements Server {
+@@ -3106,7 +3106,26 @@ public final class CraftServer implements Server {
         };
     }
 
--- a/gale-server/paper-patches/features/0018-Last-tick-time-API.patch
+++ b/gale-server/paper-patches/features/0018-Last-tick-time-API.patch
@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index aee9c56ed76e6af7f1ae181a18db182819a89023..eacb19d1cc657232e019caf28aa47c873f3f82fe 100644
+index 19a14032a8f4ff937b1dea46c67806060204c558..93f115da494a66a756961b0cc16dea11010ea54f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -3341,4 +3341,21 @@ public final class CraftServer implements Server {
+@@ -3346,4 +3346,21 @@ public final class CraftServer implements Server {
         this.console.addPluginAllowingSleep(plugin.getName(), value);
     }
     // Paper end - API to check if the server is sleeping
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.4-R0.1-SNAPSHOT

 mcVersion=1.21.4
-paperRef=e5a8ee849f6ed92f0593bf082bc84e158ee7c5f2
+paperRef=f63dbeafde535ae10bc5879e841b943df6731cfd

 org.gradle.configuration-cache=true
 org.gradle.caching=true