diff --git a/src/main/java/com/simibubi/create/AllBlocks.java b/src/main/java/com/simibubi/create/AllBlocks.java index 749aa9cf76..d894044efb 100644 --- a/src/main/java/com/simibubi/create/AllBlocks.java +++ b/src/main/java/com/simibubi/create/AllBlocks.java @@ -768,7 +768,7 @@ public class AllBlocks { .loot((lt, block) -> lt.add(block, BlazeBurnerBlock.buildLootTable())) .blockstate((c, p) -> p.simpleBlock(c.getEntry(), AssetLookup.partialBaseModel(c, p))) .onRegister(movementBehaviour(new BlazeBurnerMovementBehaviour())) - .onRegister(block -> TrainConductorHandlerImpl.registerBlazeBurner()) + .onRegister(TrainConductorHandlerImpl::registerBlazeBurner) .item(BlazeBurnerBlockItem::withBlaze) .model(AssetLookup.customBlockItemModel("blaze_burner", "block_with_blaze")) .build() 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 5645c099c3..25437ad269 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java +++ b/src/main/java/com/simibubi/create/content/contraptions/StructureTransform.java @@ -4,11 +4,11 @@ import static net.minecraft.world.level.block.state.properties.BlockStatePropert import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING; -import com.simibubi.create.api.contraption.transformable.TransformableBlock; -import com.simibubi.create.api.contraption.transformable.TransformableBlockEntity; import com.simibubi.create.api.contraption.transformable.MovedBlockTransformerRegistries; import com.simibubi.create.api.contraption.transformable.MovedBlockTransformerRegistries.BlockEntityTransformer; import com.simibubi.create.api.contraption.transformable.MovedBlockTransformerRegistries.BlockTransformer; +import com.simibubi.create.api.contraption.transformable.TransformableBlock; +import com.simibubi.create.api.contraption.transformable.TransformableBlockEntity; import net.createmod.catnip.math.VecHelper; import net.minecraft.core.BlockPos; @@ -138,7 +138,7 @@ public class StructureTransform { if (transformer != null) { transformer.transform(be, this); } else if (be instanceof TransformableBlockEntity itbe) { - itbe.transform(this); + itbe.transform(be, this); } } diff --git a/src/main/java/com/simibubi/create/impl/contraption/train/TrainConductorHandlerImpl.java b/src/main/java/com/simibubi/create/impl/contraption/train/TrainConductorHandlerImpl.java index 0a767a4cf9..6354740f07 100644 --- a/src/main/java/com/simibubi/create/impl/contraption/train/TrainConductorHandlerImpl.java +++ b/src/main/java/com/simibubi/create/impl/contraption/train/TrainConductorHandlerImpl.java @@ -10,13 +10,15 @@ import com.simibubi.create.api.contraption.train.TrainConductorHandler; import com.simibubi.create.api.contraption.train.TrainConductorHandler.UpdateScheduleCallback; import com.simibubi.create.content.processing.burner.BlazeBurnerBlock; +import net.minecraft.world.level.block.Block; + @ApiStatus.Internal public class TrainConductorHandlerImpl { public static final List CONDUCTOR_HANDLERS = new ArrayList<>(); @ApiStatus.Internal - public static void registerBlazeBurner() { - TrainConductorHandler.registerConductor(AllBlocks.BLAZE_BURNER.getId(), blockState -> AllBlocks.BLAZE_BURNER.has(blockState) + public static void registerBlazeBurner(Block block) { + TrainConductorHandler.registerConductor(block, blockState -> AllBlocks.BLAZE_BURNER.has(blockState) && blockState.getValue(BlazeBurnerBlock.HEAT_LEVEL) != BlazeBurnerBlock.HeatLevel.NONE, UpdateScheduleCallback.EMPTY); } }