diff --git a/build.gradle.kts b/build.gradle.kts index 75f8c8a..eacd8e6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.patcher") version "1.5.5" + id("io.papermc.paperweight.patcher") version "1.5.9" } repositories { @@ -15,7 +15,7 @@ repositories { } dependencies { - remapper("net.fabricmc:tiny-remapper:0.8.6:fat") + remapper("net.fabricmc:tiny-remapper:0.8.10:fat") decompiler("net.minecraftforge:forgeflower:2.0.627.2") paperclip("io.papermc:paperclip:3.0.3") } diff --git a/gradle.properties b/gradle.properties index 6d172b8..5a896c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,8 @@ group = gg.projecteden.parchment version = 1.20.1-R0.1-SNAPSHOT -mcVersion = 1.20.1 -paperRef = d6d2b6f4e51b24867b609cf747ac6d8c6345c449 +mcVersion = 1.20.2 +paperRef = f186318a91cbd3b2a2259d39cb88576989a496b8 edenVersion = 2.2.8-SNAPSHOT org.gradle.caching=true diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch index 06b0fde..98789d4 100644 --- a/patches/api/0001-Build-changes.patch +++ b/patches/api/0001-Build-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 149f9088fe806467656e8b1c4157df60fda69ba7..d9f93515f92e35ad27f20ead90952b5ecee86661 100644 +index 639651972fddce4dff63a0f0a7e566a15b9e2dd6..dc6c1b155e463bc857458306e199609157af2908 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -19,6 +19,7 @@ val apiAndDocs: Configuration by configurations.creating { +@@ -21,6 +21,7 @@ val apiAndDocs: Configuration by configurations.creating { attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) } } diff --git a/patches/api/0002-Add-Getter-interfaces.patch b/patches/api/0002-Add-Getter-interfaces.patch index 5090c7f..7b6c469 100644 --- a/patches/api/0002-Add-Getter-interfaces.patch +++ b/patches/api/0002-Add-Getter-interfaces.patch @@ -427,7 +427,7 @@ index 12163a7b0591a7d022dc7eb9ee6608a1b6c39d9b..d81c7307127b135417e06a3b244416be private static final HandlerList handlers = new HandlerList(); private final Player player; diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java -index 1bfe465b9aaeea7d3c871140145b7de1b8f1d93d..babaefd2441b3b3e3b11ac1db6e5dc95eca40f64 100644 +index 13f221dd4e332db01195eb0c92ef9f26a17eb6d6..e6ff56f03a7523508db16f1d6298074f681326d8 100644 --- a/src/main/java/org/bukkit/Location.java +++ b/src/main/java/org/bukkit/Location.java @@ -30,7 +30,7 @@ import org.bukkit.entity.Player; @@ -439,7 +439,7 @@ index 1bfe465b9aaeea7d3c871140145b7de1b8f1d93d..babaefd2441b3b3e3b11ac1db6e5dc95 private Reference world; private double x; private double y; -@@ -1200,4 +1200,11 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm +@@ -1205,4 +1205,11 @@ public class Location implements Cloneable, ConfigurationSerializable, io.paperm return new Location(world, this.x(), this.y(), this.z(), this.getYaw(), this.getPitch()); } // Paper end @@ -452,7 +452,7 @@ index 1bfe465b9aaeea7d3c871140145b7de1b8f1d93d..babaefd2441b3b3e3b11ac1db6e5dc95 + // Parchment end } diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java -index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..c1410e5d4ec281f6712ab695e57b84757ca0ec82 100644 +index bce07d84cafca677bb6fad78c21b82097f06430c..3263419051207521c8c5b818714cde9a04b895e7 100644 --- a/src/main/java/org/bukkit/OfflinePlayer.java +++ b/src/main/java/org/bukkit/OfflinePlayer.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; @@ -464,7 +464,7 @@ index 9b84cb5abdf3db55cbc7ba19c8cd6955bf4fc5ec..c1410e5d4ec281f6712ab695e57b8475 /** * Checks if this player is currently online -@@ -190,6 +190,13 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio +@@ -206,6 +206,13 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio @Nullable public Player getPlayer(); @@ -518,7 +518,7 @@ index d124768378d6f0c5573f28ee815ea3886fe74868..11a00998b1cb5ee582e225553f15b1b7 private final UUID uuid; private final String name; diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 1c3f54382d66549dc881d4577c7104be6673a274..da7ac29bf25c38d8bdcccdf15122983b6f9b07eb 100644 +index 49974558799830d827f9ccd65a8bafee3fb0376b..0015bb89899e52d3c8f1ca68807ad7092e690305 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; @@ -531,10 +531,10 @@ index 1c3f54382d66549dc881d4577c7104be6673a274..da7ac29bf25c38d8bdcccdf15122983b /** * Gets the metadata for this block diff --git a/src/main/java/org/bukkit/block/BlockState.java b/src/main/java/org/bukkit/block/BlockState.java -index 37ca7b6b0fcee8bec12026ec3715dcc47400cc11..eaf14ce470f041360082cbb0bc16247706b2cd77 100644 +index ef35316fa66ac8d9c7836b9c8af56dcefbf6ff2e..01e2c95bf52cfcffc51d354770fbda5f76540a28 100644 --- a/src/main/java/org/bukkit/block/BlockState.java +++ b/src/main/java/org/bukkit/block/BlockState.java -@@ -20,7 +20,7 @@ import org.jetbrains.annotations.Nullable; +@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; * change the state of the block and you will not know, or they may change the * block to another type entirely, causing your BlockState to become invalid. */ @@ -570,7 +570,7 @@ index 2e17b2d4f759531fbe9ee8e9b00c839186af09ca..8f4a293c131cb8b63c31b410ffa211bd /** * This is the name of the specified AnimalTamer. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 6b842453589cf148ab32c1507cf374056826316e..0bd098a93d6fd3b41d736861c9c0f65f23f4fc62 100644 +index d340ddcf6924cc834455de3acbbac91ab9c66e39..d088493b4c58be67ca110b172506ab73de77599f 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; @@ -604,7 +604,7 @@ index 8b0d04d5b39ee817555a36adddc39b18fc6f0d02..1c87047de615a85ee20297295478770e // Paper start @Override diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 14c92390aeaeee518f43778ccd5fc820fdc62689..aa99410a0bee71e68da90b596134632f3a6364fe 100644 +index 9240ea09206461d61cc08d4252e8507555bf41cf..401a992f340ba441bf81ebf54108b0e5b0421def 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -51,7 +51,17 @@ import org.jetbrains.annotations.Nullable; @@ -640,7 +640,7 @@ index 691733a642b3295bbe6d484be728c77cd32803bd..a2eae7a9bad13d1ba2bd954888a03738 private boolean dropItems; private boolean cancel; diff --git a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java -index a1350c0f74d445dca09eea6e10abac050bb06990..11bb6f8f7363f31061d5fd0f2e4515099ac40649 100644 +index 08d09c2a92d8aa6adf6610cc05905d58a76fce1f..5105d8be50d3ebc75eb776f27679ece82317fe06 100644 --- a/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; @@ -653,7 +653,7 @@ index a1350c0f74d445dca09eea6e10abac050bb06990..11bb6f8f7363f31061d5fd0f2e451509 protected boolean buildable; diff --git a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java -index cd04a0bd9d232857408b38605787016a217cb8d2..7035fe7c0f5adb981ac41804605c4fbcf57968bf 100644 +index 392cde07d578d684423e1bf369af28696eb7e484..e1dacc04c73e0cabcd04d50540f3a5716550e22f 100644 --- a/src/main/java/org/bukkit/event/block/BlockDamageEvent.java +++ b/src/main/java/org/bukkit/event/block/BlockDamageEvent.java @@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull; @@ -864,12 +864,12 @@ index cc5781f276ec0a503b1bfef19d630c85db897c2a..89b38f2ce9a355f39abc657eff49c3a5 private boolean cancelled; private final Player player; diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java -index 020739697a0b535cad0b15b574f77cdabbdfa3eb..ee4fd41e66852d5d2c62222c7b884473d3f3001d 100644 +index a965b6a78073c5da86ad671752eff4a270029420..84cc90c085ae5ab788bcbc83bf1a0081be3b8186 100644 --- a/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java +++ b/src/main/java/org/bukkit/event/inventory/FurnaceExtractEvent.java -@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; - /** - * This event is called when a player takes items out of the furnace +@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; + * {@link org.bukkit.block.Furnace}, {@link org.bukkit.block.Smoker}, or + * {@link org.bukkit.block.BlastFurnace}. */ -public class FurnaceExtractEvent extends BlockExpEvent { +public class FurnaceExtractEvent extends BlockExpEvent implements gg.projecteden.parchment.HasPlayer { // Parchment @@ -890,7 +890,7 @@ index 4db0a07db156c61867644f50c185e63b695e2462..eb6632e2e9d247bd54e02e3a134dfdbe // Paper start private final Reason reason; diff --git a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java -index ceae092eb782698803c6c3df41267dde20ba62b2..23e35e7e65bdf2e758dc8dc980b9427b7e4163a9 100644 +index 8e2afeab4c62724148e8bb0c83fb7eec569c7a0c..2843fd117151dc75c87db06915a6732277867a0c 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryOpenEvent.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; @@ -901,7 +901,7 @@ index ceae092eb782698803c6c3df41267dde20ba62b2..23e35e7e65bdf2e758dc8dc980b9427b +public class InventoryOpenEvent extends InventoryEvent implements Cancellable, gg.projecteden.parchment.HasHumanEntity { // Parchment private static final HandlerList handlers = new HandlerList(); private boolean cancelled; - + private net.kyori.adventure.text.Component titleOverride; // Paper diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java index fc2d9e85b65347b90bde3b0b13ccae759e33d466..6b2e64fa9c0f3c0af88797d63557c333edf69a5d 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -1021,7 +1021,7 @@ index 0d519813c12d98b28d62e6d01d7ec6e8c2dba3c3..469b9cc0c4b77844ba0317af51bd9ad8 /** * Returns the size of the inventory diff --git a/src/main/java/org/bukkit/inventory/InventoryView.java b/src/main/java/org/bukkit/inventory/InventoryView.java -index 77a0cd901038405ed0e267f0432f13deccae3ab5..abe9b0d97d24e9e2ef1a61e34249895eb35b800f 100644 +index ac6c5c7a58c2c88b6cb0f6632fb53e8d67f8a059..464c69fd652db3384b1a4a5f4151933c3cd7df7b 100644 --- a/src/main/java/org/bukkit/inventory/InventoryView.java +++ b/src/main/java/org/bukkit/inventory/InventoryView.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch b/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch index 1940769..9699698 100644 --- a/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,12 +5,12 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java -index c661eab343ae76488de701630424e2d589f44fc0..b0ba8331fa43f4584eac1b1d9f4c3cad9d47b872 100644 +index a4b38f284d4fea7df7f9df9bf44e4f68fefaf20f..df153e397f69a6a2f2487998efd444f26d1ff701 100644 --- a/src/main/java/org/bukkit/UnsafeValues.java +++ b/src/main/java/org/bukkit/UnsafeValues.java -@@ -250,4 +250,17 @@ public interface UnsafeValues { - */ - void setBiomeKey(RegionAccessor accessor, int x, int y, int z, NamespacedKey biomeKey); +@@ -260,4 +260,17 @@ public interface UnsafeValues { + + String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic); // Paper end + + // Parchment start diff --git a/patches/api/0008-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch index 82122aa..081f1fa 100644 --- a/patches/api/0008-Expose-MCUtil-Executors.patch +++ b/patches/api/0008-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java -index 68206cf0178c26c0f528a1e14a5fb4e9ad410369..24fa398cc02f803fbb3222082130bf0b7bdd391f 100644 +index d0c634629aa0b6bac0da93655dd86ad3aea0ce30..b3162d58938ea5cb38f735a5977ce5e60d81c2b0 100644 --- a/src/main/java/org/bukkit/Server.java +++ b/src/main/java/org/bukkit/Server.java -@@ -2053,6 +2053,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi +@@ -2162,6 +2162,22 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi @NotNull UnsafeValues getUnsafe(); diff --git a/patches/api/0010-Add-Furnace-Recipe-API.patch b/patches/api/0010-Add-Furnace-Recipe-API.patch index 4af73dc..570b5fd 100644 --- a/patches/api/0010-Add-Furnace-Recipe-API.patch +++ b/patches/api/0010-Add-Furnace-Recipe-API.patch @@ -64,10 +64,10 @@ index 0000000000000000000000000000000000000000..ea17d99c7a1d70d88e2c439399cdb376 + } +} diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 6917931966377c51db88a3364997a110dd987970..9be68828aaecba89444e745e2d4126557c02868d 100644 +index 5eb3521f5f91b0684b4beebf4f7ba2c795b41c42..c8a3e139fd462a184fac9ff472048451372229de 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -49,6 +49,36 @@ import org.jetbrains.annotations.Nullable; +@@ -50,6 +50,36 @@ import org.jetbrains.annotations.Nullable; */ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient, Metadatable, PersistentDataHolder, Keyed, net.kyori.adventure.audience.ForwardingAudience { // Paper diff --git a/patches/api/0012-Add-Player-getHiddenEntities-API.patch b/patches/api/0012-Add-Player-getHiddenEntities-API.patch index 6ded86e..56962c1 100644 --- a/patches/api/0012-Add-Player-getHiddenEntities-API.patch +++ b/patches/api/0012-Add-Player-getHiddenEntities-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#getHiddenEntities API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aa99410a0bee71e68da90b596134632f3a6364fe..4390fa4cc4616a13855d38cb5e09d60153368428 100644 +index 401a992f340ba441bf81ebf54108b0e5b0421def..0dbbf842a3e25da23d4b7c574fcc56170162601d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1851,6 +1851,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1848,6 +1848,17 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @ApiStatus.Experimental public boolean canSee(@NotNull Entity entity); @@ -23,6 +23,6 @@ index aa99410a0bee71e68da90b596134632f3a6364fe..4390fa4cc4616a13855d38cb5e09d601 + public java.util.@NotNull Set getHiddenEntities(@NotNull Plugin plugin); + // Parchment end + + // Paper start /** - * Checks to see if this player is currently flying or not. - * + * Returns whether the {@code other} player is listed for {@code this}. diff --git a/patches/api/0016-Revert-BungeeChat-Deprecation.patch b/patches/api/0016-Revert-BungeeChat-Deprecation.patch index 8130f0f..005dee7 100644 --- a/patches/api/0016-Revert-BungeeChat-Deprecation.patch +++ b/patches/api/0016-Revert-BungeeChat-Deprecation.patch @@ -5,24 +5,23 @@ Subject: [PATCH] Revert BungeeChat Deprecation diff --git a/build.gradle.kts b/build.gradle.kts -index d9f93515f92e35ad27f20ead90952b5ecee86661..4f9582d14c27ab4f8c9e87a26d305988e9edbb61 100644 +index dc6c1b155e463bc857458306e199609157af2908..bff223b263f21786afe21c5f711a6c45db685943 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { // api dependencies are listed transitively to API consumers - api("com.google.guava:guava:31.1-jre") - api("com.google.code.gson:gson:2.10") -- api("net.md-5:bungeecord-chat:1.16-R0.4-deprecated+build.9") // Paper -+ api("net.md-5:bungeecord-chat:1.16-R0.4") // Paper // Parchment - revert - api("org.yaml:snakeyaml:2.0") + api("com.google.guava:guava:32.1.2-jre") + api("com.google.code.gson:gson:2.10.1") +- api("net.md-5:bungeecord-chat:$bungeeCordChatVersion-deprecated+build.14") // Paper ++ api("net.md-5:bungeecord-chat:$bungeeCordChatVersion") // Paper // Parchment - revert + api("org.yaml:snakeyaml:2.2") api("org.joml:joml:1.10.5") // Paper start -@@ -112,7 +112,7 @@ tasks.withType { - "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", - "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations +@@ -117,6 +117,7 @@ tasks.withType { + "https://www.javadoc.io/doc/com.google.code.gson/gson/2.10.1", + // Paper end // Paper start -- //"https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat -+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/", // don't link to bungee chat // Parchment - revert ++ "https://javadoc.io/doc/net.md-5/bungeecord-chat/$bungeeCordChatVersion/", // don't link to bungee chat // Parchment - revert "https://jd.advntr.dev/api/$adventureVersion/", "https://jd.advntr.dev/text-minimessage/$adventureVersion/", "https://jd.advntr.dev/text-serializer-gson/$adventureVersion/", diff --git a/patches/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch b/patches/removed/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch similarity index 100% rename from patches/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch rename to patches/removed/server/0009-Fix-missing-CraftMetaSkull-serializedProfile.patch diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 3c71cb4..853cf01 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 fb98936bb8a5488db75d676c5bcb4060597fbbf8..55e8753d31f371c016cae67e8d5eee002293ac12 100644 +index 79beac737c17412913983614bd478d33e3c6ed58..4f3c8c1f17035a3142d7e94649af1827608fb0ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ @@ -29,7 +29,7 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..55e8753d31f371c016cae67e8d5eee00 // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -72,7 +77,7 @@ tasks.jar { +@@ -70,7 +75,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -38,7 +38,7 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..55e8753d31f371c016cae67e8d5eee00 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -94,7 +99,27 @@ tasks.compileJava { +@@ -98,7 +103,27 @@ tasks.compileTestJava { publishing { publications.create("maven") { @@ -67,7 +67,7 @@ index fb98936bb8a5488db75d676c5bcb4060597fbbf8..55e8753d31f371c016cae67e8d5eee00 } } -@@ -149,7 +174,7 @@ fun TaskContainer.registerRunTask( +@@ -154,7 +179,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) { @@ -107,10 +107,10 @@ index 9d687da5bdf398bb3f6c84cdf1249a7213d09f2e..9b248dde91651b40b6b3e3dda8985c73 return history != null ? TextComponent.ofChildren(updateMessage, Component.newline(), history) : updateMessage; diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..deccd238278f003ead4d8973004b3965f077bfff 100644 +index 8f31413c939cc2b0454ad3d9a1b618dbae449d00..5a99c361cd8db829d4a42f37dd81d26afcb285ca 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop soundEvent = BuiltInRegistries.SOUND_EVENT.getOptional(name); diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 18aac3da3c88f33b1a71a5920a8daa27e9723913..1727c741664b981311b69fadc849ac6de5423a6a 100644 +index 584a768f2ce1c98a1de7749060c47f21721f9055..c900dcd24fbbabf2bfc0e42015478b8af61c6b9d 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1753,12 +1753,46 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1787,12 +1787,46 @@ public class ServerLevel extends Level implements WorldGenLevel { @Override public void playSeededSound(@Nullable Player except, double x, double y, double z, Holder sound, SoundSource category, float volume, float pitch, long seed) { @@ -137,10 +137,10 @@ index 18aac3da3c88f33b1a71a5920a8daa27e9723913..1727c741664b981311b69fadc849ac6d @Override diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index dc5fda83a66afbfeb7897fc20b4742899d8aca08..6a5c781cf14521659426cf30bd1c46cd65814df4 100644 +index f71a4a8307fb092d33545e12d253e0b80c884168..50dc222a2ebd08fe6ef2d45a6b16801a096f8681 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2328,7 +2328,20 @@ public class ServerPlayer extends Player { +@@ -2336,7 +2336,20 @@ public class ServerPlayer extends Player { @Override public void playNotifySound(SoundEvent event, SoundSource category, float volume, float pitch) { @@ -163,10 +163,10 @@ index dc5fda83a66afbfeb7897fc20b4742899d8aca08..6a5c781cf14521659426cf30bd1c46cd @Override diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 640e9bd618dc8286933318744c2064ede1fd9b5f..38eae743afa3c517c59bb1df83b1871d06165dbc 100644 +index 33abcf12b4426572b74ca4c813e4392c823494bc..f1627a528d703b87225573c400bdee8288254e36 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -947,7 +947,7 @@ public abstract class PlayerList { +@@ -970,7 +970,7 @@ public abstract class PlayerList { BlockState data = worldserver1.getBlockState(blockposition); worldserver1.setBlock(blockposition, data.setValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE, data.getValue(net.minecraft.world.level.block.RespawnAnchorBlock.CHARGE) - 1), 3); } @@ -176,10 +176,10 @@ index 640e9bd618dc8286933318744c2064ede1fd9b5f..38eae743afa3c517c59bb1df83b1871d } // Added from changeDimension diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 58152160d609d0e9d105153aeb166a56a7955603..7a4a07cd0618e7d51be0824e9102e979dfbdc7e6 100644 +index 481c3e321cfc0f20bb1c4c6942b8bdbd23c06339..2a9b0ba338f3bc8f3750deb6b93bd2099c867f28 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1918,7 +1918,21 @@ public abstract class Player extends LivingEntity { +@@ -1924,7 +1924,21 @@ public abstract class Player extends LivingEntity { private static void sendSoundEffect(Player fromEntity, double x, double y, double z, SoundEvent soundEffect, SoundSource soundCategory, float volume, float pitch) { fromEntity.level().playSound(fromEntity, x, y, z, soundEffect, soundCategory, volume, pitch); // This will not send the effect to the entity himself if (fromEntity instanceof ServerPlayer) { @@ -203,10 +203,10 @@ index 58152160d609d0e9d105153aeb166a56a7955603..7a4a07cd0618e7d51be0824e9102e979 } // Paper end diff --git a/src/main/java/net/minecraft/world/entity/raid/Raid.java b/src/main/java/net/minecraft/world/entity/raid/Raid.java -index f7399737548483905f3b5c08a03876b0da54b714..e668de87a5b58febf451fe4be79e47143f4eab01 100644 +index eaa2943b667967f93f28d9d794d702fdaeb670ec..df03f4867742cd194db260dfb81398b14286397e 100644 --- a/src/main/java/net/minecraft/world/entity/raid/Raid.java +++ b/src/main/java/net/minecraft/world/entity/raid/Raid.java -@@ -538,7 +538,7 @@ public class Raid { +@@ -542,7 +542,7 @@ public class Raid { double d2 = vec3d.z + 13.0D / d0 * (vec3d1.z - vec3d.z); if (d0 <= 64.0D || collection.contains(entityplayer)) { @@ -216,10 +216,10 @@ index f7399737548483905f3b5c08a03876b0da54b714..e668de87a5b58febf451fe4be79e4714 } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 26e1a9002d675245d4cf91e6682605314b078fb2..9d5b1851f719cb51a64f7aa904268867f1855d72 100644 +index 5dc160b743534665c6b3efb10b10f7c36e2da5ab..7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2106,4 +2106,42 @@ public class CraftEventFactory { +@@ -2166,4 +2166,42 @@ public class CraftEventFactory { return event; } // Paper end - add EntityFertilizeEggEvent diff --git a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch index be5a5e2..21bb57f 100644 --- a/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch +++ b/patches/server/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add origin location to EntityDamageByBlockEvent diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 9d5b1851f719cb51a64f7aa904268867f1855d72..e2012fd752c3a5dcf604d7892bf3e01c354ce275 100644 +index 7f0c6e9d8ffb1126ac8dbf8c8c8c8888b5f2506c..fdbff121810d46cd6896558863cc6317586abca5 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -1021,7 +1021,7 @@ public class CraftEventFactory { +@@ -1051,7 +1051,7 @@ public class CraftEventFactory { CraftEventFactory.entityDamage = null; EntityDamageEvent event; if (damager == null) { @@ -17,7 +17,7 @@ index 9d5b1851f719cb51a64f7aa904268867f1855d72..e2012fd752c3a5dcf604d7892bf3e01c } else if (entity instanceof EnderDragon && /*PAIL FIXME ((EntityEnderDragon) entity).target == damager*/ false) { event = new EntityDamageEvent(entity.getBukkitEntity(), DamageCause.ENTITY_EXPLOSION, modifiers, modifierFunctions); } else { -@@ -1069,7 +1069,7 @@ public class CraftEventFactory { +@@ -1099,7 +1099,7 @@ public class CraftEventFactory { return CraftEventFactory.callEntityDamageEvent(damager, entity, cause, modifiers, modifierFunctions, cancelled, source.isCritical()); // Paper - add critical damage API } else if (source.is(DamageTypes.FELL_OUT_OF_WORLD)) { @@ -26,7 +26,7 @@ index 9d5b1851f719cb51a64f7aa904268867f1855d72..e2012fd752c3a5dcf604d7892bf3e01c event.setCancelled(cancelled); CraftEventFactory.callEvent(event); if (!event.isCancelled()) { -@@ -1079,7 +1079,7 @@ public class CraftEventFactory { +@@ -1109,7 +1109,7 @@ public class CraftEventFactory { } return event; } else if (source.is(DamageTypes.LAVA)) { diff --git a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch index be4ef9d..e511d56 100644 --- a/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch +++ b/patches/server/0006-Add-UnsafeValues-canPlaceItemOn.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add UnsafeValues#canPlaceItemOn diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index 83cef5ec27c31f133a23cd27349f722799c786ea..dae633aed4da8f10a94801486c1208ac996ca23e 100644 +index 548c77592a3520e8053483644eba805079a14f1a..4ea241f475e89b29e27a425fb4c64644ad5e8727 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -@@ -624,6 +624,55 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -645,6 +645,55 @@ public final class CraftMagicNumbers implements UnsafeValues { } // Paper end diff --git a/patches/server/0007-Add-Player-setGameProfile.patch b/patches/server/0007-Add-Player-setGameProfile.patch index faaaec8..f83f6be 100644 --- a/patches/server/0007-Add-Player-setGameProfile.patch +++ b/patches/server/0007-Add-Player-setGameProfile.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add Player#setGameProfile diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 7a4a07cd0618e7d51be0824e9102e979dfbdc7e6..2a9cd25b0a2bb90a91efd981572923436b53c02f 100644 +index 2a9b0ba338f3bc8f3750deb6b93bd2099c867f28..70bb9c9052ed52308ea42542f50939c23d0311e1 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -1510,6 +1510,12 @@ public abstract class Player extends LivingEntity { +@@ -1516,6 +1516,12 @@ public abstract class Player extends LivingEntity { return this.gameProfile; } diff --git a/patches/server/0008-Expose-MCUtil-Executors.patch b/patches/server/0008-Expose-MCUtil-Executors.patch index 388df84..0b96a15 100644 --- a/patches/server/0008-Expose-MCUtil-Executors.patch +++ b/patches/server/0008-Expose-MCUtil-Executors.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expose MCUtil Executors diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 429f492aa0802a0456487aa52c22ec6902079616..a165f8f14b1e6feec49c349e26b91d76395f3cfa 100644 +index 2d4b1ea8a3fd11f7b7cfb204d0c5c08ca4b784cb..afdb48692ba8ae632146e595e31928a73f1a4bc3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3115,4 +3115,16 @@ public final class CraftServer implements Server { +@@ -3196,4 +3196,16 @@ public final class CraftServer implements Server { } // Paper end diff --git a/patches/server/0010-Add-BlockDropResourcesEvent.patch b/patches/server/0009-Add-BlockDropResourcesEvent.patch similarity index 94% rename from patches/server/0010-Add-BlockDropResourcesEvent.patch rename to patches/server/0009-Add-BlockDropResourcesEvent.patch index 7573a89..79545e5 100644 --- a/patches/server/0010-Add-BlockDropResourcesEvent.patch +++ b/patches/server/0009-Add-BlockDropResourcesEvent.patch @@ -8,7 +8,7 @@ to easily get the items being dropped by any block instead of only blocks broken by players. diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java -index 9522e646529f3d849471931b4b3c0d133e7fcfc5..cbdcbfed03afbdf194243d4472e69a664dcf71b9 100644 +index d4cbff18adb62073a1dceb189043789620af6877..059954dd8cf9958c32b9310d93c4f958db9bd72e 100644 --- a/src/main/java/net/minecraft/world/level/block/Block.java +++ b/src/main/java/net/minecraft/world/level/block/Block.java @@ -302,7 +302,7 @@ public class Block extends BlockBehaviour implements ItemLike { @@ -39,10 +39,10 @@ index 9522e646529f3d849471931b4b3c0d133e7fcfc5..cbdcbfed03afbdf194243d4472e69a66 }); state.spawnAfterBreak((ServerLevel) world, pos, tool, true); diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index e2012fd752c3a5dcf604d7892bf3e01c354ce275..694158155deb70d0be219a03e2302535d32ef558 100644 +index fdbff121810d46cd6896558863cc6317586abca5..7ab04307f15e980627d023fe83f36358d8b883b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -2143,5 +2143,19 @@ public class CraftEventFactory { +@@ -2203,5 +2203,19 @@ public class CraftEventFactory { } }); } diff --git a/patches/server/0011-Add-Furnace-Recipe-API.patch b/patches/server/0010-Add-Furnace-Recipe-API.patch similarity index 96% rename from patches/server/0011-Add-Furnace-Recipe-API.patch rename to patches/server/0010-Add-Furnace-Recipe-API.patch index 4d20c2c..d620161 100644 --- a/patches/server/0011-Add-Furnace-Recipe-API.patch +++ b/patches/server/0010-Add-Furnace-Recipe-API.patch @@ -215,10 +215,10 @@ index 0000000000000000000000000000000000000000..e7114e456f818d7bdd4081620f4b9b93 + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 1a481fb4f4228f0fea8a7dc6132248c98b727c90..03553404519e7ac1e404a2cff36062ef6bcda36f 100644 +index c3060d1d4d0caf369c6ab516cb424f45eb851019..96468013783c2a2f3178bdbbe0884f855dbd72ec 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2437,4 +2437,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { +@@ -2466,4 +2466,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { return this.adventure$pointers; } // Paper end @@ -226,7 +226,7 @@ index 1a481fb4f4228f0fea8a7dc6132248c98b727c90..03553404519e7ac1e404a2cff36062ef + // Parchment start + @Override + public ItemStack smeltItem(ItemStack toSmelt, gg.projecteden.parchment.inventory.RecipeType recipeType) { -+ return world.getRecipeManager().getRecipeFor(gg.projecteden.parchment.inventory.CraftRecipeType.asCookingRecipe(recipeType), new gg.projecteden.parchment.inventory.SingletonContainer(toSmelt), world).map(recipe -> recipe.getResultItem(world.registryAccess()).getBukkitStack()).orElse(null); ++ return world.getRecipeManager().getRecipeFor(gg.projecteden.parchment.inventory.CraftRecipeType.asCookingRecipe(recipeType), new gg.projecteden.parchment.inventory.SingletonContainer(toSmelt), world).map(recipe -> recipe.value().getResultItem(world.registryAccess()).getBukkitStack()).orElse(null); + } + // Parchment end } diff --git a/patches/server/0012-Disable-sleep-status-announcements.patch b/patches/server/0011-Disable-sleep-status-announcements.patch similarity index 84% rename from patches/server/0012-Disable-sleep-status-announcements.patch rename to patches/server/0011-Disable-sleep-status-announcements.patch index d257c5d..4318c51 100644 --- a/patches/server/0012-Disable-sleep-status-announcements.patch +++ b/patches/server/0011-Disable-sleep-status-announcements.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable sleep status announcements diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 1727c741664b981311b69fadc849ac6de5423a6a..417f8621b80702f1b64aa618b279a606a3a3b7f9 100644 +index c900dcd24fbbabf2bfc0e42015478b8af61c6b9d..2dbfff6a36591c9c8e9dbdb217da7e470a8e5bc5 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java -@@ -1116,7 +1116,7 @@ public class ServerLevel extends Level implements WorldGenLevel { +@@ -1150,7 +1150,7 @@ public class ServerLevel extends Level implements WorldGenLevel { } private void announceSleepStatus() { diff --git a/patches/server/0013-Add-config-for-ticking-TIME_SINCE_REST.patch b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch similarity index 80% rename from patches/server/0013-Add-config-for-ticking-TIME_SINCE_REST.patch rename to patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch index 878474e..714dae4 100644 --- a/patches/server/0013-Add-config-for-ticking-TIME_SINCE_REST.patch +++ b/patches/server/0012-Add-config-for-ticking-TIME_SINCE_REST.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add config for ticking TIME_SINCE_REST diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index a33de97340f14219291c4175e9194914cdf441db..a6341580f9c1a163ddb9c380a2c5c1658cb5bf0d 100644 +index ed79d30f33b2674863b2d73b1abdb48433c33412..ba37d877ca690b67223c0f1989b441301ce1047c 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -265,6 +265,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -286,6 +286,7 @@ public class WorldConfiguration extends ConfigurationPart { } public boolean disablePlayerCrits = false; @@ -17,10 +17,10 @@ index a33de97340f14219291c4175e9194914cdf441db..a6341580f9c1a163ddb9c380a2c5c165 public PillagerPatrols pillagerPatrols; diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java -index 2a9cd25b0a2bb90a91efd981572923436b53c02f..d904529cb725f751cfc8ba5ff911d2f6972022bc 100644 +index 70bb9c9052ed52308ea42542f50939c23d0311e1..5f310ffc47a30897494beb1c351509a182781e1d 100644 --- a/src/main/java/net/minecraft/world/entity/player/Player.java +++ b/src/main/java/net/minecraft/world/entity/player/Player.java -@@ -292,7 +292,7 @@ public abstract class Player extends LivingEntity { +@@ -293,7 +293,7 @@ public abstract class Player extends LivingEntity { this.awardStat(Stats.CROUCH_TIME); } diff --git a/patches/server/0014-Add-HangingFrame-Tick-API.patch b/patches/server/0013-Add-HangingFrame-Tick-API.patch similarity index 89% rename from patches/server/0014-Add-HangingFrame-Tick-API.patch rename to patches/server/0013-Add-HangingFrame-Tick-API.patch index 417cf1f..0800579 100644 --- a/patches/server/0014-Add-HangingFrame-Tick-API.patch +++ b/patches/server/0013-Add-HangingFrame-Tick-API.patch @@ -26,12 +26,12 @@ index 66cf0a6cd1525ecf2615809210a26d55f445d07d..360ca6458083fa4018f11fcdade3ce93 if (this.checkInterval++ == this.level().spigotConfig.hangingTickFrequency) { // Spigot this.checkInterval = 0; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java -index 62e11bf104b8d39ac73883e2a5d207e5f7393253..639bd33ae91ed818bda29fed776adb8c169458d7 100644 +index cbdcf767c01e2c173913f56747d2dacbda2f0094..a74f783df0225223a2b2ae3dc632541ccf078893 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHanging.java -@@ -72,4 +72,16 @@ public class CraftHanging extends CraftEntity implements Hanging { - public EntityType getType() { - return EntityType.UNKNOWN; +@@ -66,4 +66,16 @@ public class CraftHanging extends CraftEntity implements Hanging { + public String toString() { + return "CraftHanging"; } + + // Parchment start diff --git a/patches/server/0015-Add-Player-getHiddenEntities-API.patch b/patches/server/0014-Add-Player-getHiddenEntities-API.patch similarity index 80% rename from patches/server/0015-Add-Player-getHiddenEntities-API.patch rename to patches/server/0014-Add-Player-getHiddenEntities-API.patch index 99488af..f873dbc 100644 --- a/patches/server/0015-Add-Player-getHiddenEntities-API.patch +++ b/patches/server/0014-Add-Player-getHiddenEntities-API.patch @@ -5,11 +5,11 @@ Subject: [PATCH] Add Player#getHiddenEntities API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 5bbded65095dccfadaf7576fc41b5f62974878b4..ece3637304863c8441c153e06ea9934cc91ff961 100644 +index 83aaf3e6e377d731ce02f779f80b7bf5db46f89f..1aa00378a3c6d62a110767e943e998e0ce47ab68 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1972,6 +1972,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { - server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity)); // Paper +@@ -1985,6 +1985,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player { + this.server.getPluginManager().callEvent(new PlayerShowEntityEvent(this, entity)); } // Paper start + diff --git a/patches/server/0016-Big-Barrels.patch b/patches/server/0015-Big-Barrels.patch similarity index 100% rename from patches/server/0016-Big-Barrels.patch rename to patches/server/0015-Big-Barrels.patch diff --git a/patches/server/0017-Add-Timings-Events.patch b/patches/server/0016-Add-Timings-Events.patch similarity index 91% rename from patches/server/0017-Add-Timings-Events.patch rename to patches/server/0016-Add-Timings-Events.patch index 8136d30..82cb535 100644 --- a/patches/server/0017-Add-Timings-Events.patch +++ b/patches/server/0016-Add-Timings-Events.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Timings Events diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index c07eb451a576811a39021f6f97103c77488fd001..58fd2d024a9de3a9a31cde948bb9fc8b68f461bc 100644 +index a2f71a6d1a9e98133dff6cd0f625da9435a8af14..88244a89ccf7ed33073e3795ef26a5ee4645e323 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java @@ -350,6 +350,8 @@ public class TimingsExport extends Thread { diff --git a/patches/server/0018-Expanded-Insomnia-API.patch b/patches/server/0017-Expanded-Insomnia-API.patch similarity index 87% rename from patches/server/0018-Expanded-Insomnia-API.patch rename to patches/server/0017-Expanded-Insomnia-API.patch index 562f390..4c23d98 100644 --- a/patches/server/0018-Expanded-Insomnia-API.patch +++ b/patches/server/0017-Expanded-Insomnia-API.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Expanded Insomnia API diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index ece3637304863c8441c153e06ea9934cc91ff961..af23e113aea3112b618d3fc9b0c9baf59a693025 100644 +index 1aa00378a3c6d62a110767e943e998e0ce47ab68..85687cf09b185c57b52578cc0d8967803d2c1b6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -81,6 +81,7 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl; +@@ -83,6 +83,7 @@ import net.minecraft.server.network.ServerGamePacketListenerImpl; import net.minecraft.server.players.UserWhiteListEntry; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.Entity; @@ -16,7 +16,7 @@ index ece3637304863c8441c153e06ea9934cc91ff961..af23e113aea3112b618d3fc9b0c9baf5 import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeMap; import net.minecraft.world.entity.ai.attributes.Attributes; -@@ -196,6 +197,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -198,6 +199,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit private long lastSaveTime; // Paper end @@ -24,7 +24,7 @@ index ece3637304863c8441c153e06ea9934cc91ff961..af23e113aea3112b618d3fc9b0c9baf5 public CraftPlayer(CraftServer server, ServerPlayer entity) { super(server, entity); -@@ -2092,6 +2094,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { +@@ -2144,6 +2146,33 @@ public class CraftPlayer extends CraftHumanEntity implements Player { return this; } @@ -57,4 +57,4 @@ index ece3637304863c8441c153e06ea9934cc91ff961..af23e113aea3112b618d3fc9b0c9baf5 + @Override public ServerPlayer getHandle() { - return (ServerPlayer) entity; + return (ServerPlayer) this.entity; diff --git a/patches/server/0019-Add-spam-bypass-permission.patch b/patches/server/0018-Add-spam-bypass-permission.patch similarity index 80% rename from patches/server/0019-Add-spam-bypass-permission.patch rename to patches/server/0018-Add-spam-bypass-permission.patch index 598c55b..4724293 100644 --- a/patches/server/0019-Add-spam-bypass-permission.patch +++ b/patches/server/0018-Add-spam-bypass-permission.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add spam bypass permission diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..66e5fc6e704ec3f859ed2172acef0a9e83fa39c2 100644 +index 65bb221993147a558995b36fb835f7b82e0eb4bd..dc3f2da0977705c487132bef552cd74244e3fa8f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -884,6 +884,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -770,6 +770,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl public void handleCustomCommandSuggestions(ServerboundCommandSuggestionPacket packet) { // PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); // Paper - run this async // CraftBukkit start @@ -16,15 +16,15 @@ index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..66e5fc6e704ec3f859ed2172acef0a9e if (this.chatSpamTickCount.addAndGet(io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamIncrement) > io.papermc.paper.configuration.GlobalConfiguration.get().spamLimiter.tabSpamLimit && !this.server.getPlayerList().isOp(this.player.getGameProfile())) { // Paper start - split and make configurable server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper - kick event cause return; -@@ -894,6 +895,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]), org.bukkit.event.player.PlayerKickEvent.Cause.SPAM)); // Paper +@@ -780,6 +781,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + server.scheduleOnMain(() -> this.disconnect(Component.translatable("disconnect.spam", new Object[0]))); // Paper return; } + } // Parchment - spam bypass // Paper end // CraftBukkit end // Paper start - Don't suggest if tab-complete is disabled -@@ -2562,6 +2564,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2448,6 +2450,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl // Spigot start - spam exclusions private void detectRateSpam(String s) { @@ -32,8 +32,8 @@ index 75bd92e1d40588d3bc40fa7837943eec9f2062a6..66e5fc6e704ec3f859ed2172acef0a9e // CraftBukkit start - replaced with thread safe throttle boolean counted = true; for ( String exclude : org.spigotmc.SpigotConfig.spamExclusions ) -@@ -3294,10 +3297,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic - PacketUtils.ensureRunningOnSameThread(packet, this, this.player.serverLevel()); +@@ -3197,10 +3200,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl + public void handlePlaceRecipe(ServerboundPlaceRecipePacket packet) { // Paper start if (!org.bukkit.Bukkit.isPrimaryThread()) { + if (!this.getCraftPlayer().hasPermission("spam.bypass")) { // Parchment - spam bypass diff --git a/patches/server/0020-Disable-set-respawn-message.patch b/patches/server/0019-Disable-set-respawn-message.patch similarity index 84% rename from patches/server/0020-Disable-set-respawn-message.patch rename to patches/server/0019-Disable-set-respawn-message.patch index a85c413..4a60de3 100644 --- a/patches/server/0020-Disable-set-respawn-message.patch +++ b/patches/server/0019-Disable-set-respawn-message.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Disable set respawn message diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java -index 2abe06cb5de5ac63c31c1a120a3239aca07557f8..2eae1123cc24ad49248a8668701aa7015cbc4840 100644 +index 50dc222a2ebd08fe6ef2d45a6b16801a096f8681..2659e767a55d1ac75baaa4b663a3949bf520251b 100644 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java -@@ -2279,9 +2279,11 @@ public class ServerPlayer extends Player { +@@ -2300,9 +2300,11 @@ public class ServerPlayer extends Player { forced = event.isForced(); // Paper end diff --git a/patches/server/0021-Make-FixLight-use-action-bar.patch b/patches/server/0020-Make-FixLight-use-action-bar.patch similarity index 96% rename from patches/server/0021-Make-FixLight-use-action-bar.patch rename to patches/server/0020-Make-FixLight-use-action-bar.patch index c0e5210..9660f40 100644 --- a/patches/server/0021-Make-FixLight-use-action-bar.patch +++ b/patches/server/0020-Make-FixLight-use-action-bar.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make FixLight use action bar diff --git a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java -index 7784d72ddd6db00c674e22759c00c430222c4b85..b336789b74d6d6819b38e78cb2014f61de3f004b 100644 +index 463c6d8d5b114816ed9065558285945817c30385..d77fb29ea767fce5b8e00b76625188f19ecdbd24 100644 --- a/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java +++ b/src/main/java/io/papermc/paper/command/subcommands/FixLightCommand.java @@ -24,6 +24,7 @@ import static net.kyori.adventure.text.format.NamedTextColor.BLUE; diff --git a/patches/server/0022-Remove-Hanging-Entity-Debug.patch b/patches/server/0021-Remove-Hanging-Entity-Debug.patch similarity index 100% rename from patches/server/0022-Remove-Hanging-Entity-Debug.patch rename to patches/server/0021-Remove-Hanging-Entity-Debug.patch diff --git a/patches/server/0023-Add-PreEntityShootBowEvent.patch b/patches/server/0022-Add-PreEntityShootBowEvent.patch similarity index 95% rename from patches/server/0023-Add-PreEntityShootBowEvent.patch rename to patches/server/0022-Add-PreEntityShootBowEvent.patch index 61ae3c6..3920dfa 100644 --- a/patches/server/0023-Add-PreEntityShootBowEvent.patch +++ b/patches/server/0022-Add-PreEntityShootBowEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PreEntityShootBowEvent diff --git a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java -index 9ca1e9d95e62929c0015d5ca2c2f9c70e421842e..36c55a63cc44724e377d8505321bca75bb4b2cea 100644 +index b319021b22c5dceba6199ed27814b2dcf47b8d50..d12a49f9eb0110d4d889f15863ecb88c07a848b9 100644 --- a/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java +++ b/src/main/java/net/minecraft/world/entity/monster/AbstractSkeleton.java @@ -199,13 +199,17 @@ public abstract class AbstractSkeleton extends Monster implements RangedAttackMo @@ -51,7 +51,7 @@ index 63fce7e3d9f59f36e29bc827a46396d73143bb8b..9762a79c928d7235a7868b37858474e1 org.bukkit.event.entity.EntityShootBowEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityShootBowEvent(this, this.getMainHandItem(), entityarrow.getPickupItem(), entityarrow, target.getUsedItemHand(), 0.8F, true); if (event.isCancelled()) { diff --git a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java -index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..d960c55a28222066b6898d85d9588c8a1f0f9cc1 100644 +index 6c176933967f6ee98da3026f16a10efe4c3842fe..fa0608f40bb83694d2a6d413c4b66e760c9db985 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java +++ b/src/main/java/net/minecraft/world/entity/projectile/AbstractArrow.java @@ -129,8 +129,10 @@ public abstract class AbstractArrow extends Projectile { @@ -68,10 +68,10 @@ index 7226be19248a1ffb8ff2c89b55882529d33a6c0c..d960c55a28222066b6898d85d9588c8a } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index 1b7cf6d06bdf36f146656727511a461f2520762e..8389b75b7534eedebe97dd975729039678b64c1e 100644 +index a90317100d32974e481e14476843f66997a2cf3a..f65c29dd02b31431e085074dd6460eca17214471 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -157,9 +157,17 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -164,9 +164,17 @@ public abstract class Projectile extends Entity implements TraceableEntity { } public void shoot(double x, double y, double z, float speed, float divergence) { @@ -89,7 +89,7 @@ index 1b7cf6d06bdf36f146656727511a461f2520762e..8389b75b7534eedebe97dd9757290396 double d3 = vec3d.horizontalDistance(); this.setYRot((float) (Mth.atan2(vec3d.x, vec3d.z) * 57.2957763671875D)); -@@ -169,6 +177,12 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -176,6 +184,12 @@ public abstract class Projectile extends Entity implements TraceableEntity { } public void shootFromRotation(Entity shooter, float pitch, float yaw, float roll, float speed, float divergence) { @@ -102,7 +102,7 @@ index 1b7cf6d06bdf36f146656727511a461f2520762e..8389b75b7534eedebe97dd9757290396 float f5 = -Mth.sin(yaw * 0.017453292F) * Mth.cos(pitch * 0.017453292F); float f6 = -Mth.sin((pitch + roll) * 0.017453292F); float f7 = Mth.cos(yaw * 0.017453292F) * Mth.cos(pitch * 0.017453292F); -@@ -176,7 +190,9 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -183,7 +197,9 @@ public abstract class Projectile extends Entity implements TraceableEntity { this.shoot((double) f5, (double) f6, (double) f7, speed, divergence); Vec3 vec3d = shooter.getDeltaMovement(); diff --git a/patches/server/0024-Return-Displays-in-getTargetEntity.patch b/patches/server/0023-Return-Displays-in-getTargetEntity.patch similarity index 89% rename from patches/server/0024-Return-Displays-in-getTargetEntity.patch rename to patches/server/0023-Return-Displays-in-getTargetEntity.patch index 75cac30..91c5577 100644 --- a/patches/server/0024-Return-Displays-in-getTargetEntity.patch +++ b/patches/server/0023-Return-Displays-in-getTargetEntity.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Return Displays in getTargetEntity diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e11d7283662834047b2ff81a2fd25a4263792deb..e170773b922c4b3970d0914f5e8cf26d419c0ffd 100644 +index a76eb3d051db0229ed088b71c92ff3f131449007..4fa9da4b9bdda2e826a73145cf8fd49e461518fd 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -4036,7 +4036,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -4097,7 +4097,7 @@ public abstract class LivingEntity extends Entity implements Attackable { Vec3 direction = this.getLookAngle(); Vec3 end = start.add(direction.x * maxDistance, direction.y * maxDistance, direction.z * maxDistance); diff --git a/patches/server/0025-Make-SynchedEntityData-packAll-Public.patch b/patches/server/0024-Make-SynchedEntityData-packAll-Public.patch similarity index 90% rename from patches/server/0025-Make-SynchedEntityData-packAll-Public.patch rename to patches/server/0024-Make-SynchedEntityData-packAll-Public.patch index 0cc3e85..29d51e9 100644 --- a/patches/server/0025-Make-SynchedEntityData-packAll-Public.patch +++ b/patches/server/0024-Make-SynchedEntityData-packAll-Public.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Make SynchedEntityData#packAll Public diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java -index 5dfb35117c285e0b202dc9c088ad5848beb8d054..662e20a607c348403250f50a8ff0a0171e128701 100644 +index a043c382c37058032548a5192e17f5f816abe5a6..24fb2e60bcf3722cbc95684ce81952ad4a4f840d 100644 --- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java +++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java @@ -289,7 +289,7 @@ public class SynchedEntityData {