Improves DisplayFloatingPet

anjoismysign · Jan 7, 2024 · 33f3f08 · 33f3f08
1 parent dcd6385
commit 33f3f08
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 26 deletions.
diff --git a/ci-pom.xml b/ci-pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.55</version>
+        <version>1.697.56</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/local-pom.xml b/local-pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>us.mytheria</groupId>
         <artifactId>BlobLib</artifactId>
-        <version>1.697.55</version>
+        <version>1.697.56</version>
         <relativePath>pom.xml</relativePath>
     </parent>
     <artifactId>bloblib</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>us.mytheria</groupId>
     <artifactId>BlobLib</artifactId>
-    <version>1.697.55</version>
+    <version>1.697.56</version>
     <packaging>pom</packaging>
 
     <properties>
@@ -50,7 +50,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.20.1-R0.1-SNAPSHOT</version>
+            <version>1.20.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/BlockDisplayFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/BlockDisplayFloatingPet.java
@@ -31,13 +31,8 @@ void spawnEntity(Location location) {
         BlobLib plugin = BlobLib.getInstance();
         entity = (BlockDisplay) location.getWorld().spawnEntity(location,
                 EntityType.BLOCK_DISPLAY);
-        vehicle = (BlockDisplay) location.getWorld().spawnEntity(location,
-                EntityType.BLOCK_DISPLAY);
         entity.setPersistent(false);
-        vehicle.setPersistent(false);
-        if (!vehicle.addPassenger(entity)) {
-            throw new RuntimeException("Failed to add passenger to vehicle");
-        }
+        entity.setTeleportDuration(1);
         setCustomName(getCustomName());
         entity.setBlock(getDisplay());
         initAnimations(plugin);

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/DisplayFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/DisplayFloatingPet.java
@@ -1,6 +1,5 @@
 package us.mytheria.bloblib.displayentity;
 
-import me.anjoismysign.manobukkit.entities.decorators.implementations.ManoratorFactory;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Particle;
@@ -10,18 +9,23 @@
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import us.mytheria.bloblib.BlobLibAPI;
 
 import java.util.Objects;
 import java.util.Random;
 import java.util.UUID;
 
+/**
+ * Represents a FloatingPet.
+ * Uses 1.20.2+ Bukkit API
+ *
+ * @param <T> - the Display entity
+ * @param <R> - (BlockData/ItemStack)
+ */
 public abstract class DisplayFloatingPet<T extends Display, R extends Cloneable>
         implements DisplayPet<Display, R> {
-    private static final ManoratorFactory MANORATOR_FACTORY = BlobLibAPI.getInstance().getManoBukkit().getManoratorFactory();
 
     private Particle particle;
-    protected T entity, vehicle;
+    protected T entity;
     private Location location;
     private UUID owner;
     private boolean activated, pauseLogic;
@@ -209,12 +213,9 @@ public String getCustomName() {
      * @param loc the new location
      */
     public void teleport(Location loc) {
-        if (vehicle != null) {
-            loadChunks(location);
-            loadChunks(loc);
-            MANORATOR_FACTORY.of(vehicle).vehicleTeleport(loc);
-        } else
-            throw new NullPointerException("Expected vehicle is null");
+        loadChunks(location);
+        loadChunks(loc);
+        entity.teleport(loc);
         setLocation(loc);
     }
 

diff --git a/src/main/java/us/mytheria/bloblib/displayentity/ItemDisplayFloatingPet.java b/src/main/java/us/mytheria/bloblib/displayentity/ItemDisplayFloatingPet.java
@@ -32,13 +32,8 @@ void spawnEntity(Location location) {
         BlobLib plugin = BlobLib.getInstance();
         entity = (ItemDisplay) location.getWorld().spawnEntity(location,
                 EntityType.ITEM_DISPLAY);
-        vehicle = (ItemDisplay) location.getWorld().spawnEntity(location,
-                EntityType.ITEM_DISPLAY);
         entity.setPersistent(false);
-        vehicle.setPersistent(false);
-        if (!vehicle.addPassenger(entity)) {
-            throw new RuntimeException("Failed to add passenger to vehicle");
-        }
+        entity.setTeleportDuration(1);
         setCustomName(getCustomName());
         entity.setItemStack(getDisplay());
         Transformation transformation = entity.getTransformation();