9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-19 15:09:25 +00:00

Init Leaf 1.21.9

This commit is contained in:
Dreeam
2025-09-27 12:42:53 -04:00
parent f1e884e0fc
commit 4618ea34e1
22 changed files with 107 additions and 107 deletions

View File

@@ -1,8 +1,8 @@
name: Build Leaf 1.21.8
name: Build Leaf 1.21.9
on:
push:
branches: [ "ver/1.21.8" ]
branches: [ "ver/1.21.9" ]
workflow_dispatch:
jobs:
@@ -93,15 +93,15 @@ jobs:
- name: Upload Leaf
uses: actions/upload-artifact@v4
with:
name: Leaf 1.21.8
path: ./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar
name: Leaf 1.21.9
path: ./leaf-1.21.9-${{ env.BUILD_NUMBER }}.jar
- name: Release Leaf
uses: softprops/action-gh-release@v2
with:
name: "Leaf 1.21.8"
tag_name: "ver-1.21.8"
files: "./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar"
name: "Leaf 1.21.9"
tag_name: "ver-1.21.9"
files: "./leaf-1.21.9-${{ env.BUILD_NUMBER }}.jar"
body_path: "./release_notes.md"
token: "${{ secrets.GITHUB_TOKEN }}"
target_commitish: "${{ github.sha }}"
@@ -111,7 +111,7 @@ jobs:
- name: Calculate SHA-256
id: hash
run: |
FILE_NAME="leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar"
FILE_NAME="leaf-1.21.9-${{ env.BUILD_NUMBER }}.jar"
HASH=$(sha256sum "$FILE_NAME" | awk '{ print $1 }')
echo "sha256=$HASH" >> $GITHUB_OUTPUT
@@ -121,7 +121,7 @@ jobs:
host: ${{ secrets.API_HOST }}
username: ${{ secrets.API_USER }}
password: ${{ secrets.API_PASS }}
source: "./leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar"
source: "./leaf-1.21.9-${{ env.BUILD_NUMBER }}.jar"
target: "~/api/uploads/"
- name: Insert build to download API
@@ -141,11 +141,11 @@ jobs:
node insertBuild.js \
--projectName leaf \
--projectFriendlyName "Leaf" \
--version 1.21.8 \
--versionGroupName 1.21.8 \
--versionName 1.21.8 \
--version 1.21.9 \
--versionGroupName 1.21.9 \
--versionName 1.21.9 \
--build-number ${{ env.BUILD_NUMBER }} \
--repositoryPath "$REPO_DIR" \
--storagePath /root/api/storage \
--download "primary:/root/api/uploads/leaf-1.21.8-${{ env.BUILD_NUMBER }}.jar:${{ steps.hash.outputs.sha256 }}" \
--download "primary:/root/api/uploads/leaf-1.21.9-${{ env.BUILD_NUMBER }}.jar:${{ steps.hash.outputs.sha256 }}" \
--buildChannel experimental

View File

@@ -2,7 +2,7 @@ name: Build Pull Request
on:
pull_request:
branches: [ "ver/1.21.8" ]
branches: [ "ver/1.21.9" ]
jobs:
build:
@@ -34,9 +34,9 @@ jobs:
- name: Rename Paperclip JARs
run: |
mv leaf-server/build/libs/leaf-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.8.jar
mv leaf-server/build/libs/leaf-paperclip-1.21.9-R0.1-SNAPSHOT-mojmap.jar ./leaf-1.21.9.jar
- name: Upload Leaf as build artifact
uses: actions/upload-artifact@v4
with:
name: Leaf 1.21.8
path: ./leaf-1.21.8.jar
name: Leaf 1.21.9
path: ./leaf-1.21.9.jar

View File

@@ -2,7 +2,7 @@ name: Publish API
on:
push:
branches: [ "ver/1.21.8" ]
branches: [ "ver/1.21.9" ]
jobs:
build:

View File

