diff --git a/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch b/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch new file mode 100644 index 000000000..154124ad2 --- /dev/null +++ b/patches/api/0003-Allow-use-of-TYPE_USE-annotations.patch @@ -0,0 +1,38 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Riley Park +Date: Mon, 21 Jun 2021 09:51:29 -0700 +Subject: [PATCH] Allow use of TYPE_USE annotations + + +diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java +index 0c7377247ad9251c9e498039511e7220370aba2d..2ef6b56642f792d1a648e76e904e61bf7a662f8c 100644 +--- a/src/test/java/org/bukkit/AnnotationTest.java ++++ b/src/test/java/org/bukkit/AnnotationTest.java +@@ -66,15 +66,26 @@ public class AnnotationTest { + continue; + } + +- if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) { ++ if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations) && !isWellAnnotated(method.visibleTypeAnnotations) && !isWellAnnotated(method.invisibleTypeAnnotations)) { // Paper - also check (in)visible type annotations + warn(errors, clazz, method, "return value"); + } + + Type[] paramTypes = Type.getArgumentTypes(method.desc); + List parameters = method.parameters; + ++ dancing: // Paper + for (int i = 0; i < paramTypes.length; i++) { + if (mustBeAnnotated(paramTypes[i]) && !isWellAnnotated(method.invisibleParameterAnnotations == null ? null : method.invisibleParameterAnnotations[i])) { ++ // Paper start - wheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee ++ if (method.invisibleTypeAnnotations != null) { ++ for (final org.objectweb.asm.tree.TypeAnnotationNode invisibleTypeAnnotation : method.invisibleTypeAnnotations) { ++ final org.objectweb.asm.TypeReference ref = new org.objectweb.asm.TypeReference(invisibleTypeAnnotation.typeRef); ++ if (ref.getSort() == org.objectweb.asm.TypeReference.METHOD_FORMAL_PARAMETER && ref.getTypeParameterIndex() == i && java.util.Arrays.binarySearch(ACCEPTED_ANNOTATIONS, invisibleTypeAnnotation.desc) >= 0) { ++ continue dancing; ++ } ++ } ++ } ++ // Paper end + ParameterNode paramNode = parameters == null ? null : parameters.get(i); + String paramName = paramNode == null ? null : paramNode.name; + diff --git a/patches/api/0003-Add-FastUtil-to-Bukkit.patch b/patches/api/0004-Add-FastUtil-to-Bukkit.patch similarity index 100% rename from patches/api/0003-Add-FastUtil-to-Bukkit.patch rename to patches/api/0004-Add-FastUtil-to-Bukkit.patch diff --git a/patches/api/0004-Paper-Utils.patch b/patches/api/0005-Paper-Utils.patch similarity index 100% rename from patches/api/0004-Paper-Utils.patch rename to patches/api/0005-Paper-Utils.patch diff --git a/patches/api/0005-Timings-v2.patch b/patches/api/0006-Timings-v2.patch similarity index 100% rename from patches/api/0005-Timings-v2.patch rename to patches/api/0006-Timings-v2.patch diff --git a/patches/api/0006-Adventure.patch b/patches/api/0007-Adventure.patch similarity index 99% rename from patches/api/0006-Adventure.patch rename to patches/api/0007-Adventure.patch index d202369b4..7fcfad68c 100644 --- a/patches/api/0006-Adventure.patch +++ b/patches/api/0007-Adventure.patch @@ -3706,7 +3706,7 @@ index da01d2926cc8a2485a3349ac1ebb32cad20e287c..f0af10a5b9ad048be197ed5ec6c8ed26 /** diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 0c7377247ad9251c9e498039511e7220370aba2d..c62919f18f318fec15a6c364d8b6d562c2b04762 100644 +index 4aee3dd321453009fda10db9c4fbea0ffed6ed69..002677ac589aa88b643c52a883a72a2bdc3696dd 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -26,6 +26,12 @@ import org.objectweb.asm.tree.ParameterNode; @@ -3722,16 +3722,7 @@ index 0c7377247ad9251c9e498039511e7220370aba2d..c62919f18f318fec15a6c364d8b6d562 "Lorg/jetbrains/annotations/Nullable;", "Lorg/jetbrains/annotations/NotNull;", "Lorg/jetbrains/annotations/Contract;", -@@ -66,7 +72,7 @@ public class AnnotationTest { - continue; - } - -- if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations)) { -+ if (mustBeAnnotated(Type.getReturnType(method.desc)) && !isWellAnnotated(method.invisibleAnnotations) && !isWellAnnotated(method.visibleTypeAnnotations)) { // Paper - also check visible type annotations - warn(errors, clazz, method, "return value"); - } - -@@ -174,7 +180,7 @@ public class AnnotationTest { +@@ -185,7 +191,7 @@ public class AnnotationTest { return true; } diff --git a/patches/api/0007-Player-affects-spawning-API.patch b/patches/api/0008-Player-affects-spawning-API.patch similarity index 100% rename from patches/api/0007-Player-affects-spawning-API.patch rename to patches/api/0008-Player-affects-spawning-API.patch diff --git a/patches/api/0008-Add-getTPS-method.patch b/patches/api/0009-Add-getTPS-method.patch similarity index 100% rename from patches/api/0008-Add-getTPS-method.patch rename to patches/api/0009-Add-getTPS-method.patch diff --git a/patches/api/0009-Entity-Origin-API.patch b/patches/api/0010-Entity-Origin-API.patch similarity index 96% rename from patches/api/0009-Entity-Origin-API.patch rename to patches/api/0010-Entity-Origin-API.patch index 626916f4f..d34f06d5e 100644 --- a/patches/api/0009-Entity-Origin-API.patch +++ b/patches/api/0010-Entity-Origin-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity Origin API diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index 03e12de470f983e89a473c4e42c21941085b1d37..fdce246aecac775c3ff4a028c307b09762505258 100644 +index d7a4cfed4f46b34f83fb2c07bdab5a71215d26bb..8c93c640dd163ca99df81706715117094fea5738 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -655,5 +655,15 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0010-Version-Command-2.0.patch b/patches/api/0011-Version-Command-2.0.patch similarity index 100% rename from patches/api/0010-Version-Command-2.0.patch rename to patches/api/0011-Version-Command-2.0.patch diff --git a/patches/api/0011-Add-PlayerLocaleChangeEvent.patch b/patches/api/0012-Add-PlayerLocaleChangeEvent.patch similarity index 100% rename from patches/api/0011-Add-PlayerLocaleChangeEvent.patch rename to patches/api/0012-Add-PlayerLocaleChangeEvent.patch diff --git a/patches/api/0012-Add-player-view-distance-API.patch b/patches/api/0013-Add-player-view-distance-API.patch similarity index 100% rename from patches/api/0012-Add-player-view-distance-API.patch rename to patches/api/0013-Add-player-view-distance-API.patch diff --git a/patches/api/0013-Add-BeaconEffectEvent.patch b/patches/api/0014-Add-BeaconEffectEvent.patch similarity index 100% rename from patches/api/0013-Add-BeaconEffectEvent.patch rename to patches/api/0014-Add-BeaconEffectEvent.patch diff --git a/patches/api/0014-Add-PlayerInitialSpawnEvent.patch b/patches/api/0015-Add-PlayerInitialSpawnEvent.patch similarity index 100% rename from patches/api/0014-Add-PlayerInitialSpawnEvent.patch rename to patches/api/0015-Add-PlayerInitialSpawnEvent.patch diff --git a/patches/api/0015-Automatically-disable-plugins-that-fail-to-load.patch b/patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch similarity index 100% rename from patches/api/0015-Automatically-disable-plugins-that-fail-to-load.patch rename to patches/api/0016-Automatically-disable-plugins-that-fail-to-load.patch diff --git a/patches/api/0016-Expose-server-CommandMap.patch b/patches/api/0017-Expose-server-CommandMap.patch similarity index 100% rename from patches/api/0016-Expose-server-CommandMap.patch rename to patches/api/0017-Expose-server-CommandMap.patch diff --git a/patches/api/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch similarity index 100% rename from patches/api/0017-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch rename to patches/api/0018-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch diff --git a/patches/api/0018-Add-exception-reporting-event.patch b/patches/api/0019-Add-exception-reporting-event.patch similarity index 100% rename from patches/api/0018-Add-exception-reporting-event.patch rename to patches/api/0019-Add-exception-reporting-event.patch diff --git a/patches/api/0019-Player-Tab-List-and-Title-APIs.patch b/patches/api/0020-Player-Tab-List-and-Title-APIs.patch similarity index 100% rename from patches/api/0019-Player-Tab-List-and-Title-APIs.patch rename to patches/api/0020-Player-Tab-List-and-Title-APIs.patch diff --git a/patches/api/0020-Fix-ServerListPingEvent-flagging-as-Async.patch b/patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch similarity index 100% rename from patches/api/0020-Fix-ServerListPingEvent-flagging-as-Async.patch rename to patches/api/0021-Fix-ServerListPingEvent-flagging-as-Async.patch diff --git a/patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch b/patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch similarity index 100% rename from patches/api/0021-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch rename to patches/api/0022-Add-BaseComponent-sendMessage-methods-to-CommandSend.patch diff --git a/patches/api/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch b/patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch similarity index 100% rename from patches/api/0022-Add-methods-for-working-with-arrows-stuck-in-living-.patch rename to patches/api/0023-Add-methods-for-working-with-arrows-stuck-in-living-.patch diff --git a/patches/api/0023-Complete-resource-pack-API.patch b/patches/api/0024-Complete-resource-pack-API.patch similarity index 100% rename from patches/api/0023-Complete-resource-pack-API.patch rename to patches/api/0024-Complete-resource-pack-API.patch diff --git a/patches/api/0024-Use-ASM-for-event-executors.patch b/patches/api/0025-Use-ASM-for-event-executors.patch similarity index 99% rename from patches/api/0024-Use-ASM-for-event-executors.patch rename to patches/api/0025-Use-ASM-for-event-executors.patch index b886c8d3d..0d912355a 100644 --- a/patches/api/0024-Use-ASM-for-event-executors.patch +++ b/patches/api/0025-Use-ASM-for-event-executors.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/build.gradle.kts b/build.gradle.kts -index 3a36b2b7f38e3446177f0883083d30c739f6c9b1..9d0675e2afcd9c0f82b6e993b1185d507b32ed0f 100644 +index 19b55f2c25db81fc352a7ab973b2ca7fefbcb432..d1a3e38012873109709cc6fffdce9d9c5614ec73 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -24,6 +24,8 @@ dependencies { diff --git a/patches/api/0025-Add-a-call-helper-to-Event.patch b/patches/api/0026-Add-a-call-helper-to-Event.patch similarity index 100% rename from patches/api/0025-Add-a-call-helper-to-Event.patch rename to patches/api/0026-Add-a-call-helper-to-Event.patch diff --git a/patches/api/0026-Add-sender-name-to-commands.yml-replacement.patch b/patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch similarity index 100% rename from patches/api/0026-Add-sender-name-to-commands.yml-replacement.patch rename to patches/api/0027-Add-sender-name-to-commands.yml-replacement.patch diff --git a/patches/api/0027-Add-command-to-reload-permissions.yml-and-require-co.patch b/patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch similarity index 100% rename from patches/api/0027-Add-command-to-reload-permissions.yml-and-require-co.patch rename to patches/api/0028-Add-command-to-reload-permissions.yml-and-require-co.patch diff --git a/patches/api/0028-Custom-replacement-for-eaten-items.patch b/patches/api/0029-Custom-replacement-for-eaten-items.patch similarity index 100% rename from patches/api/0028-Custom-replacement-for-eaten-items.patch rename to patches/api/0029-Custom-replacement-for-eaten-items.patch diff --git a/patches/api/0029-Entity-AddTo-RemoveFrom-World-Events.patch b/patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch similarity index 100% rename from patches/api/0029-Entity-AddTo-RemoveFrom-World-Events.patch rename to patches/api/0030-Entity-AddTo-RemoveFrom-World-Events.patch diff --git a/patches/api/0030-EntityPathfindEvent.patch b/patches/api/0031-EntityPathfindEvent.patch similarity index 100% rename from patches/api/0030-EntityPathfindEvent.patch rename to patches/api/0031-EntityPathfindEvent.patch diff --git a/patches/api/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch b/patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch similarity index 100% rename from patches/api/0031-Reduce-thread-synchronization-in-MetadataStoreBase.patch rename to patches/api/0032-Reduce-thread-synchronization-in-MetadataStoreBase.patch diff --git a/patches/api/0032-Add-MetadataStoreBase.removeAll-Plugin.patch b/patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch similarity index 100% rename from patches/api/0032-Add-MetadataStoreBase.removeAll-Plugin.patch rename to patches/api/0033-Add-MetadataStoreBase.removeAll-Plugin.patch diff --git a/patches/api/0033-Add-PlayerUseUnknownEntityEvent.patch b/patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch similarity index 100% rename from patches/api/0033-Add-PlayerUseUnknownEntityEvent.patch rename to patches/api/0034-Add-PlayerUseUnknownEntityEvent.patch diff --git a/patches/api/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch b/patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch similarity index 100% rename from patches/api/0034-Add-handshake-event-to-allow-plugins-to-handle-clien.patch rename to patches/api/0035-Add-handshake-event-to-allow-plugins-to-handle-clien.patch diff --git a/patches/api/0035-Arrow-pickup-rule-API.patch b/patches/api/0036-Arrow-pickup-rule-API.patch similarity index 100% rename from patches/api/0035-Arrow-pickup-rule-API.patch rename to patches/api/0036-Arrow-pickup-rule-API.patch diff --git a/patches/api/0036-EntityRegainHealthEvent-isFastRegen-API.patch b/patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch similarity index 100% rename from patches/api/0036-EntityRegainHealthEvent-isFastRegen-API.patch rename to patches/api/0037-EntityRegainHealthEvent-isFastRegen-API.patch diff --git a/patches/api/0037-LootTable-API.patch b/patches/api/0038-LootTable-API.patch similarity index 100% rename from patches/api/0037-LootTable-API.patch rename to patches/api/0038-LootTable-API.patch diff --git a/patches/api/0038-Add-EntityZapEvent.patch b/patches/api/0039-Add-EntityZapEvent.patch similarity index 100% rename from patches/api/0038-Add-EntityZapEvent.patch rename to patches/api/0039-Add-EntityZapEvent.patch diff --git a/patches/api/0039-Misc-Utils.patch b/patches/api/0040-Misc-Utils.patch similarity index 100% rename from patches/api/0039-Misc-Utils.patch rename to patches/api/0040-Misc-Utils.patch diff --git a/patches/api/0040-Allow-Reloading-of-Command-Aliases.patch b/patches/api/0041-Allow-Reloading-of-Command-Aliases.patch similarity index 100% rename from patches/api/0040-Allow-Reloading-of-Command-Aliases.patch rename to patches/api/0041-Allow-Reloading-of-Command-Aliases.patch diff --git a/patches/api/0041-Add-source-to-PlayerExpChangeEvent.patch b/patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch similarity index 100% rename from patches/api/0041-Add-source-to-PlayerExpChangeEvent.patch rename to patches/api/0042-Add-source-to-PlayerExpChangeEvent.patch diff --git a/patches/api/0042-Add-ProjectileCollideEvent.patch b/patches/api/0043-Add-ProjectileCollideEvent.patch similarity index 100% rename from patches/api/0042-Add-ProjectileCollideEvent.patch rename to patches/api/0043-Add-ProjectileCollideEvent.patch diff --git a/patches/api/0043-Add-String-based-Action-Bar-API.patch b/patches/api/0044-Add-String-based-Action-Bar-API.patch similarity index 100% rename from patches/api/0043-Add-String-based-Action-Bar-API.patch rename to patches/api/0044-Add-String-based-Action-Bar-API.patch diff --git a/patches/api/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch b/patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch similarity index 100% rename from patches/api/0044-Add-API-methods-to-control-if-armour-stands-can-move.patch rename to patches/api/0045-Add-API-methods-to-control-if-armour-stands-can-move.patch diff --git a/patches/api/0045-IllegalPacketEvent.patch b/patches/api/0046-IllegalPacketEvent.patch similarity index 100% rename from patches/api/0045-IllegalPacketEvent.patch rename to patches/api/0046-IllegalPacketEvent.patch diff --git a/patches/api/0046-Fireworks-API-s.patch b/patches/api/0047-Fireworks-API-s.patch similarity index 100% rename from patches/api/0046-Fireworks-API-s.patch rename to patches/api/0047-Fireworks-API-s.patch diff --git a/patches/api/0047-PlayerTeleportEndGatewayEvent.patch b/patches/api/0048-PlayerTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0047-PlayerTeleportEndGatewayEvent.patch rename to patches/api/0048-PlayerTeleportEndGatewayEvent.patch diff --git a/patches/api/0048-Provide-E-TE-Chunk-count-stat-methods.patch b/patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch similarity index 100% rename from patches/api/0048-Provide-E-TE-Chunk-count-stat-methods.patch rename to patches/api/0049-Provide-E-TE-Chunk-count-stat-methods.patch diff --git a/patches/api/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch b/patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch similarity index 100% rename from patches/api/0049-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch rename to patches/api/0050-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch diff --git a/patches/api/0050-Expose-WorldBorder-isInBounds-Location-check.patch b/patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch similarity index 100% rename from patches/api/0050-Expose-WorldBorder-isInBounds-Location-check.patch rename to patches/api/0051-Expose-WorldBorder-isInBounds-Location-check.patch diff --git a/patches/api/0051-Add-configuration-option-to-prevent-player-names-fro.patch b/patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch similarity index 100% rename from patches/api/0051-Add-configuration-option-to-prevent-player-names-fro.patch rename to patches/api/0052-Add-configuration-option-to-prevent-player-names-fro.patch diff --git a/patches/api/0052-Fix-upstream-javadoc-warnings-and-errors.patch b/patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch similarity index 100% rename from patches/api/0052-Fix-upstream-javadoc-warnings-and-errors.patch rename to patches/api/0053-Fix-upstream-javadoc-warnings-and-errors.patch diff --git a/patches/api/0053-Item-canEntityPickup.patch b/patches/api/0054-Item-canEntityPickup.patch similarity index 100% rename from patches/api/0053-Item-canEntityPickup.patch rename to patches/api/0054-Item-canEntityPickup.patch diff --git a/patches/api/0054-PlayerAttemptPickupItemEvent.patch b/patches/api/0055-PlayerAttemptPickupItemEvent.patch similarity index 100% rename from patches/api/0054-PlayerAttemptPickupItemEvent.patch rename to patches/api/0055-PlayerAttemptPickupItemEvent.patch diff --git a/patches/api/0055-Add-UnknownCommandEvent.patch b/patches/api/0056-Add-UnknownCommandEvent.patch similarity index 100% rename from patches/api/0055-Add-UnknownCommandEvent.patch rename to patches/api/0056-Add-UnknownCommandEvent.patch diff --git a/patches/api/0056-Basic-PlayerProfile-API.patch b/patches/api/0057-Basic-PlayerProfile-API.patch similarity index 100% rename from patches/api/0056-Basic-PlayerProfile-API.patch rename to patches/api/0057-Basic-PlayerProfile-API.patch diff --git a/patches/api/0057-PlayerPickupItemEvent-setFlyAtPlayer.patch b/patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch similarity index 100% rename from patches/api/0057-PlayerPickupItemEvent-setFlyAtPlayer.patch rename to patches/api/0058-PlayerPickupItemEvent-setFlyAtPlayer.patch diff --git a/patches/api/0058-Shoulder-Entities-Release-API.patch b/patches/api/0059-Shoulder-Entities-Release-API.patch similarity index 100% rename from patches/api/0058-Shoulder-Entities-Release-API.patch rename to patches/api/0059-Shoulder-Entities-Release-API.patch diff --git a/patches/api/0059-Entity-fromMobSpawner.patch b/patches/api/0060-Entity-fromMobSpawner.patch similarity index 88% rename from patches/api/0059-Entity-fromMobSpawner.patch rename to patches/api/0060-Entity-fromMobSpawner.patch index 73b4016c9..44c4dd6e6 100644 --- a/patches/api/0059-Entity-fromMobSpawner.patch +++ b/patches/api/0060-Entity-fromMobSpawner.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Entity#fromMobSpawner() diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index fdce246aecac775c3ff4a028c307b09762505258..fdc95c87a6020bdcaee5b0b8ab5a996c0e241b33 100644 +index 8c93c640dd163ca99df81706715117094fea5738..85478ed185a938aa8e95d450da8197c76f13106b 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -665,5 +665,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent diff --git a/patches/api/0060-Profile-Lookup-Events.patch b/patches/api/0061-Profile-Lookup-Events.patch similarity index 100% rename from patches/api/0060-Profile-Lookup-Events.patch rename to patches/api/0061-Profile-Lookup-Events.patch diff --git a/patches/api/0061-Improve-the-Saddle-API-for-Horses.patch b/patches/api/0062-Improve-the-Saddle-API-for-Horses.patch similarity index 100% rename from patches/api/0061-Improve-the-Saddle-API-for-Horses.patch rename to patches/api/0062-Improve-the-Saddle-API-for-Horses.patch diff --git a/patches/api/0062-Add-getI18NDisplayName-API.patch b/patches/api/0063-Add-getI18NDisplayName-API.patch similarity index 100% rename from patches/api/0062-Add-getI18NDisplayName-API.patch rename to patches/api/0063-Add-getI18NDisplayName-API.patch diff --git a/patches/api/0063-ensureServerConversions-API.patch b/patches/api/0064-ensureServerConversions-API.patch similarity index 100% rename from patches/api/0063-ensureServerConversions-API.patch rename to patches/api/0064-ensureServerConversions-API.patch diff --git a/patches/api/0064-Make-plugins-list-alphabetical.patch b/patches/api/0065-Make-plugins-list-alphabetical.patch similarity index 100% rename from patches/api/0064-Make-plugins-list-alphabetical.patch rename to patches/api/0065-Make-plugins-list-alphabetical.patch diff --git a/patches/api/0065-LivingEntity-setKiller.patch b/patches/api/0066-LivingEntity-setKiller.patch similarity index 90% rename from patches/api/0065-LivingEntity-setKiller.patch rename to patches/api/0066-LivingEntity-setKiller.patch index b7b93870e..37cb713a6 100644 --- a/patches/api/0065-LivingEntity-setKiller.patch +++ b/patches/api/0066-LivingEntity-setKiller.patch @@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity#setKiller diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 45e9f585c3e522ecf94a6bc42cdc190e1a191a5c..33fffda7c8b05cde3c95623937e7eb6c8b628ec6 100644 +index b41133f23d25f90fc0993499056c4eeaf003a701..bfc90a3569abc717f37c064e3068c55ef323edab 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -279,6 +279,15 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0066-ProfileWhitelistVerifyEvent.patch b/patches/api/0067-ProfileWhitelistVerifyEvent.patch similarity index 100% rename from patches/api/0066-ProfileWhitelistVerifyEvent.patch rename to patches/api/0067-ProfileWhitelistVerifyEvent.patch diff --git a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch similarity index 95% rename from patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch rename to patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch index 0ee190ea3..bf10b2b79 100644 --- a/patches/api/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/patches/api/0068-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -14,7 +14,7 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/build.gradle.kts b/build.gradle.kts -index c10c9f86db276b42d8b7c21c353970691990f125..6d04816e22f44a33c001d2b7e080402fba6af86c 100644 +index d1a3e38012873109709cc6fffdce9d9c5614ec73..e142072f31a41b25ac637970f79e71ab70c2f28c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -26,6 +26,7 @@ dependencies { diff --git a/patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch b/patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch similarity index 100% rename from patches/api/0068-Handle-plugin-prefixes-in-implementation-logging-con.patch rename to patches/api/0069-Handle-plugin-prefixes-in-implementation-logging-con.patch diff --git a/patches/api/0069-Add-PlayerJumpEvent.patch b/patches/api/0070-Add-PlayerJumpEvent.patch similarity index 100% rename from patches/api/0069-Add-PlayerJumpEvent.patch rename to patches/api/0070-Add-PlayerJumpEvent.patch diff --git a/patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch b/patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch similarity index 100% rename from patches/api/0070-Add-workaround-for-plugins-modifying-the-parent-of-t.patch rename to patches/api/0071-Add-workaround-for-plugins-modifying-the-parent-of-t.patch diff --git a/patches/api/0071-Add-PlayerArmorChangeEvent.patch b/patches/api/0072-Add-PlayerArmorChangeEvent.patch similarity index 100% rename from patches/api/0071-Add-PlayerArmorChangeEvent.patch rename to patches/api/0072-Add-PlayerArmorChangeEvent.patch diff --git a/patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch b/patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch similarity index 100% rename from patches/api/0072-API-to-get-a-BlockState-without-a-snapshot.patch rename to patches/api/0073-API-to-get-a-BlockState-without-a-snapshot.patch diff --git a/patches/api/0073-AsyncTabCompleteEvent.patch b/patches/api/0074-AsyncTabCompleteEvent.patch similarity index 100% rename from patches/api/0073-AsyncTabCompleteEvent.patch rename to patches/api/0074-AsyncTabCompleteEvent.patch diff --git a/patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch b/patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch similarity index 100% rename from patches/api/0074-Expose-client-protocol-version-and-virtual-host.patch rename to patches/api/0075-Expose-client-protocol-version-and-virtual-host.patch diff --git a/patches/api/0075-Display-warning-on-deprecated-recipe-API.patch b/patches/api/0076-Display-warning-on-deprecated-recipe-API.patch similarity index 100% rename from patches/api/0075-Display-warning-on-deprecated-recipe-API.patch rename to patches/api/0076-Display-warning-on-deprecated-recipe-API.patch diff --git a/patches/api/0076-PlayerPickupExperienceEvent.patch b/patches/api/0077-PlayerPickupExperienceEvent.patch similarity index 100% rename from patches/api/0076-PlayerPickupExperienceEvent.patch rename to patches/api/0077-PlayerPickupExperienceEvent.patch diff --git a/patches/api/0077-ExperienceOrbMergeEvent.patch b/patches/api/0078-ExperienceOrbMergeEvent.patch similarity index 100% rename from patches/api/0077-ExperienceOrbMergeEvent.patch rename to patches/api/0078-ExperienceOrbMergeEvent.patch diff --git a/patches/api/0078-Ability-to-apply-mending-to-XP-API.patch b/patches/api/0079-Ability-to-apply-mending-to-XP-API.patch similarity index 100% rename from patches/api/0078-Ability-to-apply-mending-to-XP-API.patch rename to patches/api/0079-Ability-to-apply-mending-to-XP-API.patch diff --git a/patches/api/0079-PreCreatureSpawnEvent.patch b/patches/api/0080-PreCreatureSpawnEvent.patch similarity index 100% rename from patches/api/0079-PreCreatureSpawnEvent.patch rename to patches/api/0080-PreCreatureSpawnEvent.patch diff --git a/patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch b/patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch similarity index 100% rename from patches/api/0080-PlayerNaturallySpawnCreaturesEvent.patch rename to patches/api/0081-PlayerNaturallySpawnCreaturesEvent.patch diff --git a/patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch b/patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch similarity index 100% rename from patches/api/0081-Add-setPlayerProfile-API-for-Skulls.patch rename to patches/api/0082-Add-setPlayerProfile-API-for-Skulls.patch diff --git a/patches/api/0082-Fill-Profile-Property-Events.patch b/patches/api/0083-Fill-Profile-Property-Events.patch similarity index 100% rename from patches/api/0082-Fill-Profile-Property-Events.patch rename to patches/api/0083-Fill-Profile-Property-Events.patch diff --git a/patches/api/0083-PlayerAdvancementCriterionGrantEvent.patch b/patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch similarity index 100% rename from patches/api/0083-PlayerAdvancementCriterionGrantEvent.patch rename to patches/api/0084-PlayerAdvancementCriterionGrantEvent.patch diff --git a/patches/api/0084-Add-ArmorStand-Item-Meta.patch b/patches/api/0085-Add-ArmorStand-Item-Meta.patch similarity index 100% rename from patches/api/0084-Add-ArmorStand-Item-Meta.patch rename to patches/api/0085-Add-ArmorStand-Item-Meta.patch diff --git a/patches/api/0085-Optimize-Hoppers.patch b/patches/api/0086-Optimize-Hoppers.patch similarity index 100% rename from patches/api/0085-Optimize-Hoppers.patch rename to patches/api/0086-Optimize-Hoppers.patch diff --git a/patches/api/0086-Tameable-getOwnerUniqueId-API.patch b/patches/api/0087-Tameable-getOwnerUniqueId-API.patch similarity index 100% rename from patches/api/0086-Tameable-getOwnerUniqueId-API.patch rename to patches/api/0087-Tameable-getOwnerUniqueId-API.patch diff --git a/patches/api/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch similarity index 100% rename from patches/api/0087-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch rename to patches/api/0088-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch diff --git a/patches/api/0088-Add-extended-PaperServerListPingEvent.patch b/patches/api/0089-Add-extended-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0088-Add-extended-PaperServerListPingEvent.patch rename to patches/api/0089-Add-extended-PaperServerListPingEvent.patch diff --git a/patches/api/0089-Player.setPlayerProfile-API.patch b/patches/api/0090-Player.setPlayerProfile-API.patch similarity index 100% rename from patches/api/0089-Player.setPlayerProfile-API.patch rename to patches/api/0090-Player.setPlayerProfile-API.patch diff --git a/patches/api/0090-getPlayerUniqueId-API.patch b/patches/api/0091-getPlayerUniqueId-API.patch similarity index 100% rename from patches/api/0090-getPlayerUniqueId-API.patch rename to patches/api/0091-getPlayerUniqueId-API.patch diff --git a/patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch b/patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch similarity index 100% rename from patches/api/0091-Add-legacy-ping-support-to-PaperServerListPingEvent.patch rename to patches/api/0092-Add-legacy-ping-support-to-PaperServerListPingEvent.patch diff --git a/patches/api/0092-Add-method-to-open-already-placed-sign.patch b/patches/api/0093-Add-method-to-open-already-placed-sign.patch similarity index 100% rename from patches/api/0092-Add-method-to-open-already-placed-sign.patch rename to patches/api/0093-Add-method-to-open-already-placed-sign.patch diff --git a/patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch b/patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch similarity index 100% rename from patches/api/0093-Add-Ban-Methods-to-Player-Objects.patch rename to patches/api/0094-Add-Ban-Methods-to-Player-Objects.patch diff --git a/patches/api/0094-EndermanEscapeEvent.patch b/patches/api/0095-EndermanEscapeEvent.patch similarity index 100% rename from patches/api/0094-EndermanEscapeEvent.patch rename to patches/api/0095-EndermanEscapeEvent.patch diff --git a/patches/api/0095-Enderman.teleportRandomly.patch b/patches/api/0096-Enderman.teleportRandomly.patch similarity index 100% rename from patches/api/0095-Enderman.teleportRandomly.patch rename to patches/api/0096-Enderman.teleportRandomly.patch diff --git a/patches/api/0096-Additional-world.getNearbyEntities-API-s.patch b/patches/api/0097-Additional-world.getNearbyEntities-API-s.patch similarity index 100% rename from patches/api/0096-Additional-world.getNearbyEntities-API-s.patch rename to patches/api/0097-Additional-world.getNearbyEntities-API-s.patch diff --git a/patches/api/0097-Location.isChunkLoaded-API.patch b/patches/api/0098-Location.isChunkLoaded-API.patch similarity index 100% rename from patches/api/0097-Location.isChunkLoaded-API.patch rename to patches/api/0098-Location.isChunkLoaded-API.patch diff --git a/patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch b/patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch similarity index 100% rename from patches/api/0098-Expand-World.spawnParticle-API-and-add-Builder.patch rename to patches/api/0099-Expand-World.spawnParticle-API-and-add-Builder.patch diff --git a/patches/api/0099-EndermanAttackPlayerEvent.patch b/patches/api/0100-EndermanAttackPlayerEvent.patch similarity index 100% rename from patches/api/0099-EndermanAttackPlayerEvent.patch rename to patches/api/0100-EndermanAttackPlayerEvent.patch diff --git a/patches/api/0100-Close-Plugin-Class-Loaders-on-Disable.patch b/patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch similarity index 100% rename from patches/api/0100-Close-Plugin-Class-Loaders-on-Disable.patch rename to patches/api/0101-Close-Plugin-Class-Loaders-on-Disable.patch diff --git a/patches/api/0101-WitchConsumePotionEvent.patch b/patches/api/0102-WitchConsumePotionEvent.patch similarity index 100% rename from patches/api/0101-WitchConsumePotionEvent.patch rename to patches/api/0102-WitchConsumePotionEvent.patch diff --git a/patches/api/0102-WitchThrowPotionEvent.patch b/patches/api/0103-WitchThrowPotionEvent.patch similarity index 100% rename from patches/api/0102-WitchThrowPotionEvent.patch rename to patches/api/0103-WitchThrowPotionEvent.patch diff --git a/patches/api/0103-Location.toBlockLocation-toCenterLocation.patch b/patches/api/0104-Location.toBlockLocation-toCenterLocation.patch similarity index 100% rename from patches/api/0103-Location.toBlockLocation-toCenterLocation.patch rename to patches/api/0104-Location.toBlockLocation-toCenterLocation.patch diff --git a/patches/api/0104-PotionEffect-clone-methods.patch b/patches/api/0105-PotionEffect-clone-methods.patch similarity index 100% rename from patches/api/0104-PotionEffect-clone-methods.patch rename to patches/api/0105-PotionEffect-clone-methods.patch diff --git a/patches/api/0105-WitchReadyPotionEvent.patch b/patches/api/0106-WitchReadyPotionEvent.patch similarity index 100% rename from patches/api/0105-WitchReadyPotionEvent.patch rename to patches/api/0106-WitchReadyPotionEvent.patch diff --git a/patches/api/0106-ItemStack-getMaxItemUseDuration.patch b/patches/api/0107-ItemStack-getMaxItemUseDuration.patch similarity index 100% rename from patches/api/0106-ItemStack-getMaxItemUseDuration.patch rename to patches/api/0107-ItemStack-getMaxItemUseDuration.patch diff --git a/patches/api/0107-Add-EntityTeleportEndGatewayEvent.patch b/patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch similarity index 100% rename from patches/api/0107-Add-EntityTeleportEndGatewayEvent.patch rename to patches/api/0108-Add-EntityTeleportEndGatewayEvent.patch diff --git a/patches/api/0108-Make-shield-blocking-delay-configurable.patch b/patches/api/0109-Make-shield-blocking-delay-configurable.patch similarity index 100% rename from patches/api/0108-Make-shield-blocking-delay-configurable.patch rename to patches/api/0109-Make-shield-blocking-delay-configurable.patch diff --git a/patches/api/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch b/patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch similarity index 100% rename from patches/api/0109-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch rename to patches/api/0110-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch diff --git a/patches/api/0110-Add-getNearbyXXX-methods-to-Location.patch b/patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch similarity index 100% rename from patches/api/0110-Add-getNearbyXXX-methods-to-Location.patch rename to patches/api/0111-Add-getNearbyXXX-methods-to-Location.patch diff --git a/patches/api/0111-PlayerReadyArrowEvent.patch b/patches/api/0112-PlayerReadyArrowEvent.patch similarity index 100% rename from patches/api/0111-PlayerReadyArrowEvent.patch rename to patches/api/0112-PlayerReadyArrowEvent.patch diff --git a/patches/api/0112-Add-EntityKnockbackByEntityEvent.patch b/patches/api/0113-Add-EntityKnockbackByEntityEvent.patch similarity index 100% rename from patches/api/0112-Add-EntityKnockbackByEntityEvent.patch rename to patches/api/0113-Add-EntityKnockbackByEntityEvent.patch diff --git a/patches/api/0113-Expand-Explosions-API.patch b/patches/api/0114-Expand-Explosions-API.patch similarity index 100% rename from patches/api/0113-Expand-Explosions-API.patch rename to patches/api/0114-Expand-Explosions-API.patch diff --git a/patches/api/0114-ItemStack-API-additions-for-quantity-flags-lore.patch b/patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch similarity index 100% rename from patches/api/0114-ItemStack-API-additions-for-quantity-flags-lore.patch rename to patches/api/0115-ItemStack-API-additions-for-quantity-flags-lore.patch diff --git a/patches/api/0115-LivingEntity-Hand-Raised-Item-Use-API.patch b/patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch similarity index 100% rename from patches/api/0115-LivingEntity-Hand-Raised-Item-Use-API.patch rename to patches/api/0116-LivingEntity-Hand-Raised-Item-Use-API.patch diff --git a/patches/api/0116-RangedEntity-API.patch b/patches/api/0117-RangedEntity-API.patch similarity index 100% rename from patches/api/0116-RangedEntity-API.patch rename to patches/api/0117-RangedEntity-API.patch diff --git a/patches/api/0117-Add-World.getEntity-UUID-API.patch b/patches/api/0118-Add-World.getEntity-UUID-API.patch similarity index 100% rename from patches/api/0117-Add-World.getEntity-UUID-API.patch rename to patches/api/0118-Add-World.getEntity-UUID-API.patch diff --git a/patches/api/0118-InventoryCloseEvent-Reason-API.patch b/patches/api/0119-InventoryCloseEvent-Reason-API.patch similarity index 96% rename from patches/api/0118-InventoryCloseEvent-Reason-API.patch rename to patches/api/0119-InventoryCloseEvent-Reason-API.patch index cbacde69b..a674e86b3 100644 --- a/patches/api/0118-InventoryCloseEvent-Reason-API.patch +++ b/patches/api/0119-InventoryCloseEvent-Reason-API.patch @@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers to "confirm" things based on if it was player triggered close or not. diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 2e86d4c9ee85cf0f9096472b8c3d131522181215..3cf96a3656d3366952f15744c9970e752e97be9a 100644 +index a46cefbb0508c192fdfefd685c7ad3973bb9c0c9..66f11e9670770e05a164922cc0f2aa863c066203 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -153,6 +153,15 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder diff --git a/patches/api/0119-Allow-setting-the-vex-s-summoner.patch b/patches/api/0120-Allow-setting-the-vex-s-summoner.patch similarity index 100% rename from patches/api/0119-Allow-setting-the-vex-s-summoner.patch rename to patches/api/0120-Allow-setting-the-vex-s-summoner.patch diff --git a/patches/api/0120-Entity-getChunk-API.patch b/patches/api/0121-Entity-getChunk-API.patch similarity index 92% rename from patches/api/0120-Entity-getChunk-API.patch rename to patches/api/0121-Entity-getChunk-API.patch index 8de03dab4..a02bb6d15 100644 --- a/patches/api/0120-Entity-getChunk-API.patch +++ b/patches/api/0121-Entity-getChunk-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API Get the chunk the entity is currently registered to diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index fdc95c87a6020bdcaee5b0b8ab5a996c0e241b33..ef95afb92f7a6fea77fe483e26ee3cf6d1bdd041 100644 +index 85478ed185a938aa8e95d450da8197c76f13106b..38d7685063bf47491c55c1911c6f2cb915f64202 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java @@ -3,6 +3,7 @@ package org.bukkit.entity; diff --git a/patches/api/0121-Add-an-asterisk-to-legacy-API-plugins.patch b/patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch similarity index 100% rename from patches/api/0121-Add-an-asterisk-to-legacy-API-plugins.patch rename to patches/api/0122-Add-an-asterisk-to-legacy-API-plugins.patch diff --git a/patches/api/0122-EnderDragon-Events.patch b/patches/api/0123-EnderDragon-Events.patch similarity index 100% rename from patches/api/0122-EnderDragon-Events.patch rename to patches/api/0123-EnderDragon-Events.patch diff --git a/patches/api/0123-PlayerElytraBoostEvent.patch b/patches/api/0124-PlayerElytraBoostEvent.patch similarity index 100% rename from patches/api/0123-PlayerElytraBoostEvent.patch rename to patches/api/0124-PlayerElytraBoostEvent.patch diff --git a/patches/api/0124-PlayerLaunchProjectileEvent.patch b/patches/api/0125-PlayerLaunchProjectileEvent.patch similarity index 100% rename from patches/api/0124-PlayerLaunchProjectileEvent.patch rename to patches/api/0125-PlayerLaunchProjectileEvent.patch diff --git a/patches/api/0125-EntityTransformedEvent.patch b/patches/api/0126-EntityTransformedEvent.patch similarity index 100% rename from patches/api/0125-EntityTransformedEvent.patch rename to patches/api/0126-EntityTransformedEvent.patch diff --git a/patches/api/0126-Allow-disabling-armour-stand-ticking.patch b/patches/api/0127-Allow-disabling-armour-stand-ticking.patch similarity index 100% rename from patches/api/0126-Allow-disabling-armour-stand-ticking.patch rename to patches/api/0127-Allow-disabling-armour-stand-ticking.patch diff --git a/patches/api/0127-SkeletonHorse-Additions.patch b/patches/api/0128-SkeletonHorse-Additions.patch similarity index 100% rename from patches/api/0127-SkeletonHorse-Additions.patch rename to patches/api/0128-SkeletonHorse-Additions.patch diff --git a/patches/api/0128-Expand-Location-Manipulation-API.patch b/patches/api/0129-Expand-Location-Manipulation-API.patch similarity index 100% rename from patches/api/0128-Expand-Location-Manipulation-API.patch rename to patches/api/0129-Expand-Location-Manipulation-API.patch diff --git a/patches/api/0129-Expand-ArmorStand-API.patch b/patches/api/0130-Expand-ArmorStand-API.patch similarity index 100% rename from patches/api/0129-Expand-ArmorStand-API.patch rename to patches/api/0130-Expand-ArmorStand-API.patch diff --git a/patches/api/0130-AnvilDamageEvent.patch b/patches/api/0131-AnvilDamageEvent.patch similarity index 100% rename from patches/api/0130-AnvilDamageEvent.patch rename to patches/api/0131-AnvilDamageEvent.patch diff --git a/patches/api/0131-Remove-deadlock-risk-in-firing-async-events.patch b/patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch similarity index 100% rename from patches/api/0131-Remove-deadlock-risk-in-firing-async-events.patch rename to patches/api/0132-Remove-deadlock-risk-in-firing-async-events.patch diff --git a/patches/api/0132-Add-hand-to-bucket-events.patch b/patches/api/0133-Add-hand-to-bucket-events.patch similarity index 100% rename from patches/api/0132-Add-hand-to-bucket-events.patch rename to patches/api/0133-Add-hand-to-bucket-events.patch diff --git a/patches/api/0133-Add-TNTPrimeEvent.patch b/patches/api/0134-Add-TNTPrimeEvent.patch similarity index 100% rename from patches/api/0133-Add-TNTPrimeEvent.patch rename to patches/api/0134-Add-TNTPrimeEvent.patch diff --git a/patches/api/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch b/patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch similarity index 100% rename from patches/api/0134-Provide-Chunk-Coordinates-as-a-Long-API.patch rename to patches/api/0135-Provide-Chunk-Coordinates-as-a-Long-API.patch diff --git a/patches/api/0135-Make-EnderDragon-extend-Mob.patch b/patches/api/0136-Make-EnderDragon-extend-Mob.patch similarity index 100% rename from patches/api/0135-Make-EnderDragon-extend-Mob.patch rename to patches/api/0136-Make-EnderDragon-extend-Mob.patch diff --git a/patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch b/patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch similarity index 100% rename from patches/api/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch rename to patches/api/0137-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch diff --git a/patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch b/patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch similarity index 100% rename from patches/api/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch rename to patches/api/0138-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch diff --git a/patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch b/patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch similarity index 100% rename from patches/api/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch rename to patches/api/0139-Allow-Blocks-to-be-accessed-via-a-long-key.patch diff --git a/patches/api/0139-Slime-Pathfinder-Events.patch b/patches/api/0140-Slime-Pathfinder-Events.patch similarity index 100% rename from patches/api/0139-Slime-Pathfinder-Events.patch rename to patches/api/0140-Slime-Pathfinder-Events.patch diff --git a/patches/api/0140-Add-PhantomPreSpawnEvent.patch b/patches/api/0141-Add-PhantomPreSpawnEvent.patch similarity index 100% rename from patches/api/0140-Add-PhantomPreSpawnEvent.patch rename to patches/api/0141-Add-PhantomPreSpawnEvent.patch diff --git a/patches/api/0141-Add-More-Creeper-API.patch b/patches/api/0142-Add-More-Creeper-API.patch similarity index 100% rename from patches/api/0141-Add-More-Creeper-API.patch rename to patches/api/0142-Add-More-Creeper-API.patch diff --git a/patches/api/0142-isChunkGenerated-API.patch b/patches/api/0143-isChunkGenerated-API.patch similarity index 100% rename from patches/api/0142-isChunkGenerated-API.patch rename to patches/api/0143-isChunkGenerated-API.patch diff --git a/patches/api/0143-Add-source-block-to-BlockPhysicsEvent.patch b/patches/api/0144-Add-source-block-to-BlockPhysicsEvent.patch similarity index 100% rename from patches/api/0143-Add-source-block-to-BlockPhysicsEvent.patch rename to patches/api/0144-Add-source-block-to-BlockPhysicsEvent.patch diff --git a/patches/api/0144-Inventory-removeItemAnySlot.patch b/patches/api/0145-Inventory-removeItemAnySlot.patch similarity index 100% rename from patches/api/0144-Inventory-removeItemAnySlot.patch rename to patches/api/0145-Inventory-removeItemAnySlot.patch diff --git a/patches/api/0145-Async-Chunks-API.patch b/patches/api/0146-Async-Chunks-API.patch similarity index 100% rename from patches/api/0145-Async-Chunks-API.patch rename to patches/api/0146-Async-Chunks-API.patch diff --git a/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch similarity index 98% rename from patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch rename to patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch index 8b636c854..5fe29b7e3 100644 --- a/patches/api/0146-Add-ray-tracing-methods-to-LivingEntity.patch +++ b/patches/api/0147-Add-ray-tracing-methods-to-LivingEntity.patch @@ -65,7 +65,7 @@ index 0000000000000000000000000000000000000000..18a96dbb01d3b34476652264b2d6be37 + } +} diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java -index 4f62a49e7b0538f0ce9cecd2c1b645f40ce17b3d..05992ade1bca42a6233373b44513b89986d89c5a 100644 +index 6d8d96976bcef4e176453fede81a529478f11234..ad885a0775b387e3e8ca6bfae80c18465038056c 100644 --- a/src/main/java/org/bukkit/entity/LivingEntity.java +++ b/src/main/java/org/bukkit/entity/LivingEntity.java @@ -82,6 +82,77 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource diff --git a/patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch b/patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch similarity index 100% rename from patches/api/0147-Expose-attack-cooldown-methods-for-Player.patch rename to patches/api/0148-Expose-attack-cooldown-methods-for-Player.patch diff --git a/patches/api/0148-Improve-death-events.patch b/patches/api/0149-Improve-death-events.patch similarity index 100% rename from patches/api/0148-Improve-death-events.patch rename to patches/api/0149-Improve-death-events.patch diff --git a/patches/api/0149-Mob-Pathfinding-API.patch b/patches/api/0150-Mob-Pathfinding-API.patch similarity index 100% rename from patches/api/0149-Mob-Pathfinding-API.patch rename to patches/api/0150-Mob-Pathfinding-API.patch diff --git a/patches/api/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch similarity index 100% rename from patches/api/0150-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch rename to patches/api/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch diff --git a/patches/api/0151-Performance-Concurrency-Improvements-to-Permissions.patch b/patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch similarity index 100% rename from patches/api/0151-Performance-Concurrency-Improvements-to-Permissions.patch rename to patches/api/0152-Performance-Concurrency-Improvements-to-Permissions.patch diff --git a/patches/api/0152-Add-ItemStackRecipeChoice-Draft-API.patch b/patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch similarity index 100% rename from patches/api/0152-Add-ItemStackRecipeChoice-Draft-API.patch rename to patches/api/0153-Add-ItemStackRecipeChoice-Draft-API.patch diff --git a/patches/api/0153-Implement-furnace-cook-speed-multiplier-API.patch b/patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch similarity index 100% rename from patches/api/0153-Implement-furnace-cook-speed-multiplier-API.patch rename to patches/api/0154-Implement-furnace-cook-speed-multiplier-API.patch diff --git a/patches/api/0154-Material-API-additions.patch b/patches/api/0155-Material-API-additions.patch similarity index 100% rename from patches/api/0154-Material-API-additions.patch rename to patches/api/0155-Material-API-additions.patch diff --git a/patches/api/0155-PreSpawnerSpawnEvent.patch b/patches/api/0156-PreSpawnerSpawnEvent.patch similarity index 100% rename from patches/api/0155-PreSpawnerSpawnEvent.patch rename to patches/api/0156-PreSpawnerSpawnEvent.patch diff --git a/patches/api/0156-Add-Material-Tags.patch b/patches/api/0157-Add-Material-Tags.patch similarity index 100% rename from patches/api/0156-Add-Material-Tags.patch rename to patches/api/0157-Add-Material-Tags.patch diff --git a/patches/api/0157-Add-LivingEntity-getTargetEntity.patch b/patches/api/0158-Add-LivingEntity-getTargetEntity.patch similarity index 100% rename from patches/api/0157-Add-LivingEntity-getTargetEntity.patch rename to patches/api/0158-Add-LivingEntity-getTargetEntity.patch diff --git a/patches/api/0158-Add-sun-related-API.patch b/patches/api/0159-Add-sun-related-API.patch similarity index 100% rename from patches/api/0158-Add-sun-related-API.patch rename to patches/api/0159-Add-sun-related-API.patch diff --git a/patches/api/0159-Here-s-Johnny.patch b/patches/api/0160-Here-s-Johnny.patch similarity index 100% rename from patches/api/0159-Here-s-Johnny.patch rename to patches/api/0160-Here-s-Johnny.patch diff --git a/patches/api/0160-Turtle-API.patch b/patches/api/0161-Turtle-API.patch similarity index 100% rename from patches/api/0160-Turtle-API.patch rename to patches/api/0161-Turtle-API.patch diff --git a/patches/api/0161-Add-spectator-target-events.patch b/patches/api/0162-Add-spectator-target-events.patch similarity index 100% rename from patches/api/0161-Add-spectator-target-events.patch rename to patches/api/0162-Add-spectator-target-events.patch diff --git a/patches/api/0162-Add-more-Witch-API.patch b/patches/api/0163-Add-more-Witch-API.patch similarity index 100% rename from patches/api/0162-Add-more-Witch-API.patch rename to patches/api/0163-Add-more-Witch-API.patch diff --git a/patches/api/0163-Make-the-default-permission-message-configurable.patch b/patches/api/0164-Make-the-default-permission-message-configurable.patch similarity index 100% rename from patches/api/0163-Make-the-default-permission-message-configurable.patch rename to patches/api/0164-Make-the-default-permission-message-configurable.patch diff --git a/patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch b/patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch similarity index 100% rename from patches/api/0164-Support-cancellation-supression-of-EntityDismount-Ve.patch rename to patches/api/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch diff --git a/patches/api/0165-Add-more-Zombie-API.patch b/patches/api/0166-Add-more-Zombie-API.patch similarity index 100% rename from patches/api/0165-Add-more-Zombie-API.patch rename to patches/api/0166-Add-more-Zombie-API.patch diff --git a/patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch b/patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch similarity index 100% rename from patches/api/0166-Change-the-reserved-channel-check-to-be-sensible.patch rename to patches/api/0167-Change-the-reserved-channel-check-to-be-sensible.patch diff --git a/patches/api/0167-Add-PlayerConnectionCloseEvent.patch b/patches/api/0168-Add-PlayerConnectionCloseEvent.patch similarity index 100% rename from patches/api/0167-Add-PlayerConnectionCloseEvent.patch rename to patches/api/0168-Add-PlayerConnectionCloseEvent.patch diff --git a/patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch similarity index 100% rename from patches/api/0168-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch rename to patches/api/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch diff --git a/patches/api/0169-BlockDestroyEvent.patch b/patches/api/0170-BlockDestroyEvent.patch similarity index 100% rename from patches/api/0169-BlockDestroyEvent.patch rename to patches/api/0170-BlockDestroyEvent.patch diff --git a/patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch b/patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch similarity index 100% rename from patches/api/0170-Add-ItemStack-Recipe-API-helper-methods.patch rename to patches/api/0171-Add-ItemStack-Recipe-API-helper-methods.patch diff --git a/patches/api/0171-Add-WhitelistToggleEvent.patch b/patches/api/0172-Add-WhitelistToggleEvent.patch similarity index 100% rename from patches/api/0171-Add-WhitelistToggleEvent.patch rename to patches/api/0172-Add-WhitelistToggleEvent.patch diff --git a/patches/api/0172-Annotation-Test-changes.patch b/patches/api/0173-Annotation-Test-changes.patch similarity index 92% rename from patches/api/0172-Annotation-Test-changes.patch rename to patches/api/0173-Annotation-Test-changes.patch index 380b55d77..ec5480f21 100644 --- a/patches/api/0172-Annotation-Test-changes.patch +++ b/patches/api/0173-Annotation-Test-changes.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Annotation Test changes diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index c62919f18f318fec15a6c364d8b6d562c2b04762..2bb75e967d4250476a151599b68de80011d222b2 100644 +index 002677ac589aa88b643c52a883a72a2bdc3696dd..dfd4174c8dca51600c2203e3f4c933507fb827e7 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -46,7 +46,17 @@ public class AnnotationTest { diff --git a/patches/api/0173-Entity-getEntitySpawnReason.patch b/patches/api/0174-Entity-getEntitySpawnReason.patch similarity index 100% rename from patches/api/0173-Entity-getEntitySpawnReason.patch rename to patches/api/0174-Entity-getEntitySpawnReason.patch diff --git a/patches/api/0174-Add-GS4-Query-event.patch b/patches/api/0175-Add-GS4-Query-event.patch similarity index 100% rename from patches/api/0174-Add-GS4-Query-event.patch rename to patches/api/0175-Add-GS4-Query-event.patch diff --git a/patches/api/0175-Add-PlayerPostRespawnEvent.patch b/patches/api/0176-Add-PlayerPostRespawnEvent.patch similarity index 100% rename from patches/api/0175-Add-PlayerPostRespawnEvent.patch rename to patches/api/0176-Add-PlayerPostRespawnEvent.patch diff --git a/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch b/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch similarity index 87% rename from patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch rename to patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch index 28d9857af..9649b2268 100644 --- a/patches/api/0176-Ignore-package-private-methods-for-nullability-annot.patch +++ b/patches/api/0177-Ignore-package-private-methods-for-nullability-annot.patch @@ -6,10 +6,10 @@ Subject: [PATCH] Ignore package-private methods for nullability annotations This isn't API diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 2bb75e967d4250476a151599b68de80011d222b2..03229d5f4ec36a82197beb391356d791ff67fb2f 100644 +index dfd4174c8dca51600c2203e3f4c933507fb827e7..1c6a41644257cd35ced235af6cc60efc925ebc18 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java -@@ -168,7 +168,7 @@ public class AnnotationTest { +@@ -179,7 +179,7 @@ public class AnnotationTest { private static boolean isMethodIncluded(@NotNull ClassNode clazz, @NotNull MethodNode method, @NotNull Map allClasses) { // Exclude private, synthetic and deprecated methods diff --git a/patches/api/0177-Flip-some-Spigot-API-null-annotations.patch b/patches/api/0178-Flip-some-Spigot-API-null-annotations.patch similarity index 100% rename from patches/api/0177-Flip-some-Spigot-API-null-annotations.patch rename to patches/api/0178-Flip-some-Spigot-API-null-annotations.patch diff --git a/patches/api/0178-Server-Tick-Events.patch b/patches/api/0179-Server-Tick-Events.patch similarity index 100% rename from patches/api/0178-Server-Tick-Events.patch rename to patches/api/0179-Server-Tick-Events.patch diff --git a/patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch b/patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch similarity index 100% rename from patches/api/0179-PlayerDeathEvent-getItemsToKeep.patch rename to patches/api/0180-PlayerDeathEvent-getItemsToKeep.patch diff --git a/patches/api/0180-Add-Heightmap-API.patch b/patches/api/0181-Add-Heightmap-API.patch similarity index 100% rename from patches/api/0180-Add-Heightmap-API.patch rename to patches/api/0181-Add-Heightmap-API.patch diff --git a/patches/api/0181-Mob-Spawner-API-Enhancements.patch b/patches/api/0182-Mob-Spawner-API-Enhancements.patch similarity index 100% rename from patches/api/0181-Mob-Spawner-API-Enhancements.patch rename to patches/api/0182-Mob-Spawner-API-Enhancements.patch diff --git a/patches/api/0182-Add-BlockSoundGroup-interface.patch b/patches/api/0183-Add-BlockSoundGroup-interface.patch similarity index 100% rename from patches/api/0182-Add-BlockSoundGroup-interface.patch rename to patches/api/0183-Add-BlockSoundGroup-interface.patch diff --git a/patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch b/patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch similarity index 100% rename from patches/api/0183-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch rename to patches/api/0184-Amend-PlayerInteractAtEntityEvent-javadoc-for-ArmorS.patch diff --git a/patches/api/0184-Increase-custom-payload-channel-message-size.patch b/patches/api/0185-Increase-custom-payload-channel-message-size.patch similarity index 100% rename from patches/api/0184-Increase-custom-payload-channel-message-size.patch rename to patches/api/0185-Increase-custom-payload-channel-message-size.patch diff --git a/patches/api/0185-Expose-the-internal-current-tick.patch b/patches/api/0186-Expose-the-internal-current-tick.patch similarity index 100% rename from patches/api/0185-Expose-the-internal-current-tick.patch rename to patches/api/0186-Expose-the-internal-current-tick.patch diff --git a/patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch b/patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch similarity index 100% rename from patches/api/0186-PlayerDeathEvent-shouldDropExperience.patch rename to patches/api/0187-PlayerDeathEvent-shouldDropExperience.patch diff --git a/patches/api/0187-Add-effect-to-block-break-naturally.patch b/patches/api/0188-Add-effect-to-block-break-naturally.patch similarity index 100% rename from patches/api/0187-Add-effect-to-block-break-naturally.patch rename to patches/api/0188-Add-effect-to-block-break-naturally.patch diff --git a/patches/api/0188-World-view-distance-api.patch b/patches/api/0189-World-view-distance-api.patch similarity index 100% rename from patches/api/0188-World-view-distance-api.patch rename to patches/api/0189-World-view-distance-api.patch diff --git a/patches/api/0189-Add-ThrownEggHatchEvent.patch b/patches/api/0190-Add-ThrownEggHatchEvent.patch similarity index 100% rename from patches/api/0189-Add-ThrownEggHatchEvent.patch rename to patches/api/0190-Add-ThrownEggHatchEvent.patch diff --git a/patches/api/0190-Entity-Jump-API.patch b/patches/api/0191-Entity-Jump-API.patch similarity index 100% rename from patches/api/0190-Entity-Jump-API.patch rename to patches/api/0191-Entity-Jump-API.patch diff --git a/patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch b/patches/api/0192-add-hand-to-BlockMultiPlaceEvent.patch similarity index 100% rename from patches/api/0191-add-hand-to-BlockMultiPlaceEvent.patch rename to patches/api/0192-add-hand-to-BlockMultiPlaceEvent.patch diff --git a/patches/api/0192-Add-tick-times-API.patch b/patches/api/0193-Add-tick-times-API.patch similarity index 100% rename from patches/api/0192-Add-tick-times-API.patch rename to patches/api/0193-Add-tick-times-API.patch diff --git a/patches/api/0193-Expose-MinecraftServer-isRunning.patch b/patches/api/0194-Expose-MinecraftServer-isRunning.patch similarity index 100% rename from patches/api/0193-Expose-MinecraftServer-isRunning.patch rename to patches/api/0194-Expose-MinecraftServer-isRunning.patch diff --git a/patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch b/patches/api/0195-Add-Raw-Byte-ItemStack-Serialization.patch similarity index 100% rename from patches/api/0194-Add-Raw-Byte-ItemStack-Serialization.patch rename to patches/api/0195-Add-Raw-Byte-ItemStack-Serialization.patch diff --git a/patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch b/patches/api/0196-Disable-Sync-Events-firing-Async-errors-during-shutd.patch similarity index 100% rename from patches/api/0195-Disable-Sync-Events-firing-Async-errors-during-shutd.patch rename to patches/api/0196-Disable-Sync-Events-firing-Async-errors-during-shutd.patch diff --git a/patches/api/0196-Make-JavaPluginLoader-thread-safe.patch b/patches/api/0197-Make-JavaPluginLoader-thread-safe.patch similarity index 100% rename from patches/api/0196-Make-JavaPluginLoader-thread-safe.patch rename to patches/api/0197-Make-JavaPluginLoader-thread-safe.patch diff --git a/patches/api/0197-Add-Player-Client-Options-API.patch b/patches/api/0198-Add-Player-Client-Options-API.patch similarity index 100% rename from patches/api/0197-Add-Player-Client-Options-API.patch rename to patches/api/0198-Add-Player-Client-Options-API.patch diff --git a/patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/api/0199-Add-PlayerAttackEntityCooldownResetEvent.patch similarity index 100% rename from patches/api/0198-Add-PlayerAttackEntityCooldownResetEvent.patch rename to patches/api/0199-Add-PlayerAttackEntityCooldownResetEvent.patch diff --git a/patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch b/patches/api/0200-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch similarity index 100% rename from patches/api/0199-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch rename to patches/api/0200-Fix-Potion-toItemStack-swapping-the-extended-and-upg.patch diff --git a/patches/api/0200-Add-item-slot-convenience-methods.patch b/patches/api/0201-Add-item-slot-convenience-methods.patch similarity index 100% rename from patches/api/0200-Add-item-slot-convenience-methods.patch rename to patches/api/0201-Add-item-slot-convenience-methods.patch diff --git a/patches/api/0201-Villager-Restocks-API.patch b/patches/api/0202-Villager-Restocks-API.patch similarity index 100% rename from patches/api/0201-Villager-Restocks-API.patch rename to patches/api/0202-Villager-Restocks-API.patch diff --git a/patches/api/0202-Add-Mob-Goal-API.patch b/patches/api/0203-Add-Mob-Goal-API.patch similarity index 100% rename from patches/api/0202-Add-Mob-Goal-API.patch rename to patches/api/0203-Add-Mob-Goal-API.patch diff --git a/patches/api/0203-Expose-game-version.patch b/patches/api/0204-Expose-game-version.patch similarity index 100% rename from patches/api/0203-Expose-game-version.patch rename to patches/api/0204-Expose-game-version.patch diff --git a/patches/api/0204-Add-villager-reputation-API.patch b/patches/api/0205-Add-villager-reputation-API.patch similarity index 100% rename from patches/api/0204-Add-villager-reputation-API.patch rename to patches/api/0205-Add-villager-reputation-API.patch diff --git a/patches/api/0205-Spawn-Reason-API.patch b/patches/api/0206-Spawn-Reason-API.patch similarity index 100% rename from patches/api/0205-Spawn-Reason-API.patch rename to patches/api/0206-Spawn-Reason-API.patch diff --git a/patches/api/0206-Potential-bed-API.patch b/patches/api/0207-Potential-bed-API.patch similarity index 100% rename from patches/api/0206-Potential-bed-API.patch rename to patches/api/0207-Potential-bed-API.patch diff --git a/patches/api/0207-Prioritise-own-classes-where-possible.patch b/patches/api/0208-Prioritise-own-classes-where-possible.patch similarity index 100% rename from patches/api/0207-Prioritise-own-classes-where-possible.patch rename to patches/api/0208-Prioritise-own-classes-where-possible.patch diff --git a/patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch b/patches/api/0209-Provide-a-useful-PluginClassLoader-toString.patch similarity index 100% rename from patches/api/0208-Provide-a-useful-PluginClassLoader-toString.patch rename to patches/api/0209-Provide-a-useful-PluginClassLoader-toString.patch diff --git a/patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch b/patches/api/0210-Inventory-getHolder-method-without-block-snapshot.patch similarity index 100% rename from patches/api/0209-Inventory-getHolder-method-without-block-snapshot.patch rename to patches/api/0210-Inventory-getHolder-method-without-block-snapshot.patch diff --git a/patches/api/0210-Expose-Arrow-getItemStack.patch b/patches/api/0211-Expose-Arrow-getItemStack.patch similarity index 100% rename from patches/api/0210-Expose-Arrow-getItemStack.patch rename to patches/api/0211-Expose-Arrow-getItemStack.patch diff --git a/patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch b/patches/api/0212-Add-and-implement-PlayerRecipeBookClickEvent.patch similarity index 100% rename from patches/api/0211-Add-and-implement-PlayerRecipeBookClickEvent.patch rename to patches/api/0212-Add-and-implement-PlayerRecipeBookClickEvent.patch diff --git a/patches/api/0212-Support-components-in-ItemMeta.patch b/patches/api/0213-Support-components-in-ItemMeta.patch similarity index 100% rename from patches/api/0212-Support-components-in-ItemMeta.patch rename to patches/api/0213-Support-components-in-ItemMeta.patch diff --git a/patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch b/patches/api/0214-added-2-new-TargetReasons-for-1.16-mob-behavior.patch similarity index 100% rename from patches/api/0213-added-2-new-TargetReasons-for-1.16-mob-behavior.patch rename to patches/api/0214-added-2-new-TargetReasons-for-1.16-mob-behavior.patch diff --git a/patches/api/0214-Add-entity-liquid-API.patch b/patches/api/0215-Add-entity-liquid-API.patch similarity index 100% rename from patches/api/0214-Add-entity-liquid-API.patch rename to patches/api/0215-Add-entity-liquid-API.patch diff --git a/patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch b/patches/api/0216-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch similarity index 100% rename from patches/api/0215-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch rename to patches/api/0216-Add-PrepareResultEvent-PrepareGrindstoneEvent.patch diff --git a/patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch b/patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch similarity index 100% rename from patches/api/0216-Allow-delegation-to-vanilla-chunk-gen.patch rename to patches/api/0217-Allow-delegation-to-vanilla-chunk-gen.patch diff --git a/patches/api/0217-Support-hex-colors-in-getLastColors.patch b/patches/api/0218-Support-hex-colors-in-getLastColors.patch similarity index 100% rename from patches/api/0217-Support-hex-colors-in-getLastColors.patch rename to patches/api/0218-Support-hex-colors-in-getLastColors.patch diff --git a/patches/api/0218-Add-setMaxPlayers-API.patch b/patches/api/0219-Add-setMaxPlayers-API.patch similarity index 100% rename from patches/api/0218-Add-setMaxPlayers-API.patch rename to patches/api/0219-Add-setMaxPlayers-API.patch diff --git a/patches/api/0219-Add-moon-phase-API.patch b/patches/api/0220-Add-moon-phase-API.patch similarity index 100% rename from patches/api/0219-Add-moon-phase-API.patch rename to patches/api/0220-Add-moon-phase-API.patch diff --git a/patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch b/patches/api/0221-Add-playPickupItemAnimation-to-LivingEntity.patch similarity index 100% rename from patches/api/0220-Add-playPickupItemAnimation-to-LivingEntity.patch rename to patches/api/0221-Add-playPickupItemAnimation-to-LivingEntity.patch diff --git a/patches/api/0221-Add-BellRingEvent.patch b/patches/api/0222-Add-BellRingEvent.patch similarity index 100% rename from patches/api/0221-Add-BellRingEvent.patch rename to patches/api/0222-Add-BellRingEvent.patch diff --git a/patches/api/0222-Brand-support.patch b/patches/api/0223-Brand-support.patch similarity index 100% rename from patches/api/0222-Brand-support.patch rename to patches/api/0223-Brand-support.patch diff --git a/patches/api/0223-Add-more-Evoker-API.patch b/patches/api/0224-Add-more-Evoker-API.patch similarity index 100% rename from patches/api/0223-Add-more-Evoker-API.patch rename to patches/api/0224-Add-more-Evoker-API.patch diff --git a/patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch b/patches/api/0225-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch similarity index 100% rename from patches/api/0224-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch rename to patches/api/0225-Add-a-way-to-get-translation-keys-for-blocks-entitie.patch diff --git a/patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch b/patches/api/0226-Create-HoverEvent-from-ItemStack-Entity.patch similarity index 100% rename from patches/api/0225-Create-HoverEvent-from-ItemStack-Entity.patch rename to patches/api/0226-Create-HoverEvent-from-ItemStack-Entity.patch diff --git a/patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch b/patches/api/0227-Add-additional-open-container-api-to-HumanEntity.patch similarity index 100% rename from patches/api/0226-Add-additional-open-container-api-to-HumanEntity.patch rename to patches/api/0227-Add-additional-open-container-api-to-HumanEntity.patch diff --git a/patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch b/patches/api/0228-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch similarity index 100% rename from patches/api/0227-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch rename to patches/api/0228-Expose-the-Entity-Counter-to-allow-plugins-to-use-va.patch diff --git a/patches/api/0228-Entity-isTicking.patch b/patches/api/0229-Entity-isTicking.patch similarity index 100% rename from patches/api/0228-Entity-isTicking.patch rename to patches/api/0229-Entity-isTicking.patch diff --git a/patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch b/patches/api/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch similarity index 100% rename from patches/api/0229-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch rename to patches/api/0230-Clarify-the-Javadocs-for-Entity.getEntitySpawnReason.patch diff --git a/patches/api/0230-Villager-resetOffers.patch b/patches/api/0231-Villager-resetOffers.patch similarity index 100% rename from patches/api/0230-Villager-resetOffers.patch rename to patches/api/0231-Villager-resetOffers.patch diff --git a/patches/api/0231-Player-elytra-boost-API.patch b/patches/api/0232-Player-elytra-boost-API.patch similarity index 100% rename from patches/api/0231-Player-elytra-boost-API.patch rename to patches/api/0232-Player-elytra-boost-API.patch diff --git a/patches/api/0232-Add-getOfflinePlayerIfCached-String.patch b/patches/api/0233-Add-getOfflinePlayerIfCached-String.patch similarity index 100% rename from patches/api/0232-Add-getOfflinePlayerIfCached-String.patch rename to patches/api/0233-Add-getOfflinePlayerIfCached-String.patch diff --git a/patches/api/0233-Add-ignore-discounts-API.patch b/patches/api/0234-Add-ignore-discounts-API.patch similarity index 100% rename from patches/api/0233-Add-ignore-discounts-API.patch rename to patches/api/0234-Add-ignore-discounts-API.patch diff --git a/patches/api/0234-Item-no-age-no-player-pickup.patch b/patches/api/0235-Item-no-age-no-player-pickup.patch similarity index 100% rename from patches/api/0234-Item-no-age-no-player-pickup.patch rename to patches/api/0235-Item-no-age-no-player-pickup.patch diff --git a/patches/api/0235-Beacon-API-custom-effect-ranges.patch b/patches/api/0236-Beacon-API-custom-effect-ranges.patch similarity index 100% rename from patches/api/0235-Beacon-API-custom-effect-ranges.patch rename to patches/api/0236-Beacon-API-custom-effect-ranges.patch diff --git a/patches/api/0236-Add-API-for-quit-reason.patch b/patches/api/0237-Add-API-for-quit-reason.patch similarity index 100% rename from patches/api/0236-Add-API-for-quit-reason.patch rename to patches/api/0237-Add-API-for-quit-reason.patch diff --git a/patches/api/0237-Add-Destroy-Speed-API.patch b/patches/api/0238-Add-Destroy-Speed-API.patch similarity index 100% rename from patches/api/0237-Add-Destroy-Speed-API.patch rename to patches/api/0238-Add-Destroy-Speed-API.patch diff --git a/patches/api/0238-Add-LivingEntity-clearActiveItem.patch b/patches/api/0239-Add-LivingEntity-clearActiveItem.patch similarity index 100% rename from patches/api/0238-Add-LivingEntity-clearActiveItem.patch rename to patches/api/0239-Add-LivingEntity-clearActiveItem.patch diff --git a/patches/api/0239-Add-PlayerItemCooldownEvent.patch b/patches/api/0240-Add-PlayerItemCooldownEvent.patch similarity index 100% rename from patches/api/0239-Add-PlayerItemCooldownEvent.patch rename to patches/api/0240-Add-PlayerItemCooldownEvent.patch diff --git a/patches/api/0240-More-lightning-API.patch b/patches/api/0241-More-lightning-API.patch similarity index 100% rename from patches/api/0240-More-lightning-API.patch rename to patches/api/0241-More-lightning-API.patch diff --git a/patches/api/0241-Add-PlayerShearBlockEvent.patch b/patches/api/0242-Add-PlayerShearBlockEvent.patch similarity index 100% rename from patches/api/0241-Add-PlayerShearBlockEvent.patch rename to patches/api/0242-Add-PlayerShearBlockEvent.patch diff --git a/patches/api/0242-Enable-multi-release-plugin-jars.patch b/patches/api/0243-Enable-multi-release-plugin-jars.patch similarity index 100% rename from patches/api/0242-Enable-multi-release-plugin-jars.patch rename to patches/api/0243-Enable-multi-release-plugin-jars.patch diff --git a/patches/api/0243-Player-Chunk-Load-Unload-Events.patch b/patches/api/0244-Player-Chunk-Load-Unload-Events.patch similarity index 100% rename from patches/api/0243-Player-Chunk-Load-Unload-Events.patch rename to patches/api/0244-Player-Chunk-Load-Unload-Events.patch diff --git a/patches/api/0244-Expose-LivingEntity-hurt-direction.patch b/patches/api/0245-Expose-LivingEntity-hurt-direction.patch similarity index 100% rename from patches/api/0244-Expose-LivingEntity-hurt-direction.patch rename to patches/api/0245-Expose-LivingEntity-hurt-direction.patch diff --git a/patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch similarity index 100% rename from patches/api/0245-Add-OBSTRUCTED-reason-to-BedEnterResult.patch rename to patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch diff --git a/patches/api/0246-Added-PlayerTradeEvent.patch b/patches/api/0247-Added-PlayerTradeEvent.patch similarity index 100% rename from patches/api/0246-Added-PlayerTradeEvent.patch rename to patches/api/0247-Added-PlayerTradeEvent.patch diff --git a/patches/api/0247-Add-TargetHitEvent-API.patch b/patches/api/0248-Add-TargetHitEvent-API.patch similarity index 100% rename from patches/api/0247-Add-TargetHitEvent-API.patch rename to patches/api/0248-Add-TargetHitEvent-API.patch diff --git a/patches/api/0248-Additional-Block-Material-API-s.patch b/patches/api/0249-Additional-Block-Material-API-s.patch similarity index 100% rename from patches/api/0248-Additional-Block-Material-API-s.patch rename to patches/api/0249-Additional-Block-Material-API-s.patch diff --git a/patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch b/patches/api/0250-Add-API-to-get-Material-from-Boats-and-Minecarts.patch similarity index 100% rename from patches/api/0249-Add-API-to-get-Material-from-Boats-and-Minecarts.patch rename to patches/api/0250-Add-API-to-get-Material-from-Boats-and-Minecarts.patch diff --git a/patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch b/patches/api/0251-Add-PlayerFlowerPotManipulateEvent.patch similarity index 100% rename from patches/api/0250-Add-PlayerFlowerPotManipulateEvent.patch rename to patches/api/0251-Add-PlayerFlowerPotManipulateEvent.patch diff --git a/patches/api/0251-Zombie-API-breaking-doors.patch b/patches/api/0252-Zombie-API-breaking-doors.patch similarity index 100% rename from patches/api/0251-Zombie-API-breaking-doors.patch rename to patches/api/0252-Zombie-API-breaking-doors.patch diff --git a/patches/api/0252-Add-EntityLoadCrossbowEvent.patch b/patches/api/0253-Add-EntityLoadCrossbowEvent.patch similarity index 100% rename from patches/api/0252-Add-EntityLoadCrossbowEvent.patch rename to patches/api/0253-Add-EntityLoadCrossbowEvent.patch diff --git a/patches/api/0253-Added-WorldGameRuleChangeEvent.patch b/patches/api/0254-Added-WorldGameRuleChangeEvent.patch similarity index 100% rename from patches/api/0253-Added-WorldGameRuleChangeEvent.patch rename to patches/api/0254-Added-WorldGameRuleChangeEvent.patch diff --git a/patches/api/0254-Added-ServerResourcesReloadedEvent.patch b/patches/api/0255-Added-ServerResourcesReloadedEvent.patch similarity index 100% rename from patches/api/0254-Added-ServerResourcesReloadedEvent.patch rename to patches/api/0255-Added-ServerResourcesReloadedEvent.patch diff --git a/patches/api/0255-Add-BlockFailedDispenseEvent.patch b/patches/api/0256-Add-BlockFailedDispenseEvent.patch similarity index 100% rename from patches/api/0255-Add-BlockFailedDispenseEvent.patch rename to patches/api/0256-Add-BlockFailedDispenseEvent.patch diff --git a/patches/api/0256-Added-PlayerLecternPageChangeEvent.patch b/patches/api/0257-Added-PlayerLecternPageChangeEvent.patch similarity index 100% rename from patches/api/0256-Added-PlayerLecternPageChangeEvent.patch rename to patches/api/0257-Added-PlayerLecternPageChangeEvent.patch diff --git a/patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch b/patches/api/0258-Added-PlayerLoomPatternSelectEvent.patch similarity index 100% rename from patches/api/0257-Added-PlayerLoomPatternSelectEvent.patch rename to patches/api/0258-Added-PlayerLoomPatternSelectEvent.patch diff --git a/patches/api/0258-Better-AnnotationTest-printout.patch b/patches/api/0259-Better-AnnotationTest-printout.patch similarity index 89% rename from patches/api/0258-Better-AnnotationTest-printout.patch rename to patches/api/0259-Better-AnnotationTest-printout.patch index faa7160d6..a5a038423 100644 --- a/patches/api/0258-Better-AnnotationTest-printout.patch +++ b/patches/api/0259-Better-AnnotationTest-printout.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Better AnnotationTest printout diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 03229d5f4ec36a82197beb391356d791ff67fb2f..19271057cf24329757c9419fa6c97848e008a96c 100644 +index 1c6a41644257cd35ced235af6cc60efc925ebc18..b94d87832a271a76a5c8c0c9bf403c35348b31ed 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java -@@ -107,13 +107,18 @@ public class AnnotationTest { +@@ -118,13 +118,18 @@ public class AnnotationTest { Collections.sort(errors); diff --git a/patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch b/patches/api/0260-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch similarity index 100% rename from patches/api/0259-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch rename to patches/api/0260-Add-API-to-get-exact-interaction-point-in-PlayerInte.patch diff --git a/patches/api/0260-Add-sendOpLevel-API.patch b/patches/api/0261-Add-sendOpLevel-API.patch similarity index 100% rename from patches/api/0260-Add-sendOpLevel-API.patch rename to patches/api/0261-Add-sendOpLevel-API.patch diff --git a/patches/api/0261-Add-StructureLocateEvent.patch b/patches/api/0262-Add-StructureLocateEvent.patch similarity index 100% rename from patches/api/0261-Add-StructureLocateEvent.patch rename to patches/api/0262-Add-StructureLocateEvent.patch diff --git a/patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch b/patches/api/0263-Return-chat-component-with-empty-text-instead-of-thr.patch similarity index 100% rename from patches/api/0262-Return-chat-component-with-empty-text-instead-of-thr.patch rename to patches/api/0263-Return-chat-component-with-empty-text-instead-of-thr.patch diff --git a/patches/api/0263-Add-BlockPreDispenseEvent.patch b/patches/api/0264-Add-BlockPreDispenseEvent.patch similarity index 100% rename from patches/api/0263-Add-BlockPreDispenseEvent.patch rename to patches/api/0264-Add-BlockPreDispenseEvent.patch diff --git a/patches/api/0264-Added-Vanilla-Entity-Tags.patch b/patches/api/0265-Added-Vanilla-Entity-Tags.patch similarity index 100% rename from patches/api/0264-Added-Vanilla-Entity-Tags.patch rename to patches/api/0265-Added-Vanilla-Entity-Tags.patch diff --git a/patches/api/0265-added-Wither-API.patch b/patches/api/0266-added-Wither-API.patch similarity index 100% rename from patches/api/0265-added-Wither-API.patch rename to patches/api/0266-added-Wither-API.patch diff --git a/patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch b/patches/api/0267-Added-PlayerChangeBeaconEffectEvent.patch similarity index 100% rename from patches/api/0266-Added-PlayerChangeBeaconEffectEvent.patch rename to patches/api/0267-Added-PlayerChangeBeaconEffectEvent.patch diff --git a/patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch b/patches/api/0268-Added-PlayerStonecutterRecipeSelectEvent.patch similarity index 100% rename from patches/api/0267-Added-PlayerStonecutterRecipeSelectEvent.patch rename to patches/api/0268-Added-PlayerStonecutterRecipeSelectEvent.patch diff --git a/patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch b/patches/api/0269-Add-dropLeash-variable-to-EntityUnleashEvent.patch similarity index 100% rename from patches/api/0268-Add-dropLeash-variable-to-EntityUnleashEvent.patch rename to patches/api/0269-Add-dropLeash-variable-to-EntityUnleashEvent.patch diff --git a/patches/api/0269-EntityMoveEvent.patch b/patches/api/0270-EntityMoveEvent.patch similarity index 100% rename from patches/api/0269-EntityMoveEvent.patch rename to patches/api/0270-EntityMoveEvent.patch diff --git a/patches/api/0270-add-DragonEggFormEvent.patch b/patches/api/0271-add-DragonEggFormEvent.patch similarity index 100% rename from patches/api/0270-add-DragonEggFormEvent.patch rename to patches/api/0271-add-DragonEggFormEvent.patch diff --git a/patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch b/patches/api/0272-Allow-adding-items-to-BlockDropItemEvent.patch similarity index 100% rename from patches/api/0271-Allow-adding-items-to-BlockDropItemEvent.patch rename to patches/api/0272-Allow-adding-items-to-BlockDropItemEvent.patch diff --git a/patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch b/patches/api/0273-Add-getMainThreadExecutor-to-BukkitScheduler.patch similarity index 100% rename from patches/api/0272-Add-getMainThreadExecutor-to-BukkitScheduler.patch rename to patches/api/0273-Add-getMainThreadExecutor-to-BukkitScheduler.patch diff --git a/patches/api/0273-living-entity-allow-attribute-registration.patch b/patches/api/0274-living-entity-allow-attribute-registration.patch similarity index 100% rename from patches/api/0273-living-entity-allow-attribute-registration.patch rename to patches/api/0274-living-entity-allow-attribute-registration.patch diff --git a/patches/api/0274-Add-missing-effects.patch b/patches/api/0275-Add-missing-effects.patch similarity index 100% rename from patches/api/0274-Add-missing-effects.patch rename to patches/api/0275-Add-missing-effects.patch diff --git a/patches/api/0275-Expose-Tracked-Players.patch b/patches/api/0276-Expose-Tracked-Players.patch similarity index 100% rename from patches/api/0275-Expose-Tracked-Players.patch rename to patches/api/0276-Expose-Tracked-Players.patch diff --git a/patches/api/0276-Cache-the-result-of-Material-isBlock.patch b/patches/api/0277-Cache-the-result-of-Material-isBlock.patch similarity index 100% rename from patches/api/0276-Cache-the-result-of-Material-isBlock.patch rename to patches/api/0277-Cache-the-result-of-Material-isBlock.patch diff --git a/patches/api/0277-Add-worldborder-events.patch b/patches/api/0278-Add-worldborder-events.patch similarity index 100% rename from patches/api/0277-Add-worldborder-events.patch rename to patches/api/0278-Add-worldborder-events.patch diff --git a/patches/api/0278-added-PlayerNameEntityEvent.patch b/patches/api/0279-added-PlayerNameEntityEvent.patch similarity index 100% rename from patches/api/0278-added-PlayerNameEntityEvent.patch rename to patches/api/0279-added-PlayerNameEntityEvent.patch diff --git a/patches/api/0279-Add-recipe-to-cook-events.patch b/patches/api/0280-Add-recipe-to-cook-events.patch similarity index 100% rename from patches/api/0279-Add-recipe-to-cook-events.patch rename to patches/api/0280-Add-recipe-to-cook-events.patch diff --git a/patches/api/0280-Add-Block-isValidTool.patch b/patches/api/0281-Add-Block-isValidTool.patch similarity index 100% rename from patches/api/0280-Add-Block-isValidTool.patch rename to patches/api/0281-Add-Block-isValidTool.patch diff --git a/patches/api/0281-Implement-Keyed-on-World.patch b/patches/api/0282-Implement-Keyed-on-World.patch similarity index 100% rename from patches/api/0281-Implement-Keyed-on-World.patch rename to patches/api/0282-Implement-Keyed-on-World.patch diff --git a/patches/api/0282-fix-Inventory-getContents-null-annotations.patch b/patches/api/0283-fix-Inventory-getContents-null-annotations.patch similarity index 100% rename from patches/api/0282-fix-Inventory-getContents-null-annotations.patch rename to patches/api/0283-fix-Inventory-getContents-null-annotations.patch diff --git a/patches/api/0283-Item-Rarity-API.patch b/patches/api/0284-Item-Rarity-API.patch similarity index 100% rename from patches/api/0283-Item-Rarity-API.patch rename to patches/api/0284-Item-Rarity-API.patch diff --git a/patches/api/0284-Expose-protocol-version.patch b/patches/api/0285-Expose-protocol-version.patch similarity index 100% rename from patches/api/0284-Expose-protocol-version.patch rename to patches/api/0285-Expose-protocol-version.patch diff --git a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch b/patches/api/0286-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch similarity index 99% rename from patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch rename to patches/api/0286-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch index c0c5e15a4..6fa0ad91f 100644 --- a/patches/api/0285-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch +++ b/patches/api/0286-Allow-for-Component-suggestion-tooltips-in-AsyncTabC.patch @@ -393,7 +393,7 @@ index 0000000000000000000000000000000000000000..6f560a51277ccbd46a9142cfa057d276 + } +} diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java -index 19271057cf24329757c9419fa6c97848e008a96c..82b2783497947f336b0dd95db61f31f8f77f446c 100644 +index b94d87832a271a76a5c8c0c9bf403c35348b31ed..6f50e5b0422afc905650e5519def8ed403cb9c54 100644 --- a/src/test/java/org/bukkit/AnnotationTest.java +++ b/src/test/java/org/bukkit/AnnotationTest.java @@ -48,6 +48,8 @@ public class AnnotationTest { diff --git a/patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch b/patches/api/0287-add-isDeeplySleeping-to-HumanEntity.patch similarity index 100% rename from patches/api/0286-add-isDeeplySleeping-to-HumanEntity.patch rename to patches/api/0287-add-isDeeplySleeping-to-HumanEntity.patch diff --git a/patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0288-add-consumeFuel-to-FurnaceBurnEvent.patch similarity index 100% rename from patches/api/0287-add-consumeFuel-to-FurnaceBurnEvent.patch rename to patches/api/0288-add-consumeFuel-to-FurnaceBurnEvent.patch diff --git a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch b/patches/api/0289-add-get-set-drop-chance-to-EntityEquipment.patch similarity index 93% rename from patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch rename to patches/api/0289-add-get-set-drop-chance-to-EntityEquipment.patch index 6512a4192..98332c1fa 100644 --- a/patches/api/0288-add-get-set-drop-chance-to-EntityEquipment.patch +++ b/patches/api/0289-add-get-set-drop-chance-to-EntityEquipment.patch @@ -5,7 +5,7 @@ Subject: [PATCH] add get-set drop chance to EntityEquipment diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java -index e85c4208f3536277fcd0f8a0f0b4841c4e073b2c..d0abfc3211a7ec451d83e59c7e39cfc7cc47f43e 100644 +index e85c4208f3536277fcd0f8a0f0b4841c4e073b2c..04de95d658b5317937f1acdfd1280dcecfd3137f 100644 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java @@ -406,4 +406,32 @@ public interface EntityEquipment { diff --git a/patches/api/0289-Added-PlayerDeepSleepEvent.patch b/patches/api/0290-Added-PlayerDeepSleepEvent.patch similarity index 100% rename from patches/api/0289-Added-PlayerDeepSleepEvent.patch rename to patches/api/0290-Added-PlayerDeepSleepEvent.patch diff --git a/patches/api/0290-More-World-API.patch b/patches/api/0291-More-World-API.patch similarity index 100% rename from patches/api/0290-More-World-API.patch rename to patches/api/0291-More-World-API.patch diff --git a/patches/api/0291-Added-PlayerBedFailEnterEvent.patch b/patches/api/0292-Added-PlayerBedFailEnterEvent.patch similarity index 100% rename from patches/api/0291-Added-PlayerBedFailEnterEvent.patch rename to patches/api/0292-Added-PlayerBedFailEnterEvent.patch diff --git a/patches/api/0292-Introduce-beacon-activation-deactivation-events.patch b/patches/api/0293-Introduce-beacon-activation-deactivation-events.patch similarity index 100% rename from patches/api/0292-Introduce-beacon-activation-deactivation-events.patch rename to patches/api/0293-Introduce-beacon-activation-deactivation-events.patch diff --git a/patches/api/0293-PlayerMoveEvent-Improvements.patch b/patches/api/0294-PlayerMoveEvent-Improvements.patch similarity index 100% rename from patches/api/0293-PlayerMoveEvent-Improvements.patch rename to patches/api/0294-PlayerMoveEvent-Improvements.patch diff --git a/patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch b/patches/api/0295-add-RespawnFlags-to-PlayerRespawnEvent.patch similarity index 100% rename from patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch rename to patches/api/0295-add-RespawnFlags-to-PlayerRespawnEvent.patch diff --git a/patches/api/0295-Add-more-WanderingTrader-API.patch b/patches/api/0296-Add-more-WanderingTrader-API.patch similarity index 100% rename from patches/api/0295-Add-more-WanderingTrader-API.patch rename to patches/api/0296-Add-more-WanderingTrader-API.patch diff --git a/patches/api/0296-Add-EntityBlockStorage-clearEntities.patch b/patches/api/0297-Add-EntityBlockStorage-clearEntities.patch similarity index 100% rename from patches/api/0296-Add-EntityBlockStorage-clearEntities.patch rename to patches/api/0297-Add-EntityBlockStorage-clearEntities.patch diff --git a/patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch b/patches/api/0298-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch similarity index 100% rename from patches/api/0297-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch rename to patches/api/0298-Add-Adventure-message-to-PlayerAdvancementDoneEvent.patch diff --git a/patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch b/patches/api/0299-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch similarity index 100% rename from patches/api/0298-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch rename to patches/api/0299-Add-raw-address-to-AsyncPlayerPreLoginEvent.patch diff --git a/patches/api/0299-Inventory-close.patch b/patches/api/0300-Inventory-close.patch similarity index 100% rename from patches/api/0299-Inventory-close.patch rename to patches/api/0300-Inventory-close.patch diff --git a/patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch b/patches/api/0301-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch similarity index 100% rename from patches/api/0300-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch rename to patches/api/0301-Add-a-should-burn-in-sunlight-API-for-Phantoms-and-S.patch diff --git a/patches/api/0301-Add-basic-Datapack-API.patch b/patches/api/0302-Add-basic-Datapack-API.patch similarity index 100% rename from patches/api/0301-Add-basic-Datapack-API.patch rename to patches/api/0302-Add-basic-Datapack-API.patch diff --git a/patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch b/patches/api/0303-additions-to-PlayerGameModeChangeEvent.patch similarity index 100% rename from patches/api/0302-additions-to-PlayerGameModeChangeEvent.patch rename to patches/api/0303-additions-to-PlayerGameModeChangeEvent.patch diff --git a/patches/api/0303-ItemStack-repair-check-API.patch b/patches/api/0304-ItemStack-repair-check-API.patch similarity index 100% rename from patches/api/0303-ItemStack-repair-check-API.patch rename to patches/api/0304-ItemStack-repair-check-API.patch diff --git a/patches/api/0304-More-Enchantment-API.patch b/patches/api/0305-More-Enchantment-API.patch similarity index 100% rename from patches/api/0304-More-Enchantment-API.patch rename to patches/api/0305-More-Enchantment-API.patch diff --git a/patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch b/patches/api/0306-Add-command-line-option-to-load-extra-plugin-jars-no.patch similarity index 100% rename from patches/api/0305-Add-command-line-option-to-load-extra-plugin-jars-no.patch rename to patches/api/0306-Add-command-line-option-to-load-extra-plugin-jars-no.patch diff --git a/patches/api/0306-List-all-missing-hard-depends-not-just-first.patch b/patches/api/0307-List-all-missing-hard-depends-not-just-first.patch similarity index 100% rename from patches/api/0306-List-all-missing-hard-depends-not-just-first.patch rename to patches/api/0307-List-all-missing-hard-depends-not-just-first.patch diff --git a/patches/api/0307-Add-Mob-lookAt-API.patch b/patches/api/0308-Add-Mob-lookAt-API.patch similarity index 100% rename from patches/api/0307-Add-Mob-lookAt-API.patch rename to patches/api/0308-Add-Mob-lookAt-API.patch diff --git a/patches/api/0308-ItemStack-editMeta.patch b/patches/api/0309-ItemStack-editMeta.patch similarity index 100% rename from patches/api/0308-ItemStack-editMeta.patch rename to patches/api/0309-ItemStack-editMeta.patch diff --git a/patches/api/0309-Add-EntityInsideBlockEvent.patch b/patches/api/0310-Add-EntityInsideBlockEvent.patch similarity index 100% rename from patches/api/0309-Add-EntityInsideBlockEvent.patch rename to patches/api/0310-Add-EntityInsideBlockEvent.patch diff --git a/patches/api/0310-Attributes-API-for-item-defaults.patch b/patches/api/0311-Attributes-API-for-item-defaults.patch similarity index 100% rename from patches/api/0310-Attributes-API-for-item-defaults.patch rename to patches/api/0311-Attributes-API-for-item-defaults.patch diff --git a/patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch b/patches/api/0312-Add-cause-to-Weather-ThunderChangeEvents.patch similarity index 100% rename from patches/api/0311-Add-cause-to-Weather-ThunderChangeEvents.patch rename to patches/api/0312-Add-cause-to-Weather-ThunderChangeEvents.patch diff --git a/patches/api/0312-More-Lidded-Block-API.patch b/patches/api/0313-More-Lidded-Block-API.patch similarity index 100% rename from patches/api/0312-More-Lidded-Block-API.patch rename to patches/api/0313-More-Lidded-Block-API.patch diff --git a/patches/api/0313-Add-PlayerKickEvent-causes.patch b/patches/api/0314-Add-PlayerKickEvent-causes.patch similarity index 100% rename from patches/api/0313-Add-PlayerKickEvent-causes.patch rename to patches/api/0314-Add-PlayerKickEvent-causes.patch diff --git a/patches/api/0314-Add-PufferFishStateChangeEvent.patch b/patches/api/0315-Add-PufferFishStateChangeEvent.patch similarity index 100% rename from patches/api/0314-Add-PufferFishStateChangeEvent.patch rename to patches/api/0315-Add-PufferFishStateChangeEvent.patch diff --git a/patches/api/0315-Add-BellRevealRaiderEvent.patch b/patches/api/0316-Add-BellRevealRaiderEvent.patch similarity index 100% rename from patches/api/0315-Add-BellRevealRaiderEvent.patch rename to patches/api/0316-Add-BellRevealRaiderEvent.patch diff --git a/patches/api/0316-Add-ElderGuardianAppearanceEvent.patch b/patches/api/0317-Add-ElderGuardianAppearanceEvent.patch similarity index 100% rename from patches/api/0316-Add-ElderGuardianAppearanceEvent.patch rename to patches/api/0317-Add-ElderGuardianAppearanceEvent.patch diff --git a/patches/api/0317-Add-more-line-of-sight-methods.patch b/patches/api/0318-Add-more-line-of-sight-methods.patch similarity index 100% rename from patches/api/0317-Add-more-line-of-sight-methods.patch rename to patches/api/0318-Add-more-line-of-sight-methods.patch diff --git a/patches/api/0318-Add-Feature-Stage-API.patch b/patches/api/0319-Add-Feature-Stage-API.patch similarity index 99% rename from patches/api/0318-Add-Feature-Stage-API.patch rename to patches/api/0319-Add-Feature-Stage-API.patch index 64f16a83d..d5b9c3c17 100644 --- a/patches/api/0318-Add-Feature-Stage-API.patch +++ b/patches/api/0319-Add-Feature-Stage-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add Feature Stage API diff --git a/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java new file mode 100644 -index 0000000000000000000000000000000000000000..63de080e945dfa0e63e6f3c63e498f20481dab27 +index 0000000000000000000000000000000000000000..cf9443f1cd3039f0e53c645c894483027455465b --- /dev/null +++ b/src/main/java/io/papermc/paper/world/generation/ProtoWorld.java @@ -0,0 +1,270 @@