SteamWar/Paper-Old
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Projekte Releases Wiki Aktivität

Bucketable API (#7204)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Owen1212055 2021-12-30 14:58:38 -05:00 committet von GitHub
Ursprung 7b833ca18f
Commit a99a33cdd9
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 4AEE18F83AFDEB23
2 geänderte Dateien mit 146 neuen und 0 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

77
patches/api/0352-Bucketable-API.patch Normale Datei
Datei anzeigen

@ -0,0 +1,77 @@
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

69
patches/server/0841-Bucketable-API.patch Normale Datei
Datei anzeigen

@ -0,0 +1,69 @@
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..c4eee682f5b8cd82f71f92f0549f39b76e735cd8
--- /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.getBukkit(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 cd751a13a29c34be1d084253f19bf2dce8399d01..cdaf860ec1b84c4ad9f2345968786d878f483f74 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAxolotl.java
@@ -5,7 +5,7 @@ import org.bukkit.craftbukkit.CraftServer;
import org.bukkit.entity.Axolotl;
import org.bukkit.entity.EntityType;
-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 69d103a8ec74b17ee3116bb4d448494bd66f50b6..3c64461119391ec2e987fc936104e21ef0a95ce4 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);