1.15.2 pre2 and mappings

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=1.15.2-pre1
+	minecraft_version=1.15.2-pre2
-	yarn_mappings=1.15.2-pre1+build.1
+	yarn_mappings=1.15.2-pre2+build.3
 	loader_version=0.7.4+build.177
 
 # Mod Properties

src/main/java/carpet/commands/PerimeterInfoCommand.java

@@ -14,6 +14,7 @@ import net.minecraft.command.arguments.BlockPosArgumentType;
 import net.minecraft.command.arguments.EntitySummonArgumentType;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
@@ -51,7 +52,7 @@ public class PerimeterInfoCommand
         {
             nbttagcompound.putString("id", mobId);
             entityliving = (MobEntity) EntityType.loadEntityWithPassengers(nbttagcompound, source.getWorld(), (entity_1x) -> {
-                entity_1x.setPositionAndAngles(pos.getX(), pos.getY()+2, pos.getZ(), entity_1x.yaw, entity_1x.pitch);
+                entity_1x.refreshPositionAndAngles(pos.offset(Direction.UP,2), entity_1x.yaw, entity_1x.pitch);
                 return !source.getWorld().tryLoadEntity(entity_1x) ? null : entity_1x;
             });
             if (entityliving == null)

src/main/java/carpet/helpers/XPcombine.java

@@ -47,7 +47,7 @@ public class XPcombine
         if (getTextureByXP(first.getExperienceAmount()) != size)
         {
             newOrb =  new ExperienceOrbEntity(EntityType.EXPERIENCE_ORB, first.world);
-            newOrb.setPositionAndAngles(first.getX(), first.getY(), first.getZ(), first.yaw, first.pitch);
+            newOrb.refreshPositionAndAngles(first.getX(), first.getY(), first.getZ(), first.yaw, first.pitch);
             ((ExperienceOrbInterface)newOrb).setAmount(first.getExperienceAmount());
 
             first.world.spawnEntity(newOrb);

src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java

@@ -32,14 +32,14 @@ public abstract class Entity_portalSuffocationMixin
 
     @Redirect(method = "changeDimension", at = @At(
             value = "INVOKE",
-            target = "Lnet/minecraft/entity/Entity;setPositionAndAngles(Lnet/minecraft/util/math/BlockPos;FF)V"
+            target = "Lnet/minecraft/entity/Entity;refreshPositionAndAngles(Lnet/minecraft/util/math/BlockPos;FF)V"
     ))
     private void alternativeSetPositionAndAngles(Entity entity, BlockPos blockPos_1, float float_1, float float_2)
     {
         if (CarpetSettings.portalSuffocationFix && CarpetSettings.fixedPosition != null)
-            entity.setPositionAndAngles(CarpetSettings.fixedPosition.x, CarpetSettings.fixedPosition.y, CarpetSettings.fixedPosition.z, float_1, float_2);
+            entity.refreshPositionAndAngles(CarpetSettings.fixedPosition.x, CarpetSettings.fixedPosition.y, CarpetSettings.fixedPosition.z, float_1, float_2);
         else
-            entity.setPositionAndAngles(blockPos_1, float_1, float_2);
+            entity.refreshPositionAndAngles(blockPos_1, float_1, float_2);
     }
 
     @Inject(method = "changeDimension", at = @At("RETURN"))

src/main/java/carpet/mixins/GuardianEntityMixin.java

@@ -27,7 +27,7 @@ public abstract class GuardianEntityMixin extends HostileEntity
         if (!this.world.isClient && !this.removed && CarpetSettings.renewableSponges)
         {
             ElderGuardianEntity elderGuardian = new ElderGuardianEntity(EntityType.ELDER_GUARDIAN ,this.world);
-            elderGuardian.setPositionAndAngles(this.getX(), this.getY(), this.getZ(), this.yaw, this.pitch);
+            elderGuardian.refreshPositionAndAngles(this.getX(), this.getY(), this.getZ(), this.yaw, this.pitch);
             elderGuardian.initialize(this.world ,this.world.getLocalDifficulty(new BlockPos(elderGuardian)), SpawnType.CONVERSION, (EntityData)null, (CompoundTag)null);
             elderGuardian.setAiDisabled(this.isAiDisabled());
             

src/main/java/carpet/mixins/SummonCommandMixin.java

@@ -41,7 +41,7 @@ public class SummonCommandMixin
                 SkeletonHorseEntity skeletonHorseEntity_1 = (SkeletonHorseEntity) EntityType.SKELETON_HORSE.create(world);
                 skeletonHorseEntity_1.setTrapped(true);
                 skeletonHorseEntity_1.setBreedingAge(0);
-                skeletonHorseEntity_1.setPosition(vec3d_1.x, vec3d_1.y, vec3d_1.z);
+                skeletonHorseEntity_1.resetPosition(vec3d_1.x, vec3d_1.y, vec3d_1.z);
                 world.spawnEntity(skeletonHorseEntity_1);
             }
             world.addLightning(lightningEntity_1);

src/main/java/carpet/patches/EntityPlayerMPFake.java

@@ -39,7 +39,7 @@ public class EntityPlayerMPFake extends ServerPlayerEntity
             gameprofile = SkullBlockEntity.loadProperties(gameprofile);
         }
         EntityPlayerMPFake instance = new EntityPlayerMPFake(server, worldIn, gameprofile, interactionManagerIn);
-        instance.fixStartingPosition = () -> instance.setPositionAndAngles(d0, d1, d2, (float) yaw, (float) pitch);
+        instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(d0, d1, d2, (float) yaw, (float) pitch);
         server.getPlayerManager().onPlayerConnect(new NetworkManagerFake(NetworkSide.SERVERBOUND), instance);
         if (instance.dimension != dimension) //player was logged in in a different dimension
         {

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

@@ -2206,7 +2206,7 @@ public class CarpetExpression
             } else {
                 ServerWorld serverWorld = cc.s.getWorld();
                 Entity entity_1 = EntityType.loadEntityWithPassengers(tag, serverWorld, (entity_1x) -> {
-                    entity_1x.setPositionAndAngles(vec3d.x, vec3d.y, vec3d.z, entity_1x.yaw, entity_1x.pitch);
+                    entity_1x.refreshPositionAndAngles(vec3d.x, vec3d.y, vec3d.z, entity_1x.yaw, entity_1x.pitch);
                     return !serverWorld.tryLoadEntity(entity_1x) ? null : entity_1x;
                 });
                 if (entity_1 == null) {
@@ -3172,7 +3172,7 @@ public class CarpetExpression
             }
 
             ArmorStandEntity armorstand = new ArmorStandEntity(EntityType.ARMOR_STAND, cc.s.getWorld());
-            armorstand.setPositionAndAngles(
+            armorstand.refreshPositionAndAngles(
                     pointLocator.vec.x,
                     pointLocator.vec.y - ((targetBlock==null)?(armorstand.getHeight()+0.41):(armorstand.getHeight()-0.3)),
                     pointLocator.vec.z,

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

@@ -476,7 +476,7 @@ public class EntityValue extends Value
         }
         else
         {
-            e.setPositionAnglesAndUpdate(x, y, z, yaw, pitch);
+            e.refreshPositionAndAngles(x, y, z, yaw, pitch);
             ((ServerWorld) e.getEntityWorld()).getChunkManager().sendToNearbyPlayers(e, new EntityPositionS2CPacket(e));
         }
 

src/main/java/carpet/utils/BlockInfo.java

@@ -202,7 +202,7 @@ public class BlockInfo
     {
         MobEntityWithAi creature = new ZombiePigmanEntity(EntityType.ZOMBIE_PIGMAN, worldIn);
         creature.initialize(worldIn, worldIn.getLocalDifficulty(pos), SpawnType.NATURAL, null, null);
-        creature.setPositionAndAngles(pos.getX()+0.5F, pos.getY(), pos.getZ()+0.5F, 0.0F, 0.0F);
+        creature.refreshPositionAndAngles(pos, 0.0F, 0.0F);
         WanderAroundGoal wander = new WanderAroundGoal(creature, 0.8D);
         int success = 0;
         for (int i=0; i<1000; i++)

src/main/java/carpet/utils/PerimeterDiagnostics.java

@@ -176,7 +176,7 @@ public class PerimeterDiagnostics
 
         if (SpawnHelper.canSpawn(spt, worldServer, pos, sle.type))
         {
-            el.setPositionAndAngles((float)pos.getX() + 0.5F, (float)pos.getY(), (float)pos.getZ()+0.5F, 0.0F, 0.0F);
+            el.refreshPositionAndAngles((float)pos.getX() + 0.5F, (float)pos.getY(), (float)pos.getZ()+0.5F, 0.0F, 0.0F);
             return el.canSpawn(worldServer) &&
                     SpawnRestriction.canSpawn(el.getType(),el.getEntityWorld(), SpawnType.NATURAL, el.getBlockPos(), el.getEntityWorld().random) &&
                     worldServer.doesNotCollide(el); // check collision rules once they stop fiddling with them after 1.14.1

src/main/java/carpet/utils/SpawnReporter.java

@@ -434,7 +434,7 @@ public class SpawnReporter
                         {
                             float f = (float)x + 0.5F;
                             float f1 = (float)z + 0.5F;
-                            mob.setPositionAndAngles((double)f, (double)y, (double)f1, worldIn.random.nextFloat() * 360.0F, 0.0F);
+                            mob.refreshPositionAndAngles((double)f, (double)y, (double)f1, worldIn.random.nextFloat() * 360.0F, 0.0F);
                             fits1 = worldIn.doesNotCollide(mob);
                             
                             for (int i = 0; i < 20; ++i)