From c4632b9d8b72355e462ea61d9a40bf9d6bd8c3a4 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 17 Jan 2020 17:16:21 -0400 Subject: [PATCH 1/2] POI API --- .../java/carpet/mixins/PointOfInterest_scarpetMixin.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java b/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java index 6956788b..07bff90c 100644 --- a/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java +++ b/src/main/java/carpet/mixins/PointOfInterest_scarpetMixin.java @@ -1,6 +1,6 @@ package carpet.mixins; -import net.minecraft.village.PointOfInterest; +import net.minecraft.world.poi.PointOfInterest; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index eba711a3..e30848b2 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -92,9 +92,9 @@ import net.minecraft.util.math.EulerAngle; import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.Vec3d; import net.minecraft.util.registry.Registry; -import net.minecraft.village.PointOfInterest; -import net.minecraft.village.PointOfInterestStorage; -import net.minecraft.village.PointOfInterestType; +import net.minecraft.world.poi.PointOfInterest; +import net.minecraft.world.poi.PointOfInterestStorage; +import net.minecraft.world.poi.PointOfInterestType; import net.minecraft.world.Heightmap; import net.minecraft.world.LightType; import net.minecraft.world.World; From 9c62968ee8f59429e053c3697c0c437c37459a01 Mon Sep 17 00:00:00 2001 From: gnembon Date: Fri, 17 Jan 2020 17:36:39 -0400 Subject: [PATCH 2/2] 1.15.2 pre2 and mappings --- gradle.properties | 4 ++-- src/main/java/carpet/commands/PerimeterInfoCommand.java | 3 ++- src/main/java/carpet/helpers/XPcombine.java | 2 +- .../java/carpet/mixins/Entity_portalSuffocationMixin.java | 6 +++--- src/main/java/carpet/mixins/GuardianEntityMixin.java | 2 +- src/main/java/carpet/mixins/SummonCommandMixin.java | 2 +- src/main/java/carpet/patches/EntityPlayerMPFake.java | 2 +- src/main/java/carpet/script/CarpetExpression.java | 4 ++-- src/main/java/carpet/script/value/EntityValue.java | 2 +- src/main/java/carpet/utils/BlockInfo.java | 2 +- src/main/java/carpet/utils/PerimeterDiagnostics.java | 2 +- src/main/java/carpet/utils/SpawnReporter.java | 2 +- 12 files changed, 17 insertions(+), 16 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8292c5ad..91321e21 100644 --- a/gradle.properties +++ b/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 - yarn_mappings=1.15.2-pre1+build.1 + minecraft_version=1.15.2-pre2 + yarn_mappings=1.15.2-pre2+build.3 loader_version=0.7.4+build.177 # Mod Properties diff --git a/src/main/java/carpet/commands/PerimeterInfoCommand.java b/src/main/java/carpet/commands/PerimeterInfoCommand.java index 91926441..06760f38 100644 --- a/src/main/java/carpet/commands/PerimeterInfoCommand.java +++ b/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) diff --git a/src/main/java/carpet/helpers/XPcombine.java b/src/main/java/carpet/helpers/XPcombine.java index a3664279..a570e3cb 100644 --- a/src/main/java/carpet/helpers/XPcombine.java +++ b/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); diff --git a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java b/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java index 6980c334..db1f3111 100644 --- a/src/main/java/carpet/mixins/Entity_portalSuffocationMixin.java +++ b/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")) diff --git a/src/main/java/carpet/mixins/GuardianEntityMixin.java b/src/main/java/carpet/mixins/GuardianEntityMixin.java index ffa917a4..ad7234ce 100644 --- a/src/main/java/carpet/mixins/GuardianEntityMixin.java +++ b/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()); diff --git a/src/main/java/carpet/mixins/SummonCommandMixin.java b/src/main/java/carpet/mixins/SummonCommandMixin.java index 13a0d835..b8113764 100644 --- a/src/main/java/carpet/mixins/SummonCommandMixin.java +++ b/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); diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 97ffb2c9..8c7468c8 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/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 { diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index e81a0d7a..d71d81fa 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/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, diff --git a/src/main/java/carpet/script/value/EntityValue.java b/src/main/java/carpet/script/value/EntityValue.java index 8b2d3f9d..84fc2fd7 100644 --- a/src/main/java/carpet/script/value/EntityValue.java +++ b/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)); } diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java index f5e034c8..f5c4ca52 100644 --- a/src/main/java/carpet/utils/BlockInfo.java +++ b/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++) diff --git a/src/main/java/carpet/utils/PerimeterDiagnostics.java b/src/main/java/carpet/utils/PerimeterDiagnostics.java index 54517276..d2b4239f 100644 --- a/src/main/java/carpet/utils/PerimeterDiagnostics.java +++ b/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 diff --git a/src/main/java/carpet/utils/SpawnReporter.java b/src/main/java/carpet/utils/SpawnReporter.java index 67d80157..e0999239 100644 --- a/src/main/java/carpet/utils/SpawnReporter.java +++ b/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)