From d144b575162aeb9bb729cbaac449a68c68f488de Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 15 Jun 2023 19:40:54 +0800 Subject: [PATCH] 1.20.1 --- .../{build-120.yml => build-1201.yml} | 18 ++++++++--------- README.md | 2 +- gradle.properties | 4 ++-- patches/api/0002-Leaf-config-files.patch | 4 ++-- patches/api/0005-KeYi-Player-Skull-API.patch | 4 ++-- patches/api/0006-Slice-Smooth-Teleports.patch | 4 ++-- patches/server/0001-Rebrand.patch | 20 +++++++++---------- patches/server/0002-Leaf-Config.patch | 4 ++-- ...004-Pufferfish-Optimize-mob-spawning.patch | 4 ++-- patches/server/0008-Bump-Dependencies.patch | 10 +++++----- ...Remove-UseItemOnPacket-Too-Far-Check.patch | 4 ++-- .../server/0014-KeYi-Player-Skull-API.patch | 6 +++--- .../server/0020-Slice-Smooth-Teleports.patch | 8 ++++---- .../server/0024-Leaves-Jade-Protocol.patch | 12 +++++------ .../0025-Leaves-Appleskin-Protocol.patch | 8 ++++---- 15 files changed, 56 insertions(+), 56 deletions(-) rename .github/workflows/{build-120.yml => build-1201.yml} (80%) diff --git a/.github/workflows/build-120.yml b/.github/workflows/build-1201.yml similarity index 80% rename from .github/workflows/build-120.yml rename to .github/workflows/build-1201.yml index cdcaae92..bc2477a3 100644 --- a/.github/workflows/build-120.yml +++ b/.github/workflows/build-1201.yml @@ -1,4 +1,4 @@ -name: Build Leaf 1.20 +name: Build Leaf 1.20.1 on: [ push, pull_request ] jobs: build: @@ -9,8 +9,8 @@ jobs: - name: Set up JDK uses: graalvm/setup-graalvm@main with: - version: 22.3.1 - java-version: 19 + version: latest + java-version: 20 github-token: "${{ secrets.GITHUB_TOKEN }}" cache: gradle - name: Grant execute permission for gradlew @@ -22,18 +22,18 @@ jobs: - name: Create ReobfPaperclipJar run: ./gradlew -Dorg.gradle.jvmargs="-Dgraal.CompilerConfiguration=enterprise -Dgraal.UsePriorityInlining=true -Dgraal.Vectorization=true -Dgraal.OptDuplication=true --add-modules jdk.incubator.vector" createReobfPaperclipJar --stacktrace --no-daemon - name: Rename Paperclip Jar - run: mv build/libs/leaf-paperclip-1.20-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.jar + run: mv build/libs/leaf-paperclip-1.20.1-R0.1-SNAPSHOT-reobf.jar ./leaf-1.20.1.jar - name: Upload Leaf uses: actions/upload-artifact@v3 with: name: Leaf - path: ./leaf-1.20.jar + path: ./leaf-1.20.1.jar - name: Release Leaf - if: github.ref_name == 'ver/1.20' + if: github.ref_name == 'ver/1.20.1' uses: marvinpinto/action-automatic-releases@latest with: - title: "Leaf 1.20" - automatic_release_tag: "ver-1.20" + title: "Leaf 1.20.1" + automatic_release_tag: "ver-1.20.1" repo_token: "${{ secrets.GITHUB_TOKEN }}" - files: "./leaf-1.20.jar" + files: "./leaf-1.20.1.jar" prerelease: false diff --git a/README.md b/README.md index 386be9ca..5bd38e66 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ## Leaf -[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-120.yml?branch=ver%2F1.20&style=flat-square)](https://github.com/Winds-Studio/Leaf/releases) +[![Github Actions Build](https://img.shields.io/github/actions/workflow/status/Winds-Studio/Leaf/build-1201.yml?branch=ver%2F1.20.1&style=flat-square)](https://github.com/Winds-Studio/Leaf/releases) [![MIT License](https://img.shields.io/github/license/Winds-Studio/Leaf?style=flat-square)](LICENSE)
Leaf is a drop-in replacement designed for removing some checks, customized, and high-performance built on top of Gale with optimization from other forks.
diff --git a/gradle.properties b/gradle.properties index 68b9276d..2ebf6ddb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.dreeam.leaf -version = 1.20-R0.1-SNAPSHOT +version = 1.20.1-R0.1-SNAPSHOT -galeCommit = 9c8dd899fbd55e11a7d8b0d87db58565b5ce0940 +galeCommit = cbcc8ae61697c51e5e8daea53811c81ffdb21993 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/api/0002-Leaf-config-files.patch b/patches/api/0002-Leaf-config-files.patch index c4fd875b..0477719d 100644 --- a/patches/api/0002-Leaf-config-files.patch +++ b/patches/api/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 007e23a9383ab8eda12c6dffb385256215356040..c890e9655551865f7cea3c92782ee6a09e90f88e 100644 +index 714ea77b4509ba842c764e78e0bfc1862abcd537..00d22f46f3aae9fccc70146b72e89bd751851be1 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2047,6 +2047,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2060,6 +2060,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi // Paper end diff --git a/patches/api/0005-KeYi-Player-Skull-API.patch b/patches/api/0005-KeYi-Player-Skull-API.patch index 7e74e2cd..883806bd 100644 --- a/patches/api/0005-KeYi-Player-Skull-API.patch +++ b/patches/api/0005-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 e378c91155b4c70d89e5ee2af59828051454e192..5662c72e0b76b3e0aa2d7a78305637fd36245d5e 100644 +index ddd7267f30c7ca2d6fdb1af71ceaf2bceb38c52a..f920a363dbfc5cddcaa4dffd3cc8984ac6d7e625 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -4,7 +4,10 @@ import java.net.InetSocketAddress; @@ -22,7 +22,7 @@ index e378c91155b4c70d89e5ee2af59828051454e192..5662c72e0b76b3e0aa2d7a78305637fd import org.bukkit.DyeColor; import org.bukkit.Effect; import org.bukkit.GameMode; -@@ -3086,4 +3089,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -3099,4 +3102,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @Override Spigot spigot(); // Spigot end diff --git a/patches/api/0006-Slice-Smooth-Teleports.patch b/patches/api/0006-Slice-Smooth-Teleports.patch index 5813f2c6..aa2effc2 100644 --- a/patches/api/0006-Slice-Smooth-Teleports.patch +++ b/patches/api/0006-Slice-Smooth-Teleports.patch @@ -7,10 +7,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 5662c72e0b76b3e0aa2d7a78305637fd36245d5e..c7232a047106efa998512c45ea200d6320432289 100644 +index f920a363dbfc5cddcaa4dffd3cc8984ac6d7e625..12fd83efce98cdb56a7af9903cfd62152cf9d822 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -2971,6 +2971,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -2984,6 +2984,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM String getClientBrandName(); // Paper end diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 564e81d8..4daf2dd2 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Rebrand diff --git a/build.gradle.kts b/build.gradle.kts -index 3097e021e89bf04e9cf18dae1f9be8a089d29743..d209ac7c8fe639a23904e4ebd5bade0637fb8eab 100644 +index 120ca197cd75afa0670e14ef377c955bcfa6b791..fe36067414a2a1d3408f30cd9a08ec7b2f005914 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ plugins { @@ -15,9 +15,9 @@ index 3097e021e89bf04e9cf18dae1f9be8a089d29743..d209ac7c8fe639a23904e4ebd5bade06 - implementation(project(":gale-api")) + implementation(project(":leaf-api")) // Leaf // Depend on Paper MojangAPI - implementation("io.papermc.paper:paper-mojangapi:1.20-R0.1-SNAPSHOT") { + implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") { exclude("io.papermc.paper", "paper-api") -@@ -79,7 +79,7 @@ tasks.jar { +@@ -80,7 +80,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -40,10 +40,10 @@ index e45e6b44b2a8f2cdae6e0048a812b92126aa17ca..b5f3f213da8a40d5184098af017c8e26 .completer(new ConsoleCommandCompleter(this.server)) .option(LineReader.Option.COMPLETE_IN_WORD, true); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index ecb42a8f9a8eb18d7fd3f828ece4ac8ebf4de0e0..66f284345fe011bd317019bc035e009e90c58fdc 100644 +index 556fca5daf3de2c12a9b30ad7cf8c024ed9ca8ed..19d1e0dbee516e360381b6d7e1fee83e03ae9034 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -907,7 +907,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 1.18.x update by Mojang. By removing this check, it enable hackers to use some modules of hack clients. diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 79dba3796df83d0127db6e29f38a35e1d3289724..297a9c2eba28c66c511ba83daeaa3e8a07fa6504 100644 +index 8d90209a01020d44626f56e2cb0dd5eca300f699..e82898d6415db34d3aca01187000718ede37af21 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -189,6 +189,7 @@ import net.minecraft.world.phys.shapes.VoxelShape; @@ -18,7 +18,7 @@ index 79dba3796df83d0127db6e29f38a35e1d3289724..297a9c2eba28c66c511ba83daeaa3e8a import org.slf4j.Logger; // CraftBukkit start -@@ -1977,7 +1978,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1980,7 +1981,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D; diff --git a/patches/server/0014-KeYi-Player-Skull-API.patch b/patches/server/0014-KeYi-Player-Skull-API.patch index cf3b7574..ad21e3a5 100644 --- a/patches/server/0014-KeYi-Player-Skull-API.patch +++ b/patches/server/0014-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/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 548eddde8b0558b780f672d321507cfcbac92558..132d50e23ba713ab9178e17b34332b9af74f63f5 100644 +index 03bb444705916ffe0b9eb4b7496524dc3459ebe0..f4d3452fd2f22df2014df8bd721aa51f2a4d51bf 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -25,6 +25,11 @@ import java.util.Optional; @@ -22,7 +22,7 @@ index 548eddde8b0558b780f672d321507cfcbac92558..132d50e23ba713ab9178e17b34332b9a import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nullable; -@@ -153,6 +158,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent; +@@ -152,6 +157,7 @@ import org.bukkit.event.player.PlayerUnregisterChannelEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.InventoryView.Property; import org.bukkit.inventory.ItemStack; @@ -30,7 +30,7 @@ index 548eddde8b0558b780f672d321507cfcbac92558..132d50e23ba713ab9178e17b34332b9a import org.bukkit.map.MapCursor; import org.bukkit.map.MapView; import org.bukkit.metadata.MetadataValue; -@@ -3144,4 +3150,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -3138,4 +3144,28 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this.spigot; } // Spigot end diff --git a/patches/server/0020-Slice-Smooth-Teleports.patch b/patches/server/0020-Slice-Smooth-Teleports.patch index 2d47072b..ae25cad2 100644 --- a/patches/server/0020-Slice-Smooth-Teleports.patch +++ b/patches/server/0020-Slice-Smooth-Teleports.patch @@ -7,7 +7,7 @@ Original license: MIT Original project: https://github.com/Cryptite/Slice diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index f4cc145f2670dee5893eeb1891b3fb8bfadd9b36..25fe104b1bc92ae6b21000c9accdfdb02493fe1f 100644 +index 00ce8b78e35055da01a053cb0d4ed914d50acebc..853ca649d513d263482dd56b84cf9c55f5972f37 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java @@ -278,6 +278,7 @@ public class ServerPlayer extends Player { @@ -19,7 +19,7 @@ index f4cc145f2670dee5893eeb1891b3fb8bfadd9b36..25fe104b1bc92ae6b21000c9accdfdb0 private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 88d350ecfb16e34d6710ad7b17ce7438e4dbceb9..0669c806b8c6b150183b4e02146f970bc4c3e225 100644 +index 697bd3a7c0ab1e941355a818bffe85bdb28a70db..326bbc8700249f80b57d059952beea861e4bfd35 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -942,12 +942,12 @@ public abstract class PlayerList { @@ -38,10 +38,10 @@ index 88d350ecfb16e34d6710ad7b17ce7438e4dbceb9..0669c806b8c6b150183b4e02146f970b // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 132d50e23ba713ab9178e17b34332b9af74f63f5..073f4e31bcd796484340dead39539b026e72680f 100644 +index f4d3452fd2f22df2014df8bd721aa51f2a4d51bf..747127ae9514363622375cee55b3fd9f80776739 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1242,6 +1242,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -1232,6 +1232,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player { // Paper end } diff --git a/patches/server/0024-Leaves-Jade-Protocol.patch b/patches/server/0024-Leaves-Jade-Protocol.patch index 0a3c6604..51ff53ec 100644 --- a/patches/server/0024-Leaves-Jade-Protocol.patch +++ b/patches/server/0024-Leaves-Jade-Protocol.patch @@ -9,7 +9,7 @@ Original project: https://github.com/LeavesMC/Leaves This patch is Powered by Jade(https://github.com/Snownee/Jade) diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 297a9c2eba28c66c511ba83daeaa3e8a07fa6504..6155fa16a73de3314bc636b9af63106cf5b508e4 100644 +index e82898d6415db34d3aca01187000718ede37af21..48d34b8a2a86225942cb25d681c334abdeeae154 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -249,6 +249,7 @@ import org.bukkit.inventory.CraftingInventory; @@ -20,7 +20,7 @@ index 297a9c2eba28c66c511ba83daeaa3e8a07fa6504..6155fa16a73de3314bc636b9af63106c // CraftBukkit end public class ServerGamePacketListenerImpl implements ServerPlayerConnection, TickablePacketListener, ServerGamePacketListener { -@@ -3592,6 +3593,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3595,6 +3596,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } // Paper end this.cserver.getMessenger().dispatchIncomingMessage(this.player.getBukkitEntity(), packet.identifier.toString(), data); @@ -31,7 +31,7 @@ index 297a9c2eba28c66c511ba83daeaa3e8a07fa6504..6155fa16a73de3314bc636b9af63106c ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t dispatch custom payload", ex); this.disconnect("Invalid custom payload!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 0669c806b8c6b150183b4e02146f970bc4c3e225..2bf8ba3463eab42dd70cee3c1cf0098ca1754e75 100644 +index 326bbc8700249f80b57d059952beea861e4bfd35..9ad8b5dccb4627f647d9e993b72bb0dd5793999b 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -358,6 +358,8 @@ public abstract class PlayerList { @@ -57,10 +57,10 @@ index c83dabddf93249a6477c10725622119c939db4d5..bfb85d119355f99c96e8cebb0c9be43c } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index ffdedab6808736ad96850d2e6eecf09fb758306a..8ac5414c04a601801bfcc872f809fb2bfeb306f9 100644 +index bca065a167a1bf0581559f2e578c112fdf570c8a..48aa2507667a46704dfc6f17711b4020325396b6 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -254,6 +254,7 @@ import org.bukkit.scoreboard.Criteria; +@@ -253,6 +253,7 @@ import org.bukkit.scoreboard.Criteria; import org.bukkit.structure.StructureManager; import org.bukkit.util.StringUtil; import org.bukkit.util.permissions.DefaultPermissions; @@ -68,7 +68,7 @@ index ffdedab6808736ad96850d2e6eecf09fb758306a..8ac5414c04a601801bfcc872f809fb2b import org.yaml.snakeyaml.LoaderOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; -@@ -393,6 +394,7 @@ public final class CraftServer implements Server { +@@ -392,6 +393,7 @@ public final class CraftServer implements Server { MapPalette.setMapColorCache(new CraftMapColorCache(this.logger)); } datapackManager = new io.papermc.paper.datapack.PaperDatapackManager(console.getPackRepository()); // Paper diff --git a/patches/server/0025-Leaves-Appleskin-Protocol.patch b/patches/server/0025-Leaves-Appleskin-Protocol.patch index 24666581..23b211c5 100644 --- a/patches/server/0025-Leaves-Appleskin-Protocol.patch +++ b/patches/server/0025-Leaves-Appleskin-Protocol.patch @@ -7,10 +7,10 @@ Original license: GPLv3 Original project: https://github.com/LeavesMC/Leaves diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index e178004a3360bf6841e6aa0c874ca8ef10587f49..c44fe9e25cbaeba46601ee6fd076792210b20adc 100644 +index c62a225a97deca88a15f3d7c61550debdcbfccfe..dc7185ceaad06fefdf2df6afe19eb183c250fbaf 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1548,6 +1548,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop