Refactor: Change upstream to pufferfish

build.gradle.kts

@@ -62,13 +62,13 @@ paperweight {
     remapRepo.set("https://maven.fabricmc.net/")
     decompileRepo.set("https://maven.quiltmc.org/")
 
-    useStandardUpstream("Gale") {
-        url.set(github("GaleMC", "Gale"))
-        ref.set(providers.gradleProperty("GaleCommit"))
+    useStandardUpstream("Pufferfish") {
+        url.set(github("pufferfish-gg", "Pufferfish"))
+        ref.set(providers.gradleProperty("PufferfishCommit"))
 
         withStandardPatcher {
-            apiSourceDirPath.set("gale-api")
-            serverSourceDirPath.set("gale-server")
+            apiSourceDirPath.set("pufferfish-api")
+            serverSourceDirPath.set("pufferfish-server")
 
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
             apiOutputDir.set(layout.projectDirectory.dir("Leaf-API"))

gradle.properties

@@ -1,7 +1,7 @@
 group = org.dreeam.leaf
 version = 1.19.2-R0.1-SNAPSHOT
 
-GaleCommit = c171237448de714f1679ca90e93fa34b2de7a65d
+PufferfishCommit = 9b8cdc74a4bed029a68682a6f0b6ec039b5c2707
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/api/0001-Leaf-config-files.patch

@@ -5,11 +5,11 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index f3eaf734ee6414d8809f8da30de417da6677982c..528c5d756f0f1a33f747edc0bdc558a65a505914 100644
+index e43fef0152468944d8a33036344a43e95fe58476..396e1fa1ef8e3617a9e69ae9d056b0e9b281972a 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2012,6 +2012,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-
+@@ -1969,6 +1969,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+         }
          // Paper end
 
 +        // Leaf start

patches/api/0002-Bump-Dependencies.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bump Dependencies
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 2c3c8fbba6247a44b1782dbed45a00fdaa051473..88949ee7c41e37adb359951bcedcefff92725d18 100644
+index 780c9b40f69c247592c1fe469c05fd12e984b633..724840d317053a95a69b8bfd638bd9d39186e3b0 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -23,15 +23,15 @@ configurations.api {
@@ -28,14 +28,15 @@ index 2c3c8fbba6247a44b1782dbed45a00fdaa051473..88949ee7c41e37adb359951bcedcefff
      apiAndDocs(platform("net.kyori:adventure-bom:$adventureVersion"))
      apiAndDocs("net.kyori:adventure-api")
      apiAndDocs("net.kyori:adventure-text-minimessage")
-@@ -39,17 +39,17 @@ dependencies {
+@@ -39,18 +39,18 @@ dependencies {
      apiAndDocs("net.kyori:adventure-text-serializer-legacy")
      apiAndDocs("net.kyori:adventure-text-serializer-plain")
      apiAndDocs("net.kyori:adventure-text-logger-slf4j")
 -    api("org.apache.logging.log4j:log4j-api:2.17.1")
 -    api("org.slf4j:slf4j-api:1.8.0-beta4")
 +    api("org.apache.logging.log4j:log4j-api:2.19.0")
 +    api("org.slf4j:slf4j-api:1.8.0-beta4") // Leaf TODO - Bump later, need to fix breaking compatibility
+     api("io.sentry:sentry:5.4.0") // Pufferfish
 
 -    implementation("org.ow2.asm:asm:9.2")
 -    implementation("org.ow2.asm:asm-commons:9.2")
@@ -53,7 +54,7 @@ index 2c3c8fbba6247a44b1782dbed45a00fdaa051473..88949ee7c41e37adb359951bcedcefff
 
      val annotations = "org.jetbrains:annotations:23.0.0" // Paper - we don't want Java 5 annotations...
      compileOnly(annotations)
-@@ -63,8 +63,8 @@ dependencies {
+@@ -64,8 +64,8 @@ dependencies {
 
      testImplementation("org.apache.commons:commons-lang3:3.12.0")
      testImplementation("junit:junit:4.13.2")

patches/api/0004-Purpur-Lagging-threshold.patch

@@ -27,13 +27,14 @@ index 232c08c9a588d957d90f198ce479e57615c6e650..54fa24b5531424a011a194b606c35488
 +    // Purpur end
  }
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 528c5d756f0f1a33f747edc0bdc558a65a505914..1a930e3345a8098084337eaaf859a788578ab9b9 100644
+index 396e1fa1ef8e3617a9e69ae9d056b0e9b281972a..d53376adafa4affee5fba287f37be7aab5e098c9 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2214,4 +2214,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
-     long getLastTickOversleepTime();
-     // Gale end - YAPFA - last tick time - API
-
+@@ -2145,4 +2145,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+      */
+     @NotNull org.bukkit.potion.PotionBrewer getPotionBrewer();
+     // Paper end
++
 +    // Purpur start
 +    /**
 +     * Check if server is lagging according to laggy threshold setting
@@ -42,5 +43,4 @@ index 528c5d756f0f1a33f747edc0bdc558a65a505914..1a930e3345a8098084337eaaf859a788
 +     */
 +    boolean isLagging();
 +    // Purpur end
-+
  }

patches/api/0006-Purpur-Lobotomize-stuck-villagers.patch

@@ -7,10 +7,10 @@ Original license: MIT
 Original project: https://github.com/PurpurMC/Purpur
 
 diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
-index d61855b83da0776fe910dee8cde184c720571a71..b7b7963c07f9859df980017d0515ab437f7d9d10 100644
+index c61e7e41aeb3d4f5f4ac47da8890051d8e97340d..12b08318f78c8144cc809dbccf0feabdd31f0ee2 100644
 --- a/src/main/java/org/bukkit/entity/Villager.java
 +++ b/src/main/java/org/bukkit/entity/Villager.java
-@@ -297,4 +297,14 @@ public interface Villager extends AbstractVillager {
+@@ -328,4 +328,14 @@ public interface Villager extends AbstractVillager {
       */
      public void clearReputations();
      // Paper end

patches/api/0007-KeYi-Optimize-Spigot-event-bus.patch

@@ -10,7 +10,7 @@ Original code by lynxplay, licensed under GNU General Public License v3.0
 You can find the original code on https://github.com/lynxplay/ktp
 
 diff --git a/src/main/java/org/bukkit/plugin/RegisteredListener.java b/src/main/java/org/bukkit/plugin/RegisteredListener.java
-index 419aec56b0e3fa8bcec2ea7f340caa3456b57d00..8530d926931a54ed1300c40cd1e0908b2d9b594d 100644
+index 3b3d9642a8d63798dc28f2f8df77f0466451cbff..8d3605f25e97a375971705c737bc7bacbac045cd 100644
 --- a/src/main/java/org/bukkit/plugin/RegisteredListener.java
 +++ b/src/main/java/org/bukkit/plugin/RegisteredListener.java
 @@ -62,8 +62,10 @@ public class RegisteredListener {
@@ -27,12 +27,12 @@ index 419aec56b0e3fa8bcec2ea7f340caa3456b57d00..8530d926931a54ed1300c40cd1e0908b
              }
          }
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index 7edbcee946bb310bba54720cd47cd21f0a36276d..8939524f367eb84b9b01faa758bfbb229db2af42 100644
+index 49a4611ed4891cce10fd6e01b4062740ad18ee6f..d70c0e3172828b43bc7dea2c84d92282403a7fa8 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-@@ -660,11 +660,15 @@ public final class SimplePluginManager implements PluginManager {
-         // Gale end - JettPack - skip events without listeners
-
+@@ -654,11 +654,15 @@ public final class SimplePluginManager implements PluginManager {
+     @Override
+     public void callEvent(@NotNull Event event) {
          // Paper - replace callEvent by merging to below method
 -        if (event.isAsynchronous() && server.isPrimaryThread()) {
 +        // KTP start - optimize spigot event bus
@@ -46,5 +46,5 @@ index 7edbcee946bb310bba54720cd47cd21f0a36276d..8939524f367eb84b9b01faa758bfbb22
          }
 +        // KTP end - optimize spigot event bus
 
-         for (RegisteredListener registration : listeners) {
-             if (!registration.getPlugin().isEnabled()) {
+         HandlerList handlers = event.getHandlers();
+         RegisteredListener[] listeners = handlers.getRegisteredListeners();

patches/api/0008-KeYi-Smooth-Teleports.patch

@@ -12,10 +12,10 @@ Original license: MIT
 Original project: https://github.com/Cryptite/Slice
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 9ce603a0c905017f512260de110cf7d8d2097028..84c82c5cfbd8ee7037007285733aeb281df81606 100644
+index 1e27b9de47f111b9c000243214e22890e323f7fc..39c65831f38b3992c52f35abcc4aab1d2e09473c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2773,6 +2773,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2763,6 +2763,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
 

patches/api/0009-KeYi-Add-Java19-Support-for-SIMD.patch

@@ -7,15 +7,21 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-index d51f9de6ac01f518ca9577827dc719daad78df4c..2316006d50ecedf88ca49e7cbcbeae7f727f64c2 100644
+index 93f5d7ca36e043e6c0f959450d38e6946b348eaf..42288a065acee7e3181364bfadb26d3c1dc6fdc2 100644
 --- a/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
 +++ b/src/main/java/gg/pufferfish/pufferfish/simd/SIMDChecker.java
-@@ -17,7 +17,7 @@ public class SIMDChecker {
-     @Deprecated
-     public static boolean canEnable(Logger logger, boolean logVectorSizesToConsole) {
-         try {
--            if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) {
-+            if (SIMDDetection.getJavaVersion() < 17) { // KeYi - Add Java19 Support for SIMD
-                 return false;
-             } else {
-                 SIMDDetection.testRun = true;
+@@ -15,7 +15,7 @@ public class SIMDChecker {
+ 	@Deprecated
+ 	public static boolean canEnable(Logger logger) {
+ 		try {
+-			if (SIMDDetection.getJavaVersion() != 17 && SIMDDetection.getJavaVersion() != 18) {
++			if (SIMDDetection.getJavaVersion() < 17) { // KeYi - Add Java19 Support for SIMD
+ 				return false;
+ 			} else {
+ 				SIMDDetection.testRun = true;
+@@ -36,5 +36,4 @@ public class SIMDChecker {
+ 		} catch (NoClassDefFoundError | Exception ignored) {} // Basically, we don't do anything. This lets us detect if it's not functional and disable it.
+ 		return false;
+ 	}
+-	
+ }

patches/api/0010-KeYi-Player-Skull-API.patch

@@ -7,7 +7,7 @@ Original license: MIT
 Original project: https://github.com/KeYiMC/KeYi
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 84c82c5cfbd8ee7037007285733aeb281df81606..b1bf0041050f3d6ff7ec11a6e346b7d325311917 100644
+index 39c65831f38b3992c52f35abcc4aab1d2e09473c..6baf8fff6a6def7e78db00e5660025ecec6ab08c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -18,7 +18,7 @@ index 84c82c5cfbd8ee7037007285733aeb281df81606..b1bf0041050f3d6ff7ec11a6e346b7d3
  import com.destroystokyo.paper.ClientOption; // Paper
  import com.destroystokyo.paper.Title; // Paper
  import net.kyori.adventure.text.Component;
-@@ -2926,4 +2927,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2916,4 +2917,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @Override
      Spigot spigot();
      // Spigot end