From e1b507799cf47c14afaf8bb0b7933f0685d0ca8b Mon Sep 17 00:00:00 2001 From: granny Date: Sat, 7 Mar 2026 15:18:46 -0800 Subject: [PATCH] apply all paper api patches --- .../src/main/java/org/bukkit/Material.java.patch | 2 +- .../src/main/java/org/bukkit/World.java.patch | 2 +- .../main/java/org/bukkit/entity/Player.java.patch | 2 +- .../java/org/bukkit/entity/Villager.java.patch | 2 +- .../main/java/org/bukkit/entity/Wolf.java.patch | 14 ++++++++------ .../bukkit/plugin/java/LibraryLoader.java.patch | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch index e95863592..fc2f269ea 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java -@@ -3703,4 +_,40 @@ +@@ -3705,4 +_,40 @@ return this.asItemType().getDefaultDataTypes(); } // Paper end - data component API diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch index bf9a3418b..9484cb37f 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/World.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -4465,6 +_,100 @@ +@@ -4468,6 +_,100 @@ @Nullable public DragonBattle getEnderDragonBattle(); diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch index 63bc57f4a..28fb1e5e8 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java -@@ -4012,4 +_,123 @@ +@@ -4011,4 +_,123 @@ */ @ApiStatus.Experimental PlayerGameConnection getConnection(); diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch index 6fc3b4a03..446119a47 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Villager.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/entity/Villager.java +++ b/src/main/java/org/bukkit/entity/Villager.java -@@ -409,4 +_,13 @@ +@@ -406,4 +_,13 @@ * Demand is still updated even if all events are canceled. */ public void restock(); diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch index 75efe3b44..f084d77da 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/entity/Wolf.java.patch @@ -1,10 +1,9 @@ --- a/src/main/java/org/bukkit/entity/Wolf.java +++ b/src/main/java/org/bukkit/entity/Wolf.java -@@ -163,4 +_,20 @@ - return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(Key.key(Key.MINECRAFT_NAMESPACE, key)); - } - } -+ +@@ -104,6 +_,22 @@ + */ + void setSoundVariant(@NotNull SoundVariant soundVariant); + + // Purpur start + /** + * Checks if this wolf is rabid @@ -20,4 +19,7 @@ + */ + void setRabid(boolean rabid); + // Purpur end - } ++ + /** + * Represents the variant of a wolf. + */ diff --git a/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch index 29f7d6f64..61c0fca39 100644 --- a/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch +++ b/purpur-api/paper-patches/files/src/main/java/org/bukkit/plugin/java/LibraryLoader.java.patch @@ -1,6 +1,6 @@ --- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java +++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java -@@ -69,6 +_,7 @@ +@@ -68,6 +_,7 @@ session.setTransferListener(new AbstractTransferListener() { @Override public void transferStarted(@NotNull TransferEvent event) { @@ -8,7 +8,7 @@ logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName()); } }); -@@ -94,6 +_,7 @@ +@@ -93,6 +_,7 @@ // Paper end - plugin loader api return null; } @@ -16,7 +16,7 @@ logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[] { java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix -@@ -146,6 +_,7 @@ +@@ -142,6 +_,7 @@ } jarFiles.add(url);