Leaf 1.21.4

WIP

Author: Dreeam-qwq

.github/workflows/auto-update.yml

@@ -45,23 +45,23 @@ jobs:
       - name: Grant execute permission for gradlew
         run: |
           cd Leaf
-          git config --global user.name "Dreeam"
+          git config --global user.name "Dreeam-qwq"
           git config --global user.email [email protected]
           chmod +x gradlew
 
       - uses: actions/setup-java@main
         with:
           distribution: 'zulu'
-          java-version:  21
+          java-version:  '21'
 
       - name: Running tests before push
         run: |
           cd Leaf
           if ! git diff --quiet; then
             echo "Running tests...."
-            ./gradlew applyPatches
-            ./gradlew createMojmapPaperclipJar
-            ./gradlew rebuildPatches
+            ./gradlew applyAllPatches
+            ./gradlew build
+            ./gradlew rebuildAllServerPatches
           fi
 
       - name: Check for changes and write to repository

.github/workflows/build-1213.yml renamed to .github/workflows/build-1214.yml

@@ -1,17 +1,16 @@
-name: Build Leaf 1.21.3
+name: Build Leaf 1.21.4
 
 on:
   push:
-    branches: [ "ver/1.21.3" ]
+    branches: [ "dev/1.21.4" ]
   pull_request:
