From 76169471d8241934e1a9f65cee0b544fd48b8c9b Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Tue, 10 Dec 2019 23:56:33 +0000 Subject: [PATCH] API --- Spigot-API-Patches/0001-POM-changes.patch | 10 +++--- Spigot-API-Patches/0004-Timings-v2.patch | 8 ++--- .../0005-Player-affects-spawning-API.patch | 8 ++--- .../0007-Entity-Origin-API.patch | 6 ++-- .../0008-Version-Command-2.0.patch | 24 ++++--------- .../0010-Add-player-view-distance-API.patch | 8 ++--- ...cord-chat-API-from-spigot-subclasses.patch | 8 ++--- .../0016-Player-Tab-List-and-Title-APIs.patch | 15 ++++---- .../0021-Complete-resource-pack-API.patch | 10 +++--- .../0022-Use-ASM-for-event-executors.patch | 24 ++++++------- ...0042-Add-String-based-Action-Bar-API.patch | 14 ++++---- ...upstream-javadoc-warnings-and-errors.patch | 34 +++++++++---------- .../0059-Entity-fromMobSpawner.patch | 6 ++-- ...low-plugins-to-use-SLF4J-for-logging.patch | 10 +++--- ...nt-protocol-version-and-virtual-host.patch | 8 ++--- ...7-Ability-to-apply-mending-to-XP-API.patch | 8 ++--- .../0088-Player.setPlayerProfile-API.patch | 18 +++++----- ...92-Add-Ban-Methods-to-Player-Objects.patch | 18 ++++------ ...ld.spawnParticle-API-and-add-Builder.patch | 12 +++---- .../0118-Entity-getChunk-API.patch | 6 ++-- ...e-attack-cooldown-methods-for-Player.patch | 8 ++--- ...CanPlaceOn-and-CanDestroy-NBT-values.patch | 19 ++++++----- .../0154-Material-API-additions.patch | 10 +++--- .../0174-Entity-getEntitySpawnReason.patch | 6 ++-- work/BuildData | 2 +- work/Bukkit | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 28 files changed, 146 insertions(+), 160 deletions(-) diff --git a/Spigot-API-Patches/0001-POM-changes.patch b/Spigot-API-Patches/0001-POM-changes.patch index e8d480ece..35db9f133 100644 --- a/Spigot-API-Patches/0001-POM-changes.patch +++ b/Spigot-API-Patches/0001-POM-changes.patch @@ -1,11 +1,11 @@ -From 9524ffe0f99ca69cf2478a834000bd6959a981d5 Mon Sep 17 00:00:00 2001 +From cc8002ef8dee63701f56047bc02977182517f71a Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 1 Mar 2016 00:16:08 +0100 Subject: [PATCH] POM changes diff --git a/pom.xml b/pom.xml -index 23d0a44a2..aef4ec33d 100644 +index 78388c20..3617d769 100644 --- a/pom.xml +++ b/pom.xml @@ -2,34 +2,28 @@ @@ -22,7 +22,7 @@ index 23d0a44a2..aef4ec33d 100644 - spigot-api + com.destroystokyo.paper + paper-api - 1.14.4-R0.1-SNAPSHOT + 1.15-R0.1-SNAPSHOT jar - Spigot-API @@ -94,7 +94,7 @@ index 23d0a44a2..aef4ec33d 100644 org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.8.1 - - - eclipse @@ -111,5 +111,5 @@ index 23d0a44a2..aef4ec33d 100644 true -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0004-Timings-v2.patch b/Spigot-API-Patches/0004-Timings-v2.patch index a490d74aa..d7a684f37 100644 --- a/Spigot-API-Patches/0004-Timings-v2.patch +++ b/Spigot-API-Patches/0004-Timings-v2.patch @@ -1,4 +1,4 @@ -From 5b14068add26b91b006e51d745d5de6118e4c154 Mon Sep 17 00:00:00 2001 +From bbf376e0410c47c16785ba43f2223235d9f888bc Mon Sep 17 00:00:00 2001 From: Aikar Date: Mon, 29 Feb 2016 18:48:17 -0600 Subject: [PATCH] Timings v2 @@ -3714,10 +3714,10 @@ index 6023e4f6..00000000 - // Spigot end -} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ae6274d7..bf0b8bf1 100644 +index 010b4675..63c6d6a1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1601,6 +1601,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1554,6 +1554,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) { throw new UnsupportedOperationException("Not supported yet."); } @@ -4114,5 +4114,5 @@ index b71235f6..3cbe5c2b 100644 + } -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch index b9f2ed4f4..81c9dcbb5 100644 --- a/Spigot-API-Patches/0005-Player-affects-spawning-API.patch +++ b/Spigot-API-Patches/0005-Player-affects-spawning-API.patch @@ -1,14 +1,14 @@ -From c7add24cf1bb4f0e68fa2581e86966c71be9d595 Mon Sep 17 00:00:00 2001 +From 928d6548448689181ff2df6ff172e8a61f651213 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Mon, 29 Feb 2016 17:22:34 -0600 Subject: [PATCH] Player affects spawning API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index bf0b8bf1..b0ead72d 100644 +index 63c6d6a1..46912889 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1484,6 +1484,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1450,6 +1450,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM @NotNull public String getLocale(); @@ -32,5 +32,5 @@ index bf0b8bf1..b0ead72d 100644 * Update the list of commands sent to the client. *
-- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0007-Entity-Origin-API.patch b/Spigot-API-Patches/0007-Entity-Origin-API.patch index 8de4bbcd2..25ceb1373 100644 --- a/Spigot-API-Patches/0007-Entity-Origin-API.patch +++ b/Spigot-API-Patches/0007-Entity-Origin-API.patch @@ -1,14 +1,14 @@ -From 41621b25e0cf0bfeb03eae74642833149b45a8f9 Mon Sep 17 00:00:00 2001 +From 417c860ef8f5168eafc0268f4a21f74ebdd06f8e Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 17:50:31 -0600 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 85fb83c1..5ed0be71 100644 +index d708d62b..8cfcc3a5 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -610,4 +610,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -599,4 +599,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent @Override Spigot spigot(); // Spigot end diff --git a/Spigot-API-Patches/0008-Version-Command-2.0.patch b/Spigot-API-Patches/0008-Version-Command-2.0.patch index 63c25b0ac..812fb4dc2 100644 --- a/Spigot-API-Patches/0008-Version-Command-2.0.patch +++ b/Spigot-API-Patches/0008-Version-Command-2.0.patch @@ -1,4 +1,4 @@ -From b23ef215ad1b3b0fa3048ea44fd244d0e42164a6 Mon Sep 17 00:00:00 2001 +From c2f8a5c4612e7ece86b19e5a3f731c04949ec86f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 27 May 2019 01:10:06 -0500 Subject: [PATCH] Version Command 2.0 @@ -72,7 +72,7 @@ index 72c5501e..c0ff133d 100644 // Paper end } diff --git a/src/main/java/org/bukkit/command/defaults/VersionCommand.java b/src/main/java/org/bukkit/command/defaults/VersionCommand.java -index 9d8360f7..b3345cba 100644 +index cbce5244..0486abd1 100644 --- a/src/main/java/org/bukkit/command/defaults/VersionCommand.java +++ b/src/main/java/org/bukkit/command/defaults/VersionCommand.java @@ -1,5 +1,6 @@ @@ -98,17 +98,7 @@ index 9d8360f7..b3345cba 100644 public VersionCommand(@NotNull String name) { super(name); -@@ -41,8 +51,7 @@ public class VersionCommand extends BukkitCommand { - - if (args.length == 0) { - sender.sendMessage("This server is running " + Bukkit.getName() + " version " + Bukkit.getVersion() + " (Implementing API version " + Bukkit.getBukkitVersion() + ")"); -- sender.sendMessage(ChatColor.YELLOW + "This is a final build for 1.14.4. Please see https://www.spigotmc.org/go/1.14.4 for details about upgrading."); -- // sendVersion(sender); -+ sendVersion(sender); // Paper - Not dead yet, Jim! - } else { - StringBuilder name = new StringBuilder(); - -@@ -151,18 +160,18 @@ public class VersionCommand extends BukkitCommand { +@@ -150,18 +160,18 @@ public class VersionCommand extends BukkitCommand { private void sendVersion(@NotNull CommandSender sender) { if (hasVersion) { @@ -130,7 +120,7 @@ index 9d8360f7..b3345cba 100644 return; } versionWaiters.add(sender); -@@ -184,7 +193,12 @@ public class VersionCommand extends BukkitCommand { +@@ -183,7 +193,12 @@ public class VersionCommand extends BukkitCommand { private void obtainVersion() { String version = Bukkit.getVersion(); @@ -144,7 +134,7 @@ index 9d8360f7..b3345cba 100644 if (version.startsWith("git-Spigot-")) { String[] parts = version.substring("git-Spigot-".length()).split("-"); int cbVersions = getDistance("craftbukkit", parts[1].substring(0, parts[1].indexOf(' '))); -@@ -214,6 +228,9 @@ public class VersionCommand extends BukkitCommand { +@@ -213,6 +228,9 @@ public class VersionCommand extends BukkitCommand { } else { setVersionMessage("Unknown version, custom build?"); } @@ -154,7 +144,7 @@ index 9d8360f7..b3345cba 100644 } private void setVersionMessage(@NotNull String msg) { -@@ -223,8 +240,13 @@ public class VersionCommand extends BukkitCommand { +@@ -222,8 +240,13 @@ public class VersionCommand extends BukkitCommand { try { hasVersion = true; versionTaskStarted = false; @@ -169,7 +159,7 @@ index 9d8360f7..b3345cba 100644 } versionWaiters.clear(); } finally { -@@ -232,6 +254,15 @@ public class VersionCommand extends BukkitCommand { +@@ -231,6 +254,15 @@ public class VersionCommand extends BukkitCommand { } } diff --git a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch index 21f3e5342..efb35f41f 100644 --- a/Spigot-API-Patches/0010-Add-player-view-distance-API.patch +++ b/Spigot-API-Patches/0010-Add-player-view-distance-API.patch @@ -1,14 +1,14 @@ -From de62be87c34a6ebbe3a52fc8e59e2cd751c39f84 Mon Sep 17 00:00:00 2001 +From aacdd9bb06cfd6da30e880f569581d5852e5ba42 Mon Sep 17 00:00:00 2001 From: Byteflux Date: Mon, 29 Feb 2016 18:05:37 -0600 Subject: [PATCH] Add player view distance API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index b0ead72d..abd119dd 100644 +index 46912889..0fb36ebd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1498,6 +1498,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1464,6 +1464,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param affects Whether the player can affect mob spawning */ public void setAffectsSpawning(boolean affects); @@ -30,5 +30,5 @@ index b0ead72d..abd119dd 100644 /** -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch index 97b07ac45..f9ef32b7e 100644 --- a/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch +++ b/Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch @@ -1,4 +1,4 @@ -From d8e1178f4ed95249e163c53d295a8bd726f419cf Mon Sep 17 00:00:00 2001 +From 425e0884f3112dde54266793417f71afdb0de1a8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Mon, 29 Feb 2016 19:54:32 -0600 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses @@ -68,10 +68,10 @@ index 87300a5d..d35d2def 100644 * Gets the name of the update folder. The update folder is used to safely * update plugins at the right moment on a plugin load. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index abd119dd..8bf46516 100644 +index 0fb36ebd..9a79e409 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -443,6 +443,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -442,6 +442,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void sendMap(@NotNull MapView map); @@ -111,5 +111,5 @@ index abd119dd..8bf46516 100644 * Forces an update of the player's entire inventory. * -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch index 3dc1403eb..064afd7ef 100644 --- a/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch +++ b/Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch @@ -1,4 +1,4 @@ -From 30e1c5bf22a481e6c32a2c67fd5a67f6ebc33273 Mon Sep 17 00:00:00 2001 +From d2fe81e66aa64df04655b6c92751cca9d544172f Mon Sep 17 00:00:00 2001 From: Techcable Date: Mon, 29 Feb 2016 20:02:40 -0600 Subject: [PATCH] Player Tab List and Title APIs @@ -384,19 +384,18 @@ index 00000000..4fe18540 + } +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 8bf46516..4d6b06da 100644 +index 9a79e409..81677fcd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1,6 +1,8 @@ +@@ -1,6 +1,7 @@ package org.bukkit.entity; import java.net.InetSocketAddress; -+ -+import com.destroystokyo.paper.Title; - import org.bukkit.Achievement; ++import com.destroystokyo.paper.Title; // Paper import org.bukkit.DyeColor; import org.bukkit.Effect; -@@ -473,6 +475,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + import org.bukkit.GameMode; +@@ -472,6 +473,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } @@ -514,5 +513,5 @@ index 8bf46516..4d6b06da 100644 /** -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch index a4d952a1a..81b04b88f 100644 --- a/Spigot-API-Patches/0021-Complete-resource-pack-API.patch +++ b/Spigot-API-Patches/0021-Complete-resource-pack-API.patch @@ -1,14 +1,14 @@ -From 63a712aa7eb94e803bc1ef1eb81c8827b5710169 Mon Sep 17 00:00:00 2001 +From c790b30bf69fbd5001c937a33018dd83e72a9153 Mon Sep 17 00:00:00 2001 From: Jedediah Smith Date: Sat, 4 Apr 2015 22:59:54 -0400 Subject: [PATCH] Complete resource pack API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 4d6b06da..aaa74125 100644 +index 81677fcd..d1290ab3 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1235,7 +1235,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1200,7 +1200,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @throws IllegalArgumentException Thrown if the URL is null. * @throws IllegalArgumentException Thrown if the URL is too long. The * length restriction is an implementation specific arbitrary value. @@ -18,7 +18,7 @@ index 4d6b06da..aaa74125 100644 public void setResourcePack(@NotNull String url); /** -@@ -1673,6 +1675,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1638,6 +1640,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void openBook(@NotNull ItemStack book); @@ -119,5 +119,5 @@ index b9819565..4c2102a1 100644 * Gets the status of this pack. * -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch index b6f80191a..745cb052a 100644 --- a/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch +++ b/Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch @@ -1,4 +1,4 @@ -From d87d2f7f427676e03cff1ec88420117d8dd7f993 Mon Sep 17 00:00:00 2001 +From 185096afc97f9e07872d20bf890627c4010093cc Mon Sep 17 00:00:00 2001 From: Techcable Date: Thu, 3 Mar 2016 13:20:33 -0700 Subject: [PATCH] Use ASM for event executors. @@ -6,11 +6,11 @@ Subject: [PATCH] Use ASM for event executors. Uses method handles for private or static methods. diff --git a/pom.xml b/pom.xml -index 2daee11a2..709b7a222 100644 +index 2c2823b3..a6567413 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,17 @@ - 7.1 + 7.2 test + @@ -29,7 +29,7 @@ index 2daee11a2..709b7a222 100644 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java new file mode 100644 -index 000000000..5b28e9b1d +index 00000000..5b28e9b1 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java @@ -0,0 +1,42 @@ @@ -77,7 +77,7 @@ index 000000000..5b28e9b1d +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java new file mode 100644 -index 000000000..c83672427 +index 00000000..c8367242 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java @@ -0,0 +1,43 @@ @@ -126,7 +126,7 @@ index 000000000..c83672427 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java new file mode 100644 -index 000000000..b6e7d8ee8 +index 00000000..b6e7d8ee --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java @@ -0,0 +1,47 @@ @@ -179,7 +179,7 @@ index 000000000..b6e7d8ee8 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java new file mode 100644 -index 000000000..beed9e6e0 +index 00000000..beed9e6e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java @@ -0,0 +1,35 @@ @@ -220,7 +220,7 @@ index 000000000..beed9e6e0 +} diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java new file mode 100644 -index 000000000..ac99477e9 +index 00000000..ac99477e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java @@ -0,0 +1,66 @@ @@ -292,7 +292,7 @@ index 000000000..ac99477e9 +} diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java new file mode 100644 -index 000000000..72e48e8ef +index 00000000..72e48e8e --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java @@ -0,0 +1,35 @@ @@ -332,7 +332,7 @@ index 000000000..72e48e8ef + } +} diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java -index a850f0780..9026e108c 100644 +index a850f078..9026e108 100644 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java @@ -5,9 +5,75 @@ import org.bukkit.event.EventException; @@ -412,7 +412,7 @@ index a850f0780..9026e108c 100644 + // Paper end } diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java -index 12601db68..06b6724fa 100644 +index 12601db6..06b6724f 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader { @@ -439,5 +439,5 @@ index 12601db68..06b6724fa 100644 eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled())); } else { -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch index 32d1c32ac..c7dc2097e 100644 --- a/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch +++ b/Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch @@ -1,14 +1,14 @@ -From 1e1122199e63c367ef06b4dc4dd05ab81197f123 Mon Sep 17 00:00:00 2001 +From 309fd45f13802f3b9798340addc0526ba1ad9ded Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 20 Dec 2016 15:55:55 -0500 Subject: [PATCH] Add String based Action Bar API diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index aaa74125..f41545c5 100644 +index d1290ab3..63e5197d 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -446,6 +446,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -444,6 +444,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start @@ -35,7 +35,7 @@ index aaa74125..f41545c5 100644 /** * Sends the component to the player * -@@ -469,9 +489,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -467,9 +487,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Sends an array of components as a single message to the specified screen position of this player * @@ -47,7 +47,7 @@ index aaa74125..f41545c5 100644 public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) { spigot().sendMessage(position, components); } -@@ -1817,9 +1839,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1769,9 +1791,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Sends the component to the specified screen position of this player * @@ -59,7 +59,7 @@ index aaa74125..f41545c5 100644 public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) { throw new UnsupportedOperationException("Not supported yet."); } -@@ -1827,9 +1851,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1779,9 +1803,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Sends an array of components as a single message to the specified screen position of this player * @@ -72,5 +72,5 @@ index aaa74125..f41545c5 100644 throw new UnsupportedOperationException("Not supported yet."); } -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch index 27c23040d..7a49e8a64 100644 --- a/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch +++ b/Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch @@ -1,4 +1,4 @@ -From 6a79e6167bb1cb6969b6953abe148343e8fa0b1c Mon Sep 17 00:00:00 2001 +From 8aea92454d5f89b1ab06b6e04ac10945b0f7f81f Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 10 Jun 2017 16:59:40 -0500 Subject: [PATCH] Fix upstream javadoc warnings and errors @@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index 767cdf0aa..3858b0576 100644 +index 767cdf0a..3858b057 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -1786,6 +1786,7 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -74,7 +74,7 @@ index 767cdf0aa..3858b0576 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force); diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java -index c2096b534..bca9d3659 100644 +index c2096b53..bca9d365 100644 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java @@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity { @@ -86,10 +86,10 @@ index c2096b534..bca9d3659 100644 void setParticle(@NotNull Particle particle, @Nullable T data); diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f41545c52..576ad2c68 100644 +index 63e5197d..881ccce5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -461,7 +461,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -459,7 +459,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * * Use supplied alternative character to the section symbol to represent legacy color codes. * @@ -98,7 +98,7 @@ index f41545c52..576ad2c68 100644 * @param message The message to send */ public void sendActionBar(char alternateChar, @NotNull String message); -@@ -528,6 +528,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -526,6 +526,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Update the subtitle of titles displayed to the player * @@ -106,7 +106,7 @@ index f41545c52..576ad2c68 100644 * @deprecated Use {@link #updateTitle(Title)} */ @Deprecated -@@ -536,6 +537,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -534,6 +535,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Update the subtitle of titles displayed to the player * @@ -114,7 +114,7 @@ index f41545c52..576ad2c68 100644 * @deprecated Use {@link #updateTitle(Title)} */ @Deprecated -@@ -544,6 +546,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -542,6 +544,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Show the given title to the player, along with the last subtitle set, using the last set times * @@ -122,7 +122,7 @@ index f41545c52..576ad2c68 100644 * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)} */ @Deprecated -@@ -552,6 +555,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -550,6 +553,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM /** * Show the given title to the player, along with the last subtitle set, using the last set times * @@ -130,7 +130,7 @@ index f41545c52..576ad2c68 100644 * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)} */ @Deprecated -@@ -1452,6 +1456,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1417,6 +1421,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -138,7 +138,7 @@ index f41545c52..576ad2c68 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data); -@@ -1468,6 +1473,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1433,6 +1438,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param count the number of particles * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -146,7 +146,7 @@ index f41545c52..576ad2c68 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data); -@@ -1518,6 +1524,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1483,6 +1489,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -154,7 +154,7 @@ index f41545c52..576ad2c68 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -1538,6 +1545,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1503,6 +1510,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param offsetZ the maximum random offset on the Z axis * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -162,7 +162,7 @@ index f41545c52..576ad2c68 100644 */ public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data); -@@ -1594,6 +1602,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1559,6 +1567,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -170,7 +170,7 @@ index f41545c52..576ad2c68 100644 */ public void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); -@@ -1616,6 +1625,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1581,6 +1590,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * particle used (normally speed) * @param data the data to use for the particle or null, * the type of this depends on {@link Particle#getDataType()} @@ -179,7 +179,7 @@ index f41545c52..576ad2c68 100644 public void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data); diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java -index 1b2267f4e..1a58734d9 100644 +index 1b2267f4..1a58734d 100644 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java @@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable { @@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644 return to; } -- -2.23.0 +2.24.0 diff --git a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch index d8d037661..36068f5c4 100644 --- a/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch +++ b/Spigot-API-Patches/0059-Entity-fromMobSpawner.patch @@ -1,14 +1,14 @@ -From 6b693ff4425d9b346bd9c19cc64e97b1862e96a8 Mon Sep 17 00:00:00 2001 +From fd4f5b79ced349d3b9bf58d77a569234b46f15f3 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Sun, 18 Jun 2017 18:17:05 -0500 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 5ed0be71..d088490f 100644 +index 8cfcc3a5..bd8507f6 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -621,5 +621,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -610,5 +610,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @Nullable Location getOrigin(); diff --git a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch index a0d6920b6..721606790 100644 --- a/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch +++ b/Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch @@ -1,4 +1,4 @@ -From 42992ea0a373658e8d49bac0fe96d13aab7128d9 Mon Sep 17 00:00:00 2001 +From 0a294869c703f3fc7f22f2752e20cedd85985c12 Mon Sep 17 00:00:00 2001 From: Minecrell Date: Thu, 21 Sep 2017 16:33:12 +0200 Subject: [PATCH] Allow plugins to use SLF4J for logging @@ -14,11 +14,11 @@ it without having to shade it in the plugin and going through several layers of logging abstraction. diff --git a/pom.xml b/pom.xml -index 709b7a222..5088c3315 100644 +index a6567413..1179fd55 100644 --- a/pom.xml +++ b/pom.xml @@ -109,6 +109,13 @@ - 17.0.0 + 18.0.0 provided + @@ -32,7 +32,7 @@ index 709b7a222..5088c3315 100644 junit diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java -index febfec6ef..79890c68f 100644 +index febfec6e..79890c68 100644 --- a/src/main/java/org/bukkit/plugin/Plugin.java +++ b/src/main/java/org/bukkit/plugin/Plugin.java @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor { @@ -50,5 +50,5 @@ index febfec6ef..79890c68f 100644 * Returns the name of the plugin. *

-- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch index f2f1ee78d..81d5504dc 100644 --- a/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch +++ b/Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch @@ -1,4 +1,4 @@ -From a83294fb7e0bf05bb21e385dbf2812a3cfbf66ed Mon Sep 17 00:00:00 2001 +From 0895c179d69d82b098e9314d5c9e30b4c547091c Mon Sep 17 00:00:00 2001 From: Minecrell Date: Tue, 10 Oct 2017 18:44:42 +0200 Subject: [PATCH] Expose client protocol version and virtual host @@ -57,10 +57,10 @@ index 00000000..7b2af1bd + +} diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 576ad2c6..ce4ea22c 100644 +index 881ccce5..0a630843 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable; +@@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; /** * Represents a player, connected or not */ @@ -70,5 +70,5 @@ index 576ad2c6..ce4ea22c 100644 /** * Gets the "friendly" name to display of this player. This may include -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch index 75bd9b4e4..91181f8e3 100644 --- a/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch +++ b/Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch @@ -1,4 +1,4 @@ -From bd2a47a6ee4f1377158cdae2ce956b246ffaa488 Mon Sep 17 00:00:00 2001 +From d668b4a2573d6df68b52462d67d209ab210d6506 Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 20 Dec 2017 17:38:07 -0500 Subject: [PATCH] Ability to apply mending to XP API @@ -10,10 +10,10 @@ of giving the player experience points. Both an API To standalone mend, and apply mending logic to .giveExp has been added. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index ce4ea22c..d069a84c 100644 +index 0a630843..2bd1af78 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -969,12 +969,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -934,12 +934,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM */ public void resetPlayerWeather(); @@ -49,5 +49,5 @@ index ce4ea22c..d069a84c 100644 /** * Gives the player the amount of experience levels specified. Levels can -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch index 0bf6cc162..da1dc8611 100644 --- a/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch +++ b/Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch @@ -1,4 +1,4 @@ -From 1ffa1cfeb3a4e5911ce0d90cc9577ccd3b3f0de7 Mon Sep 17 00:00:00 2001 +From 27fb597be22c4610e04e02a92a7fea238fb3caa7 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 18 Mar 2018 12:28:55 -0400 Subject: [PATCH] Player.setPlayerProfile API @@ -6,18 +6,18 @@ Subject: [PATCH] Player.setPlayerProfile API This can be useful for changing name or skins after a player has logged in. diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index d069a84c..f89b6c6b 100644 +index 2bd1af78..f9a3a3e5 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -3,6 +3,7 @@ package org.bukkit.entity; - import java.net.InetSocketAddress; +@@ -2,6 +2,7 @@ package org.bukkit.entity; - import com.destroystokyo.paper.Title; -+import com.destroystokyo.paper.profile.PlayerProfile; - import org.bukkit.Achievement; + import java.net.InetSocketAddress; + import com.destroystokyo.paper.Title; // Paper ++import com.destroystokyo.paper.profile.PlayerProfile; // Paper import org.bukkit.DyeColor; import org.bukkit.Effect; -@@ -1782,6 +1783,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM + import org.bukkit.GameMode; +@@ -1747,6 +1748,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED} */ boolean hasResourcePack(); @@ -39,5 +39,5 @@ index d069a84c..f89b6c6b 100644 // Spigot start -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch index 145cb11a7..913be4a32 100644 --- a/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch +++ b/Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch @@ -1,4 +1,4 @@ -From 17206f185f229b2098e02d880e53d1b5b4c50519 Mon Sep 17 00:00:00 2001 +From 9cced81315e6ffdc7f528dae1e86441c53025428 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 28 Apr 2018 10:28:50 -0400 Subject: [PATCH] Add Ban Methods to Player Objects @@ -74,25 +74,21 @@ index ffc8ad37..222a9a7b 100644 /** * Checks if this player is whitelisted or not diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index f89b6c6b..7ae67786 100644 +index f9a3a3e5..75bbbefd 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1,10 +1,14 @@ - package org.bukkit.entity; - +@@ -3,6 +3,10 @@ package org.bukkit.entity; import java.net.InetSocketAddress; + import com.destroystokyo.paper.Title; // Paper + import com.destroystokyo.paper.profile.PlayerProfile; // Paper +import java.util.Date; // Paper - - import com.destroystokyo.paper.Title; - import com.destroystokyo.paper.profile.PlayerProfile; - import org.bukkit.Achievement; +import org.bukkit.BanEntry; // Paper +import org.bukkit.BanList; // Paper +import org.bukkit.Bukkit; // Paper import org.bukkit.DyeColor; import org.bukkit.Effect; import org.bukkit.GameMode; -@@ -447,6 +451,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -445,6 +449,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM public void sendMap(@NotNull MapView map); // Paper start @@ -256,5 +252,5 @@ index f89b6c6b..7ae67786 100644 /** * Sends an Action Bar message to the client. -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch index 7aa516791..3130e2152 100644 --- a/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch +++ b/Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch @@ -1,4 +1,4 @@ -From 01d4f9b7ba0c84a9fdfb0d5836cfe72149053842 Mon Sep 17 00:00:00 2001 +From a5a392102a4e68a205208efd60e3fb9c7b0d096c Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 29 Aug 2017 23:58:48 -0400 Subject: [PATCH] Expand World.spawnParticle API and add Builder @@ -10,7 +10,7 @@ This adds a new Builder API which is much friendlier to use. diff --git a/src/main/java/com/destroystokyo/paper/ParticleBuilder.java b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java new file mode 100644 -index 000000000..06f1602f5 +index 00000000..06f1602f --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/ParticleBuilder.java @@ -0,0 +1,478 @@ @@ -493,10 +493,10 @@ index 000000000..06f1602f5 + } +} diff --git a/src/main/java/org/bukkit/Particle.java b/src/main/java/org/bukkit/Particle.java -index 68cb74420..69aae30a3 100644 +index 49467ac7..d2ceb07c 100644 --- a/src/main/java/org/bukkit/Particle.java +++ b/src/main/java/org/bukkit/Particle.java -@@ -92,6 +92,17 @@ public enum Particle { +@@ -96,6 +96,17 @@ public enum Particle { return dataType; } @@ -515,7 +515,7 @@ index 68cb74420..69aae30a3 100644 * Options which can be applied to redstone dust particles - a particle * color and size. diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index c0158a369..fee0f5211 100644 +index c0158a36..fee0f521 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java @@ -2210,7 +2210,57 @@ public interface World extends PluginMessageRecipient, Metadatable { @@ -578,5 +578,5 @@ index c0158a369..fee0f5211 100644 /** * Spawns the particle (the number of times specified by count) -- -2.23.0 +2.24.0 diff --git a/Spigot-API-Patches/0118-Entity-getChunk-API.patch b/Spigot-API-Patches/0118-Entity-getChunk-API.patch index 65af86de8..763ed7718 100644 --- a/Spigot-API-Patches/0118-Entity-getChunk-API.patch +++ b/Spigot-API-Patches/0118-Entity-getChunk-API.patch @@ -1,4 +1,4 @@ -From 77ef58bd694a6a39109f73570fe9b0cf2487884d Mon Sep 17 00:00:00 2001 +From 11f610016476f57c9873273afa8cf7c3b3dd090c Mon Sep 17 00:00:00 2001 From: Aikar Date: Wed, 4 Jul 2018 02:25:48 -0400 Subject: [PATCH] Entity#getChunk API @@ -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 d088490f..1171b103 100644 +index bd8507f6..79b94800 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; @@ -17,7 +17,7 @@ index d088490f..1171b103 100644 import org.bukkit.EntityEffect; import org.bukkit.Location; import org.bukkit.Nameable; -@@ -628,5 +629,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -617,5 +618,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent * @return True if entity spawned from a mob spawner */ boolean fromMobSpawner(); diff --git a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch index 7281f73ce..96e3c313b 100644 --- a/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch +++ b/Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch @@ -1,14 +1,14 @@ -From 69961ff56b5517f3eba960e3d0d2188d8e852338 Mon Sep 17 00:00:00 2001 +From 976bc055befda1c109616e17d0fafd815ded8770 Mon Sep 17 00:00:00 2001 From: BillyGalbreath Date: Tue, 4 Sep 2018 15:01:54 -0500 Subject: [PATCH] Expose attack cooldown methods for Player diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 7ae67786..8d8d8957 100644 +index 75bbbefd..e37c94e4 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -1957,6 +1957,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM +@@ -1922,6 +1922,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM * @param profile The new profile to use */ void setPlayerProfile(@NotNull PlayerProfile profile); @@ -36,5 +36,5 @@ index 7ae67786..8d8d8957 100644 // Spigot start -- -2.22.0 +2.24.0 diff --git a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 668ac4953..ca5cc8cbf 100644 --- a/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From a93a9fc5e1da7b55efda58c850961a2c23943858 Mon Sep 17 00:00:00 2001 +From 45b3ed4d07d28d39b41e0154719bacb84d073413 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -6,7 +6,7 @@ Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/com/destroystokyo/paper/Namespaced.java b/src/main/java/com/destroystokyo/paper/Namespaced.java new file mode 100644 -index 000000000..cd1a34b82 +index 00000000..cd1a34b8 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/Namespaced.java @@ -0,0 +1,40 @@ @@ -52,7 +52,7 @@ index 000000000..cd1a34b82 +} diff --git a/src/main/java/com/destroystokyo/paper/NamespacedTag.java b/src/main/java/com/destroystokyo/paper/NamespacedTag.java new file mode 100644 -index 000000000..28f3fda95 +index 00000000..28f3fda9 --- /dev/null +++ b/src/main/java/com/destroystokyo/paper/NamespacedTag.java @@ -0,0 +1,142 @@ @@ -199,7 +199,7 @@ index 000000000..28f3fda95 + } +} diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java -index 22eca2a18..620a962df 100644 +index 22eca2a1..620a962d 100644 --- a/src/main/java/org/bukkit/NamespacedKey.java +++ b/src/main/java/org/bukkit/NamespacedKey.java @@ -18,7 +18,7 @@ import org.jetbrains.annotations.NotNull; @@ -226,13 +226,14 @@ index 22eca2a18..620a962df 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 4e8c7a8ac..595df539b 100644 +index 1df31be7..b1fa15a1 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -@@ -421,4 +421,86 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste +@@ -388,4 +388,87 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable, Persiste + @SuppressWarnings("javadoc") @NotNull - Spigot spigot(); - // Spigot end + ItemMeta clone(); ++ + // Paper start - Add an API for CanPlaceOn and CanDestroy NBT values + /** + * Gets set of materials what given item can destroy in {@link org.bukkit.GameMode#ADVENTURE} @@ -317,5 +318,5 @@ index 4e8c7a8ac..595df539b 100644 + // Paper end } -- -2.21.0 +2.24.0 diff --git a/Spigot-API-Patches/0154-Material-API-additions.patch b/Spigot-API-Patches/0154-Material-API-additions.patch index 5ec149313..a3cde3eca 100644 --- a/Spigot-API-Patches/0154-Material-API-additions.patch +++ b/Spigot-API-Patches/0154-Material-API-additions.patch @@ -1,14 +1,14 @@ -From 7cadf4fba9dd48cbc9e075a1dae7c3bba21516c2 Mon Sep 17 00:00:00 2001 +From 48215f315183e9ee6f9f6c31a8072e9094cbfb60 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sat, 6 Oct 2018 21:14:29 -0400 Subject: [PATCH] Material API additions diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java -index b9838dc96..9a1c37248 100644 +index 9dc0ed03..535179c2 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -80,6 +80,7 @@ import org.jetbrains.annotations.Nullable; +@@ -81,6 +81,7 @@ import org.jetbrains.annotations.Nullable; /** * An enum of all material IDs accepted by the official server and client */ @@ -16,7 +16,7 @@ index b9838dc96..9a1c37248 100644 public enum Material implements Keyed { // ACACIA_BOAT(27326, 1), -@@ -3291,6 +3292,22 @@ public enum Material implements Keyed { +@@ -3305,6 +3306,22 @@ public enum Material implements Keyed { } } @@ -40,5 +40,5 @@ index b9838dc96..9a1c37248 100644 * Do not use for any reason. * -- -2.21.0 +2.24.0 diff --git a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch index 71a44a599..a00e64253 100644 --- a/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch +++ b/Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch @@ -1,4 +1,4 @@ -From 5a4094e7f3aad507d9f44cacfddd6a6bb705421d Mon Sep 17 00:00:00 2001 +From 438ca84fe0a7cabce8f510292ce8f288596aed51 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 24 Mar 2019 00:21:23 -0400 Subject: [PATCH] Entity#getEntitySpawnReason @@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners, or DEFAULT since data was not stored. diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java -index da7b35f0..ac28ba01 100644 +index 83e02aea..60dbfab0 100644 --- a/src/main/java/org/bukkit/entity/Entity.java +++ b/src/main/java/org/bukkit/entity/Entity.java -@@ -661,5 +661,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent +@@ -650,5 +650,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent */ @NotNull Chunk getChunk(); diff --git a/work/BuildData b/work/BuildData index 2dbde4c18..f845c6ee8 160000 --- a/work/BuildData +++ b/work/BuildData @@ -1 +1 @@ -Subproject commit 2dbde4c18d3b3e34142da21d42cea4b1beb33d7d +Subproject commit f845c6ee8a6d41562c71dc218c7d5b7b9eeb03d6 diff --git a/work/Bukkit b/work/Bukkit index 8b6dd1038..cff5f1c33 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 8b6dd103832def3e8d1a7c3cdb98cde9826d543c +Subproject commit cff5f1c332ebd788c79e0f7497d52ce6e11af0ba diff --git a/work/CraftBukkit b/work/CraftBukkit index 656701746..de42aa13f 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 656701746abf477beb78cb6108298b20dc053cf1 +Subproject commit de42aa13f387632b360c5b1b003b212499f3f4f2 diff --git a/work/Spigot b/work/Spigot index 56f84710b..530f6689b 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 56f84710b85569a76df91e08104baa55000b565a +Subproject commit 530f6689ba4fea0365550cc95a50d6b76bbd9dbb