better name, extended storage, building height case

Author: Allmoz

src/main/java/com/simibubi/create/content/contraptions/Contraption.java

@@ -1144,7 +1144,7 @@ public void addBlocksToWorld(Level world, StructureTransform transform) {
 
 		translateMultiblockControllers(transform);
 
-		SingleBlockServerLevel popChamber = null;
+		GhostPlacementServerLevel ghostLevel = null;
 
 		for (boolean nonBrittles : Iterate.trueAndFalse) {
 			for (StructureBlockInfo block : blocks.values()) {
@@ -1163,26 +1163,26 @@ public void addBlocksToWorld(Level world, StructureTransform transform) {
 							targetPos.relative(face));
 
 				BlockState blockState = world.getBlockState(targetPos);
-				if (blockState.getDestroySpeed(world, targetPos) == -1 || (state.getCollisionShape(world, targetPos)
-					.isEmpty()
-					&& !blockState.getCollisionShape(world, targetPos)
-					.isEmpty())) {
+				if (world.isOutsideBuildHeight(targetPos) ||
+					blockState.getDestroySpeed(world, targetPos) == -1 ||
+					(state.getCollisionShape(world, targetPos).isEmpty() &&
+						!blockState.getCollisionShape(world, targetPos).isEmpty())) {
 					if (targetPos.getY() == world.getMinBuildHeight())
 						targetPos = targetPos.above();
 
-					if(popChamber == null && world instanceof ServerLevel serverWorld)
-						popChamber = new SingleBlockServerLevel(serverWorld);
+					if(ghostLevel == null && world instanceof ServerLevel serverWorld)
+						ghostLevel = new GhostPlacementServerLevel(serverWorld);
 
-					if(popChamber != null){
-						popChamber.setBlock(targetPos, state, Block.UPDATE_NONE);
-						BlockEntity be = popChamber.getBlockEntity(targetPos);
+					if(ghostLevel != null){
+						ghostLevel.setBlock(targetPos, state, Block.UPDATE_NONE);
+						BlockEntity be = ghostLevel.getBlockEntity(targetPos);
 						if (be != null) {
 							CompoundTag tag = block.nbt();
 							tag = NBTProcessors.process(state, be, tag, false);
 							if (tag != null)
 								be.load(tag);
 						}
-						popChamber.destroyBlock(targetPos, true);
+						ghostLevel.destroyBlock(targetPos, true);
 					}
 					world.levelEvent(2001, targetPos, Block.getId(state));
 					continue;

src/main/java/com/simibubi/create/content/contraptions/SingleBlockServerLevel.java renamed to src/main/java/com/simibubi/create/content/contraptions/GhostPlacementServerLevel.java

@@ -13,43 +13,57 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 
-public class SingleBlockServerLevel extends WrappedServerLevel {
+import java.util.HashMap;
+import java.util.Map;
 
-	public BlockState blockState;
-	public @Nullable BlockEntity blockEntity;
+public class GhostPlacementServerLevel extends WrappedServerLevel {
 
-	public SingleBlockServerLevel(ServerLevel level) {
+	protected final Map<BlockPos, BlockState> blockStates = new HashMap<>();
+	protected final Map<BlockPos, BlockEntity> blockEntities = new HashMap<>();
+
+	public GhostPlacementServerLevel(ServerLevel level) {
 		super(level);
-		blockState = Blocks.AIR.defaultBlockState();
-		blockEntity = null;
 	}
 
 	@Override
 	public boolean setBlock(BlockPos pos, BlockState newState, int flags) {
-		blockState.onRemove(this, pos, newState, (flags & 64) != 0);
-		blockState = newState;
-		blockEntity = null;
+		pos = pos.immutable();
+		getBlockState(pos).onRemove(this, pos, newState,false);
+		blockStates.put(pos, newState);
 		return true;
 	}
 
 	@Override
 	public BlockState getBlockState(BlockPos pos) {
-		return blockState;
+		return blockStates.getOrDefault(pos, Blocks.AIR.defaultBlockState());
 	}
 
 	@Nullable
 	public BlockEntity getBlockEntity(BlockPos pos) {
-		if (blockState.hasBlockEntity() && blockEntity == null)
+		BlockState blockState = getBlockState(pos);
+		BlockEntity blockEntity = blockEntities.getOrDefault(pos, null);
+		if (blockState.hasBlockEntity() && blockEntity == null) {
 			blockEntity = ((EntityBlock) blockState.getBlock()).newBlockEntity(pos, blockState);
+			if(blockEntity != null)
+				blockEntity.setLevel(this);
+			pos = pos.immutable();
+			blockEntities.put(pos, blockEntity);
+		}
 		return blockEntity;
 	}
 
+	@Override
+	public void removeBlockEntity(BlockPos pos) {
+		blockEntities.remove(pos);
+	}
+
 	@Override
 	public boolean destroyBlock(BlockPos pos, boolean dropBlock, @Nullable Entity entity, int recursionLeft){
+		BlockState blockState = getBlockState(pos);
 		if (blockState.isAir())
 			return false;
 		if (dropBlock)
-			Block.dropResources(blockState, this, pos, blockEntity, entity, ItemStack.EMPTY);
+			Block.dropResources(blockState, this, pos, getBlockEntity(pos), entity, ItemStack.EMPTY);
 		setBlock(pos, Blocks.AIR.defaultBlockState(), Block.UPDATE_NONE);
 		return true;
 	}