diff --git a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java index 8ce39cb40..3fd012d12 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java +++ b/src/main/java/com/simibubi/create/content/contraptions/actors/roller/RollerMovementBehaviour.java @@ -12,6 +12,7 @@ import javax.annotation.Nullable; import com.jozufozu.flywheel.api.MaterialManager; import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld; import com.simibubi.create.AllBlocks; +import com.simibubi.create.AllTags; import com.simibubi.create.content.contraptions.actors.roller.RollerBlockEntity.RollingMode; import com.simibubi.create.content.contraptions.behaviour.MovementContext; import com.simibubi.create.content.contraptions.pulley.PulleyContraption; @@ -108,7 +109,7 @@ public class RollerMovementBehaviour extends BlockBreakingMovementBehaviour { return false; return super.canBreak(world, breakingPos, state) && !state.getCollisionShape(world, breakingPos) - .isEmpty() && !AllBlocks.TRACK.has(state); + .isEmpty() && !AllTags.AllBlockTags.TRACKS.matches(state); } @Override @@ -141,7 +142,7 @@ public class RollerMovementBehaviour extends BlockBreakingMovementBehaviour { max = hardness; argMax = toBreak; } - + if (argMax == null) { triggerPaver(context, pos); return; @@ -194,13 +195,13 @@ public class RollerMovementBehaviour extends BlockBreakingMovementBehaviour { int startingY = 1; if (!getStateToPaveWith(context).isAir()) { FilterItemStack filter = context.getFilterFromBE(); - if (!ItemHelper + if (!ItemHelper .extract(context.contraption.getSharedInventory(), stack -> filter.test(context.world, stack), 1, true) .isEmpty()) startingY = 0; } - + // Train PaveTask profileForTracks = createHeightProfileForTracks(context); if (profileForTracks != null) { @@ -305,7 +306,7 @@ public class RollerMovementBehaviour extends BlockBreakingMovementBehaviour { BlockState stateToPaveWith = getStateToPaveWith(context); BlockState stateToPaveWithAsSlab = getStateToPaveWithAsSlab(context); RollingMode mode = getMode(context); - + if (mode != RollingMode.TUNNEL_PAVE && stateToPaveWith.isAir()) return;