Minecart Purgatory

- Further attempts at improving the coupling physics
- Fixed reversed couplings losing their physics entry point
- Fixed "angel block" placement through super glue

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueEntity.java

@@ -43,6 +43,7 @@ import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.RayTraceResult.Type;
 import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -256,28 +257,40 @@ public class SuperGlueEntity extends Entity implements IEntityAdditionalSpawnDat
 
 	@OnlyIn(Dist.CLIENT)
 	private void triggerPlaceBlock(PlayerEntity player, Hand hand) {
-		if (player instanceof ClientPlayerEntity && player.world instanceof ClientWorld) {
+		if (!(player instanceof ClientPlayerEntity))
+			return;
+		if (!(player.world instanceof ClientWorld))
+			return;
+
 		ClientPlayerEntity cPlayer = (ClientPlayerEntity) player;
 		Minecraft mc = Minecraft.getInstance();
 		RayTraceResult ray =
 			cPlayer.pick(mc.playerController.getBlockReachDistance(), mc.getRenderPartialTicks(), false);
-			if (ray instanceof BlockRayTraceResult) {
+
+		if (!(ray instanceof BlockRayTraceResult))
+			return;
+		if (ray.getType() == Type.MISS)
+			return;
+		BlockRayTraceResult blockRay = (BlockRayTraceResult) ray;
+		if (!blockRay.getPos()
+			.offset(blockRay.getFace())
+			.equals(getHangingPosition()))
+			return;
+
 		for (Hand handIn : Hand.values()) {
 			ItemStack itemstack = cPlayer.getHeldItem(handIn);
 			int countBefore = itemstack.getCount();
-					ActionResultType actionResultType = mc.playerController.func_217292_a(cPlayer,
+			ActionResultType actionResultType =
-						(ClientWorld) cPlayer.world, handIn, (BlockRayTraceResult) ray);
+				mc.playerController.func_217292_a(cPlayer, (ClientWorld) cPlayer.world, handIn, blockRay);
-					if (actionResultType == ActionResultType.SUCCESS) {
+			if (actionResultType != ActionResultType.SUCCESS)
+				return;
+
 			cPlayer.swingArm(handIn);
-						if (!itemstack.isEmpty()
+			if (!itemstack.isEmpty() && (itemstack.getCount() != countBefore || mc.playerController.isInCreativeMode()))
-							&& (itemstack.getCount() != countBefore || mc.playerController.isInCreativeMode()))
 				mc.gameRenderer.itemRenderer.resetEquippedProgress(handIn);
 			return;
 		}
 	}
-			}
-		}
-	}
 
 	@Override
 	public void writeAdditional(CompoundNBT compound) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/CouplingPhysics.java

@@ -11,7 +11,9 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.MoverType;
 import net.minecraft.entity.item.minecart.AbstractMinecartEntity;
 import net.minecraft.state.properties.RailShape;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
