Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 15:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Finally bearable

Browse source 
- Entities can now jump on Mechanical Belts
- Entities on belts no longer get force-centered while actively moving or strafing
This commit is contained in:
simibubi 2021-06-17 11:28:29 +02:00
parent 761fa2c1e9
commit 4265a2855c
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/simibubi/create/content/contraptions/relays/belt/transport/BeltMovementHandler.java
View file

@ -95,9 +95,8 @@ public class BeltMovementHandler {
// Lock entities in place // Lock entities in place
boolean isPlayer = entityIn instanceof PlayerEntity; boolean isPlayer = entityIn instanceof PlayerEntity;
if (entityIn instanceof LivingEntity && !isPlayer) { if (entityIn instanceof LivingEntity && !isPlayer)
((LivingEntity) entityIn).addPotionEffect(new EffectInstance(Effects.SLOWNESS, 10, 1, false, false)); ((LivingEntity) entityIn).addPotionEffect(new EffectInstance(Effects.SLOWNESS, 10, 1, false, false));
}
final Direction beltFacing = blockState.get(BlockStateProperties.HORIZONTAL_FACING); final Direction beltFacing = blockState.get(BlockStateProperties.HORIZONTAL_FACING);
final BeltSlope slope = blockState.get(BeltBlock.SLOPE); final BeltSlope slope = blockState.get(BeltBlock.SLOPE);
@ -138,12 +137,14 @@ public class BeltMovementHandler {
movement = movement.add(0, -Math.abs(axis.getCoordinate(movement.x, movement.y, movement.z)), 0); movement = movement.add(0, -Math.abs(axis.getCoordinate(movement.x, movement.y, movement.z)), 0);
Vector3d centering = Vector3d.of(centeringDirection).scale(diffCenter * Math.min(Math.abs(movementSpeed), .1f) * 4); Vector3d centering = Vector3d.of(centeringDirection).scale(diffCenter * Math.min(Math.abs(movementSpeed), .1f) * 4);
float step = entityIn.stepHeight;
if (!isPlayer) { if (!(entityIn instanceof LivingEntity)
|| ((LivingEntity) entityIn).moveForward == 0 && ((LivingEntity) entityIn).moveStrafing == 0)
movement = movement.add(centering); movement = movement.add(centering);
float step = entityIn.stepHeight;
if (!isPlayer)
entityIn.stepHeight = 1; entityIn.stepHeight = 1;
}
// Entity Collisions // Entity Collisions
if (Math.abs(movementSpeed) < .5f) { if (Math.abs(movementSpeed) < .5f) {
@ -176,6 +177,8 @@ public class BeltMovementHandler {
entityIn.move(SELF, movement); entityIn.move(SELF, movement);
} }
entityIn.onGround = true;
if (!isPlayer) if (!isPlayer)
entityIn.stepHeight = step; entityIn.stepHeight = step;
@ -189,6 +192,7 @@ public class BeltMovementHandler {
entityIn.setMotion(movement); entityIn.setMotion(movement);
entityIn.velocityChanged = true; entityIn.velocityChanged = true;
} }
} }
public static boolean shouldIgnoreBlocking(Entity me, Entity other) { public static boolean shouldIgnoreBlocking(Entity me, Entity other) {