From 79db3a2a4bf3705fed1f04815f71493c7d00b30b Mon Sep 17 00:00:00 2001 From: Owen <23108066+Owen1212055@users.noreply.github.com> Date: Fri, 17 Mar 2023 17:11:08 -0400 Subject: [PATCH] Add Shearable API (#6796) --- patches/api/0419-Add-Shearable-API.patch | 94 +++++++++++++++++++++ patches/server/0965-Add-Shearable-API.patch | 72 ++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 patches/api/0419-Add-Shearable-API.patch create mode 100644 patches/server/0965-Add-Shearable-API.patch diff --git a/patches/api/0419-Add-Shearable-API.patch b/patches/api/0419-Add-Shearable-API.patch new file mode 100644 index 0000000000..96049cfd38 --- /dev/null +++ b/patches/api/0419-Add-Shearable-API.patch @@ -0,0 +1,94 @@ +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. ++ *
++ * 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. ++ *
++ * Some shearing behavior may cause the entity to no longer be valid ++ * due to it being replaced by a different entity. ++ *
++ * 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 738d547d2a6966122cb2f9f6e94263ee526d9fab..a5ed2bb03684da44951ec8aecbb229fe2b355e63 100644
+--- a/src/main/java/org/bukkit/entity/MushroomCow.java
++++ b/src/main/java/org/bukkit/entity/MushroomCow.java
+@@ -5,7 +5,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
+
+ /**
+ * Get the variant of this cow.
+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
diff --git a/patches/server/0965-Add-Shearable-API.patch b/patches/server/0965-Add-Shearable-API.patch
new file mode 100644
index 0000000000..950ecc2beb
--- /dev/null
+++ b/patches/server/0965-Add-Shearable-API.patch
@@ -0,0 +1,72 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
+Date: Sun, 17 Oct 2021 15:39:48 -0400
+Subject: [PATCH] Add Shearable API
+
+
+diff --git a/src/main/java/io/papermc/paper/entity/PaperShearable.java b/src/main/java/io/papermc/paper/entity/PaperShearable.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..bcf254e3c81cf1e401bddc850fb24ad29dcc127c
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/entity/PaperShearable.java
+@@ -0,0 +1,21 @@
++package io.papermc.paper.entity;
++
++import io.papermc.paper.adventure.PaperAdventure;
++import net.kyori.adventure.sound.Sound;
++import net.minecraft.world.entity.Shearable;
++import org.jetbrains.annotations.NotNull;
++
++public interface PaperShearable extends io.papermc.paper.entity.Shearable {
++
++ Shearable getHandle();
++
++ @Override
++ default boolean readyToBeSheared() {
++ return this.getHandle().readyForShearing();
++ }
++
++ @Override
++ default void shear(@NotNull Sound.Source source) {
++ this.getHandle().shear(PaperAdventure.asVanilla(source));
++ }
++}
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
+index 20eaa3424428b8b30fd15591b660983cb7fc4375..4a6aae106de5eeeb80c078c5a167ef0484b13929 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMushroomCow.java
+@@ -6,7 +6,7 @@ import org.bukkit.entity.EntityType;
+ import org.bukkit.entity.MushroomCow;
+ import org.bukkit.entity.MushroomCow.Variant;
+
+-public class CraftMushroomCow extends CraftCow implements MushroomCow {
++public class CraftMushroomCow extends CraftCow implements MushroomCow, io.papermc.paper.entity.PaperShearable { // Paper
+ public CraftMushroomCow(CraftServer server, net.minecraft.world.entity.animal.MushroomCow entity) {
+ super(server, entity);
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
+index ca8e35fbf04a54d60c3612f74be0b5fbf2ab7a56..81ccb4bde315c42409a0c04883f5cb4551398308 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSheep.java
+@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
+ import org.bukkit.entity.EntityType;
+ import org.bukkit.entity.Sheep;
+
+-public class CraftSheep extends CraftAnimals implements Sheep {
++public class CraftSheep extends CraftAnimals implements Sheep, io.papermc.paper.entity.PaperShearable { // Paper
+ public CraftSheep(CraftServer server, net.minecraft.world.entity.animal.Sheep entity) {
+ super(server, entity);
+ }
+diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
+index 659e2959c5330e4764ea1edc7f8de9f464f9ff52..42b7058d93fab8cbee49dba130734e1df9910096 100644
+--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
++++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftSnowman.java
+@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
+ import org.bukkit.entity.EntityType;
+ import org.bukkit.entity.Snowman;
+
+-public class CraftSnowman extends CraftGolem implements Snowman, com.destroystokyo.paper.entity.CraftRangedEntity