2019-05-27 09:13:41 +00:00
|
|
|
From f789dbd181102df5658bcd4a048056ab55b5b109 Mon Sep 17 00:00:00 2001
|
2018-10-11 03:40:49 +00:00
|
|
|
From: BillyGalbreath <Blake.Galbreath@GMail.com>
|
|
|
|
Date: Fri, 28 Sep 2018 17:08:09 -0500
|
|
|
|
Subject: [PATCH] Turtle API
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
|
|
|
|
new file mode 100644
|
2019-03-24 17:16:59 +00:00
|
|
|
index 00000000..021356d1
|
2018-10-11 03:40:49 +00:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleGoHomeEvent.java
|
2019-03-20 00:28:15 +00:00
|
|
|
@@ -0,0 +1,49 @@
|
2018-10-11 03:40:49 +00:00
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
|
|
|
+import org.bukkit.entity.Turtle;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
2019-03-20 00:28:15 +00:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Fired when a Turtle decides to go home
|
|
|
|
+ */
|
|
|
|
+public class TurtleGoHomeEvent extends EntityEvent implements Cancellable {
|
|
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
|
|
+ private boolean cancelled = false;
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public TurtleGoHomeEvent(@NotNull Turtle turtle) {
|
2018-10-11 03:40:49 +00:00
|
|
|
+ super(turtle);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * The turtle going home
|
|
|
|
+ *
|
|
|
|
+ * @return The turtle
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public Turtle getEntity() {
|
|
|
|
+ return (Turtle) entity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
|
|
|
|
new file mode 100644
|
2019-03-24 17:16:59 +00:00
|
|
|
index 00000000..a315c518
|
2018-10-11 03:40:49 +00:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleLayEggEvent.java
|
2019-03-20 00:28:15 +00:00
|
|
|
@@ -0,0 +1,87 @@
|
2018-10-11 03:40:49 +00:00
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
|
|
|
+import org.bukkit.Location;
|
|
|
|
+import org.bukkit.entity.Turtle;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
2019-03-20 00:28:15 +00:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Fired when a Turtle lays eggs
|
|
|
|
+ */
|
|
|
|
+public class TurtleLayEggEvent extends EntityEvent implements Cancellable {
|
|
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
|
|
+ private boolean cancelled = false;
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ private final Location location;
|
|
|
|
+ private int eggCount;
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public TurtleLayEggEvent(@NotNull Turtle turtle, @NotNull Location location, int eggCount) {
|
2018-10-11 03:40:49 +00:00
|
|
|
+ super(turtle);
|
|
|
|
+ this.location = location;
|
|
|
|
+ this.eggCount = eggCount;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * The turtle laying the eggs
|
|
|
|
+ *
|
|
|
|
+ * @return The turtle
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public Turtle getEntity() {
|
|
|
|
+ return (Turtle) entity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the location where the eggs are being laid
|
|
|
|
+ *
|
|
|
|
+ * @return Location of eggs
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public Location getLocation() {
|
|
|
|
+ return location;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the number of eggs being laid
|
|
|
|
+ *
|
|
|
|
+ * @return Number of eggs
|
|
|
|
+ */
|
|
|
|
+ public int getEggCount() {
|
|
|
|
+ return eggCount;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Set the number of eggs being laid
|
|
|
|
+ *
|
|
|
|
+ * @param eggCount Number of eggs
|
|
|
|
+ */
|
|
|
|
+ public void setEggCount(int eggCount) {
|
|
|
|
+ if (eggCount < 1) {
|
|
|
|
+ cancelled = true;
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ eggCount = Math.min(eggCount, 4);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
|
|
|
|
new file mode 100644
|
2019-03-24 17:16:59 +00:00
|
|
|
index 00000000..abeb24fc
|
2018-10-11 03:40:49 +00:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/entity/TurtleStartDiggingEvent.java
|
2019-03-20 00:28:15 +00:00
|
|
|
@@ -0,0 +1,62 @@
|
2018-10-11 03:40:49 +00:00
|
|
|
+package com.destroystokyo.paper.event.entity;
|
|
|
|
+
|
|
|
|
+import org.bukkit.Location;
|
|
|
|
+import org.bukkit.entity.Turtle;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.entity.EntityEvent;
|
2019-03-20 00:28:15 +00:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * Fired when a Turtle starts digging to lay eggs
|
|
|
|
+ */
|
|
|
|
+public class TurtleStartDiggingEvent extends EntityEvent implements Cancellable {
|
|
|
|
+ private static final HandlerList handlers = new HandlerList();
|
|
|
|
+ private boolean cancelled = false;
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull private final Location location;
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ public TurtleStartDiggingEvent(@NotNull Turtle turtle, @NotNull Location location) {
|
2018-10-11 03:40:49 +00:00
|
|
|
+ super(turtle);
|
|
|
|
+ this.location = location;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * The turtle digging
|
|
|
|
+ *
|
|
|
|
+ * @return The turtle
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public Turtle getEntity() {
|
|
|
|
+ return (Turtle) entity;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the location where the turtle is digging
|
|
|
|
+ *
|
|
|
|
+ * @return Location where digging
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public Location getLocation() {
|
|
|
|
+ return location;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public HandlerList getHandlers() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return handlers;
|
|
|
|
+ }
|
|
|
|
+}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Turtle.java b/src/main/java/org/bukkit/entity/Turtle.java
|
2019-03-24 17:16:59 +00:00
|
|
|
index 0a4cd299..5375ea14 100644
|
2018-10-11 03:40:49 +00:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Turtle.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Turtle.java
|
2019-03-20 00:28:15 +00:00
|
|
|
@@ -1,6 +1,55 @@
|
2018-10-11 03:40:49 +00:00
|
|
|
package org.bukkit.entity;
|
|
|
|
|
|
|
|
+import org.bukkit.Location;
|
2019-03-20 00:28:15 +00:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
|
|
|
/**
|
|
|
|
* Represents a turtle.
|
|
|
|
*/
|
|
|
|
-public interface Turtle extends Animals { }
|
|
|
|
+public interface Turtle extends Animals {
|
|
|
|
+ // Paper start
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get the turtle's home location
|
|
|
|
+ *
|
|
|
|
+ * @return Home location
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ @NotNull
|
2018-10-11 03:40:49 +00:00
|
|
|
+ Location getHome();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Set the turtle's home location
|
|
|
|
+ *
|
|
|
|
+ * @param location Home location
|
|
|
|
+ */
|
2019-03-20 00:28:15 +00:00
|
|
|
+ void setHome(@NotNull Location location);
|
2018-10-11 03:40:49 +00:00
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Check if turtle is currently pathfinding to it's home
|
|
|
|
+ *
|
|
|
|
+ * @return True if going home
|
|
|
|
+ */
|
|
|
|
+ boolean isGoingHome();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get if turtle is digging to lay eggs
|
|
|
|
+ *
|
|
|
|
+ * @return True if digging
|
|
|
|
+ */
|
|
|
|
+ boolean isDigging();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Get if turtle is carrying egg
|
|
|
|
+ *
|
|
|
|
+ * @return True if carrying egg
|
|
|
|
+ */
|
|
|
|
+ boolean hasEgg();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Set if turtle is carrying egg
|
|
|
|
+ *
|
|
|
|
+ * @param hasEgg True if carrying egg
|
|
|
|
+ */
|
|
|
|
+ void setHasEgg(boolean hasEgg);
|
|
|
|
+ // Paper end
|
|
|
|
+}
|
|
|
|
--
|
2019-04-23 04:47:07 +00:00
|
|
|
2.21.0
|
2018-10-11 03:40:49 +00:00
|
|
|
|