mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-28 14:37:35 +02:00
ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
95 lines
4.0 KiB
Diff
95 lines
4.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 17 Oct 2021 15:39:41 -0400
|
|
Subject: [PATCH] Add Shearable API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/entity/Shearable.java b/src/main/java/io/papermc/paper/entity/Shearable.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..0d5793790ab6a47525ad33033517361205756338
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/entity/Shearable.java
|
|
@@ -0,0 +1,43 @@
|
|
+package io.papermc.paper.entity;
|
|
+
|
|
+import net.kyori.adventure.sound.Sound;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Represents an entity that can be sheared.
|
|
+ */
|
|
+public interface Shearable extends Entity {
|
|
+
|
|
+ /**
|
|
+ * Forces the entity to be sheared and then play the effect as if it were sheared by a player.
|
|
+ * This will cause the entity to be sheared, even if {@link Shearable#readyToBeSheared()} is false.
|
|
+ * <p>
|
|
+ * Some shearing behavior may cause the entity to no longer be valid
|
|
+ * due to it being replaced by a different entity.
|
|
+ */
|
|
+ default void shear() {
|
|
+ this.shear(Sound.Source.PLAYER);
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Forces the entity to be sheared and then play the effect as if it were sheared by the provided source.
|
|
+ * This will cause the entity to be sheared, even if {@link Shearable#readyToBeSheared()} is false.
|
|
+ * <p>
|
|
+ * Some shearing behavior may cause the entity to no longer be valid
|
|
+ * due to it being replaced by a different entity.
|
|
+ * <p>
|
|
+ * This simulates the behavior of an actual shearing, which may cause events like EntityTransformEvent to be called
|
|
+ * for mooshrooms, and EntityDropItemEvent to be called for sheep.
|
|
+ *
|
|
+ * @param source Sound source to play any sound effects on
|
|
+ */
|
|
+ void shear(@NotNull Sound.Source source);
|
|
+
|
|
+ /**
|
|
+ * Gets if the entity would be able to be sheared or not naturally using shears.
|
|
+ *
|
|
+ * @return if the entity can be sheared
|
|
+ */
|
|
+ boolean readyToBeSheared();
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/MushroomCow.java b/src/main/java/org/bukkit/entity/MushroomCow.java
|
|
index cef1700834643fe28ed5737578d91ecefbe99e2f..86c0043ef4e1288b6fe2f68a9b6d01c3de2c3454 100644
|
|
--- a/src/main/java/org/bukkit/entity/MushroomCow.java
|
|
+++ b/src/main/java/org/bukkit/entity/MushroomCow.java
|
|
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
|
|
/**
|
|
* Represents a mushroom {@link Cow}
|
|
*/
|
|
-public interface MushroomCow extends Cow {
|
|
+public interface MushroomCow extends Cow, io.papermc.paper.entity.Shearable { // Paper
|
|
|
|
/**
|
|
* Checks for the presence of custom potion effects to be applied to the
|
|
diff --git a/src/main/java/org/bukkit/entity/Sheep.java b/src/main/java/org/bukkit/entity/Sheep.java
|
|
index f4ce312ccd927a8b64f4266b35a0a53b85e591f3..97388d46cee225dedc0b61a12e7b60b3424732c8 100644
|
|
--- a/src/main/java/org/bukkit/entity/Sheep.java
|
|
+++ b/src/main/java/org/bukkit/entity/Sheep.java
|
|
@@ -5,7 +5,7 @@ import org.bukkit.material.Colorable;
|
|
/**
|
|
* Represents a Sheep.
|
|
*/
|
|
-public interface Sheep extends Animals, Colorable {
|
|
+public interface Sheep extends Animals, Colorable, io.papermc.paper.entity.Shearable { // Paper - Shear API
|
|
|
|
/**
|
|
* @return Whether the sheep is sheared.
|
|
diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
|
|
index 10f8f6d45ae9280651c3ebddd1f90acbd7d6ff29..7fbfdb07585c7b28acea1f0c1f58ada0cc744441 100644
|
|
--- a/src/main/java/org/bukkit/entity/Snowman.java
|
|
+++ b/src/main/java/org/bukkit/entity/Snowman.java
|
|
@@ -5,7 +5,7 @@ import com.destroystokyo.paper.entity.RangedEntity;
|
|
/**
|
|
* Represents a snowman entity
|
|
*/
|
|
-public interface Snowman extends Golem, RangedEntity { // Paper
|
|
+public interface Snowman extends Golem, RangedEntity, io.papermc.paper.entity.Shearable { // Paper
|
|
|
|
/**
|
|
* Gets whether this snowman is in "derp mode", meaning it is not wearing a
|