@@ -2,7 +2,7 @@
<div align="center">
[![Download](https://img.shields.io/badge/releases-blue?label=download&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/download)
[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1218.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)
[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1219.yml?&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)
[![Discord](https://img.shields.io/discord/1145991395388162119?label=discord&style=for-the-badge&colorA=19201a&colorB=298046)](https://discord.gg/gfgAwdSEuM)
[![Docs](https://img.shields.io/badge/leafmc.one/docs/-blue?label=docs&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/docs/getting-started)
@@ -66,7 +66,7 @@ Building a Paperclip JAR for distribution:
<dependency>
<groupId>cn.dreeam.leaf</groupId>
<artifactId>leaf-api</artifactId>
<version>1.21.8-R0.1-SNAPSHOT</version>
<version>1.21.9-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@@ -79,7 +79,7 @@ repositories {
}
dependencies {
compileOnly("cn.dreeam.leaf:leaf-api:1.21.8-R0.1-SNAPSHOT")
compileOnly("cn.dreeam.leaf:leaf-api:1.21.9-R0.1-SNAPSHOT")
}
java {

View File

@@ -1,8 +1,8 @@
group=cn.dreeam.leaf
mcVersion=1.21.8
version=1.21.8-R0.1-SNAPSHOT
mcVersion=1.21.9-rc1
version=1.21.9-rc1-R0.1-SNAPSHOT
paperCommit=29c8822d90899c89d2689338e81a98f690bcba12
paperCommit=922c85fe9d76be4b1a2e1afde588a396d4a21ea9
org.gradle.configuration-cache=true
org.gradle.caching=true

View File

@@ -2,7 +2,7 @@
+++ b/paper-api/build.gradle.kts
@@ -13,8 +_,10 @@
// Keep in sync with paper-server adventure-text-serializer-ansi dep
val adventureVersion = "4.24.0"
val adventureVersion = "4.25.0-SNAPSHOT"
val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
-val slf4jVersion = "2.0.16"
-val log4jVersion = "2.24.1"
@@ -145,8 +145,8 @@
"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",
@@ -185,7 +_,7 @@
"https://jd.advntr.dev/text-logger-slf4j/$adventureVersion/",
@@ -187,7 +_,7 @@
*/
"https://javadoc.io/doc/org.slf4j/slf4j-api/$slf4jVersion/",
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
- "https://javadoc.io/doc/org.apache.maven.resolver/maven-resolver-api/1.7.3",
@@ -154,7 +154,7 @@
)
options.tags("apiNote:a:API Note:")
@@ -199,16 +_,19 @@
@@ -201,16 +_,19 @@
}
// workaround for https://github.com/gradle/gradle/issues/4046
@@ -176,7 +176,7 @@
}
tasks.test {
@@ -230,6 +_,11 @@
@@ -232,6 +_,11 @@
jarToScan.set(tasks.jar.flatMap { it.archiveFile })
classpath.from(configurations.compileClasspath)
}

View File

@@ -13,10 +13,10 @@ As part of: Paper (https://github.com/PaperMC/Paper)
Licensed under: MIT (https://opensource.org/licenses/MIT)
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9bab00ab10c78908090c8a1a12d4c84e9324b08b..544791edbd13d4ee711d22e6c8ef48329944e99c 100644
index 964b57bb240151ddf4f11c203b67e8be6469e473..50fdb3f378be4301a321e9735870dc5d579d763c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2385,6 +2385,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2422,6 +2422,21 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
{
throw new UnsupportedOperationException("Not supported yet.");
}

View File

@@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..00b16e4aacba50996b81fac81c3f78b6
+
+}
diff --git a/src/main/java/org/bukkit/map/MapPalette.java b/src/main/java/org/bukkit/map/MapPalette.java
index 204860b32b4958a2804b2e5bc82f5be099e461f3..df3753e7593aedb1ed6731be86a6e90ff8449f3e 100644
index 477b8cd1820259bc3726fed7674402a9e705e681..d10a75b22afaba5363ef4e42adacb438cde4f1f1 100644
--- a/src/main/java/org/bukkit/map/MapPalette.java
+++ b/src/main/java/org/bukkit/map/MapPalette.java
@@ -35,7 +35,7 @@ public final class MapPalette {
@@ -120,9 +120,9 @@ index 204860b32b4958a2804b2e5bc82f5be099e461f3..df3753e7593aedb1ed6731be86a6e90f
- static final Color[] colors = {
+ public static final Color[] colors = { // Gale - Pufferfish - vectorized map color conversion - package -> public
// Start generate - MapPalette#colors
// @GeneratedFrom 1.21.8
new Color(0x00000000, true),
@@ -395,9 +395,15 @@ public final class MapPalette {
new Color(0x00000000, true),
@@ -394,9 +394,15 @@ public final class MapPalette {
temp.getRGB(0, 0, temp.getWidth(), temp.getHeight(), pixels, 0, temp.getWidth());
byte[] result = new byte[temp.getWidth() * temp.getHeight()];

View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 3584ca0a89f59e391ab6d5be8f2274a6801d025f..cc663ca87a6f64ea891984c72554796f25bb308f 100644
index 25c6779582284e793366401ee60d03143d36e8a1..469afb51fa705d5a56c3c5e9d44c2588975c42e2 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -2128,6 +2128,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -2162,6 +2162,16 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
boolean listPlayer(Player other);
// Paper end

View File

@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
Gale - https://galemc.org
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3 100644
index 14d81c7b138ebf999d5812d26fbf869209c100f3..183c9791967c60640c85c108dbb775c064bcb247 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2447,6 +2447,35 @@ public final class Bukkit {
@@ -2434,6 +2434,35 @@ public final class Bukkit {
return server.getTPS();
}
@@ -47,10 +47,10 @@ index 3bde4ad79ade5aae18e9073307f637717e8dd9e3..bac8bf1996350e4c16ba9a494c5d9bf0
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 544791edbd13d4ee711d22e6c8ef48329944e99c..ee28284f665cd343930b8c0419009c7420830a67 100644
index 50fdb3f378be4301a321e9735870dc5d579d763c..e45d33e443ea6e4b6ebdaa2dcd50d04e68e80380 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2133,6 +2133,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2170,6 +2170,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public double @NotNull [] getTPS();

View File

@@ -37,10 +37,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3..c899da328fca4dccbf69b2e2d74bcdf31e0e2c33 100644
index 183c9791967c60640c85c108dbb775c064bcb247..c9592972d0fb854ba5832c5611025a6756a6e281 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2447,7 +2447,30 @@ public final class Bukkit {
@@ -2434,7 +2434,30 @@ public final class Bukkit {
return server.getTPS();
}
@@ -72,10 +72,10 @@ index bac8bf1996350e4c16ba9a494c5d9bf052ad7fa3..c899da328fca4dccbf69b2e2d74bcdf3
* Gets the average server TPS over the last 1 minute
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ee28284f665cd343930b8c0419009c7420830a67..c067cd28639dada3aaea71298ad78969ddb79954 100644
index e45d33e443ea6e4b6ebdaa2dcd50d04e68e80380..c33d592d9133e9b8a59dd739ab1bf97dbd74ea7b 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2133,7 +2133,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2170,7 +2170,27 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
public double @NotNull [] getTPS();

View File

@@ -23,10 +23,10 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index c899da328fca4dccbf69b2e2d74bcdf31e0e2c33..ffb2f5d949cc255263674b2a03d4da809b0c36c5 100644
index c9592972d0fb854ba5832c5611025a6756a6e281..bed9165580e9682a81bfa5f017b05bf524f037e9 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3053,6 +3053,20 @@ public final class Bukkit {
@@ -3040,6 +3040,20 @@ public final class Bukkit {
}
// Paper end - Folia region threading API
@@ -48,10 +48,10 @@ index c899da328fca4dccbf69b2e2d74bcdf31e0e2c33..ffb2f5d949cc255263674b2a03d4da80
* @deprecated All methods on this class have been deprecated, see the individual methods for replacements.
*/
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index c067cd28639dada3aaea71298ad78969ddb79954..ad65ee800d9d394d0322e7ca0b71972d81ca66a1 100644
index c33d592d9133e9b8a59dd739ab1bf97dbd74ea7b..e8be2f89240d058d5d35d1a3719ae5e371aeed72 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2781,4 +2781,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2818,4 +2818,29 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
void allowPausing(@NotNull org.bukkit.plugin.Plugin plugin, boolean value);
// Paper end - API to check if the server is sleeping

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
Original license: MIT
Original project: https://github.com/PurpurMC/Purpur
Commit: 0c9140aff1fac81adb2edae1dc75cc8b069b8c3b
Commit: 1f1d4dcb6eea1cbf80ae6bb9c2e4b363270bd4f4
Patches listed below are removed in this patch, They exists in Gale or Leaf:
* "co/aikar/timings/TimedEventExecutor.java.patch"
@@ -21,7 +21,7 @@ Patches listed below are removed in this patch, They exists in Gale or Leaf:
* "org/spigotmc/CustomTimingsHandler.java.patch"
diff --git a/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java b/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
index 8f39c993056ba5564f111f29d1f84bd014a4c95d..cc1afe2e179d5b0f3f5d9c5c730ca385a14349c5 100644
index a2a80b85d2812d4beb5abab075d556955042b910..ff57f4b27cabfbb8c40261141e4825d97b2d820b 100644
--- a/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
+++ b/src/generated/java/com/destroystokyo/paper/entity/ai/VanillaGoal.java
@@ -446,6 +446,26 @@ public interface VanillaGoal<T extends Mob> extends Goal<T> {
@@ -70,10 +70,10 @@ index f738bbcefe288474c5f591dda03d713850633854..c198304386e83edc2ec582fdf66d97d6
/**
* The brand id for Gale.
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index ffb2f5d949cc255263674b2a03d4da809b0c36c5..f04f42832a098836bf41e98787c2db35d154c892 100644
index bed9165580e9682a81bfa5f017b05bf524f037e9..460db45262f7245481454497211f6b8a9b948586 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3082,4 +3082,133 @@ public final class Bukkit {
@@ -3069,4 +3069,133 @@ public final class Bukkit {
public static void restart() {
server.restart();
}
@@ -290,10 +290,10 @@ index 918a045165cdcde264bc24082b7afebb407271de..f283bcabff7fe6eede6cf4344537e430
+ // Purpur end - ChatColor conveniences
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index f6bf9a5222a2ee72ac307787f69fa32130ae6a03..60458cd8e2127d128acd69bbfb8eb6edf8e1de8c 100644
index 73cf04c20ff55f0780521c574e725f533a3ac955..743f9a55c0b4e5a9df165b1ad9f1c5e478f3092d 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -3633,4 +3633,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -3690,4 +3690,40 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
return this.asItemType().getDefaultDataTypes();
}
// Paper end - data component API
@@ -335,13 +335,13 @@ index f6bf9a5222a2ee72ac307787f69fa32130ae6a03..60458cd8e2127d128acd69bbfb8eb6ed
+ // Purpur end - ItemStack convenience methods
}
diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
index 6f83097b1097d0ffa81a95e6f0300cb410dfee2b..c1f19d5c1b819873fce1185b4fbf4c72eda26309 100644
index 0530e8b4f8c816eb91f29f49fb1b1e7828654896..28ebe77719afcc6b975def6b9d89f469173396f0 100644
--- a/src/main/java/org/bukkit/OfflinePlayer.java
+++ b/src/main/java/org/bukkit/OfflinePlayer.java
@@ -585,4 +585,104 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@Override
io.papermc.paper.persistence.PersistentDataContainerView getPersistentDataContainer();
// Paper end - add pdc to offline player
@@ -592,4 +592,104 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
default void applySkinToPlayerHeadContents(final PlayerHeadObjectContents.@NonNull Builder builder) {
builder.id(this.getUniqueId());
}
+
+ // Purpur start - OfflinePlayer API
+ /**
@@ -444,10 +444,10 @@ index 6f83097b1097d0ffa81a95e6f0300cb410dfee2b..c1f19d5c1b819873fce1185b4fbf4c72
+ // Purpur end - OfflinePlayer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ad65ee800d9d394d0322e7ca0b71972d81ca66a1..cc12db46d30c2499dea87f953ef6bf1fa18900c9 100644
index e8be2f89240d058d5d35d1a3719ae5e371aeed72..76ec06f1a05a1e2e0c6e5efee1a5ef98a1075e53 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2445,6 +2445,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2482,6 +2482,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Paper end
@@ -466,7 +466,7 @@ index ad65ee800d9d394d0322e7ca0b71972d81ca66a1..cc12db46d30c2499dea87f953ef6bf1f
/**
* Sends the component to the player
*
@@ -2806,4 +2818,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2843,4 +2855,111 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
long getLastTickOversleepTime();
// Gale end - YAPFA - last tick time - API
@@ -579,10 +579,10 @@ index ad65ee800d9d394d0322e7ca0b71972d81ca66a1..cc12db46d30c2499dea87f953ef6bf1f
+ // Purpur end - Debug Marker API
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index ae342a5cebf12b0c6fea3171d8035b75bc7a00e8..bb9fe9a6c3116e83d2ebd98f81298454f6677ccc 100644
index 7b22c923b4675eda944a94de67816a86daf1b1ca..d320e8b621a8725d07579fbc3182df9b4822e3fb 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4319,6 +4319,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4488,6 +4488,86 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@Nullable
public DragonBattle getEnderDragonBattle();
@@ -802,7 +802,7 @@ index 332c55fd6b4b3a8c0cad920a6e765ecc40e684e4..10a8d64ad2da0be2c14f34c3e7d1957c
// Paper start
/**
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
index 0aa51b777fd28444b53ccc74362798553954c52d..a3d2013adf038f1fe96127c5dba442ffd2e031a8 100644
index b657fce42de3680d12a486d9156ad22ef9f2e5c0..995e419ae77afad15aa2729277f81016f382e543 100644
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1261,4 +1261,59 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
@@ -958,10 +958,10 @@ index bcc6ba95bd21c7972865838c636a03f50b6c1f1a..c3fcd8dd7dbb1e1a18e17c014c1e6411
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 7f2892dd93a17136e1aaea14db401710bc1becfb..8c0659efa5c84191f3faa1ada52e57eb2a4f9f90 100644
index d31a23e99d778907e3611ebe1e7c353da64d058c..ed67bfc5c7de9f36a32d54c758cdc85f28a00803 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1463,4 +1463,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1467,4 +1467,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
@ApiStatus.Experimental
@NotNull CombatTracker getCombatTracker();
@@ -1008,10 +1008,10 @@ index bc84b892cae5fe7019a3ad481e9da79956efa1fe..48eb5b00c460cccde29d327cef1d63fc
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 65d8986532f89ef4a51dcad7bf779327810efce8..f2dc9ae68a373d9d1d02cc103c9253496eaa0962 100644
index 469afb51fa705d5a56c3c5e9d44c2588975c42e2..c73f715dfb57efeeb6cedcaa046cef68b7bb863c 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3942,4 +3942,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -4013,4 +4013,123 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
*/
@ApiStatus.Experimental
PlayerGameConnection getConnection();
@@ -1161,10 +1161,10 @@ index 7fbfdb07585c7b28acea1f0c1f58ada0cc744441..21fcca092e2e31baa5ece0de9e44e3fa
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java
index d2198f27241e49223a9071f8ac01ec0615d12535..9fffb63433557aa472542d95d551e32c8e1024a8 100644
index d1ab8a25589a016e210af6bc448385f465509618..b64f537a2c93259db6ca4f1d5a9487289a13e47c 100644
--- a/src/main/java/org/bukkit/entity/Villager.java
+++ b/src/main/java/org/bukkit/entity/Villager.java
@@ -408,4 +408,13 @@ public interface Villager extends AbstractVillager {
@@ -406,4 +406,13 @@ public interface Villager extends AbstractVillager {
* Demand is still updated even if all events are canceled.
*/
public void restock();
@@ -1204,10 +1204,10 @@ index 11ae1b3ad8c215f9245945d223c52f4a62ac47d9..7f23eb5a60ff08fb31e8ba3731a43bd7
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/Wolf.java b/src/main/java/org/bukkit/entity/Wolf.java
index 6c439fc766d904e79fa5d65caf365ed56d818b35..3e30563b39851812c7321f3fd24e080078b45dee 100644
index a89e60ff9b9a06e9d9c0c3d3dd4c587ca3ef3577..20f8ace4a61c5e8397f8c15999ab2cded4c8bc21 100644
--- a/src/main/java/org/bukkit/entity/Wolf.java
+++ b/src/main/java/org/bukkit/entity/Wolf.java
@@ -163,4 +163,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
@@ -162,4 +162,20 @@ public interface Wolf extends Tameable, Sittable, io.papermc.paper.entity.Collar
return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(NamespacedKey.minecraft(key));
}
}
@@ -1229,7 +1229,7 @@ index 6c439fc766d904e79fa5d65caf365ed56d818b35..3e30563b39851812c7321f3fd24e0800
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
index 6d5ae34b39d6001effc2faadd6c30e3a8ab109fa..e8c7aebcab1649e55ab9e947036c9fab839cd675 100644
index 4fa6689f53bd4cbd59c4a49bbf254aaea78344e2..3fcff8be06fc3d516386bdc1b2450fc1bfce3ad8 100644
--- a/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityDamageEvent.java
@@ -310,7 +310,8 @@ public class EntityDamageEvent extends EntityEvent implements Cancellable {
@@ -1243,7 +1243,7 @@ index 6d5ae34b39d6001effc2faadd6c30e3a8ab109fa..e8c7aebcab1649e55ab9e947036c9fab
* Damage: variable
*/
diff --git a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
index 22e14ba522510d659c191d72536cde895458d9ed..d45d781975a6026022712a217c154e316ff48f9f 100644
index 054a38983f851c52f5ca8667227b01433badb286..0fca10975319613c0e8c96857bf6aa15f20e039e 100644
--- a/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
+++ b/src/main/java/org/bukkit/event/entity/EntityPotionEffectEvent.java
@@ -218,6 +218,12 @@ public class EntityPotionEffectEvent extends EntityEvent implements Cancellable
@@ -1273,7 +1273,7 @@ index 54ff294e64abd692c0f64ba2db7341c9c71436d0..49e458e453486dcf48d1ab920da17672
private final MenuType menuType;
private final boolean isCreatable;
diff --git a/src/main/java/org/bukkit/inventory/AnvilInventory.java b/src/main/java/org/bukkit/inventory/AnvilInventory.java
index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7809a1c1e 100644
index db5be16f2a04fb9b69225da6b88fdae9eeac52be..b9a3c83ef9abc10a95cdf0694663e8470a795ce8 100644
--- a/src/main/java/org/bukkit/inventory/AnvilInventory.java
+++ b/src/main/java/org/bukkit/inventory/AnvilInventory.java
@@ -138,4 +138,42 @@ public interface AnvilInventory extends Inventory {
@@ -1320,7 +1320,7 @@ index f1f97a85ec713c05c882d7588f4a3e4a017f4795..813f6cd253322538bdf96eb323dd23a7
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 8a5a58408490110dfeb1a720aad6676883880db5..5ee730161c7f11ab7744c80563716e30921a6b5b 100644
index f20f072b0978b3ef4b3f36c952d469e0d8d5cd22..f9ae85faaeb77389f965ff4977eb6545aa9d2cc8 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -24,6 +24,13 @@ import org.bukkit.material.MaterialData;

View File

@@ -2356,7 +2356,7 @@ index 5753b9bce89db2ac378ec41f1b61907cc2e23335..00000000000000000000000000000000
-}
diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
deleted file mode 100644
index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..0000000000000000000000000000000000000000
index 207b6853a0cb0185492b62c0c5d9602d48b7959c..0000000000000000000000000000000000000000
--- a/src/main/java/co/aikar/util/LoadingMap.java
+++ /dev/null
@@ -1,369 +0,0 @@
@@ -2444,9 +2444,9 @@ index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..00000000000000000000000000000000
- /**
- * Creates a LoadingMap with an auto instantiating loader.
- *
- * Will auto construct class of of Value when not found
- * Will auto construct class of Value when not found
- *
- * Since this uses Reflection, It is more effecient to define your own static loader
- * Since this uses Reflection, It is more efficient to define your own static loader
- * than using this helper, but if performance is not critical, this is easier.
- *
- * @param backingMap Actual map being used.
@@ -2464,9 +2464,9 @@ index 1786eeb5cbeaad75602c9c5649bbcd9b2af5cf81..00000000000000000000000000000000
- /**
- * Creates a LoadingMap with an auto instantiating loader.
- *
- * Will auto construct class of of Value when not found
- * Will auto construct class of Value when not found
- *
- * Since this uses Reflection, It is more effecient to define your own static loader
- * Since this uses Reflection, It is more efficient to define your own static loader
- * than using this helper, but if performance is not critical, this is easier.
- *
- * @param backingMap Actual map being used.
@@ -2848,7 +2848,7 @@ index 3e61a926620a67daec3af54b72a1b911eaef2ed4..00000000000000000000000000000000
- }
-}
diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
index 27a7c69f23084e821d945d5e97e51a94ddd94e58..d645ee8470a2dd9f7b8eff2b7ff2211aba9c342f 100644
index e387ba67f0b6cde8ee2be7acba8f791792802ad4..06402e9d811b62ea59c67ecbffe9272c73f2040d 100644
--- a/src/main/java/org/bukkit/command/Command.java
+++ b/src/main/java/org/bukkit/command/Command.java
@@ -32,16 +32,6 @@ public abstract class Command {

View File

@@ -7,10 +7,10 @@ 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 747e943d98a385346b79897a5261d41cfc9572df..66fc9a061d0d5f030ecf8df94acf7357a4cf9eaa 100644
index c73f715dfb57efeeb6cedcaa046cef68b7bb863c..1895520d3172396e0d49bc1a41e0e9666055f32d 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -4061,4 +4061,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -4132,4 +4132,23 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
sendDeathScreen(message);
}
// Purpur end

View File

@@ -9,10 +9,10 @@ Original project: https://github.com/Cryptite/Slice
Co-authored-by: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com>
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 66fc9a061d0d5f030ecf8df94acf7357a4cf9eaa..9ee5ef2ea93fdf91abf8c312ec2a39b36d096152 100644
index 1895520d3172396e0d49bc1a41e0e9666055f32d..448328343388beb1b5259c774fa0bf63a270b448 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -3715,6 +3715,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
@@ -3786,6 +3786,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
String getClientBrandName();
// Paper end

View File

@@ -11,10 +11,10 @@ Original project: https://github.com/LeavesMC/Leaves
This patch is Powered by ReplayMod(https://github.com/ReplayMod)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f04f42832a098836bf41e98787c2db35d154c892..b7782de2fb8e636e82a6ef89a62edeec902b367e 100644
index 460db45262f7245481454497211f6b8a9b948586..fcfeaf7e599fa0db386cc6ba93a9d015a229f8aa 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -3211,4 +3211,10 @@ public final class Bukkit {
@@ -3198,4 +3198,10 @@ public final class Bukkit {
server.clearBlockHighlights();
}
// Purpur end - Debug Marker API
@@ -26,10 +26,10 @@ index f04f42832a098836bf41e98787c2db35d154c892..b7782de2fb8e636e82a6ef89a62edeec
+ // Leaves end - Photographer API
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index cc12db46d30c2499dea87f953ef6bf1fa18900c9..0d8463905bc15382c284fc31a1be6fbb7ee0a46b 100644
index 76ec06f1a05a1e2e0c6e5efee1a5ef98a1075e53..46773b5921e5d84a9a47b4b0dcad98a4a76050dc 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2925,4 +2925,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2962,4 +2962,8 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
void clearBlockHighlights();
// Purpur end - Debug Marker API

View File

@@ -16,10 +16,10 @@ With this approach only new methods are added into already existing Bukkit API,
get standarized.
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 82e56218b5c854a16851b75e3145e301d5fedab0..e12d161ac49f4725faf3ad2d13972524f625b862 100644
index 46773b5921e5d84a9a47b4b0dcad98a4a76050dc..807463113646eb09bc8d7203540c7ed872c30dd2 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2929,4 +2929,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2966,4 +2966,15 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
// Leaves start - Photographer API
@NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();
// Leaves end - Photographer API
@@ -36,10 +36,10 @@ index 82e56218b5c854a16851b75e3145e301d5fedab0..e12d161ac49f4725faf3ad2d13972524
+ // Fish end - Parallel World Ticking API
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index bb9fe9a6c3116e83d2ebd98f81298454f6677ccc..5b02d1938ddaf02c7f227271c0dc27702a41fc83 100644
index d320e8b621a8725d07579fbc3182df9b4822e3fb..f34133fe3492bbdc8d109c323fba14b1cbe9f54d 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -4494,6 +4494,25 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -4663,6 +4663,25 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@NotNull
public Collection<GeneratedStructure> getStructures(int x, int z, @NotNull Structure structure);

View File

@@ -7,7 +7,7 @@
+val leafMavenPublicUrl = "https://maven.leafmc.one/snapshots/" // Leaf - project setup - Add publish repo
dependencies {
mache("io.papermc:mache:1.21.8+build.2")
mache("io.papermc:mache:1.21.9-rc1+build.1")
- paperclip("io.papermc:paperclip:3.0.3")
+ paperclip("cn.dreeam:quantumleaper:1.0.0-SNAPSHOT") // Leaf - project setup - Use own paperclip fork
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
@@ -31,7 +31,7 @@
+ // Leaf end - project setup
+
spigot {
enabled = true
enabled = false
buildDataRef = "436eac9815c211be1a2a6ca0702615f995e81c44"
@@ -49,6 +_,7 @@
libraryRepositories.addAll(
@@ -81,7 +81,7 @@
+ implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
+ // Leaf end - Libraries
+
implementation("ca.spottedleaf:concurrentutil:0.0.3")
implementation("ca.spottedleaf:concurrentutil:0.0.5")
- implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
- implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
+ implementation("org.jline:jline-terminal-ffm:3.29.0") // use ffm on java 22+ // Leaf - Bump Dependencies
@@ -216,7 +216,7 @@
idea {
module {
generatedSourceDirs.add(generatedDir.toFile())
@@ -324,6 +_,8 @@
@@ -312,6 +_,8 @@
val memoryGb = providers.gradleProperty("paper.runMemoryGb").getOrElse("2")
minHeapSize = "${memoryGb}G"
maxHeapSize = "${memoryGb}G"
@@ -225,7 +225,7 @@
doFirst {
workingDir.mkdirs()
@@ -386,3 +_,78 @@
@@ -374,3 +_,78 @@
}
}
}

View File

@@ -3,7 +3,7 @@
<div align="center">
[![下载](https://img.shields.io/badge/releases-blue?label=%e4%b8%8b%e8%bd%bd&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/zh/download)
[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1218.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)
[![Github Actions 构建](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1219.yml?label=%e6%9e%84%e5%bb%ba&style=for-the-badge&colorA=19201a&colorB=298046)](https://github.com/Winds-Studio/Leaf/actions)
![QQ](https://img.shields.io/badge/619278377-blue?label=QQ%e7%be%a4&style=for-the-badge&colorA=19201a&colorB=298046)
[![文档](https://img.shields.io/badge/leafmc.one/zh/docs-blue?label=%e6%96%87%e6%a1%a3&style=for-the-badge&colorA=19201a&colorB=298046)](https://www.leafmc.one/zh/docs/getting-started)
@@ -66,7 +66,7 @@
<dependency>
<groupId>cn.dreeam.leaf</groupId>
<artifactId>leaf-api</artifactId>
<version>1.21.8-R0.1-SNAPSHOT</version>
<version>1.21.9-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
```
@@ -79,7 +79,7 @@ repositories {
}
dependencies {
compileOnly("cn.dreeam.leaf:leaf-api:1.21.8-R0.1-SNAPSHOT")
compileOnly("cn.dreeam.leaf:leaf-api:1.21.9-R0.1-SNAPSHOT")
}
java {

View File

@@ -5,12 +5,12 @@ IS_EOL=false
IS_UNSUPPORTED=false
IS_DEV=true
JAR_NAME="leaf-1.21.8"
CURRENT_TAG="ver-1.21.8"
JAR_NAME="leaf-1.21.9"
CURRENT_TAG="ver-1.21.9"
RELEASE_NOTES="release_notes.md"
# Rename Leaf jar
mv ./leaf-server/build/libs/leaf-paperclip-1.21.8-R0.1-SNAPSHOT-mojmap.jar ./$JAR_NAME-${BUILD_NUMBER}.jar
mv ./leaf-server/build/libs/leaf-paperclip-1.21.9-R0.1-SNAPSHOT-mojmap.jar ./$JAR_NAME-${BUILD_NUMBER}.jar
# Branch name
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)

View File

@@ -64,7 +64,7 @@ fi
# Purpur updates
if [ -n "$purpurHash" ]; then
purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "ver/1.21.8") # Update this on every version update
purpur=$(getCommits "PurpurMC/Purpur" "$purpurHash" "ver/1.21.9") # Update this on every version update
# Updates found
if [ -n "$purpur" ]; then