Updated Upstream (Bukkit/CraftBukkit) (#8430)

Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events

CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
This commit is contained in:
Nassim Jahnke 2022-10-02 09:56:36 +02:00 committed by GitHub
parent ec3cfa9b7f
commit 928bcc8d3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
979 changed files with 323 additions and 590 deletions

View file

@ -27,7 +27,7 @@ index 11038da2e071699d6561a331565db0c8d7850d0e..317acfec5894101294a55abff6181943
+/.factorypath
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000000000000000000000000000000000..16776e693165758e47152eb6726969426f180f14
index 0000000000000000000000000000000000000000..e1e7c0ff7edcc5865e81d458795755649837d7fc
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,81 @@
@ -46,7 +46,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
+ api("com.google.guava:guava:31.0.1-jre")
+ api("com.google.code.gson:gson:2.8.9")
+ api("net.md-5:bungeecord-chat:1.16-R0.4")
+ api("org.yaml:snakeyaml:1.32")
+ api("org.yaml:snakeyaml:1.33")
+
+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.5")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.3")
@ -96,7 +96,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
+ options.isDocFilesSubDirs = true
+ options.links(
+ "https://guava.dev/releases/31.0.1-jre/api/docs/",
+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.30/",
+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.33/",
+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/23.0.0/",
+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
+ )
@ -114,7 +114,7 @@ index 0000000000000000000000000000000000000000..16776e693165758e47152eb672696942
+}
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 9909fc466d96023f0b574a9bd2a2330d433d4400..0000000000000000000000000000000000000000
index becaae6cc840ee2ac49853e41d86087bc0e893a8..0000000000000000000000000000000000000000
--- a/pom.xml
+++ /dev/null
@@ -1,252 +0,0 @@
@ -175,7 +175,7 @@ index 9909fc466d96023f0b574a9bd2a2330d433d4400..00000000000000000000000000000000
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.32</version>
- <version>1.33</version>
- <scope>compile</scope>
- </dependency>
- <!-- not part of the API proper -->