body_yaw entity tag

DenizenScript · Feb 22, 2018 · c6fe30a · c6fe30a
1 parent a203906
commit c6fe30a
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 2 deletions.
diff --git a/nmshandler/src/main/java/net/aufdemrand/denizen/nms/interfaces/EntityHelper.java b/nmshandler/src/main/java/net/aufdemrand/denizen/nms/interfaces/EntityHelper.java
@@ -75,6 +75,8 @@ void follow(final Entity target, final Entity follower, final double speed, fina
      */
     void rotate(Entity entity, float yaw, float pitch);
 
+    float getBaseYaw(Entity entity);
+
     // Taken from C2 NMS class for less dependency on C2
     void look(Entity entity, float yaw, float pitch);
 

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/dEntity.java
@@ -1861,6 +1861,18 @@ else if (mtr.angle == BlockFace.EAST) {
                     .getAttribute(attribute.fulfill(1));
         }
 
+        // <--[tag]
+        // @attribute <e@entity.body_yaw>
+        // @returns Element(Decimal)
+        // @group location
+        // @description
+        // Returns the entity's body yaw (separate from head yaw).
+        // -->
+        if (attribute.startsWith("body_yaw")) {
+            return new Element(NMSHandler.getInstance().getEntityHelper().getBaseYaw(entity))
+                    .getAttribute(attribute.fulfill(1));
+        }
+
         // <--[tag]
         // @attribute <e@entity.velocity>
         // @returns dLocation

diff --git a/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java b/plugin/src/main/java/net/aufdemrand/denizen/objects/properties/entity/EntityColor.java
@@ -3,7 +3,7 @@
 import net.aufdemrand.denizen.nms.NMSHandler;
 import net.aufdemrand.denizen.nms.NMSVersion;
 import net.aufdemrand.denizen.objects.dEntity;
-import net.aufdemrand.denizen.utilities.ParrotHelper;
+import net.aufdemrand.denizen.utilities.entity.ParrotHelper;
 import net.aufdemrand.denizen.utilities.entity.RabbitType;
 import net.aufdemrand.denizencore.objects.Element;
 import net.aufdemrand.denizencore.objects.Mechanism;

diff --git a/...mrand/denizen/utilities/ParrotHelper.java → ...enizen/utilities/entity/ParrotHelper.java b/...mrand/denizen/utilities/ParrotHelper.java → ...enizen/utilities/entity/ParrotHelper.java
@@ -1,4 +1,4 @@
-package net.aufdemrand.denizen.utilities;
+package net.aufdemrand.denizen.utilities.entity;
 
 import net.aufdemrand.denizen.objects.dEntity;
 import net.aufdemrand.denizencore.objects.Mechanism;

diff --git a/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_10_R1.java b/v1_10_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_10_R1.java
@@ -387,6 +387,12 @@ else if (entity instanceof LivingEntity) {
         }
     }
 
+    @Override
+    public float getBaseYaw(Entity entity) {
+        net.minecraft.server.v1_10_R1.Entity handle = ((CraftEntity) entity).getHandle();
+        return ((EntityLiving) handle).aP;
+    }
+
     @Override
     public void look(Entity entity, float yaw, float pitch) {
         net.minecraft.server.v1_10_R1.Entity handle = ((CraftEntity) entity).getHandle();

diff --git a/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_11_R1.java b/v1_11_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_11_R1.java
@@ -386,6 +386,12 @@ else if (entity instanceof LivingEntity) {
         }
     }
 
+    @Override
+    public float getBaseYaw(Entity entity) {
+        net.minecraft.server.v1_11_R1.Entity handle = ((CraftEntity) entity).getHandle();
+        return ((EntityLiving) handle).aO;
+    }
+
     @Override
     public void look(Entity entity, float yaw, float pitch) {
         net.minecraft.server.v1_11_R1.Entity handle = ((CraftEntity) entity).getHandle();

diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java
@@ -386,6 +386,12 @@ else if (entity instanceof LivingEntity) {
         }
     }
 
+    @Override
+    public float getBaseYaw(Entity entity) {
+        net.minecraft.server.v1_12_R1.Entity handle = ((CraftEntity) entity).getHandle();
+        return ((EntityLiving) handle).aO;
+    }
+
     @Override
     public void look(Entity entity, float yaw, float pitch) {
         net.minecraft.server.v1_12_R1.Entity handle = ((CraftEntity) entity).getHandle();

diff --git a/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_8_R3.java b/v1_8_R3/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_8_R3.java
@@ -387,6 +387,12 @@ else if (entity instanceof LivingEntity) {
         }
     }
 
+    @Override
+    public float getBaseYaw(Entity entity) {
+        net.minecraft.server.v1_8_R3.Entity handle = ((CraftEntity) entity).getHandle();
+        return ((EntityLiving) handle).aK;
+    }
+
     @Override
     public void look(Entity entity, float yaw, float pitch) {
         net.minecraft.server.v1_8_R3.Entity handle = ((CraftEntity) entity).getHandle();

diff --git a/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_9_R2.java b/v1_9_R2/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_9_R2.java
@@ -387,6 +387,12 @@ else if (entity instanceof LivingEntity) {
         }
     }
 
+    @Override
+    public float getBaseYaw(Entity entity) {
+        net.minecraft.server.v1_9_R2.Entity handle = ((CraftEntity) entity).getHandle();
+        return ((EntityLiving) handle).aO;
+    }
+
     @Override
     public void look(Entity entity, float yaw, float pitch) {
         net.minecraft.server.v1_9_R2.Entity handle = ((CraftEntity) entity).getHandle();