-    branches: [ "ver/1.21.3" ]
+    branches: [ "ver/1.21.4" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@main
-      - uses: gradle/actions/wrapper-validation@main
       - name: Set up JDK
         uses: graalvm/setup-graalvm@main
         with:
@@ -33,8 +32,8 @@ jobs:
 
       - name: Rename Paperclip Jar
         run: |
-          mv build/libs/leaf-paperclip-1.21.3-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.3-mojmap.jar
-          mv build/libs/leaf-paperclip-1.21.3-R0.1-SNAPSHOT-reobf.jar ./leaf-1.21.3-reobf.jar
+          mv leaf-server/build/libs/leaf-paperclip-1.21.4-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.4-mojmap.jar
+          mv leaf-server/build/libs/leaf-paperclip-1.21.4-R0.1-SNAPSHOT-reobf.jar ./leaf-1.21.4-reobf.jar
 
       - name: Publish API
         if: github.event_name != 'pull_request'
@@ -44,27 +43,28 @@ jobs:
           export REPO_USER=${{ secrets.REPO_USER }}
           echo "REPO_PASSWORD=${{ secrets.REPO_PASSWORD }}" >> $GITHUB_ENV
           export REPO_PASSWORD=${{ secrets.REPO_PASSWORD }}
-          ./gradlew :leaf-api:publish
-          ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
+          ./gradlew publish
+          # TODO
+          # ./gradlew publishDevBundlePublicationToLeafRepository -PpublishDevBundle=true
 
       - name: Upload Leaf
         uses: actions/upload-artifact@main
         with:
-          name: Leaf 1.21.3
-          path: ./leaf-1.21.3-*.jar
+          name: Leaf 1.21.4
+          path: ./leaf-1.21.4-*.jar
 
-      - name: Rename Paperclip Jar
+      - name: Rename Leaf Jar
         run: |
-          mv ./leaf-1.21.3-mojmap.jar ./leaf-1.21.3.jar
+          mv ./leaf-1.21.4-mojmap.jar ./leaf-1.21.4.jar
 
       # TODO: marvinpinto/action-automatic-releases is archived, need to find new one
       # Notes: create releases every time, similar changelogs with this, all commits for changelogs
       - name: Release Leaf
         if: github.event_name != 'pull_request'
         uses: marvinpinto/action-automatic-releases@master
         with:
-          title: "Leaf 1.21.3"
-          automatic_release_tag: "ver-1.21.3"
+          title: "Leaf 1.21.4"
+          automatic_release_tag: "ver-1.21.4"
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          files: "./leaf-1.21.3.jar"
-          prerelease: false
+          files: "./leaf-1.21.4.jar"
+          prerelease: true

.gitignore

@@ -22,7 +22,10 @@ build-data
 patches/todo
 run
 
-Leaf-API
-Leaf-MojangAPI
-Leaf-Server
-paper-api-generator
+leaf-api/build.gradle.kts
+leaf-server/build.gradle.kts
+leaf-server/src/minecraft
+gale-api
+gale-server
+paper-api
+paper-server

LICENSE.md

@@ -2,4 +2,4 @@
 
 Paperweight files are licensed under [MIT](https://opensource.org/licenses/MIT) (included in `license/MIT.txt`).
 Patches are licensed under MIT, unless indicated differently in their header (some patches are licensed under [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.html) (included in `license/GPL-3.0.txt`) or [LGPL-3.0](https://www.gnu.org/licenses/lgpl-3.0.html) (included in `license/LGPL-3.0.txt`)).
-Binaries are licensed under GPL-3.0.
+Binaries are licensed under GPL-3.0.

Leaf-API/build.gradle.kts.patch

@@ -0,0 +1,138 @@
+--- a/gale-api/build.gradle.kts
++++ b/gale-api/build.gradle.kts
+@@ -12,8 +_,10 @@
+ val annotationsVersion = "26.0.1"
+ val bungeeCordChatVersion = "1.20-R0.2"
+ val adventureVersion = "4.18.0"
+-val slf4jVersion = "2.0.9"
+-val log4jVersion = "2.17.1"
++// Leaf start - Bump Dependencies
++val slf4jVersion = "2.0.16"
++val log4jVersion = "2.24.3"
++// Leaf end - Bump Dependencies
+ 
+ val apiAndDocs: Configuration by configurations.creating {
+     attributes {
+@@ -41,9 +_,9 @@
+ dependencies {
+ 
+     // api dependencies are listed transitively to API consumers
+-    api("com.google.guava:guava:33.3.1-jre")
++    api("com.google.guava:guava:33.4.0-jre") // Leaf - Bump Dependencies
+     api("com.google.code.gson:gson:2.11.0")
+-    api("org.yaml:snakeyaml:2.2")
++    api("org.yaml:snakeyaml:2.3") // Leaf - Bump Dependencies
+     api("org.joml:joml:1.10.8") {
+         isTransitive = false // https://github.com/JOML-CI/JOML/issues/352
+     }
+@@ -54,6 +_,7 @@
+     api("org.apache.logging.log4j:log4j-api:$log4jVersion")
+     api("org.slf4j:slf4j-api:$slf4jVersion")
+     api("com.mojang:brigadier:1.3.10")
++    api("io.sentry:sentry:8.0.0-rc.3") // Pufferfish
+ 
+     // Deprecate bungeecord-chat in favor of adventure
+     api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.19") {
+@@ -68,29 +_,37 @@
+     apiAndDocs("net.kyori:adventure-text-serializer-plain")
+     apiAndDocs("net.kyori:adventure-text-logger-slf4j")
+ 
+-    api("org.apache.maven:maven-resolver-provider:3.9.6") // make API dependency for Paper Plugins
+-    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.18")
+-    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
++    // Leaf start - Bump Dependencies
++    api("org.apache.maven:maven-resolver-provider:3.9.9") // make API dependency for Paper Plugins
++    compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.9.22") // Dreeam TODO - Update to 2.0.1
++    compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.22") // Dreeam TODO - Update to 2.0.1
++    // Leaf start - Bump Dependencies
+ 
+     // Annotations - Slowly migrate to jspecify
+     val annotations = "org.jetbrains:annotations:$annotationsVersion"
+     compileOnly(annotations)
+     testCompileOnly(annotations)
+ 
+-    val checkerQual = "org.checkerframework:checker-qual:3.33.0"
++    val checkerQual = "org.checkerframework:checker-qual:3.48.4" // Leaf - Bump Dependencies
+     compileOnlyApi(checkerQual)
+     testCompileOnly(checkerQual)
+ 
+     api("org.jspecify:jspecify:1.0.0")
+ 
+     // Test dependencies
+-    testImplementation("org.apache.commons:commons-lang3:3.12.0")
+-    testImplementation("org.junit.jupiter:junit-jupiter:5.10.2")
+-    testImplementation("org.hamcrest:hamcrest:2.2")
+-    testImplementation("org.mockito:mockito-core:5.14.1")
++    // Leaf start - Bump Dependencies
++    testImplementation("org.apache.commons:commons-lang3:3.17.0")
++    testImplementation("org.junit.jupiter:junit-jupiter:5.11.4")
++    testImplementation("org.hamcrest:hamcrest:3.0")
++    testImplementation("org.mockito:mockito-core:5.15.2")
+     testImplementation("org.ow2.asm:asm-tree:9.7.1")
+-    mockitoAgent("org.mockito:mockito-core:5.14.1") { isTransitive = false } // configure mockito agent that is needed in newer java versions
++    mockitoAgent("org.mockito:mockito-core:5.15.2") { isTransitive = false } // configure mockito agent that is needed in newer java versions
+     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
++
++    // commons-lang3 is removed in maven-resolver-provider since 3.9.8
++    // Add this because bukkit api still need it.
++    compileOnly("org.apache.commons:commons-lang3:3.17.0")
++    // Leaf end - Bump Dependencies
+ }
+ 
+ val generatedApiPath: java.nio.file.Path = rootProject.layout.projectDirectory.dir("paper-api/src/generated/java").asFile.toPath() // Gale - project setup
+@@ -105,17 +_,21 @@
+             srcDir(generatedApiPath)
+             // Gale start - project setup
+             srcDir(file("../paper-api/src/main/java"))
++            srcDir(file("../gale-api/src/main/java")) // Leaf - project setup
+         }
+         resources {
+             srcDir(file("../paper-api/src/main/resources"))
++            srcDir(file("../gale-api/src/main/resources")) // Leaf - project setup
+         }
+     }
+     test {
+         java {
+             srcDir(file("../paper-api/src/test/java"))
++            srcDir(file("../gale-api/src/test/java")) // Leaf - project setup
+         }
+         resources {
+             srcDir(file("../paper-api/src/test/resources"))
++            srcDir(file("../gale-api/src/test/resources")) // Leaf - project setup
+             // Gale end - project setup
+         }
+     }
+@@ -203,8 +_,8 @@
+     options.use()
+     options.isDocFilesSubDirs = true
+     options.links(
+-        "https://guava.dev/releases/33.3.1-jre/api/docs/",
+-        "https://javadoc.io/doc/org.yaml/snakeyaml/2.2/",
++        "https://guava.dev/releases/33.4.0-jre/api/docs/", // Leaf - Bump Dependencies
++        "https://javadoc.io/doc/org.yaml/snakeyaml/2.3/", // Leaf - Bump Dependencies
+         "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/",
+         "https://javadoc.io/doc/org.joml/joml/1.10.8/",
+         "https://www.javadoc.io/doc/com.google.code.gson/gson/2.11.0",
+@@ -217,8 +_,8 @@
+         "https://jd.advntr.dev/text-serializer-plain/$adventureVersion/",
+         "https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
+         "https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
+-        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/$log4jVersion/",
+-        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
++        "https://javadoc.io/doc/org.apache.logging.log4j/log4j-api/2.20.0/", // Leaf - Bump Dependencies
++        "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.9.22", // Leaf - Bump Dependencies
+     )
+     options.tags("apiNote:a:API Note:")
+ 
+@@ -276,6 +_,11 @@
+     jarToScan.set(tasks.jar.flatMap { it.archiveFile })
+     classpath.from(configurations.compileClasspath)
+ }
++// Leaf start - Bump Dependencies
++repositories {
++    mavenCentral()
++}
++// Leaf end - Bump Dependencies
+ tasks.check {
+     dependsOn(scanJarForOldGeneratedCode)
+ }

patches/api/0001-Rebrand.patch renamed to Leaf-API/paper-patches/features/0001-Rebrand.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand
 
 
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfo.java b/src/main/java/io/papermc/paper/ServerBuildInfo.java
-index b68770f6992b044d13e67d9affa6933c90ca8fb8..bef5b7b089f33c8ce1304292804ea56d16e574c9 100644
+index b68770f6992b044d13e67d9affa6933c90ca8fb8..184ed5a41a138d14757f12acd4ec3113cb165b72 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfo.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfo.java
 @@ -26,6 +26,17 @@ public interface ServerBuildInfo {
@@ -14,9 +14,9 @@ index b68770f6992b044d13e67d9affa6933c90ca8fb8..bef5b7b089f33c8ce1304292804ea56d
 
 +    // Leaf start
 +    /**
-+     * The brand id for Purpur.
++     * The brand id for Pufferfish.
 +     */
-+    Key BRAND_PURPUR_ID = Key.key("purpurmc", "purpur");
++    Key BRAND_PUFFERFISH_ID = Key.key("pufferfish", "pufferfish");
 +    /**
 +     * The brand id for Leaf.
 +     */

patches/api/0002-Leaf-config-files.patch renamed to Leaf-API/paper-patches/features/0002-Leaf-config-files.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Leaf config files
 
 
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index a3b84a898210b012d5fbae55f0bb739b5487505c..597b06c2cb289c235ad14009b186aa00f55cefcd 100644
+index 2dccd3f72e188a34c9cdf80816aadb0c79351279..331006b854dfe785c567baf8489afaac01a99cd0 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
-@@ -2336,6 +2336,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
+@@ -2383,6 +2383,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
 
          // Paper end
 

patches/api/0003-Pufferfish-Sentry.patch renamed to Leaf-API/paper-patches/features/0003-Pufferfish-Sentry.patch

@@ -6,18 +6,6 @@ Subject: [PATCH] Pufferfish: Sentry
 Original license: GPL v3
 Original project: https://github.com/pufferfish-gg/Pufferfish
 
-diff --git a/build.gradle.kts b/build.gradle.kts
-index 3c50294a0a68fd8e9fd4028d41495ad3b9781b1e..5fac022f2373105df7f9cfb292642c4a399c7db4 100644
---- a/build.gradle.kts
-+++ b/build.gradle.kts
-@@ -64,6 +64,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.1")
-     implementation("org.ow2.asm:asm-commons:9.7.1")
 diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
 new file mode 100644
 index 0000000000000000000000000000000000000000..c7772aac00f6db664f7a5673bc2585fa025e6aad