From db81bbead8ff409b51b124bb47fd656c34c9c969 Mon Sep 17 00:00:00 2001 From: Starforcraft Date: Thu, 22 Aug 2024 07:53:24 +0200 Subject: [PATCH] fix: rebase --- .../externalstorage/ExternalStorageTestPlots.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTestPlots.java b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTestPlots.java index b69db9a71..de71d1bf0 100644 --- a/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTestPlots.java +++ b/refinedstorage-neoforge/src/test/java/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageTestPlots.java @@ -19,14 +19,20 @@ private ExternalStorageTestPlots() { static void preparePlot(final GameTestHelper helper, final Direction direction, - final TriConsumer 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 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)); @@ -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() );