1.21 (#238)

---------

Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
Co-authored-by: LittleChest <81231195+LittleChest@users.noreply.github.com>

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Get JDK 17
+      - name: Get JDK 21
         uses: actions/setup-java@v4
         with:
           java-version: "21"

.github/workflows/test.yml

@@ -12,9 +12,7 @@ jobs:
     steps:
       - name: Get repository
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Get JDK 17
+      - name: Get JDK 21
         uses: actions/setup-java@v4
         with:
           java-version: "21"
@@ -29,18 +27,19 @@ jobs:
         run: |
           git config --global user.email "ci@leavesmc.org"
           git config --global user.name "LeavesMC CI"
-      - name: Get Build Number
-        run: bash scripts/GetBuildNumber.sh
       - name: Apply Patches
         run: ./gradlew applyPatches
       - name: Create Leavesclip Jar
         run: ./gradlew createMojmapLeavesclipJar
-        env:
-          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
-      - name: Get Release Info
-        run: sh scripts/GetReleaseInfo.sh
-        env:
-          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
+      - name: Move Jar
+        run: |
+          prop() {
+            grep "${1}" gradle.properties | cut -d'=' -f2 | sed 's/\r//'
+          }
+          
+          jarName="leaves-$(prop mcVersion).jar"
+          mv build/libs/Leaves-leavesclip-"$(prop version)"-mojmap.jar "$jarName"
+          echo "jar=$jarName" >> "$GITHUB_ENV"
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:

LICENSE.md

@@ -0,0 +1,19 @@
+Leaves inherits its licensing from upstream projects.
+
+As such, Leaves is licensed under the
+[GNU General Public License version 3](licenses/GPL.md); as it inherits it from Paper,
+who in turn inherits it from the original Spigot, Bukkit and Craftbukkit projects.
+
+Any author who is _not_ listed below should be presumed to have released their work
+under the original [GPL](licenses/GPL.md) license.
+
+In the interest of promoting a better Minecraft platform for everyone, contributors
+may choose to release their code under the more permissive [MIT License](licenses/MIT.md).
+
+The authors listed below have chosen to release their code under that more permissive
+[MIT License](licenses/MIT.md). Any contributor who wants their name added below
+should submit a pull request to this project to add their name.
+
+```text
+LittleChest <hiya@littlew.top>
+```

README.md

@@ -1,46 +1,46 @@
 Leaves 
 ===========
 
-[![Leaves CI](https://github.com/LeavesMC/Leaves/actions/workflows/leaves.yml/badge.svg)](https://github.com/LeavesMC/Leaves/actions/workflows/leaves.yml)
+[![Leaves CI](https://github.com/LeavesMC/Leaves/actions/workflows/build.yml/badge.svg)](https://github.com/LeavesMC/Leaves/actions/workflows/leaves.yml)
 [![Leaves Download](https://img.shields.io/github/downloads/LeavesMC/Leaves/total?color=0&logo=github)](https://github.com/LeavesMC/Leaves/releases/latest)
 [![Discord](https://badgen.net/discord/online-members/5hgtU72w33?icon=discord&label=Discord&list=what)](https://discord.gg/5hgtU72w33)
 [![QQ](https://img.shields.io/badge/QQ_Unofficial-815857713-blue)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=nisbmnCFeEJCcYWBQ10th4Fu99XWklH4&authKey=8VlUxSdrFCIwmIpxFQIGR8%2BXvIQ2II%2Bx2JfxuQ8amr9UKgINh%2BdXjudQfc%2FIeTO5&noverify=0&group_code=815857713)
 
-**English** | [中文](https://github.com/LeavesMC/Leaves/blob/master/README_cn.md)
+**English** | [中文](README_cn.md)
 
 > Fork of [Paper](https://github.com/PaperMC/Paper) aims at repairing broken vanilla properties.
 
-> You can see what we modify and fix at [here](https://github.com/LeavesMC/Leaves/blob/master/docs/MODIFICATION.md)
+> You can see what we modify and fix at [here](https://docs.leavesmc.org/en/leaves/reference/configuration)
 
 ## How To (Server Admins)
-Leaves use the same paperclip jar system that Paper uses.
+Leaves use the same leavesclip(paperclip fork) jar system that Paper uses.
 
-You can download the latest build (1.20.x) of Leaves by going [here](https://github.com/LeavesMC/Leaves/releases/latest)
+You can download the latest build (1.21.x) of Leaves by going [here](https://github.com/LeavesMC/Leaves/releases/latest)
 
-You can also [build it yourself](https://github.com/LeavesMC/Leaves#building).
+You can also [build it yourself](#building).
 
 You can visit our [documentation](https://docs.leavesmc.org/leaves/guides/getting-started) for more information.
 
 ## How To (Plugin developers)
 Leaves-API:
 ```kotlin
 maven {
-    name = 'leavesmc-repo'
-    url = 'https://repo.leavesmc.org/snapshots/'
+    name = "leavesmc-repo"
+    url = "https://repo.leavesmc.org/snapshots/"
 }
 
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves-api:1.21-R0.1-SNAPSHOT")
 }
  ```
 
-In order to use Leaves as a dependency you must [build it yourself](https://github.com/LeavesMC/Leaves#building).
+In order to use Leaves as a dependency you must [build it yourself](#building).
 Each time you want to update your dependency, you must re-build Leaves.
 
 Leaves-Server:
 ```kotlin
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves:1.21-R0.1-SNAPSHOT")
 }
  ```
 
@@ -54,10 +54,10 @@ You can find the jars in the `build/libs` directory.
 
 ## Pull Requests
 
-See [Contributing](https://github.com/LeavesMC/Leaves/blob/master/docs/CONTRIBUTING.md)
+See [Contributing](docs/CONTRIBUTING.md)
 
 ## Special Thanks To:
 
 [<img src="https://user-images.githubusercontent.com/21148213/121807008-8ffc6700-cc52-11eb-96a7-2f6f260f8fda.png" alt="" width="150">](https://www.jetbrains.com)
 
-[JetBrains](https://www.jetbrains.com/), creators of the IntelliJ IDEA, supports We with one of their [Open Source Licenses](https://www.jetbrains.com/opensource/). We recommend using IntelliJ IDEA as your IDE.
+[JetBrains](https://www.jetbrains.com/), creators of the IntelliJ IDEA, supports Leaves with one of their [Open Source Licenses](https://www.jetbrains.com/opensource/). Leaves recommend using IntelliJ IDEA as your IDE.

README_cn.md

@@ -6,40 +6,40 @@ Leaves
 [![Discord](https://badgen.net/discord/online-members/5hgtU72w33?icon=discord&label=Discord&list=what)](https://discord.gg/5hgtU72w33)
 [![QQ](https://img.shields.io/badge/QQ_Unofficial-815857713-blue)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=nisbmnCFeEJCcYWBQ10th4Fu99XWklH4&authKey=8VlUxSdrFCIwmIpxFQIGR8%2BXvIQ2II%2Bx2JfxuQ8amr9UKgINh%2BdXjudQfc%2FIeTO5&noverify=0&group_code=815857713)
 
-[English](https://github.com/LeavesMC/Leaves/blob/master/README.md) | **中文**
+[English](README.md) | **中文**
 
 > 一个致力于修复原版服务端被破坏特性的 [Paper](https://github.com/PaperMC/Paper) 分支
 
-> 你可以在 [这里](https://github.com/LeavesMC/Leaves/blob/master/docs/MODIFICATION_cn.md) 查看所有的修改和修复内容
+> 你可以在 [这里](https://docs.leavesmc.org/zh_Hans/leaves/reference/configuration) 查看所有的修改和修复内容
 
 ## 对于服务器管理员
-此分支使用与 Paper 一致的 paperclip 分发
+此分支使用与 Paper 一致的 leavesclip(paperclip的分支) 分发
 
-你可以从 [此处](https://github.com/LeavesMC/Leaves/releases/latest) 下载最新的构建结果 (1.20.x)
+你可以从 [此处](https://github.com/LeavesMC/Leaves/releases/latest) 下载最新的构建结果 (1.21.x)
 
-也可以通过 [此处](https://github.com/LeavesMC/Leaves/blob/master/README_cn.md#自行构建) 的指南自行构建
+也可以通过 [此处](#自行构建) 的指南自行构建
 
 如果你想要获得更多信息，那么你可以访问我们的 [文档](https://docs.leavesmc.org/zh_Hans/leaves/guides/getting-started)
 
 ## 对于插件开发者
 Leaves-API:
 ```kotlin
 maven {
-    name = 'leavesmc-repo'
-    url = 'https://repo.leavesmc.org/snapshots/'
+    name = "leavesmc-repo"
+    url = "https://repo.leavesmc.org/snapshots/"
 }
 
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves-api:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves-api:1.21-R0.1-SNAPSHOT")
 }
  ```
 
-如果你要将 Leaves 作为依赖,那么你必须进行 [自行构建](https://github.com/LeavesMC/Leaves/blob/master/README_cn.md#自行构建)
+如果你要将 Leaves 作为依赖,那么你必须进行 [自行构建](#自行构建)
 
 Leaves-Server:
 ```kotlin
 dependencies {
-    compileOnly("org.leavesmc.leaves:leaves:1.20.6-R0.1-SNAPSHOT")
+    compileOnly("org.leavesmc.leaves:leaves:1.21R0.1-SNAPSHOT")
 }
  ```
 
@@ -53,10 +53,10 @@ dependencies {
 
 ## 对于想要出一份力的开发者
 
-可查看 [Contributing](https://github.com/LeavesMC/Leaves/blob/master/docs/CONTRIBUTING_cn.md)
+可查看 [贡献须知](docs/CONTRIBUTING_cn.md)
 
 ## 特别感谢
 
 [<img src="https://user-images.githubusercontent.com/21148213/121807008-8ffc6700-cc52-11eb-96a7-2f6f260f8fda.png" alt="" width="150">](https://www.jetbrains.com)
 
-[JetBrains](https://www.jetbrains.com/)，IntelliJ IDEA的创造者，为Leaves提供了 [开源许可证](https://www.jetbrains.com/opensource/)。我们极力推荐使用IntelliJ IDEA作为你的IDE。
+[JetBrains](https://www.jetbrains.com/)，IntelliJ IDEA 的创造者，为 Leaves 提供了 [开源许可证](https://www.jetbrains.com/opensource/)。我们极力推荐使用 IntelliJ IDEA 作为你的 IDE。

build.gradle.kts

@@ -1,10 +1,7 @@
-import io.papermc.paperweight.util.*
-import kotlin.io.path.*
-
 plugins {
     java
     `maven-publish`
-    id("io.papermc.paperweight.patcher") version "1.7.1"
+    id("org.leavesmc.leavesweight.patcher") version "1.0.0-SNAPSHOT"
 }
 
 allprojects {
@@ -54,14 +51,14 @@ subprojects {
 repositories {
     mavenCentral()
     maven("https://repo.leavesmc.org/releases") {
-        content { onlyForConfigurations("paperclip") }
+        content { onlyForConfigurations("leavesclip") }
     }
 }
 
 dependencies {
-    remapper("net.fabricmc:tiny-remapper:0.10.2:fat")
+    remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
-    paperclip("org.leavesmc:leavesclip:2.0.0")
+    leavesclip("org.leavesmc:leavesclip:2.0.0")
 }
 
 paperweight {
@@ -100,37 +97,4 @@ allprojects {
             }
         }
     }
-}
-
-if (providers.gradleProperty("updatingMinecraft").getOrElse("false").toBoolean()) {
-
-    tasks.withType<io.papermc.paperweight.tasks.CollectATsFromPatches>().configureEach {
-        val dir = layout.projectDirectory.dir("patches/unapplied")
-        if (dir.path.isDirectory()) {
-            extraPatchDir = dir
-        }
-    }
-    tasks.withType<io.papermc.paperweight.tasks.RebuildGitPatches>().configureEach {
-        filterPatches = false
-    }
-}
-
-tasks.register("createMojmapLeavesclipJar") {
-    group = "paperweight"
-    dependsOn("createMojmapPaperclipJar")
-    doLast {
-        file("build/libs/Leaves-paperclip-${project.version}-mojmap.jar").renameTo(
-            file("build/libs/Leaves-leavesclip-${project.version}-mojmap.jar")
-        )
-    }
-}
-
-tasks.register("createReobfLeavesclipJar") {
-    group = "paperweight"
-    dependsOn("createReobfPaperclipJar")
-    doLast {
-        file("build/libs/Leaves-paperclip-${project.version}-reobf.jar").renameTo(
-            file("build/libs/Leaves-leavesclip-${project.version}-reobf.jar")
-        )
-    }
 }