update patches

build.gradle.kts

@@ -3,7 +3,7 @@ import io.papermc.paperweight.util.constants.PAPERCLIP_CONFIG
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.papermc.paperweight.patcher") version "1.5.8"
+    id("io.papermc.paperweight.patcher") version "1.5.11"
 }
 
 repositories {
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.8.6:fat")
+    remapper("net.fabricmc:tiny-remapper:0.8.10:fat")
     decompiler("net.minecraftforge:forgeflower:2.0.627.2")
     paperclip("io.papermc:paperclip:3.0.3")
 }

gradle.properties

@@ -1,8 +1,8 @@
 group = patina.patina
 
-version = 1.20.2-R0.1-SNAPSHOT
-mcVersion = 1.20.2
-paperRef = 250388defed6660c57f40733c318ac90b846c264
+version = 1.20.4-R0.1-SNAPSHOT
+mcVersion = 1.20.4
+paperRef = 61768e08e7cbfd40f9d909d7032df8796536c99c
 
 org.gradle.parallel = true
 org.gradle.caching = true

patches/api/0001-pufferfish-API-Changes-commit-cba85553019510b279be9b.patch → patches/api/0001-pufferfish-API-Changes-commit-cf00db8b947df008391625.patch

@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: foss-mc <[email protected]>
-Date: Mon, 6 Nov 2023 21:40:21 +0800
+Date: Wed, 27 Dec 2023 00:32:40 +0800
 Subject: [PATCH] pufferfish API Changes commit
- cba85553019510b279be9be037128b4f892098b8
+ cf00db8b947df008391625a2fb559d8077afde6d
 
 Add Sentry
 
@@ -22,18 +22,18 @@ This patch does not add any API that should be used by plugins. Any
 classes and methods added by this patch should NOT be used in plugins.
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..0b87f34c2bb5a2f72124912a62ea393b19b1f3a3 100644
+index bf01892c248b988531d21d9fb0f74d0adf2205ac..80833c13a2d19e31d6f648e7ef5b3456025e767e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -46,6 +46,7 @@ dependencies {
+@@ -51,6 +51,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
      api("org.apache.logging.log4j:log4j-api:$log4jVersion")
      api("org.slf4j:slf4j-api:$slf4jVersion")
 +    api("io.sentry:sentry:5.4.0") // Pufferfish
 
-     implementation("org.ow2.asm:asm:9.4")
-     implementation("org.ow2.asm:asm-commons:9.4")
-@@ -89,6 +90,13 @@ val generateApiVersioningFile by tasks.registering {
+     implementation("org.ow2.asm:asm:9.5")
+     implementation("org.ow2.asm:asm-commons:9.5")
+@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 
@@ -391,7 +391,7 @@ index 0000000000000000000000000000000000000000..ae2464920c9412ac90b819a540ee58be
 +	
 +}
 diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
-index 3a9aaca2e76411a9c27f9f5e0f22d060d5a66d06..9584e245144b561b4f6745b2f26a4f69a6f92891 100644
+index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad124466bf5 100644
 --- a/src/main/java/org/bukkit/map/MapPalette.java
 +++ b/src/main/java/org/bukkit/map/MapPalette.java
 @@ -1,6 +1,7 @@

patches/api/0002-purpur-API-Changes-commit-fa3166a24d0dd49f41eb0257fc.patch

@@ -9,10 +9,10 @@ Purpur config files
 Lagging threshold
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 884902cb7f86c0b56594ccafc7d05c6c7a23ab53..c3823b56d5f9c6e729f784c06e0609d346c41472 100644
+index 48fab492609e0bae459d20cc2eae78b87e37ab75..64957d33207abbfa87ade5ebc30ce35fa80babba 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2832,4 +2832,15 @@ public final class Bukkit {
+@@ -2842,4 +2842,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -29,10 +29,10 @@ index 884902cb7f86c0b56594ccafc7d05c6c7a23ab53..c3823b56d5f9c6e729f784c06e0609d3
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..3c5edcafdbdaac0abd2cd99e55d4addc56702fa2 100644
+index 9af4bc16da09e59009c47911219e99450cdf2aa5..dc841dba031a12b4df8ec8964a9fa5c1ba52c402 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2190,6 +2190,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2198,6 +2198,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 
@@ -51,7 +51,7 @@ index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..3c5edcafdbdaac0abd2cd99e55d4addc
          /**
           * Sends the component to the player
           *
-@@ -2473,4 +2485,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2481,4 +2493,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
       */
      boolean isOwnedByCurrentRegion(@NotNull Entity entity);
      // Paper end - Folia region threading API

patches/api/0003-Purpur-dependencies.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 3676035ba011fb874ad6bb8995940d9bb2a0f0ae..82dadb8bf06013022e7a4a2d9078fa38f784f10b 100644
+index 80833c13a2d19e31d6f648e7ef5b3456025e767e..d65ba3436f5bc68f5d785d3f6ce9221864fc5e3d 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -44,6 +44,7 @@ dependencies {
+@@ -49,6 +49,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")