diff --git a/gradle.properties b/gradle.properties index efd97d3b..f1bea584 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group=top.leavesmc.leaves -version=1.20-R0.1-SNAPSHOT +version=1.20.1-R0.1-SNAPSHOT -mcVersion=1.20 +mcVersion=1.20.1 packageVersion=1_20_R1 org.gradle.jvmargs=-Xmx2G -paperRef=f4dfdcbb5b287b1f42b31cb3a2ddada9bbf81703 +paperRef=2e363c73ba3c0a7b3d5138ec55a6e93c7befb5bb preVersion=true diff --git a/patches/api/0001-Leaves-Server-Config.patch b/patches/api/0001-Leaves-Server-Config.patch index 588cc12e..71afda50 100644 --- a/patches/api/0001-Leaves-Server-Config.patch +++ b/patches/api/0001-Leaves-Server-Config.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Leaves Server Config diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 1d1a1d087dabc9794e0062a064da2cced4062309..b3d333c898b8b64386d4253ca9272eab638040a0 100644 +index 5b225bbb128893d67251a96ab318035802a0cf76..d08e1fd95d9a3588bc54a078cfa93508ab1c86f9 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -1993,6 +1993,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2006,6 +2006,14 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi throw new UnsupportedOperationException("Not supported yet."); } // Paper end diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index ae54bb46..00ca052e 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d81c7c9c2 100644 +index a0c5592530d2a59bfde87d1e9eb3752e7d4694da..e46f83f5146598ef249e027bdfb7cb5f550ef829 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,8 +7,12 @@ plugins { @@ -16,14 +16,14 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d - implementation(project(":paper-mojangapi")) + implementation(project(":leaves-api")) // Leaves + // Leaves start -+ implementation("io.papermc.paper:paper-mojangapi:1.19.4-R0.1-SNAPSHOT") { ++ implementation("io.papermc.paper:paper-mojangapi:1.20.1-R0.1-SNAPSHOT") { + exclude("io.papermc.paper", "paper-api") + } + // Leaves end // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -56,13 +60,13 @@ tasks.jar { +@@ -57,13 +61,13 @@ tasks.jar { manifest { val git = Git(rootProject.layout.projectDirectory.path) val gitHash = git("rev-parse", "--short=7", "HEAD").getText().trim() @@ -39,7 +39,7 @@ index e7a03ea1dab56e7725f718da0b44c736018ac995..b84bd99de502335f75b5cc07d607756d "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -134,7 +138,7 @@ fun TaskContainer.registerRunTask( +@@ -135,7 +139,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -79,10 +79,10 @@ index 4b002e8b75d117b726b0de274a76d3596fce015b..0ac8bcb0a4b7d1da3d0e016617db7a81 metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index fb82bb52f219e7683fe1d3c0fb3acbe2251de8d4..5235cdd0f8264b8bd47ddb984e95870138f17560 100644 +index 80cf4852e4010eeeadaf920ab927a40df0179b40..36cce6ed01e4953ada9695309d7d85317340cb7c 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1681,7 +1681,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop packet) { @@ -155,7 +155,7 @@ index ae82ab0e3d8e99f87ca8465fbcbb44b5ce18bf96..9c68dd4633d23310e7e1afb4fea52cea if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 4eaf7ae37557075ebe735827861507bee6b61eed..794386d40e2f53f2707b401907af5bb73e199eb1 100644 +index 014506532812a1723356191a72850000cb1d900d..f1dca35923a6507bd1eeeb2ee57854e794e16c98 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1450,7 +1450,7 @@ public abstract class PlayerList { diff --git a/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch b/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch index 3f363b62..b26a552e 100644 --- a/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch +++ b/patches/server/0023-Strip-raytracing-for-EntityLiving-hasLineOfSight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Strip raytracing for EntityLiving#hasLineOfSight This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 903299fd5357b9955538aa20ec790672867bf394..00081da07c63d1507657d3d69e34e4342be17f9c 100644 +index f3a45bcc878e08318304dcbd1be1e19332d8dac7..f503ca69070091a5f5787bdffb5c6cd3a5777b4b 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3667,7 +3667,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3670,7 +3670,13 @@ public abstract class LivingEntity extends Entity implements Attackable { Vec3 vec3d1 = new Vec3(entity.getX(), entity.getEyeY(), entity.getZ()); // Paper - diff on change - used in CraftLivingEntity#hasLineOfSight(Location) and CraftWorld#lineOfSightExists diff --git a/patches/server/0030-Config-to-disable-method-profiler.patch b/patches/server/0030-Config-to-disable-method-profiler.patch index 2b145033..7295be37 100644 --- a/patches/server/0030-Config-to-disable-method-profiler.patch +++ b/patches/server/0030-Config-to-disable-method-profiler.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Config to disable method profiler This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index badc618da91f554d11331e43524ac9ce59267175..100ea32bc60e5c052007bb75b35eba16564eadff 100644 +index 621706945debe358ce2ee593b2aebd9a1608bd9c..3332066fc16ec9f11fe35cfc3ea077723de2e110 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -2265,6 +2265,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop -1) { -@@ -2107,6 +2115,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2110,6 +2118,11 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic this.processedDisconnect = true; } // CraftBukkit end @@ -43,7 +43,7 @@ index 2640a9cac120b779d228018dfc375c4337e2147f..d1d55f8c38cf3d3af6105c92c67132d7 this.chatMessageChain.close(); ServerGamePacketListenerImpl.LOGGER.info("{} lost connection: {}", this.player.getName().getString(), reason.getString()); // CraftBukkit start - Replace vanilla quit message handling with our own. -@@ -3556,6 +3569,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3559,6 +3572,9 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic if (top.leavesmc.leaves.LeavesConfig.jadeProtocol && ProtocolUtils.isNamespacePacket(packet, top.leavesmc.leaves.protocol.JadeProtocol.PROTOCOL_ID)) { top.leavesmc.leaves.protocol.JadeProtocol.handlePacket(server, player, packet); } diff --git a/patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch b/patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch index 694fcc16..2ebca50c 100644 --- a/patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch +++ b/patches/server/0063-Disable-distance-check-for-UseItemOnPacket.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable distance check for UseItemOnPacket diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index d1d55f8c38cf3d3af6105c92c67132d7ec146a7b..c6a96cc5c398f3a114aee9358b70ae32e38b967e 100644 +index 35c04ddb8cacf54ff9d7a2181d44084e0df42ae7..0cc4bd960383759abeabe20c52e9af84228527a1 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -1954,7 +1954,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -1957,7 +1957,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic Vec3 vec3d2 = vec3d.subtract(vec3d1); double d0 = 1.0000001D;