mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove redundant block parameters

Browse source
This commit is contained in:
TropheusJ 2025-02-15 21:51:16 -05:00
parent e966455143
commit af365a8337
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/simibubi/create/api/contraption/transformable/MovedBlockTransformerRegistries.java
View file

@ -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, BlockTransformer> 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

2
src/main/java/com/simibubi/create/api/schematic/requirement/SchematicRequirementRegistries.java
View file

@ -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

2
src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java
View file

@ -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);
}

5
src/main/java/com/simibubi/create/content/schematics/requirement/ItemRequirement.java
View file

@ -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 {