From 3cf03fc31afa6b577abea5a9a2bea6579994516f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 25 Sep 2023 00:02:46 +0100 Subject: [PATCH] Fix/update wiki (#9758) --- patches/api/0055-Fix-upstream-javadocs.patch | 39 +++++++++++++++++++ patches/api/0152-Material-API-additions.patch | 2 +- .../0172-Fix-Spigot-annotation-mistakes.patch | 2 +- ...-Add-methods-to-get-translation-keys.patch | 2 +- ...Cache-the-result-of-Material-isBlock.patch | 2 +- patches/api/0265-Item-Rarity-API.patch | 2 +- ...289-Attributes-API-for-item-defaults.patch | 2 +- patches/api/0312-More-CommandBlock-API.patch | 6 +-- .../api/0319-Add-critical-damage-API.patch | 4 +- ...Collidable-methods-to-various-places.patch | 2 +- patches/api/0405-Win-Screen-API.patch | 8 ++-- patches/api/0420-Fix-BanList-API.patch | 2 +- .../api/0428-Add-Listing-API-for-Player.patch | 2 +- .../0015-Rewrite-dataconverter-system.patch | 4 +- 14 files changed, 59 insertions(+), 20 deletions(-) diff --git a/patches/api/0055-Fix-upstream-javadocs.patch b/patches/api/0055-Fix-upstream-javadocs.patch index 038bf29af0..656a21cc3b 100644 --- a/patches/api/0055-Fix-upstream-javadocs.patch +++ b/patches/api/0055-Fix-upstream-javadocs.patch @@ -74,6 +74,32 @@ index 0cf808356a1a5c6fc4bcf97a694ed9beb80a776a..dc765dea47a9a1c1520fb16ddb24f814 * @param z Z-coordinate (0-15) * @return temperature at given coordinate */ +diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java +index 0b6c1065751b4315b30f9710a18bbcd5620ef97c..8e04b99ee2152209d132c2b2e4228d5ddae9e339 100644 +--- a/src/main/java/org/bukkit/Material.java ++++ b/src/main/java/org/bukkit/Material.java +@@ -7919,7 +7919,7 @@ public enum Material implements Keyed, Translatable { + *
  • Only occluding blocks can be "powered" ({@link Block#isBlockPowered()}). + * + * This list may be inconclusive. For a full list of the side effects of an occluding +- * block, see the Minecraft Wiki. ++ * block, see the Minecraft Wiki. + * + * @return True if this material is a block and occludes light + */ +diff --git a/src/main/java/org/bukkit/MinecraftExperimental.java b/src/main/java/org/bukkit/MinecraftExperimental.java +index 4e7e69219876eb6162f6e2cdf2ac3d242f7d75f6..41dbf018e26efe3624d78293aed7159cbd5dc123 100644 +--- a/src/main/java/org/bukkit/MinecraftExperimental.java ++++ b/src/main/java/org/bukkit/MinecraftExperimental.java +@@ -9,7 +9,7 @@ import org.jetbrains.annotations.ApiStatus; + + /** + * Indicates that the annotated element (class, method, field, etc.) is part of a +- * minecraft experimental feature ++ * minecraft experimental feature + * and is subject to changes by Mojang. + *

    + * Note: Elements marked with this annotation require the use of a datapack or otherwise diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java index 73b782c3975ad13159b6236976783fcfabd20493..e9cbbdf310e48011ee538c5592baee2535965fee 100644 --- a/src/main/java/org/bukkit/Particle.java @@ -508,6 +534,19 @@ index af5110b4160979c39cc1e5de6fa3bd7957b21403..15a0a733b0e5804655b5957cbf208312 * * @param location the location to remove * @see #getExploredLocations() +diff --git a/src/main/java/org/bukkit/entity/SpawnCategory.java b/src/main/java/org/bukkit/entity/SpawnCategory.java +index a2772ada27a3d26be1a01a5389a57d8a6b7c54fe..87daa4cf7c92e193fb581ff941ac1243d81785d7 100644 +--- a/src/main/java/org/bukkit/entity/SpawnCategory.java ++++ b/src/main/java/org/bukkit/entity/SpawnCategory.java +@@ -3,7 +3,7 @@ package org.bukkit.entity; + /** + * Represents groups of entities with shared spawn behaviors and mob caps. + * +- * @see Minecraft Wiki ++ * @see Minecraft Wiki + */ + public enum SpawnCategory { + diff --git a/src/main/java/org/bukkit/entity/Villager.java b/src/main/java/org/bukkit/entity/Villager.java index 6bf3af3ed81b66f61e53105d3591165ea74dba0e..a91400cd8bb4c72d1f3200a17f6de025540fe09d 100644 --- a/src/main/java/org/bukkit/entity/Villager.java diff --git a/patches/api/0152-Material-API-additions.patch b/patches/api/0152-Material-API-additions.patch index c2cf84e74b..27ff61b297 100644 --- a/patches/api/0152-Material-API-additions.patch +++ b/patches/api/0152-Material-API-additions.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 0b6c1065751b4315b30f9710a18bbcd5620ef97c..1e7b4cdad22f1679f1ea0f4bc9a90839c214331b 100644 +index 8e04b99ee2152209d132c2b2e4228d5ddae9e339..56de3e2c3a7e2de59e739b64004002689a0cf691 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -118,6 +118,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch index 43ce418ed0..a176b7a9d1 100644 --- a/patches/api/0172-Fix-Spigot-annotation-mistakes.patch +++ b/patches/api/0172-Fix-Spigot-annotation-mistakes.patch @@ -90,7 +90,7 @@ index 8508aa2c6fb7c9f41f3d185f5228c86dd3b8b627..f7564581c18425c903e54f949728dd37 if (this.world == null) { return null; diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 1e7b4cdad22f1679f1ea0f4bc9a90839c214331b..10d7827e7d60ecc733358093c0369cfb8a174c6d 100644 +index 56de3e2c3a7e2de59e739b64004002689a0cf691..1e5116b7633e4a8607cf73100990ff952c1cce5f 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4468,11 +4468,11 @@ public enum Material implements Keyed, Translatable { diff --git a/patches/api/0211-Add-methods-to-get-translation-keys.patch b/patches/api/0211-Add-methods-to-get-translation-keys.patch index f081dabd87..ed9805d637 100644 --- a/patches/api/0211-Add-methods-to-get-translation-keys.patch +++ b/patches/api/0211-Add-methods-to-get-translation-keys.patch @@ -144,7 +144,7 @@ index 9443baf6de101a6d9af421314c013d8954798881..8108d6a82879e02384b83ab3f26b140e + // Paper end } diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 10d7827e7d60ecc733358093c0369cfb8a174c6d..e47f113f1c38598ac8b95b631d0a53ca0c1f6d2c 100644 +index 1e5116b7633e4a8607cf73100990ff952c1cce5f..a2d2981aff95d00c93130c139a5ab08edb05a7e1 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -119,7 +119,7 @@ import org.jetbrains.annotations.Nullable; diff --git a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch index 962106d990..c033493092 100644 --- a/patches/api/0259-Cache-the-result-of-Material-isBlock.patch +++ b/patches/api/0259-Cache-the-result-of-Material-isBlock.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache the result of Material#isBlock diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index e47f113f1c38598ac8b95b631d0a53ca0c1f6d2c..87b2cfd26d42c4f94f8571a514ef8f09febd6d56 100644 +index a2d2981aff95d00c93130c139a5ab08edb05a7e1..292e6d1ac000bff3ae4ce7a73a2010419086b9fc 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4397,6 +4397,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla diff --git a/patches/api/0265-Item-Rarity-API.patch b/patches/api/0265-Item-Rarity-API.patch index 924eadf1c9..a307eda124 100644 --- a/patches/api/0265-Item-Rarity-API.patch +++ b/patches/api/0265-Item-Rarity-API.patch @@ -39,7 +39,7 @@ index 0000000000000000000000000000000000000000..74ef8395cc040ce488c2acaa416db202 + } +} diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 87b2cfd26d42c4f94f8571a514ef8f09febd6d56..de709541754ce47aed82025e45311b6162b8c629 100644 +index 292e6d1ac000bff3ae4ce7a73a2010419086b9fc..d350e9bd4437302ef050702f09452b7fc6bd7c2f 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4463,6 +4463,17 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla diff --git a/patches/api/0289-Attributes-API-for-item-defaults.patch b/patches/api/0289-Attributes-API-for-item-defaults.patch index 0955ff42ff..17e5c6c5b9 100644 --- a/patches/api/0289-Attributes-API-for-item-defaults.patch +++ b/patches/api/0289-Attributes-API-for-item-defaults.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Attributes API for item defaults diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index de709541754ce47aed82025e45311b6162b8c629..8fea0f3f6dfa0634405ed2e4c2941beb616a0efc 100644 +index d350e9bd4437302ef050702f09452b7fc6bd7c2f..99a9c2f8b45f3c7339588b5a256598acf1f3be12 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4474,6 +4474,21 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla diff --git a/patches/api/0312-More-CommandBlock-API.patch b/patches/api/0312-More-CommandBlock-API.patch index 46ea583f90..c8c52c7587 100644 --- a/patches/api/0312-More-CommandBlock-API.patch +++ b/patches/api/0312-More-CommandBlock-API.patch @@ -6,7 +6,7 @@ Subject: [PATCH] More CommandBlock API diff --git a/src/main/java/io/papermc/paper/command/CommandBlockHolder.java b/src/main/java/io/papermc/paper/command/CommandBlockHolder.java new file mode 100644 -index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab34830862faeb88 +index 0000000000000000000000000000000000000000..cbca0e890a8e79c98555c94fb6487e7d181901aa --- /dev/null +++ b/src/main/java/io/papermc/paper/command/CommandBlockHolder.java @@ -0,0 +1,58 @@ @@ -54,7 +54,7 @@ index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab348308 + + /** + * Gets the success count from this command block. -+ * @see Command_Block#Success_count ++ * @see Command_Block#Success_count + * + * @return the success count + */ @@ -62,7 +62,7 @@ index 0000000000000000000000000000000000000000..09e57f495e3cbf3c6f434d12ab348308 + + /** + * Sets the success count from this command block. -+ * @see Command_Block#Success_count ++ * @see Command_Block#Success_count + * + * @param successCount the success count + */ diff --git a/patches/api/0319-Add-critical-damage-API.patch b/patches/api/0319-Add-critical-damage-API.patch index 3a9d1f8070..12f98b0fea 100644 --- a/patches/api/0319-Add-critical-damage-API.patch +++ b/patches/api/0319-Add-critical-damage-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add critical damage API diff --git a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java -index 869bad7405ec7fa67728e90d8b9f2e11b542611f..7ce8f1a26c1b33dd0eb6e6435952fd73abf49879 100644 +index 869bad7405ec7fa67728e90d8b9f2e11b542611f..aec5a0c2882cf69e8802b9e754b14d0acc34b162 100644 --- a/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java +++ b/src/main/java/org/bukkit/event/entity/EntityDamageByEntityEvent.java @@ -11,15 +11,40 @@ import org.jetbrains.annotations.NotNull; @@ -40,7 +40,7 @@ index 869bad7405ec7fa67728e90d8b9f2e11b542611f..7ce8f1a26c1b33dd0eb6e6435952fd73 + * Furthermore arrows may also cause a critical damage event if the arrow {@link org.bukkit.entity.AbstractArrow#isCritical()}. + * + * @return if the hit was critical. -+ * @see https://minecraft.fandom.com/wiki/Damage#Critical_hit ++ * @see https://minecraft.wiki/wiki/Damage#Critical_hit + */ + public boolean isCritical() { + return this.critical; diff --git a/patches/api/0321-Add-isCollidable-methods-to-various-places.patch b/patches/api/0321-Add-isCollidable-methods-to-various-places.patch index 293a34acde..dddc80b8e4 100644 --- a/patches/api/0321-Add-isCollidable-methods-to-various-places.patch +++ b/patches/api/0321-Add-isCollidable-methods-to-various-places.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add isCollidable methods to various places diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index 8fea0f3f6dfa0634405ed2e4c2941beb616a0efc..8a948a61d0bdb06b0b9a6eac8a27baeb35a7d36c 100644 +index 99a9c2f8b45f3c7339588b5a256598acf1f3be12..060a77008871682cc2deac72833a3641031408de 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -4489,6 +4489,16 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla diff --git a/patches/api/0405-Win-Screen-API.patch b/patches/api/0405-Win-Screen-API.patch index 6eef30f0ef..c4eb5368c9 100644 --- a/patches/api/0405-Win-Screen-API.patch +++ b/patches/api/0405-Win-Screen-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Win Screen API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4db6e9802105eba76d6f59b74873bea9502d2c7e..62400bd5d9469f9622139d2c4a6e2e5a0a83f808 100644 +index 4db6e9802105eba76d6f59b74873bea9502d2c7e..07d018c4c57d5519554db9063f6e91d017801719 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1072,6 +1072,47 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @@ -26,7 +26,7 @@ index 4db6e9802105eba76d6f59b74873bea9502d2c7e..62400bd5d9469f9622139d2c4a6e2e5a + * + * @see #hasSeenWinScreen() + * @see #setHasSeenWinScreen(boolean) -+ * @see https://minecraft.fandom.com/wiki/End_Poem#Technical_details ++ * @see https://minecraft.wiki/wiki/End_Poem#Technical_details + */ + public void showWinScreen(); + @@ -37,7 +37,7 @@ index 4db6e9802105eba76d6f59b74873bea9502d2c7e..62400bd5d9469f9622139d2c4a6e2e5a + * @return Whether this player has seen the win screen before + * @see #setHasSeenWinScreen(boolean) + * @see #showWinScreen() -+ * @see https://minecraft.fandom.com/wiki/End_Poem ++ * @see https://minecraft.wiki/wiki/End_Poem + */ + public boolean hasSeenWinScreen(); + @@ -48,7 +48,7 @@ index 4db6e9802105eba76d6f59b74873bea9502d2c7e..62400bd5d9469f9622139d2c4a6e2e5a + * @param hasSeenWinScreen Whether this player has seen the win screen before + * @see #hasSeenWinScreen() + * @see #showWinScreen() -+ * @see https://minecraft.fandom.com/wiki/End_Poem ++ * @see https://minecraft.wiki/wiki/End_Poem + */ + public void setHasSeenWinScreen(boolean hasSeenWinScreen); + // Paper end diff --git a/patches/api/0420-Fix-BanList-API.patch b/patches/api/0420-Fix-BanList-API.patch index f585bdbf82..306478c765 100644 --- a/patches/api/0420-Fix-BanList-API.patch +++ b/patches/api/0420-Fix-BanList-API.patch @@ -130,7 +130,7 @@ index e805e629cede1c4c0674282c930cb67852718c3e..5248cf08ef83c7304dd76c42a2f646bb + // Paper end } diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 62400bd5d9469f9622139d2c4a6e2e5a0a83f808..c85cfcefdd74b908cfec9a473f4b1d1af63082f4 100644 +index 07d018c4c57d5519554db9063f6e91d017801719..017f6d682181ccba3cb4f826c393f90ee614868f 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -298,7 +298,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/api/0428-Add-Listing-API-for-Player.patch b/patches/api/0428-Add-Listing-API-for-Player.patch index 8ff1c0000d..286e47c366 100644 --- a/patches/api/0428-Add-Listing-API-for-Player.patch +++ b/patches/api/0428-Add-Listing-API-for-Player.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add Listing API for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index c85cfcefdd74b908cfec9a473f4b1d1af63082f4..5c7a73ea74efe256c695080ba92b8cf698e4cd86 100644 +index 017f6d682181ccba3cb4f826c393f90ee614868f..20fa1024f9ad8f478a347be5c554b5e45b398a1c 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -1841,6 +1841,32 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM diff --git a/patches/server/0015-Rewrite-dataconverter-system.patch b/patches/server/0015-Rewrite-dataconverter-system.patch index 9a8a5f5444..4786abdf35 100644 --- a/patches/server/0015-Rewrite-dataconverter-system.patch +++ b/patches/server/0015-Rewrite-dataconverter-system.patch @@ -586,7 +586,7 @@ index 0000000000000000000000000000000000000000..127da265fe98f9f15476c589b5ecd950 +} diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java new file mode 100644 -index 0000000000000000000000000000000000000000..3444afdbadd117a6726c411b3739f5abc788622a +index 0000000000000000000000000000000000000000..86793648d7b8376e08ea145a80753ce70944e8a4 --- /dev/null +++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/MCVersions.java @@ -0,0 +1,479 @@ @@ -595,7 +595,7 @@ index 0000000000000000000000000000000000000000..3444afdbadd117a6726c411b3739f5ab +@SuppressWarnings("unused") +public final class MCVersions { + -+ /* https://minecraft.fandom.com/wiki/Data_version */ ++ /* https://minecraft.wiki/wiki/Data_version */ + + public static final int V15W32A = 100; + public static final int V15W32B = 103;