diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java index 9ae70d96c..98aa52153 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ContraptionCollider.java @@ -313,7 +313,7 @@ public class ContraptionCollider { boolean canWalk = bounce != 0 || slide == 0; if (canWalk || !rotation.hasVerticalRotation()) { if (canWalk) - entity.onGround = true; + entity.setOnGround(true); if (entity instanceof ItemEntity) entityMotion = entityMotion.multiply(.5f, 1, .5f); } @@ -413,7 +413,7 @@ public class ContraptionCollider { boolean flag = p_20273_.x != vec3.x; boolean flag1 = p_20273_.y != vec3.y; boolean flag2 = p_20273_.z != vec3.z; - boolean flag3 = e.onGround || flag1 && p_20273_.y < 0.0D; + boolean flag3 = e.isOnGround() || flag1 && p_20273_.y < 0.0D; if (e.maxUpStep > 0.0F && flag3 && (flag || flag2)) { Vec3 vec31 = collideBoundingBoxHeuristically(e, new Vec3(p_20273_.x, e.maxUpStep, p_20273_.z), aabb, e.level, collisioncontext, rewindablestream); diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java index 4b9d74b3b..3247f3c7d 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java @@ -177,7 +177,7 @@ public class BeltMovementHandler { entityIn.move(SELF, movement); } - entityIn.onGround = true; + entityIn.setOnGround(true); if (!isPlayer) entityIn.maxUpStep = step; diff --git a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java index a0ab04265..f0f7bac38 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java +++ b/src/main/java/com/simibubi/create/content/curiosities/armor/DivingBootsItem.java @@ -28,11 +28,11 @@ public class DivingBootsItem extends CopperArmorItem { Vec3 motion = entity.getDeltaMovement(); Boolean isJumping = ObfuscationReflectionHelper.getPrivateValue(LivingEntity.class, entity, "f_20899_"); // jumping - entity.onGround |= entity.verticalCollision; + entity.setOnGround(entity.isOnGround() || entity.verticalCollision); - if (isJumping && entity.onGround) { + if (isJumping && entity.isOnGround()) { motion = motion.add(0, .5f, 0); - entity.onGround = false; + entity.setOnGround(false); } else { motion = motion.add(0, -0.05f, 0); } diff --git a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java b/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java index f34ea5941..11f5589b6 100644 --- a/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java +++ b/src/main/java/com/simibubi/create/content/curiosities/tools/BlueprintRenderer.java @@ -101,17 +101,9 @@ public class BlueprintRenderer extends EntityRenderer { squashedMS.scale(.625f, .625f, 1); } - Matrix3f n = squashedMS.last() - .normal(); - n.m00 = copy.m00; - n.m01 = copy.m01; - n.m02 = copy.m02; - n.m10 = copy.m10; - n.m11 = copy.m11; - n.m12 = copy.m12; - n.m20 = copy.m20; - n.m21 = copy.m21; - n.m22 = copy.m22; + squashedMS.last() + .normal() + .load(copy); Minecraft.getInstance() .getItemRenderer() diff --git a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java index 298fe7a3c..875d6462c 100644 --- a/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java +++ b/src/main/java/com/simibubi/create/content/logistics/block/depot/EjectorBlock.java @@ -96,8 +96,8 @@ public class EjectorBlock extends HorizontalKineticBlock implements ITE