MOVEMENT ENGINE!!!!

Author: Tofaa2

api/src/main/java/me/tofaa/entitylib/extras/skin/SFUtils.java

@@ -22,7 +22,8 @@ public static ErroredTextureProperties getTextures(String username) {
             InputStream stream = url.openStream();
             InputStreamReader isr = new InputStreamReader(stream);
             JsonObject root = parse(isr);
-            UUID uuid = UUID.fromString(root.get("id").getAsString());
+            String uuidStr = root.get("id").getAsString();
+            UUID uuid = UUID.fromString(uuidStr.substring(0, 8) + "-" + uuidStr.substring(8, 12) + "-" + uuidStr.substring(12, 16) + "-" + uuidStr.substring(16, 20) + "-" + uuidStr.substring(20));
             isr.close();
             stream.close();
             return getTextures(uuid);

api/src/main/java/me/tofaa/entitylib/wrapper/WrapperEntity.java

@@ -548,7 +548,7 @@ public void setHasNoGravity(boolean hasNoGravity) {
      */
     public void addPassenger(int passenger) {
         if (passengers.contains(passenger)) {
-            throw new IllegalArgumentException("Passenger already exists");
+            return;
         }
 
         passengers.add(passenger);

api/src/main/java/me/tofaa/entitylib/wrapper/hologram/Hologram.java

@@ -32,6 +32,8 @@ public interface Hologram {
 
     @NotNull Location getLocation();
 
+    @NotNull me.tofaa.entitylib.wrapper.WrapperEntity getEntity();
+
 
     void show();
 
@@ -54,6 +56,13 @@ default void addViewer(@NotNull User user) {
         addViewer(user.getUUID());
     }
 
+    void removeViewer(@NotNull UUID viewer);
+    default void removeViewer(@NotNull User user) {
+        removeViewer(user.getUUID());
+    }
+
+    void setParent(@NotNull me.tofaa.entitylib.wrapper.WrapperEntity parent);
+
     interface Modern extends Hologram {
 
         // I got too lazy

api/src/main/java/me/tofaa/entitylib/wrapper/hologram/LegacyHologram.java

@@ -40,16 +40,31 @@ public void addViewer(@NotNull UUID viewer) {
         }
     }
 
+    @Override
+    public void removeViewer(@NotNull UUID viewer) {
+        for (WrapperEntity line : lines) {
+            line.removeViewer(viewer);
+        }
+    }
+
+@Override
+    public @NotNull Location getLocation() {
+        return location;
+    }
+
+    @Override
+    public @NotNull WrapperEntity getEntity() {
+        return lines.isEmpty() ? null : lines.get(0);
+    }
+
     @Override
     public boolean isMarker() {
         return marker;
     }
 
     @Override
     public void setMarker(boolean marker) {
-        this.marker = true;
-        if (lines.isEmpty()) return;
-        teleport(location); // refresh
+        this.marker = marker;
     }
 
     @Override
@@ -144,8 +159,19 @@ public void setLineOffset(boolean marker, float value) {
     }
 
     @Override
-    public @NotNull Location getLocation() {
-        return location;
+    public void setParent(@NotNull WrapperEntity parent) {
+        if (lines.isEmpty()) return;
+        
+        WrapperEntity first = lines.get(0);
+        for (WrapperEntity e : lines) {
+            if (e.getUuid().equals(first.getUuid())) continue;
+            try {
+                first.addPassenger(e);
+            } catch (Exception ignored) {}
+        }
+        try {
+            parent.addPassenger(first);
+        } catch (Exception ignored) {}
     }
 
 }

api/src/main/java/me/tofaa/entitylib/wrapper/hologram/ModernHologram.java

@@ -22,6 +22,7 @@ final class ModernHologram implements Hologram.Modern {
     private final List<WrapperEntity> lines = new ArrayList<>(3);
     private Consumer<TextDisplayMeta> modifier;
     private boolean spawned = false;
+    private WrapperEntity parent;
 
     ModernHologram(@NotNull Location location) {
         this.location = location;
@@ -55,6 +56,11 @@ public void hide() {
     public void teleport(Location location) {
         this.location = location;
         if (lines.isEmpty()) return;
+        
+        if (parent != null) {
+            return;
+        }
+        
         WrapperEntity first = lines.get(0);
         first.teleport(location);
         for (WrapperEntity e : lines) {
@@ -63,6 +69,23 @@ public void teleport(Location location) {
         }
     }
 
+    @Override
+    public void setParent(@NotNull WrapperEntity parent) {
+        this.parent = parent;
+        if (lines.isEmpty()) return;
+        
+        WrapperEntity first = lines.get(0);
+        for (WrapperEntity e : lines) {
+            if (e.getUuid().equals(first.getUuid())) continue;
+            try {
+                first.addPassenger(e);
+            } catch (Exception ignored) {}
+        }
+        try {
+            parent.addPassenger(first);
+        } catch (Exception ignored) {}
+    }
+
     @Override
     public @Nullable Component getLine(int index) {
         if (index < 0 || index >= lines.size()) {
@@ -79,6 +102,7 @@ public void setLine(int index, @Nullable Component line) {
         meta.setInvisible(true);
         meta.setHasNoGravity(true);
         meta.setText(line);
+        meta.setBillboardConstraints(me.tofaa.entitylib.meta.display.AbstractDisplayMeta.BillboardConstraints.CENTER);
         if (this.modifier != null) {
             this.modifier.accept(meta);
         }
@@ -110,6 +134,13 @@ public void addViewer(@NotNull UUID viewer) {
         }
     }
 
+    @Override
+    public void removeViewer(@NotNull UUID viewer) {
+        for (WrapperEntity line : lines) {
+            line.removeViewer(viewer);
+        }
+    }
+
 
     @Override
     public int length() {
@@ -121,6 +152,11 @@ public int length() {
         return location;
     }
 
+    @Override
+    public @NotNull WrapperEntity getEntity() {
+        return lines.isEmpty() ? null : lines.get(0);
+    }
+
 
     @Override
     public void setModifier(@NotNull Consumer<TextDisplayMeta> consumer) {

build.gradle.kts

@@ -1,4 +1,4 @@
-val fullVersion = "3.1.0"
+val fullVersion = "3.2.0"
 val snapshot = true
 
 group = "io.github.tofaa2"

movement-engine/build.gradle.kts

@@ -0,0 +1,18 @@
+plugins {
+    entitylib.`library-conventions`
+}
+
+description = "EntityLib Movement Engine - Pathfinding and movement for WrapperEntities"
+
+repositories {
+    maven("https://maven.pvphub.me/tofaa")
+    maven("https://repo.papermc.io/repository/maven-public/")
+}
+
+dependencies {
+    compileOnly(libs.packetevents.spigot)
+    compileOnly(libs.adventure.api)
+    compileOnly(libs.paper)
+    api(project(":api"))
+    implementation(project(":common"))
+}