update patches

TODO - update Akarin EMC Purpur

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.15"
+    id("io.papermc.paperweight.patcher") version "1.7.1"
 }
 
 repositories {
@@ -14,8 +14,8 @@ repositories {
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.1:fat")
-    decompiler("org.vineflower:vineflower:1.11.0-20240412.144930-14")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
+    decompiler("org.vineflower:vineflower:1.10.1")
     paperclip("io.papermc:paperclip:3.0.3")
 }
 
@@ -60,14 +60,6 @@ paperweight {
             serverOutputDir.set(layout.projectDirectory.dir("Patina-Server"))
         }
 
-        patchTasks {
-            register("mojangApi") {
-                isBareDirectory.set(true)
-                upstreamDirPath.set("Paper-MojangAPI")
-                patchDir.set(layout.projectDirectory.dir("patches/mojangapi"))
-                outputDir.set(layout.projectDirectory.dir("Patina-MojangAPI"))
-            }
-        }
         patchTasks.register("generatedApi") {
             isBareDirectory = true
             upstreamDirPath = "paper-api-generator/generated"

gradle.properties

@@ -1,8 +1,8 @@
 group = patina.patina
 
-version = 1.20.4-R0.1-SNAPSHOT
-mcVersion = 1.20.4
-paperRef = ba31f4128208e954d6648001724887352f71ece9
+version = 1.21-R0.1-SNAPSHOT
+mcVersion = 1.21
+paperRef = 4829fbf6bd51e2dc86e2f190971c081aac76a201
 
 org.gradle.parallel = true
 org.gradle.caching = true

patches/api/0001-pufferfish-API-Changes-commit-1f3ad021d3cb996f499d62.patch → patches/api/0001-pufferfish-API-Changes-commit-f05b0e9d37742c5e5ff243.patch

@@ -1,8 +1,8 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: foss-mc <69294560+foss-mc@users.noreply.github.com>
-Date: Fri, 31 May 2024 23:53:25 +0800
+Date: Tue, 20 Aug 2024 20:37:17 +1200
 Subject: [PATCH] pufferfish API Changes commit
- 1f3ad021d3cb996f499d627676d688aeb46ffef9
+ f05b0e9d37742c5e5ff2438b9fec8c870734342f
 
 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 04853c43b99951bf0d4c96ef73724625bdaf018f..9164120d299d062c62529a7ef74eac0ded367993 100644
+index 540fe7e2c110e79c3742f229b3ed8c54b101d260..07945418e95cbe07c45bfa815d828fa311c7f033 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -51,6 +51,7 @@ dependencies {
+@@ -52,6 +52,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.7")
      implementation("org.ow2.asm:asm-commons:9.7")
-@@ -109,6 +110,13 @@ val generateApiVersioningFile by tasks.registering {
+@@ -130,6 +131,13 @@ val generateApiVersioningFile by tasks.registering {
      }
  }
 
@@ -216,7 +216,7 @@ index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8e
 +}
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704ff713345
+index 0000000000000000000000000000000000000000..3441cdad70da1bd523c5933b1a914688718c2657
 --- /dev/null
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 @@ -0,0 +1,40 @@
@@ -237,7 +237,7 @@ index 0000000000000000000000000000000000000000..ab5fea0b03224bf249352ce340e94704
 +	@Deprecated
 +	public static boolean canEnable(Logger logger) {
 +		try {
-+			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18 && SIMDDetection.getJavaVersion() != 19) {
++			if (SIMDDetection.getJavaVersion() < 17 || SIMDDetection.getJavaVersion() > 21) {
 +				return false;
 +			} else {
 +				SIMDDetection.testRun = true;
@@ -428,10 +428,10 @@ index c80faa079eca1564847070f0338fc98024639829..e632d51d3487eb4807243b6705999ad1
      }
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551d75bd647 100644
+index 003bece642b682985625db93cad93026352bfc66..e8ba4f1108f2548a487877027e37d81fc150e042 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -584,7 +584,9 @@ public final class SimplePluginManager implements PluginManager {
+@@ -597,7 +597,9 @@ public final class SimplePluginManager implements PluginManager {
 
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
@@ -441,7 +441,7 @@ index fc2dae69165776d08274e34a69962cc70445f411..899d67fa782fac639fe7fb096e05c551
          callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
      }
      // Paper end
-@@ -654,9 +656,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -667,9 +669,11 @@ public final class SimplePluginManager implements PluginManager {
                              ));
                  }
              } catch (Throwable ex) {

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 9a428153f34291bdc026a71f7e60e285b7794b0c..c9048b799b38256ce61aef5c581479505b4a6894 100644
+index 4705c1d91e39fcc3c608b1f1a38a30d063ccf06e..74f5b552f0e86280cbceb9f0a37ee8d2de173acd 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
-@@ -2884,4 +2884,15 @@ public final class Bukkit {
+@@ -2910,4 +2910,15 @@ public final class Bukkit {
      public static Server.Spigot spigot() {
          return server.spigot();
      }
@@ -29,10 +29,10 @@ index 9a428153f34291bdc026a71f7e60e285b7794b0c..c9048b799b38256ce61aef5c58147950
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 4ff1b38eb65f97344257204cf018f176f247ed36..124f12e3289540033891ab61b31594eb6b6d4ff3 100644
+index c043d239c449bf4bb13a24467f2f6c67b4d28d2d..32232bb35ec54f4c86ab938d89c215684c1831d6 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2235,6 +2235,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2254,6 +2254,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
          }
          // Paper end
 
@@ -51,7 +51,7 @@ index 4ff1b38eb65f97344257204cf018f176f247ed36..124f12e3289540033891ab61b31594eb
          /**
           * Sends the component to the player
           *
-@@ -2518,4 +2530,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2543,4 +2555,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 80833c13a2d19e31d6f648e7ef5b3456025e767e..d65ba3436f5bc68f5d785d3f6ce9221864fc5e3d 100644
+index 07945418e95cbe07c45bfa815d828fa311c7f033..1d979718c8c2db437c03945a304098a5a76d9952 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -49,6 +49,7 @@ dependencies {
+@@ -50,6 +50,7 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")

patches/api/0004-Suspected-plugins-report.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Suspected plugins report
 Added "Suspected Plugins" to Watchdog, crash reports and exception messages
 
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 899d67fa782fac639fe7fb096e05c551d75bd647..0de79dca263c58f9a6a1c6707e90452d9e4edd67 100644
+index e8ba4f1108f2548a487877027e37d81fc150e042..3e8e5ddba87f11ac6ccfb6bedbc85ee0fd62fff2 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -585,7 +585,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -598,7 +598,11 @@ public final class SimplePluginManager implements PluginManager {
      // Paper start
      private void handlePluginException(String msg, Throwable ex, Plugin plugin) {
          gg.pufferfish.pufferfish.sentry.SentryContext.setPluginContext(plugin); // Pufferfish
@@ -22,7 +22,7 @@ index 899d67fa782fac639fe7fb096e05c551d75bd647..0de79dca263c58f9a6a1c6707e90452d
          gg.pufferfish.pufferfish.sentry.SentryContext.removePluginContext(); // Pufferfish
          callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerPluginEnableDisableException(msg, ex, plugin)));
      }
-@@ -659,7 +663,11 @@ public final class SimplePluginManager implements PluginManager {
+@@ -672,7 +676,11 @@ public final class SimplePluginManager implements PluginManager {
                  gg.pufferfish.pufferfish.sentry.SentryContext.setEventContext(event, registration); // Pufferfish
                  // Paper start - error reporting
                  String msg = "Could not pass event " + event.getEventName() + " to " + registration.getPlugin().getDescription().getFullName();
@@ -35,7 +35,7 @@ index 899d67fa782fac639fe7fb096e05c551d75bd647..0de79dca263c58f9a6a1c6707e90452d
                  gg.pufferfish.pufferfish.sentry.SentryContext.removeEventContext(); // Pufferfish
                  if (!(event instanceof com.destroystokyo.paper.event.server.ServerExceptionEvent)) { // We don't want to cause an endless event loop
                      callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
-@@ -982,4 +990,10 @@ public final class SimplePluginManager implements PluginManager {
+@@ -995,4 +1003,10 @@ public final class SimplePluginManager implements PluginManager {
          this.paperPluginManager.addPermissions(perm);
      }
      // Paper end
@@ -47,10 +47,10 @@ index 899d67fa782fac639fe7fb096e05c551d75bd647..0de79dca263c58f9a6a1c6707e90452d
 +    // Yatopia end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-index 34037d3da2c536bac088e0ff629ee8f1daccc65b..c946eb6d60f13c7f5eeac77ccace7fa26f710cf5 100644
+index e0203f199700c397961a0667a79792497da7f796..cc12da5066e56630784b4b770da5fa346f894761 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
-@@ -126,7 +126,7 @@ public abstract class JavaPlugin extends PluginBase {
+@@ -127,7 +127,7 @@ public abstract class JavaPlugin extends PluginBase {
       * @return File containing this plugin
       */
      @NotNull
@@ -239,7 +239,7 @@ index 0000000000000000000000000000000000000000..0aa9bc6ad0a85d469b29201b9da29165
 +
 +}
 diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
-index 88f1ca89fa640a686231b8eec87e70419b2d73ef..bf20978ae3cbd436464b6db1137cfe195e843aa7 100644
+index b82f07a2879412f6b30643ca93a97439aa49a98a..5bee03091b047ddd6c856aa6d661f7abe8ae9f53 100644
 --- a/src/test/java/org/bukkit/AnnotationTest.java
 +++ b/src/test/java/org/bukkit/AnnotationTest.java
 @@ -57,8 +57,11 @@ public class AnnotationTest {

patches/api/0005-Remove-VersionFetcher.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove VersionFetcher
 
 
 diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-index fd5d9881abfd930bb883120f018f76dc78b62b14..6aef32f45dad083ac1221a8a4c57f2f0d4f11e7d 100644
+index e64bb57f74e6d6f78927be228825b3e0bdf41f48..b275d7ccc4fec941cbef605dd36dd01fd518a109 100644
 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java
 +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java
-@@ -25,7 +25,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
+@@ -26,7 +26,7 @@ import org.bukkit.plugin.PluginDescriptionFile;
  import org.bukkit.util.StringUtil;
  import org.jetbrains.annotations.NotNull;
  // Paper start - version command 2.0
@@ -17,7 +17,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..6aef32f45dad083ac1221a8a4c57f2f0
  import net.kyori.adventure.text.Component;
  import net.kyori.adventure.text.format.NamedTextColor;
  import net.kyori.adventure.text.event.ClickEvent;
-@@ -34,14 +34,7 @@ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
+@@ -35,14 +35,7 @@ import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
  // Paper end - version command 2.0
 
  public class VersionCommand extends BukkitCommand {
@@ -33,7 +33,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..6aef32f45dad083ac1221a8a4c57f2f0
 
      public VersionCommand(@NotNull String name) {
          super(name);
-@@ -57,8 +50,8 @@ public class VersionCommand extends BukkitCommand {
+@@ -58,8 +51,8 @@ public class VersionCommand extends BukkitCommand {
          if (!testPermission(sender)) return true;
 
          if (args.length == 0) {
@@ -44,7 +44,7 @@ index fd5d9881abfd930bb883120f018f76dc78b62b14..6aef32f45dad083ac1221a8a4c57f2f0
          } else {
              StringBuilder name = new StringBuilder();
 
-@@ -170,133 +163,5 @@ public class VersionCommand extends BukkitCommand {
+@@ -171,133 +164,5 @@ public class VersionCommand extends BukkitCommand {
          return ImmutableList.of();
      }