@@ -23,12 +25,18 @@ public class CouplingPhysics {
 
 	public static void tickCoupling(World world, Couple<MinecartController> c) {
 		Couple<AbstractMinecartEntity> carts = c.map(MinecartController::cart);
-		float couplingLength = c.getFirst().getCouplingLength(true);
+		float couplingLength = c.getFirst()
+			.getCouplingLength(true);
 		softCollisionStep(world, carts, couplingLength);
+		if (world.isRemote)
+			return;
 		hardCollisionStep(world, carts, couplingLength);
 	}
 
 	public static void hardCollisionStep(World world, Couple<AbstractMinecartEntity> carts, double couplingLength) {
+		if (!MinecartSim2020.canAddMotion(carts.get(false)) && MinecartSim2020.canAddMotion(carts.get(true)))
+			carts = carts.swap();
+
 		Couple<Vec3d> corrections = Couple.create(null, null);
 		Couple<Float> maxSpeed = carts.map(AbstractMinecartEntity::getMaxCartSpeedOnRail);
 		boolean firstLoop = true;
@@ -39,6 +47,9 @@ public class CouplingPhysics {
 			float stress = (float) (couplingLength - cart.getPositionVec()
 				.distanceTo(otherCart.getPositionVec()));
 
+			if (Math.abs(stress) < 1 / 8f)
+				continue;
+
 			RailShape shape = null;
 			BlockPos railPosition = cart.getCurrentRailPosition();
 			BlockState railState = world.getBlockState(railPosition.up());
@@ -53,7 +64,12 @@ public class CouplingPhysics {
 			Vec3d link = otherCart.getPositionVec()
 				.subtract(pos);
 			float correctionMagnitude = firstLoop ? -stress / 2f : -stress;
-			correction = shape != null ? followLinkOnRail(link, pos, correctionMagnitude, shape).subtract(pos)
+			
+			if (!MinecartSim2020.canAddMotion(cart))
+				correctionMagnitude /= 2;
+			
+			correction = shape != null
+				? followLinkOnRail(link, pos, correctionMagnitude, MinecartSim2020.getRailVec(shape)).subtract(pos)
 				: link.normalize()
 					.scale(correctionMagnitude);
 
@@ -75,27 +91,30 @@ public class CouplingPhysics {
 	}
 
 	public static void softCollisionStep(World world, Couple<AbstractMinecartEntity> carts, double couplingLength) {
-
-		Couple<Vec3d> positions = carts.map(Entity::getPositionVector);
 		Couple<Float> maxSpeed = carts.map(AbstractMinecartEntity::getMaxCartSpeedOnRail);
 		Couple<Boolean> canAddmotion = carts.map(MinecartSim2020::canAddMotion);
+		Couple<Vec3d> motions = carts.map(Entity::getMotion);
+		Couple<Vec3d> nextPositions = carts.map(MinecartSim2020::predictNextPositionOf);
 
-		Couple<RailShape> shapes = carts.map(current -> {
+		Couple<RailShape> shapes = carts.mapWithContext((cart, current) -> {
-			BlockPos railPosition = current.getCurrentRailPosition();
+			AbstractMinecartEntity minecart = cart.getMinecart();
+			Vec3d vec = nextPositions.get(current);
+			int x = MathHelper.floor(vec.getX());
+	        int y = MathHelper.floor(vec.getY());
+	        int z = MathHelper.floor(vec.getZ());
+	        BlockPos pos = new BlockPos(x, y - 1, z);
+	        if (minecart.world.getBlockState(pos).isIn(BlockTags.RAILS)) pos = pos.down();
+			BlockPos railPosition = pos;
 			BlockState railState = world.getBlockState(railPosition.up());
 			if (!(railState.getBlock() instanceof AbstractRailBlock))
 				return null;
 			AbstractRailBlock block = (AbstractRailBlock) railState.getBlock();
-			return block.getRailDirection(railState, world, railPosition, current);
+			return block.getRailDirection(railState, world, railPosition, cart);
 		});
 
-		Couple<Vec3d> motions = carts.map(MinecartSim2020::predictMotionOf);
-		Couple<Vec3d> nextPositions = positions.copy();
-		nextPositions.replaceWithParams(Vec3d::add, motions);
-
 		float futureStress = (float) (couplingLength - nextPositions.getFirst()
 			.distanceTo(nextPositions.getSecond()));
-		if (Math.abs(futureStress) < 1 / 128f)
+		if (MathHelper.epsilonEquals(futureStress, 0))
 			return;
 
 		for (boolean current : Iterate.trueAndFalse) {
@@ -107,12 +126,19 @@ public class CouplingPhysics {
 
 			if (canAddmotion.get(current) != canAddmotion.get(!current))
 				correctionMagnitude = !canAddmotion.get(current) ? 0 : correctionMagnitude * 2;
+			if (!canAddmotion.get(current))
+				continue;
 
 			RailShape shape = shapes.get(current);
-			correction = shape != null ? followLinkOnRail(link, pos, correctionMagnitude, shape).subtract(pos)
+			if (shape != null) {
-				: link.normalize()
+				Vec3d railVec = MinecartSim2020.getRailVec(shape);
+				correction = followLinkOnRail(link, pos, correctionMagnitude, railVec).subtract(pos);
+			} else
+				correction = link.normalize()
 					.scale(correctionMagnitude);
+
 			correction = VecHelper.clamp(correction, maxSpeed.get(current));
+			
 			motions.set(current, motions.get(current)
 				.add(correction));
 		}
@@ -121,8 +147,7 @@ public class CouplingPhysics {
 		carts.forEachWithParams(Entity::setMotion, motions);
 	}
 
-	public static Vec3d followLinkOnRail(Vec3d link, Vec3d cart, float diffToReduce, RailShape shape) {
+	public static Vec3d followLinkOnRail(Vec3d link, Vec3d cart, float diffToReduce, Vec3d railAxis) {
-		Vec3d railAxis = MinecartSim2020.getRailVec(shape);
 		double dotProduct = railAxis.dotProduct(link);
 		if (Double.isNaN(dotProduct) || dotProduct == 0 || diffToReduce == 0)
 			return cart;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartSim2020.java

@@ -46,33 +46,20 @@ public class MinecartSim2020 {
 			map.put(RailShape.NORTH_EAST, Pair.of(north, east));
 		});
 
-	public static Vec3d predictMotionOf(AbstractMinecartEntity cart) {
+	public static Vec3d predictNextPositionOf(AbstractMinecartEntity cart) {
-//		if (cart instanceof FurnaceMinecartEntity) {
+		Vec3d position = cart.getPositionVec();
-//			return cart.getPositionVec()
+		Vec3d motion = cart.getMotion();
-//				.subtract(cart.lastTickPosX, cart.lastTickPosY, cart.lastTickPosZ);
+		return position.add(motion);
-//		}
-		return cart.getMotion().scale(1f);
-//		if (cart instanceof ContainerMinecartEntity) {
-//			ContainerMinecartEntity containerCart = (ContainerMinecartEntity) cart;
-//			float f = 0.98F;
-//			if (containerCart.isEmpty())
-//				return cart.getMotion()
-//					.mul(f, 0.0D, f);
-//			int i = 15 - Container.calcRedstoneFromInventory(containerCart);
-//			f += (float) i * 0.001F;
-//			return cart.getMotion()
-//				.mul(f, 0.0D, f);
-//		}
-//		return cart.getMotion()
-//			.scale(cart.isBeingRidden() ? 0.997D : 0.96D);
 	}
 
 	public static boolean canAddMotion(AbstractMinecartEntity c) {
 		if (c instanceof FurnaceMinecartEntity)
 			return MathHelper.epsilonEquals(((FurnaceMinecartEntity) c).pushX, 0)
 				&& MathHelper.epsilonEquals(((FurnaceMinecartEntity) c).pushZ, 0);
-		LazyOptional<MinecartController> capability = c.getCapability(CapabilityMinecartController.MINECART_CONTROLLER_CAPABILITY);
+		LazyOptional<MinecartController> capability =
-		if (capability.isPresent() && capability.orElse(null).isStalled()) 
+			c.getCapability(CapabilityMinecartController.MINECART_CONTROLLER_CAPABILITY);
+		if (capability.isPresent() && capability.orElse(null)
+			.isStalled())
 			return false;
 		return true;
 	}
@@ -196,21 +183,6 @@ public class MinecartSim2020 {
 		}
 
 		cart.setMotion(previousMotion);
-
-		if (cart instanceof FurnaceMinecartEntity) {
-//			FurnaceMinecartEntity furnaceCart = (FurnaceMinecartEntity) cart;
-//			Vec3d vec3d = cart.getMotion();
-//			double d2 = horizontalMag(vec3d);
-//			double d3 = furnaceCart.pushX * furnaceCart.pushX + furnaceCart.pushZ * furnaceCart.pushZ;
-//			if (d3 > 1.0E-4D && d2 > 0.001D) {
-//				double d40 = (double) MathHelper.sqrt(d2);
-//				double d50 = (double) MathHelper.sqrt(d3);
-//				furnaceCart.pushX = vec3d.x / d40 * d50;
-//				furnaceCart.pushZ = vec3d.z / d40 * d50;
-//				furnaceCart.setMotion(vec3d.mul(0.8D, 0.0D, 0.8D)
-//					.add(furnaceCart.pushX, 0.0D, furnaceCart.pushZ));
-//			}
-		}
 	}
 
 	public static Vec3d getRailVec(RailShape shape) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/capability/MinecartController.java

@@ -187,9 +187,9 @@ public class MinecartController implements INBTSerializable<CompoundNBT> {
 					}
 				}));
 				mc.couplings = mc.couplings.swap();
+				mc.needsEntryRefresh = true;
 				if (mc == this)
 					continue;
-				mc.needsEntryRefresh = true;
 				mc.sendData();
 			}
 		}

src/main/java/com/simibubi/create/content/logistics/block/mechanicalArm/ArmInteractionPointHandler.java

@@ -114,6 +114,7 @@ public class ArmInteractionPointHandler {
 				else
 					inputs++;
 			}
+			if (inputs + outputs > 0)
 				player.sendStatusMessage(Lang.createTranslationTextComponent("mechanical_arm.summary", inputs, outputs)
 					.applyTextStyle(TextFormatting.WHITE), true);
 		}

src/main/java/com/simibubi/create/foundation/utility/Couple.java

@@ -49,6 +49,14 @@ public class Couple<T> extends Pair<T, T> implements Iterable<T> {
 		return Couple.create(function.apply(first), function.apply(second));
 	}
 
+	public <S> Couple<S> mapWithContext(BiFunction<T, Boolean, S> function) {
+		return Couple.create(function.apply(first, true), function.apply(second, false));
+	}
+	
+	public <S, R> Couple<S> mapWithParams(BiFunction<T, R, S> function, Couple<R> values) {
+		return Couple.create(function.apply(first, values.first), function.apply(second, values.second));
+	}
+
 	public void replace(Function<T, T> function) {
 		setFirst(function.apply(getFirst()));
 		setSecond(function.apply(getSecond()));