diff --git a/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java b/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java index e0160dc481..c9f4142970 100644 --- a/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java +++ b/src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState; /** * Registry for custom transformations to apply to blocks after they've been moved by a contraption. - * These interfaces are alternatives to the {@link ITransformableBlock} and {@link ITransformableBlockEntity} interfaces. + * These interfaces are alternatives to the {@link TransformableBlock} and {@link TransformableBlockEntity} interfaces. */ public class MovedBlockTransformerRegistries { public static final SimpleRegistry BLOCK_TRANSFORMERS = SimpleRegistry.create(); @@ -18,7 +18,7 @@ public class MovedBlockTransformerRegistries { @FunctionalInterface public interface BlockTransformer { - BlockState transform(Block block, BlockState state, StructureTransform transform); + BlockState transform(BlockState state, StructureTransform transform); } @FunctionalInterface diff --git a/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java b/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java index af2a0a87ab..8e4dfc023a 100644 --- a/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java +++ b/src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java @@ -30,7 +30,7 @@ public class SchematicRequirementRegistries { @FunctionalInterface public interface BlockRequirement { - ItemRequirement getRequiredItems(Block block, BlockState state, @Nullable BlockEntity blockEntity); + ItemRequirement getRequiredItems(BlockState state, @Nullable BlockEntity blockEntity); } @FunctionalInterface diff --git a/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java index 25437ad269..72f0b5e673 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java +++ b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java @@ -151,7 +151,7 @@ public class StructureTransform { Block block = state.getBlock(); BlockTransformer transformer = MovedBlockTransformerRegistries.BLOCK_TRANSFORMERS.get(block); if (transformer != null) { - return transformer.transform(block, state, this); + return transformer.transform(state, this); } else if (block instanceof TransformableBlock transformable) { return transformable.transform(state, this); } diff --git a/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java b/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java index 1c8ddedbdc..472e880fac 100644 --- a/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java +++ b/src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java @@ -8,12 +8,13 @@ import java.util.stream.Stream; import org.jetbrains.annotations.Nullable; +import com.simibubi.create.api.schematic.requirement.SchematicRequirementRegistries; import com.simibubi.create.api.schematic.requirement.SpecialBlockEntityItemRequirement; import com.simibubi.create.api.schematic.requirement.SpecialBlockItemRequirement; import com.simibubi.create.api.schematic.requirement.SpecialEntityItemRequirement; -import com.simibubi.create.api.schematic.requirement.SchematicRequirementRegistries; import com.simibubi.create.compat.framedblocks.FramedBlocksInSchematics; import com.simibubi.create.foundation.data.recipe.Mods; + import net.createmod.catnip.nbt.NBTProcessors; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.decoration.ArmorStand; @@ -71,7 +72,7 @@ public class ItemRequirement { ItemRequirement requirement; SchematicRequirementRegistries.BlockRequirement blockRequirement = SchematicRequirementRegistries.BLOCKS.get(block); if (blockRequirement != null) { - requirement = blockRequirement.getRequiredItems(block, state, be); + requirement = blockRequirement.getRequiredItems(state, be); } else if (block instanceof SpecialBlockItemRequirement specialBlock) { requirement = specialBlock.getRequiredItems(state, be); } else {