Organize imports

src/main/java/com/simibubi/create/AllFluids.java

@@ -23,8 +23,6 @@ import net.minecraftforge.common.Tags;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.ForgeFlowingFluid;
 
-import net.minecraftforge.fluids.FluidAttributes.Builder;
-
 public class AllFluids {
 
 	private static final CreateRegistrate REGISTRATE = Create.registrate();

src/main/java/com/simibubi/create/CreateClient.java

@@ -5,7 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 
-import com.jozufozu.flywheel.core.PartialModel;
 import com.simibubi.create.content.contraptions.base.KineticTileEntityRenderer;
 import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionRenderDispatcher;
 import com.simibubi.create.content.contraptions.relays.encased.CasingConnectivity;

src/main/java/com/simibubi/create/compat/jei/GhostIngredientHandler.java

@@ -17,8 +17,6 @@ import net.minecraft.client.renderer.Rectangle2d;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 
-import mezz.jei.api.gui.handlers.IGhostIngredientHandler.Target;
-
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public class GhostIngredientHandler<T extends GhostItemContainer<?>>

src/main/java/com/simibubi/create/content/contraptions/base/CasingBlock.java

@@ -11,8 +11,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraftforge.common.ToolType;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CasingBlock extends Block implements IWrenchable {
 
 	public CasingBlock(Properties p_i48440_1_) {

src/main/java/com/simibubi/create/content/contraptions/base/DirectionalAxisKineticBlock.java

@@ -15,8 +15,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class DirectionalAxisKineticBlock extends DirectionalKineticBlock {
 
 	public static final BooleanProperty AXIS_ALONG_FIRST_COORDINATE = BooleanProperty.create("axis_along_first");

src/main/java/com/simibubi/create/content/contraptions/base/DirectionalKineticBlock.java

@@ -12,8 +12,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class DirectionalKineticBlock extends KineticBlock {
 
 	public static final DirectionProperty FACING = BlockStateProperties.FACING;

src/main/java/com/simibubi/create/content/contraptions/base/HorizontalAxisKineticBlock.java

@@ -16,8 +16,6 @@ import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class HorizontalAxisKineticBlock extends KineticBlock {
 
 	public static final Property<Axis> HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS;

src/main/java/com/simibubi/create/content/contraptions/base/HorizontalKineticBlock.java

@@ -12,8 +12,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class HorizontalKineticBlock extends KineticBlock {
 
 	public static final Property<Direction> HORIZONTAL_FACING = BlockStateProperties.HORIZONTAL_FACING;

src/main/java/com/simibubi/create/content/contraptions/base/KineticBlock.java

@@ -16,8 +16,6 @@ import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class KineticBlock extends Block implements IRotate {
 
 	protected static final Palette color = Palette.Red;

src/main/java/com/simibubi/create/content/contraptions/base/RotatedPillarKineticBlock.java

@@ -12,8 +12,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.Rotation;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class RotatedPillarKineticBlock extends KineticBlock {
 
 	public static final EnumProperty<Direction.Axis> AXIS = BlockStateProperties.AXIS;

src/main/java/com/simibubi/create/content/contraptions/components/AssemblyOperatorBlockItem.java

@@ -12,8 +12,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.vector.Vector3d;
 
-import net.minecraft.item.Item.Properties;
-
 public class AssemblyOperatorBlockItem extends BlockItem {
 
 	public AssemblyOperatorBlockItem(Block block, Properties builder) {

src/main/java/com/simibubi/create/content/contraptions/components/actors/AttachedActorBlock.java

@@ -22,8 +22,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public abstract class AttachedActorBlock extends HorizontalBlock implements IWrenchable {

src/main/java/com/simibubi/create/content/contraptions/components/actors/DrillBlock.java

@@ -27,8 +27,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class DrillBlock extends DirectionalKineticBlock implements ITE<DrillTileEntity> {

src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterBlock.java

@@ -6,8 +6,6 @@ import net.minecraft.block.BlockState;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.IBlockReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class HarvesterBlock extends AttachedActorBlock {
 
 	public HarvesterBlock(Properties p_i48377_1_) {

src/main/java/com/simibubi/create/content/contraptions/components/actors/PloughBlock.java

@@ -7,8 +7,6 @@ import com.mojang.authlib.GameProfile;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.util.FakePlayer;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class PloughBlock extends AttachedActorBlock {
 	
 	public PloughBlock(Properties p_i48377_1_) {

src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableFluidInterfaceTileEntity.java

@@ -10,8 +10,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
-
 public class PortableFluidInterfaceTileEntity extends PortableStorageInterfaceTileEntity {
 
 	protected LazyOptional<IFluidHandler> capability;

src/main/java/com/simibubi/create/content/contraptions/components/actors/PortableStorageInterfaceBlock.java

@@ -18,8 +18,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class PortableStorageInterfaceBlock extends ProperDirectionalBlock

src/main/java/com/simibubi/create/content/contraptions/components/actors/SeatBlock.java

@@ -33,8 +33,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class SeatBlock extends Block {

src/main/java/com/simibubi/create/content/contraptions/components/actors/dispenser/DispenserMovementBehaviour.java

@@ -7,7 +7,7 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
 
 import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.block.Block;
+import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.DispenserBlock;
 import net.minecraft.dispenser.DefaultDispenseItemBehavior;
@@ -19,8 +19,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Vector3d;
 
-import net.minecraft.block.AbstractBlock;
-
 public class DispenserMovementBehaviour extends DropperMovementBehaviour {
 	private static final HashMap<Item, IMovedDispenseItemBehaviour> MOVED_DISPENSE_ITEM_BEHAVIOURS = new HashMap<>();
 	private static final HashMap<Item, IMovedDispenseItemBehaviour> MOVED_PROJECTILE_DISPENSE_BEHAVIOURS = new HashMap<>();

src/main/java/com/simibubi/create/content/contraptions/components/clock/CuckooClockBlock.java

@@ -20,8 +20,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CuckooClockBlock extends HorizontalKineticBlock {
 
 	private boolean mysterious;

src/main/java/com/simibubi/create/content/contraptions/components/crafter/MechanicalCrafterBlock.java

@@ -41,8 +41,6 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalCrafterBlock extends HorizontalKineticBlock implements ITE<MechanicalCrafterTileEntity>, ICogWheel {
 
 	public static final EnumProperty<Pointing> POINTING = EnumProperty.create("pointing", Pointing.class);

src/main/java/com/simibubi/create/content/contraptions/components/crank/HandCrankBlock.java

@@ -29,8 +29,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class HandCrankBlock extends DirectionalKineticBlock implements ITE<HandCrankTileEntity> {
 
 	public HandCrankBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/crank/ValveHandleBlock.java

@@ -20,8 +20,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 public class ValveHandleBlock extends HandCrankBlock {
 	private final boolean inCreativeTab;

src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CrushingWheelBlock extends RotatedPillarKineticBlock implements ITE<CrushingWheelTileEntity> {
 
 	public CrushingWheelBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/crusher/CrushingWheelControllerBlock.java

@@ -37,8 +37,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CrushingWheelControllerBlock extends DirectionalBlock
 		implements ITE<CrushingWheelControllerTileEntity> {
 

src/main/java/com/simibubi/create/content/contraptions/components/deployer/DeployerBlock.java

@@ -31,8 +31,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class DeployerBlock extends DirectionalAxisKineticBlock implements ITE<DeployerTileEntity> {

src/main/java/com/simibubi/create/content/contraptions/components/fan/EncasedFanBlock.java

@@ -19,8 +19,6 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class EncasedFanBlock extends DirectionalKineticBlock implements ITE<EncasedFanTileEntity> {
 
 	public EncasedFanBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/fan/NozzleBlock.java

@@ -22,8 +22,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public class NozzleBlock extends ProperDirectionalBlock {

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/FlywheelBlock.java

@@ -23,8 +23,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class FlywheelBlock extends HorizontalKineticBlock {
 
 	public static EnumProperty<ConnectionState> CONNECTION = EnumProperty.create("connection", ConnectionState.class);

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineBlock.java

@@ -22,8 +22,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class EngineBlock extends HorizontalBlock implements IWrenchable {
 
 	protected EngineBlock(Properties builder) {

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/EngineTileEntity.java

@@ -15,7 +15,6 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 

src/main/java/com/simibubi/create/content/contraptions/components/flywheel/engine/FurnaceEngineBlock.java

@@ -24,8 +24,6 @@ import net.minecraftforge.eventbus.api.Event.Result;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @EventBusSubscriber
 public class FurnaceEngineBlock extends EngineBlock implements ITE<FurnaceEngineTileEntity> {
 

src/main/java/com/simibubi/create/content/contraptions/components/millstone/MillstoneBlock.java

@@ -32,8 +32,6 @@ import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.ItemStackHandler;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MillstoneBlock extends KineticBlock implements ITE<MillstoneTileEntity>, ICogWheel {
 
 	public MillstoneBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/mixer/MechanicalMixerBlock.java

@@ -19,9 +19,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 
-import com.simibubi.create.content.contraptions.base.IRotate.SpeedLevel;
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalMixerBlock extends KineticBlock implements ITE<MechanicalMixerTileEntity>, ICogWheel {
 
 	public MechanicalMixerBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/motor/CreativeMotorBlock.java

@@ -16,8 +16,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CreativeMotorBlock extends DirectionalKineticBlock {
 
 	public CreativeMotorBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/press/MechanicalPressBlock.java

@@ -19,8 +19,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalPressBlock extends HorizontalKineticBlock implements ITE<MechanicalPressTileEntity> {
 
 	public MechanicalPressBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/saw/SawBlock.java

@@ -30,8 +30,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class SawBlock extends DirectionalAxisKineticBlock implements ITE<SawTileEntity> {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java

@@ -55,8 +55,6 @@ import net.minecraftforge.fml.common.registry.IEntityAdditionalSpawnData;
 import net.minecraftforge.fml.network.NetworkHooks;
 import net.minecraftforge.fml.network.PacketDistributor;
 
-import net.minecraft.entity.Entity.IMoveCallback;
-
 public abstract class AbstractContraptionEntity extends Entity implements IEntityAdditionalSpawnData {
 
 	private static final DataParameter<Boolean> STALLED =

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/ControlledContraptionEntity.java

@@ -22,8 +22,6 @@ import net.minecraft.world.gen.feature.template.Template.BlockInfo;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState;
-
 /**
  * Ex: Pistons, bearings <br>
  * Controlled Contraption Entities can rotate around one axis and translate.

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/OrientedContraptionEntity.java

@@ -48,8 +48,6 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.util.LazyOptional;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState;
-
 /**
  * Ex: Minecarts, Couplings <br>
  * Oriented Contraption Entities can rotate freely around two axes

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/BearingBlock.java

@@ -11,8 +11,6 @@ import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IWorldReader;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class BearingBlock extends DirectionalKineticBlock {
 
 	public BearingBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/ClockworkBearingBlock.java

@@ -14,8 +14,6 @@ import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class ClockworkBearingBlock extends BearingBlock implements ITE<ClockworkBearingTileEntity> {
 
 	public ClockworkBearingBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingBlock.java

@@ -13,8 +13,6 @@ import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalBearingBlock extends BearingBlock implements ITE<MechanicalBearingTileEntity> {
 
 	public MechanicalBearingBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/MechanicalBearingTileEntity.java

@@ -27,8 +27,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption.RotationMode;
-
 public class MechanicalBearingTileEntity extends GeneratingKineticTileEntity
 	implements IBearingTileEntity, IDisplayAssemblyExceptions {
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/SailBlock.java

@@ -41,8 +41,6 @@ import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class SailBlock extends ProperDirectionalBlock {
 
 	public static SailBlock frame(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/bearing/WindmillBearingBlock.java

@@ -13,8 +13,6 @@ import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class WindmillBearingBlock extends BearingBlock implements ITE<WindmillBearingTileEntity> {
 
 	public WindmillBearingBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/AbstractChassisBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 import net.minecraftforge.common.Tags;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public abstract class AbstractChassisBlock extends RotatedPillarBlock implements IWrenchable {
 
 	public AbstractChassisBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/LinearChassisBlock.java

@@ -18,8 +18,6 @@ import net.minecraft.world.IBlockDisplayReader;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class LinearChassisBlock extends AbstractChassisBlock {
 
 	public static final BooleanProperty STICKY_TOP = BooleanProperty.create("sticky_top");

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/RadialChassisBlock.java

@@ -7,8 +7,6 @@ import net.minecraft.state.StateContainer.Builder;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class RadialChassisBlock extends AbstractChassisBlock {
 
 	public static final BooleanProperty STICKY_NORTH = BooleanProperty.create("sticky_north");

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class StickerBlock extends ProperDirectionalBlock implements ITE<StickerTileEntity> {
 
 	public static final BooleanProperty POWERED = BlockStateProperties.POWERED;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/chassis/StickerTileEntity.java

@@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.DistExecutor;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryCarriageBlock.java

@@ -24,8 +24,6 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class GantryCarriageBlock extends DirectionalAxisKineticBlock implements ITE<GantryCarriageTileEntity> {
 
 	public GantryCarriageBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/gantry/GantryContraptionEntity.java

@@ -28,8 +28,6 @@ import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fml.network.PacketDistributor;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity.ContraptionRotationState;
-
 public class GantryContraptionEntity extends AbstractContraptionEntity {
 
 	Direction movementAxis;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/glue/SuperGlueItem.java

@@ -20,8 +20,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.item.Item.Properties;
-
 public class SuperGlueItem extends Item {
 
 	public SuperGlueItem(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlock.java

@@ -57,8 +57,6 @@ import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class CartAssemblerBlock extends AbstractRailBlock
 	implements ITE<CartAssemblerTileEntity>, IWrenchable, ISpecialBlockItemRequirement {
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/CartAssemblerBlockItem.java

@@ -21,8 +21,6 @@ import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import net.minecraft.item.Item.Properties;
-
 public class CartAssemblerBlockItem extends BlockItem {
 
 	public CartAssemblerBlockItem(Block block, Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java

@@ -46,8 +46,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-import net.minecraft.item.Item.Properties;
-
 @EventBusSubscriber
 public class MinecartContraptionItem extends Item {
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MountedContraption.java

@@ -35,8 +35,6 @@ import net.minecraft.world.gen.feature.template.Template.BlockInfo;
 import net.minecraftforge.items.IItemHandlerModifiable;
 import net.minecraftforge.items.wrapper.InvWrapper;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.Contraption.ContraptionInvWrapper;
-
 public class MountedContraption extends Contraption {
 
 	public CartMovementMode rotationMode;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/LinearActuatorTileEntity.java

@@ -21,8 +21,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.vector.Vector3d;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.IControlContraption.MovementMode;
-
 public abstract class LinearActuatorTileEntity extends KineticTileEntity
 	implements IControlContraption, IDisplayAssemblyExceptions {
 

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonBlock.java

@@ -35,8 +35,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 import net.minecraftforge.common.Tags;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalPistonBlock extends DirectionalAxisKineticBlock implements ITE<MechanicalPistonTileEntity> {
 
 	public static final EnumProperty<PistonState> STATE = EnumProperty.create("state", PistonState.class);

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/MechanicalPistonHeadBlock.java

@@ -30,8 +30,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class MechanicalPistonHeadBlock extends ProperDirectionalBlock implements IWaterLoggable {
 
     public static final EnumProperty<PistonType> TYPE = BlockStateProperties.PISTON_TYPE;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/piston/PistonExtensionPoleBlock.java

@@ -44,8 +44,6 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ToolType;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class PistonExtensionPoleBlock extends ProperDirectionalBlock implements IWrenchable, IWaterLoggable {
 
     private static final int placementHelperId = PlacementHelpers.register(PlacementHelper.get());

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/pulley/PulleyBlock.java

@@ -33,8 +33,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class PulleyBlock extends HorizontalAxisKineticBlock implements ITE<PulleyTileEntity> {
 
     public static EnumProperty<Axis> HORIZONTAL_AXIS = BlockStateProperties.HORIZONTAL_AXIS;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/ContraptionRenderDispatcher.java

@@ -13,9 +13,6 @@ import static org.lwjgl.opengl.GL20.glUseProgram;
 import java.util.List;
 import java.util.Random;
 
-import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter;
-import com.simibubi.create.foundation.config.AllConfigs;
-
 import org.apache.commons.lang3.tuple.Pair;
 
 import com.jozufozu.flywheel.backend.Backend;
@@ -28,8 +25,10 @@ import com.simibubi.create.AllMovementBehaviours;
 import com.simibubi.create.CreateClient;
 import com.simibubi.create.content.contraptions.components.structureMovement.AbstractContraptionEntity;
 import com.simibubi.create.content.contraptions.components.structureMovement.Contraption;
+import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionLighter;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementBehaviour;
 import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
+import com.simibubi.create.foundation.config.AllConfigs;
 import com.simibubi.create.foundation.render.AllProgramSpecs;
 import com.simibubi.create.foundation.render.Compartment;
 import com.simibubi.create.foundation.render.CreateContexts;

src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/train/MinecartCouplingItem.java

@@ -22,8 +22,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-import net.minecraft.item.Item.Properties;
-
 @EventBusSubscriber
 public class MinecartCouplingItem extends Item {
 

src/main/java/com/simibubi/create/content/contraptions/components/tracks/ControllerRailBlock.java

@@ -39,8 +39,6 @@ import net.minecraft.util.math.vector.Vector3i;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class ControllerRailBlock extends AbstractRailBlock implements IWrenchable {

src/main/java/com/simibubi/create/content/contraptions/components/tracks/ReinforcedRailBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class ReinforcedRailBlock extends AbstractRailBlock {
 
     public static Property<RailShape> RAIL_SHAPE =

src/main/java/com/simibubi/create/content/contraptions/components/turntable/TurntableBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class TurntableBlock extends KineticBlock implements ITE<TurntableTileEntity> {
 
 	public TurntableBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/components/waterwheel/WaterWheelBlock.java

@@ -32,8 +32,6 @@ import net.minecraft.world.IWorld;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 @ParametersAreNonnullByDefault
 @MethodsReturnNonnullByDefault
 public class WaterWheelBlock extends DirectionalKineticBlock implements ITE<WaterWheelTileEntity> {

src/main/java/com/simibubi/create/content/contraptions/fluids/FluidBottleItemHook.java

@@ -18,8 +18,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 
-import net.minecraft.item.Item.Properties;
-
 @EventBusSubscriber
 public class FluidBottleItemHook extends Item {
 

src/main/java/com/simibubi/create/content/contraptions/fluids/OpenEndedPipe.java

@@ -38,8 +38,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.templates.FluidTank;
 
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
-
 public class OpenEndedPipe extends FlowSource {
 
 	World world;

src/main/java/com/simibubi/create/content/contraptions/fluids/PumpBlock.java

@@ -32,8 +32,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class PumpBlock extends DirectionalKineticBlock implements IWaterLoggable, ICogWheel {
 
 	public PumpBlock(Properties p_i48415_1_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/PumpTileEntity.java

@@ -35,8 +35,6 @@ import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes;
-
 public class PumpTileEntity extends KineticTileEntity {
 
 	LerpedFloat arrowDirection;

src/main/java/com/simibubi/create/content/contraptions/fluids/VirtualFluid.java

@@ -8,8 +8,6 @@ import net.minecraft.item.Item;
 import net.minecraft.item.Items;
 import net.minecraftforge.fluids.ForgeFlowingFluid;
 
-import net.minecraftforge.fluids.ForgeFlowingFluid.Properties;
-
 public class VirtualFluid extends ForgeFlowingFluid {
 
 	public VirtualFluid(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidDrainingBehaviour.java

@@ -28,8 +28,6 @@ import net.minecraft.util.math.shapes.ISelectionContext;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 
-import com.simibubi.create.content.contraptions.fluids.actors.FluidManipulationBehaviour.BlockPosEntry;
-
 public class FluidDrainingBehaviour extends FluidManipulationBehaviour {
 
 	Fluid fluid;

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/FluidFillingBehaviour.java

@@ -39,8 +39,6 @@ import net.minecraft.world.NextTickListEntry;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerTickList;
 
-import com.simibubi.create.content.contraptions.fluids.actors.FluidManipulationBehaviour.BlockPosEntry;
-
 public class FluidFillingBehaviour extends FluidManipulationBehaviour {
 
 	PriorityQueue<BlockPosEntry> queue;

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyBlock.java

@@ -20,8 +20,6 @@ import net.minecraft.world.IBlockReader;
 import net.minecraft.world.IWorldReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class HosePulleyBlock extends HorizontalKineticBlock implements ITE<HosePulleyTileEntity> {
 
 	public HosePulleyBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/HosePulleyFluidHandler.java

@@ -11,8 +11,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
-
 public class HosePulleyFluidHandler implements IFluidHandler {
 
 	// The dynamic interface

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/ItemDrainBlock.java

@@ -25,8 +25,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class ItemDrainBlock extends Block implements IWrenchable, ITE<ItemDrainTileEntity> {
 
 	public ItemDrainBlock(Properties p_i48440_1_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutBlock.java

@@ -15,8 +15,6 @@ import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class SpoutBlock extends Block implements IWrenchable {
 
 	public SpoutBlock(Properties p_i48440_1_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/particle/FluidParticleData.java

@@ -21,8 +21,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.registries.ForgeRegistries;
 
-import net.minecraft.particles.IParticleData.IDeserializer;
-
 public class FluidParticleData implements IParticleData, ICustomParticleData<FluidParticleData> {
 
 	private ParticleType<FluidParticleData> type;

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/AxisPipeBlock.java

@@ -38,8 +38,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class AxisPipeBlock extends RotatedPillarBlock implements IWrenchableWithBracket, IAxisPipe {
 
 	public AxisPipeBlock(Properties p_i48339_1_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlock.java

@@ -19,8 +19,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.Direction.Axis;
 import net.minecraft.util.IStringSerializable;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class BracketBlock extends ProperDirectionalBlock {
 
 	public static final BooleanProperty AXIS_ALONG_FIRST_COORDINATE =

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/BracketBlockItem.java

@@ -17,8 +17,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-import net.minecraft.item.Item.Properties;
-
 public class BracketBlockItem extends BlockItem {
 
 	public BracketBlockItem(Block p_i48527_1_, Properties p_i48527_2_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/EncasedPipeBlock.java

@@ -38,8 +38,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class EncasedPipeBlock extends Block implements IWrenchable, ISpecialBlockItemRequirement {
 
 	public static final Map<Direction, BooleanProperty> FACING_TO_PROPERTY_MAP = SixWayBlock.PROPERTY_BY_DIRECTION;

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeBlock.java

@@ -46,8 +46,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class FluidPipeBlock extends SixWayBlock implements IWaterLoggable, IWrenchableWithBracket {
 
 	public FluidPipeBlock(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidPipeTileEntity.java

@@ -15,8 +15,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockDisplayReader;
 
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes;
-
 public class FluidPipeTileEntity extends SmartTileEntity {
 
 	public FluidPipeTileEntity(TileEntityType<?> tileEntityTypeIn) {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/FluidValveBlock.java

@@ -28,8 +28,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class FluidValveBlock extends DirectionalAxisKineticBlock implements IAxisPipe {
 
 	public static final BooleanProperty ENABLED = BooleanProperty.create("enabled");

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/GlassFluidPipeBlock.java

@@ -26,9 +26,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
 
-
-import net.minecraft.block.AbstractBlock.Properties;
-
 @MethodsReturnNonnullByDefault
 @ParametersAreNonnullByDefault
 public class GlassFluidPipeBlock extends AxisPipeBlock implements IWaterLoggable, ISpecialBlockItemRequirement {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/SmartFluidPipeBlock.java

@@ -28,8 +28,6 @@ import net.minecraft.world.TickPriority;
 import net.minecraft.world.World;
 import net.minecraft.world.server.ServerWorld;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class SmartFluidPipeBlock extends HorizontalFaceBlock implements IAxisPipe {
 
 	public SmartFluidPipeBlock(Properties p_i48339_1_) {

src/main/java/com/simibubi/create/content/contraptions/fluids/pipes/StraightPipeTileEntity.java

@@ -15,8 +15,6 @@ import net.minecraft.util.Direction.AxisDirection;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockDisplayReader;
 
-import com.simibubi.create.content.contraptions.fluids.FluidTransportBehaviour.AttachmentTypes;
-
 public class StraightPipeTileEntity extends SmartTileEntity {
 
 	public StraightPipeTileEntity(TileEntityType<?> tileEntityTypeIn) {

src/main/java/com/simibubi/create/content/contraptions/fluids/potion/PotionFluid.java

@@ -20,9 +20,6 @@ import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.registries.ForgeRegistries;
 
-import net.minecraftforge.fluids.FluidAttributes.Builder;
-import net.minecraftforge.fluids.ForgeFlowingFluid.Properties;
-
 public class PotionFluid extends VirtualFluid {
 
 	public enum BottleType {

src/main/java/com/simibubi/create/content/contraptions/fluids/tank/CreativeFluidTankTileEntity.java

@@ -9,8 +9,6 @@ import net.minecraft.tileentity.TileEntityType;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraftforge.fluids.FluidStack;
 
-import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
-
 public class CreativeFluidTankTileEntity extends FluidTankTileEntity {
 
 	public CreativeFluidTankTileEntity(TileEntityType<?> tileEntityTypeIn) {

src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankBlock.java

@@ -47,8 +47,6 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 
-import net.minecraft.block.AbstractBlock.Properties;
-
 public class FluidTankBlock extends Block implements IWrenchable, ITE<FluidTankTileEntity> {
 
 	public static final BooleanProperty TOP = BooleanProperty.create("top");

src/main/java/com/simibubi/create/content/contraptions/fluids/tank/FluidTankItem.java

@@ -14,8 +14,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fluids.FluidStack;
 
-import net.minecraft.item.Item.Properties;
-
 public class FluidTankItem extends BlockItem {
 
 	public FluidTankItem(Block p_i48527_1_, Properties p_i48527_2_) {

src/main/java/com/simibubi/create/content/contraptions/goggles/GogglesItem.java

@@ -14,8 +14,6 @@ import net.minecraft.util.ActionResultType;
 import net.minecraft.util.Hand;
 import net.minecraft.world.World;
 
-import net.minecraft.item.Item.Properties;
-
 public class GogglesItem extends Item {
 
 	public GogglesItem(Properties properties) {

src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyItem.java

@@ -9,8 +9,6 @@ import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.math.MathHelper;
 
-import net.minecraft.item.Item.Properties;
-
 public class SequencedAssemblyItem extends Item {
 
 	public SequencedAssemblyItem(Properties p_i48487_1_) {

src/main/java/com/simibubi/create/content/contraptions/particle/AirFlowParticleData.java

@@ -16,8 +16,6 @@ import net.minecraft.util.math.vector.Vector3i;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.particles.IParticleData.IDeserializer;
-
 public class AirFlowParticleData implements IParticleData, ICustomParticleDataWithSprite<AirFlowParticleData> {
 	
 	public static final Codec<AirFlowParticleData> CODEC = RecordCodecBuilder.create(i -> 

src/main/java/com/simibubi/create/content/contraptions/particle/AirParticleData.java

@@ -15,8 +15,6 @@ import net.minecraft.particles.ParticleType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.particles.IParticleData.IDeserializer;
-
 public class AirParticleData implements IParticleData, ICustomParticleDataWithSprite<AirParticleData> {
 
 	public static final Codec<AirParticleData> CODEC = RecordCodecBuilder.create(i -> 

src/main/java/com/simibubi/create/content/contraptions/particle/CubeParticleData.java

@@ -15,8 +15,6 @@ import net.minecraft.particles.ParticleType;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import net.minecraft.particles.IParticleData.IDeserializer;
-
 public class CubeParticleData implements IParticleData, ICustomParticleData<CubeParticleData> {
 
 	public static final Codec<CubeParticleData> CODEC = RecordCodecBuilder.create(i ->