mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-07 04:04:57 +02:00
efd47e3a68
* Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices ecfa559a PR-849: Add InventoryView#setTitle 653d7edb SPIGOT-519: Add TNTPrimeEvent 22fccc09 PR-846: Add method to get chunk load level a070a52c PR-844: Add methods to convert Vector to and from JOML vectors cc7111fe PR-276: Add accessors to Wither's invulnerability ticks 777d24e9 SPIGOT-7209: Accessors and events for player's exp cooldown ccb2d01b SPIGOT-6308: Deprecate the location name property of map items cd04a31b PR-780: Add PlayerSpawnChangeEvent 7d1f5b64 SPIGOT-6780: Improve documentation for World#spawnFallingBlock 5696668a SPIGOT-6885: Add test and easier to debug code for reference in yaml configuration comments 2e13cff7 PR-589: Expand the FishHook API 2c7d3da5 PR-279: Minor edits to various Javadocs CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices a7cfc778f PR-1176: Add InventoryView#setTitle 563d42226 SPIGOT-519: Add TNTPrimeEvent ccbc6abca Add test for Chunk.LoadLevel mirroring 2926e0513 PR-1171: Add method to get chunk load level 63cad7f84 PR-375: Add accessors to Wither's invulnerability ticks bfd8b1ac8 SPIGOT-7209: Accessors and events for player's exp cooldown f92a41c39 PR-1181: Consolidate Location conversion code 10f866759 SPIGOT-6308: Deprecate the location name property of map items 82f7b658a PR-1095: Add PlayerSpawnChangeEvent b421af7e4 PR-808: Expand the FishHook API 598ad7b3f Increase outdated build delay Spigot Changes: d1bd3bd2 Rebuild patches e4265cc8 SPIGOT-7297: Entity Tracking Range option for Display entities * Work around javac bug * Call PlayerSpawnChangeEvent * Updated Upstream (Bukkit/CraftBukkit/Spigot) 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: 2fcba9b2 SPIGOT-7347: Add missing documentation and details to ShapedRecipe c278419d PR-854: Move getHighestBlockYAt methods from World to RegionAccessor 201399fb PR-853: Add API for directly setting Display transformation matrices CraftBukkit Changes: 01b2e1af4 SPIGOT-7346: Disallow players from executing commands after disconnecting 7fe5ee022 PR-1186: Move getHighestBlockYAt methods from World to RegionAccessor bcc85ef67 PR-1185: Add API for directly setting Display transformation matrices Spigot Changes: 7da74dae Rebuild patches
78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Sun, 26 Dec 2021 14:03:11 -0500
|
|
Subject: [PATCH] Bucketable API
|
|
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/entity/Bucketable.java b/src/main/java/io/papermc/paper/entity/Bucketable.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..84e360a16de956834a91142d45e4b5a0fe3d3a92
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/entity/Bucketable.java
|
|
@@ -0,0 +1,42 @@
|
|
+package io.papermc.paper.entity;
|
|
+
|
|
+import org.bukkit.Sound;
|
|
+import org.bukkit.entity.Entity;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Represents an entity that can be bucketed.
|
|
+ */
|
|
+public interface Bucketable extends Entity {
|
|
+
|
|
+ /**
|
|
+ * Gets if this entity originated from a bucket.
|
|
+ *
|
|
+ * @return originated from bucket
|
|
+ */
|
|
+ boolean isFromBucket();
|
|
+
|
|
+ /**
|
|
+ * Sets if this entity originated from a bucket.
|
|
+ *
|
|
+ * @param fromBucket is from a bucket
|
|
+ */
|
|
+ void setFromBucket(boolean fromBucket);
|
|
+
|
|
+ /**
|
|
+ * Gets the base itemstack of this entity in a bucket form.
|
|
+ *
|
|
+ * @return bucket form
|
|
+ */
|
|
+ @NotNull
|
|
+ ItemStack getBaseBucketItem();
|
|
+
|
|
+ /**
|
|
+ * Gets the sound that is played when this entity
|
|
+ * is picked up in a bucket.
|
|
+ * @return bucket pickup sound
|
|
+ */
|
|
+ @NotNull
|
|
+ Sound getPickupSound();
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/entity/Axolotl.java b/src/main/java/org/bukkit/entity/Axolotl.java
|
|
index 9763f3b9ac8f32c082a476f4b50a32622b2720a0..c8c738b1b72e9ad89d97b7a1f5450d58045a72ca 100644
|
|
--- a/src/main/java/org/bukkit/entity/Axolotl.java
|
|
+++ b/src/main/java/org/bukkit/entity/Axolotl.java
|
|
@@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull;
|
|
/**
|
|
* An Axolotl.
|
|
*/
|
|
-public interface Axolotl extends Animals {
|
|
+public interface Axolotl extends Animals, io.papermc.paper.entity.Bucketable { // Paper - Bucketable API
|
|
|
|
/**
|
|
* Gets if this axolotl is playing dead.
|
|
diff --git a/src/main/java/org/bukkit/entity/Fish.java b/src/main/java/org/bukkit/entity/Fish.java
|
|
index 82e390b2152e7c881006ca30f2527d160c01f8a1..86da8dc401ed7db19a39bc682721055cd341ccde 100644
|
|
--- a/src/main/java/org/bukkit/entity/Fish.java
|
|
+++ b/src/main/java/org/bukkit/entity/Fish.java
|
|
@@ -3,4 +3,4 @@ package org.bukkit.entity;
|
|
/**
|
|
* Represents a fish entity.
|
|
*/
|
|
-public interface Fish extends WaterMob { }
|
|
+public interface Fish extends WaterMob, io.papermc.paper.entity.Bucketable { } // Paper - Bucketable API
|