Merge branch 'master' into comments

src/main/java/carpet/script/CarpetExpression.java

@@ -55,7 +55,7 @@ import net.minecraft.text.LiteralText;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Box;
-import net.minecraft.util.math.EulerRotation;
+import net.minecraft.util.math.EulerAngle;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.Heightmap;
@@ -2359,7 +2359,7 @@ public class CarpetExpression
                 armorstand.setCustomName(new LiteralText(name));
                 armorstand.setCustomNameVisible(true);
             }
-            armorstand.setHeadRotation(new EulerRotation((int)pointLocator.pitch,0,0));
+            armorstand.setHeadRotation(new EulerAngle((int)pointLocator.pitch,0,0));
             armorstand.setNoGravity(true);
             armorstand.setInvisible(true);
             armorstand.setInvulnerable(true);

src/main/java/carpet/script/value/BlockValue.java

@@ -380,7 +380,7 @@ public class BlockValue extends Value
 
         @Override
         public Direction getPlayerFacing() {
-            return this.facing.getAxis() == Direction.Axis.Y ? Direction.NORTH : this.facing;
+            return this.facing.getAxis() == Direction.Axis.field_11052 ? Direction.NORTH : this.facing;
         }
 
         @Override

src/main/java/carpet/script/value/EntityValue.java

@@ -315,7 +315,7 @@ public class EntityValue extends Value
             NbtPathArgumentType.NbtPath path;
             try
             {
-                path = NbtPathArgumentType.create().method_9362(new StringReader(a.getString()));
+                path = NbtPathArgumentType.nbtPath().method_9362(new StringReader(a.getString()));
             }
             catch (CommandSyntaxException exc)
             {