Skip to content

Commit

Permalink
fix: rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
starforcraft committed Aug 22, 2024
1 parent 114558b commit db81bbe
Showing 1 changed file with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,20 @@ private ExternalStorageTestPlots() {

static void preparePlot(final GameTestHelper helper,
final Direction direction,
final TriConsumer<ExternalStorageBlockEntity, BlockPos, GameTestSequence> consumer) {
final TriConsumer<
AbstractExternalStorageBlockEntity,
BlockPos,
GameTestSequence> consumer) {
preparePlot(helper, direction, true, consumer);
}

static void preparePlot(final GameTestHelper helper,
final Direction direction,
final boolean itemStorage,
final TriConsumer<ExternalStorageBlockEntity, BlockPos, GameTestSequence> consumer) {
final TriConsumer<
AbstractExternalStorageBlockEntity,
BlockPos,
GameTestSequence> consumer) {
helper.setBlock(ZERO.above(), RSBLOCKS.getCreativeController().getDefault());
if (itemStorage) {
helper.setBlock(ZERO.above().above(), RSBLOCKS.getItemStorageBlock(ItemStorageVariant.ONE_K));
Expand All @@ -40,7 +46,7 @@ static void preparePlot(final GameTestHelper helper,
final BlockPos externalStoragePos = ZERO.above().above().above();
helper.setBlock(externalStoragePos, RSBLOCKS.getExternalStorage().getDefault().rotated(direction));
consumer.accept(
requireBlockEntity(helper, externalStoragePos, ExternalStorageBlockEntity.class),
requireBlockEntity(helper, externalStoragePos, AbstractExternalStorageBlockEntity.class),
externalStoragePos,
helper.startSequence()
);
Expand Down

0 comments on commit db81bbe

Please sign in to comment.