Skip to content

Commit b6c4328

Browse files
[Fix] Fix unable to use Grindstone Drain with Schematicannon properly
1 parent aeb0d06 commit b6c4328

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/main/java/plus/dragons/createenchantmentindustry/common/kinetics/grindstone/GrindstoneDrainBlock.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@
2020

2121
import com.simibubi.create.AllBlocks;
2222
import com.simibubi.create.AllShapes;
23-
import com.simibubi.create.api.schematic.requirement.SpecialBlockEntityItemRequirement;
23+
import com.simibubi.create.api.schematic.requirement.SpecialBlockItemRequirement;
2424
import com.simibubi.create.content.fluids.pipes.FluidPipeBlock;
2525
import com.simibubi.create.content.kinetics.base.HorizontalKineticBlock;
2626
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
27-
import com.simibubi.create.content.schematics.requirement.ItemRequirement.ItemUseType;
28-
import com.simibubi.create.content.schematics.requirement.ItemRequirement.StackRequirement;
2927
import com.simibubi.create.foundation.block.IBE;
3028
import java.util.List;
3129
import net.createmod.catnip.data.Iterate;
@@ -41,6 +39,7 @@
4139
import net.minecraft.world.level.BlockGetter;
4240
import net.minecraft.world.level.Level;
4341
import net.minecraft.world.level.LevelReader;
42+
import net.minecraft.world.level.block.entity.BlockEntity;
4443
import net.minecraft.world.level.block.entity.BlockEntityType;
4544
import net.minecraft.world.level.block.state.BlockState;
4645
import net.minecraft.world.phys.BlockHitResult;
@@ -51,11 +50,11 @@
5150
import plus.dragons.createdragonsplus.common.advancements.AdvancementBehaviour;
5251
import plus.dragons.createenchantmentindustry.common.registry.CEIBlockEntities;
5352

54-
public class GrindstoneDrainBlock extends HorizontalKineticBlock implements IBE<GrindstoneDrainBlockEntity>, SpecialBlockEntityItemRequirement {
53+
public class GrindstoneDrainBlock extends HorizontalKineticBlock implements IBE<GrindstoneDrainBlockEntity>, SpecialBlockItemRequirement {
5554
protected static VoxelShape SHAPE = new AllShapes.Builder(AllShapes.CASING_13PX.get(Direction.UP))
5655
.add(3, 3, 3, 13, 13, 13)
5756
.build();
58-
protected final MechanicalGrindstoneBlock grindstone;
57+
final MechanicalGrindstoneBlock grindstone;
5958

6059
public GrindstoneDrainBlock(MechanicalGrindstoneBlock grindstone, Properties properties) {
6160
super(properties);
@@ -114,13 +113,6 @@ public ItemStack getCloneItemStack(BlockState state, HitResult hitResult, LevelR
114113
return AllBlocks.ITEM_DRAIN.asStack();
115114
}
116115

117-
@Override
118-
public ItemRequirement getRequiredItems(BlockState state) {
119-
return new ItemRequirement(List.of(
120-
new StackRequirement(new ItemStack(this.grindstone), ItemUseType.CONSUME),
121-
new StackRequirement(AllBlocks.ITEM_DRAIN.asStack(), ItemUseType.CONSUME)));
122-
}
123-
124116
@Override
125117
public Axis getRotationAxis(BlockState state) {
126118
return state.getValue(HORIZONTAL_FACING).getAxis();
@@ -135,4 +127,11 @@ public Class<GrindstoneDrainBlockEntity> getBlockEntityClass() {
135127
public BlockEntityType<? extends GrindstoneDrainBlockEntity> getBlockEntityType() {
136128
return CEIBlockEntities.GRINDSTONE_DRAIN.get();
137129
}
130+
131+
@Override
132+
public ItemRequirement getRequiredItems(BlockState state, @Nullable BlockEntity blockEntity) {
133+
return new ItemRequirement(List.of(
134+
new ItemRequirement.StackRequirement(new ItemStack(grindstone), ItemRequirement.ItemUseType.CONSUME),
135+
new ItemRequirement.StackRequirement(AllBlocks.ITEM_DRAIN.asStack(), ItemRequirement.ItemUseType.CONSUME)));
136+
}
138137
}

0 commit comments

Comments
 (0)