From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com> Date: Sun, 26 Dec 2021 14:03:17 -0500 Subject: [PATCH] Bucketable API diff --git a/src/main/java/io/papermc/paper/entity/PaperBucketable.java b/src/main/java/io/papermc/paper/entity/PaperBucketable.java new file mode 100644 index 0000000000000000000000000000000000000000..d3fc2e5db9f3c20120b403bf03c3c340b9956cbd --- /dev/null +++ b/src/main/java/io/papermc/paper/entity/PaperBucketable.java @@ -0,0 +1,31 @@ +package io.papermc.paper.entity; + +import org.bukkit.Sound; +import org.bukkit.craftbukkit.CraftSound; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.inventory.ItemStack; + +public interface PaperBucketable extends Bucketable { + + net.minecraft.world.entity.animal.Bucketable getHandle(); + + @Override + default boolean isFromBucket() { + return this.getHandle().fromBucket(); + } + + @Override + default void setFromBucket(boolean fromBucket) { + this.getHandle().setFromBucket(fromBucket); + } + + @Override + default ItemStack getBaseBucketItem() { + return CraftItemStack.asBukkitCopy(this.getHandle().getBucketItemStack()); + } + + @Override + default Sound getPickupSound() { + return CraftSound.minecraftToBukkit(this.getHandle().getPickupSound()); + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java index e730292edca4624400bdb89d555922c5f61db7a5..cbfca242f820d238b112f8ce64e9de8398c48a1c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java @@ -4,7 +4,7 @@ import com.google.common.base.Preconditions; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Axolotl; -public class CraftAxolotl extends CraftAnimals implements Axolotl { +public class CraftAxolotl extends CraftAnimals implements Axolotl, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API public CraftAxolotl(CraftServer server, net.minecraft.world.entity.animal.axolotl.Axolotl entity) { super(server, entity); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java index da5150f4ca0397bf10053aab0c3ff18af5bc3f3c..eb10f94d5ed8ca89d3786138647dd43357609a6c 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java @@ -4,7 +4,7 @@ import net.minecraft.world.entity.animal.AbstractFish; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.entity.Fish; -public class CraftFish extends CraftWaterMob implements Fish { +public class CraftFish extends CraftWaterMob implements Fish, io.papermc.paper.entity.PaperBucketable { // Paper - Bucketable API public CraftFish(CraftServer server, AbstractFish entity) { super(server, entity);