cactus and block rotator

src/main/java/carpet/mixins/DirectionMixin.java

@@ -2,6 +2,7 @@ package carpet.mixins;
 
 import carpet.CarpetSettings;
 import carpet.fakes.EntityInterface;
+import carpet.helpers.BlockRotator;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
@@ -12,15 +13,31 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 public abstract class DirectionMixin
 {
     @Redirect(method = "getEntityFacingOrder", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getYaw(F)F"))
-    private static float ifGetYaw(Entity entity, float float_1)
+    private static float getYaw(Entity entity, float float_1)
     {
+        float yaw;
         if (!CarpetSettings.getBool("placementRotationFix"))
         {
-            return entity.getYaw(1.0F);
+            yaw = entity.getYaw(float_1);
         }
         else
         {
-            return ((EntityInterface) entity).getMainYaw(1.0F);
+            yaw = ((EntityInterface) entity).getMainYaw(float_1);
         }
+        if (BlockRotator.flippinEligibility(entity))
+        {
+            yaw += 180f;
+        }
+        return yaw;
+    }
+    @Redirect(method = "getEntityFacingOrder", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;getPitch(F)F"))
+    private static float getPitch(Entity entity, float float_1)
+    {
+        float pitch = entity.getPitch(float_1);
+        if (BlockRotator.flippinEligibility(entity))
+        {
+            pitch = -pitch;
+        }
+        return pitch;
     }
 }