1.21.1

src/main/java/com/mrh0/createaddition/blocks/alternator/AlternatorBlock.java

@@ -19,6 +19,7 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 
 public class AlternatorBlock extends DirectionalKineticBlock implements IBE<AlternatorBlockEntity>, IRotate {
 
@@ -28,7 +29,8 @@ public class AlternatorBlock extends DirectionalKineticBlock implements IBE<Alte
 	public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
 		return ALTERNATOR_SHAPE.get(state.getValue(FACING));
 	}
-
+
+	@Nullable
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext context) {
 		Direction preferred = getPreferredFacing(context);
@@ -38,12 +40,7 @@ public BlockState getStateForPlacement(BlockPlaceContext context) {
 		return defaultBlockState().setValue(FACING, preferred);
 	}
 
-	@Override
-	public boolean hideStressImpact() {
-		return false;
-	}
-
-	public AlternatorBlock(Properties properties) {
+    public AlternatorBlock(Properties properties) {
 		super(properties);
 	}
 

src/main/java/com/mrh0/createaddition/blocks/alternator/AlternatorBlockEntity.java

@@ -141,7 +141,7 @@ protected Block getStressConfigKey() {
 
 	public void firstTick() {
 		updateCache();
-	};
+	}
 
 	public void updateCache() {
 		if (level == null) return;
@@ -153,7 +153,7 @@ public void updateCache() {
 					getBlockPos().relative(side),
 					side.getOpposite(),
 					() -> !this.isRemoved(),
-					() -> { invalidSides.add(side); }
+					() -> invalidSides.add(side)
 			));
 		}
 	}

src/main/java/com/mrh0/createaddition/blocks/alternator/AlternatorRenderer.java

@@ -1,7 +1,6 @@
 package com.mrh0.createaddition.blocks.alternator;
 
 import com.simibubi.create.AllPartialModels;
-import com.simibubi.create.content.kinetics.base.KineticBlockEntity;
 import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer;
 
 import net.createmod.catnip.render.CachedBuffers;

src/main/java/com/mrh0/createaddition/blocks/cake/CACakeBlock.java

@@ -1,11 +1,8 @@
 package com.mrh0.createaddition.blocks.cake;
 
 import net.minecraft.stats.Stats;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
-import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.CakeBlock;

src/main/java/com/mrh0/createaddition/blocks/connector/base/AbstractConnectorBlockEntity.java

@@ -56,6 +56,7 @@ public AbstractConnectorBlockEntity(BlockEntityType<?> blockEntityTypeIn, BlockP
 		this.nodeCache = new IWireNode[getNodeCount()];
 	}
 
+	@Nullable
 	@Override
 	public IEnergyStorage getEnergyStorage(@Nullable Direction direction) {
 		if(isEnergyInput(direction) || isEnergyOutput(direction)) return internal;
@@ -396,7 +397,7 @@ public void updateExternalEnergyStorage() {
 			getPos().relative(side),
 			side.getOpposite(),
 			() -> !this.isRemoved(), // validity check (because the cache might outlive the object it belongs to)
-			() -> { externalStorageInvalid = true; } // invalidation listener
+			() -> externalStorageInvalid = true // invalidation listener
 		);
 	}
 

src/main/java/com/mrh0/createaddition/blocks/connector/base/ConnectorMode.java

@@ -28,32 +28,24 @@ public String getSerializedName() {
 	}
 
 	public ConnectorMode getNext() {
-		switch (this) {
-			//case Passive:
-			//	return None;
-			case None:
-				return Pull;
-			case Pull:
-				return Push;
-			case Push:
-				return None;
-		}
-		return None;
-	}
+        return switch (this) {
+            //case Passive:
+            //	return None;
+            case None -> Pull;
+            case Pull -> Push;
+            case Push -> None;
+            default -> None;
+        };
+    }
 
 	public MutableComponent getTooltip() {
-		switch (this) {
-			case Passive:
-				return Component.translatable("createaddition.tooltip.energy.passive");
-			case None:
-				return Component.translatable("createaddition.tooltip.energy.none");
-			case Pull:
-				return Component.translatable("createaddition.tooltip.energy.pull");
-			case Push:
-				return Component.translatable("createaddition.tooltip.energy.push");
-		}
-		return Component.translatable("createaddition.tooltip.energy.none");
-	}
+        return switch (this) {
+            case Passive -> Component.translatable("createaddition.tooltip.energy.passive");
+            case None -> Component.translatable("createaddition.tooltip.energy.none");
+            case Pull -> Component.translatable("createaddition.tooltip.energy.pull");
+            case Push -> Component.translatable("createaddition.tooltip.energy.push");
+        };
+    }
 
 	public boolean isActive() {
 		return this == Push || this == Pull;

src/main/java/com/mrh0/createaddition/blocks/connector/base/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+package com.mrh0.createaddition.blocks.connector.base;
+
+import net.minecraft.MethodsReturnNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

src/main/java/com/mrh0/createaddition/blocks/creative_energy/CreativeEnergyBlockEntity.java

@@ -7,7 +7,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
@@ -57,7 +56,7 @@ public void tick() {
 
 	public void firstTick() {
 		updateCache();
-	};
+	}
 
 	public void updateCache() {
 		if (level == null) return;
@@ -69,7 +68,7 @@ public void updateCache() {
 				getBlockPos().relative(side),
 				side.getOpposite(),
 				() -> !this.isRemoved(),
-				() -> { invalidSides.add(side); }
+				() -> invalidSides.add(side)
 			));
 		}
 	}

src/main/java/com/mrh0/createaddition/blocks/digital_adapter/DigitalAdapterBlockEntity.java

@@ -1,9 +1,5 @@
 package com.mrh0.createaddition.blocks.digital_adapter;
 
-import com.mrh0.createaddition.CreateAddition;
-import com.mrh0.createaddition.compat.computercraft.DigitalAdapterPeripheral;
-import com.mrh0.createaddition.compat.computercraft.Peripherals;
-import com.mrh0.createaddition.index.CABlockEntities;
 import com.simibubi.create.content.contraptions.bearing.MechanicalBearingBlockEntity;
 import com.simibubi.create.content.contraptions.elevator.ElevatorPulleyBlockEntity;
 import com.simibubi.create.content.contraptions.piston.MechanicalPistonBlockEntity;
@@ -19,10 +15,7 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.neoforged.neoforge.capabilities.Capabilities;
-import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 
-import javax.annotation.Nonnull;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -155,14 +148,14 @@ public SpeedGaugeBlockEntity getSpeedGauge(Direction dir) {
     public void setTargetSpeed(Direction dir, int speed) {
         SpeedControllerBlockEntity scte = getSpeedController(dir);
         if(scte == null) return;
-        ISpeedControllerAdapter sts = (ISpeedControllerAdapter)((Object)scte);
+        ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;
         sts.setTargetSpeed(speed);
     }
 
     public int getTargetSpeed(Direction dir) {
         SpeedControllerBlockEntity scte = getSpeedController(dir);
         if(scte == null) return 0;
-        ISpeedControllerAdapter sts = (ISpeedControllerAdapter)((Object)scte);
+        ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;
         return sts.getTargetSpeed();
     }
 }

src/main/java/com/mrh0/createaddition/blocks/electric_motor/ElectricMotorBlock.java

@@ -24,6 +24,7 @@
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
 
 public class ElectricMotorBlock extends DirectionalKineticBlock implements IBE<ElectricMotorBlockEntity> {
 
@@ -47,6 +48,7 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos,
 		return ELECTRIC_MOTOR_SHAPE.get(state.getValue(FACING));
 	}
 
+	@Nullable
 	@Override
 	public BlockState getStateForPlacement(BlockPlaceContext context) {
 		Direction preferred = getPreferredFacing(context);
@@ -85,7 +87,7 @@ public void setPowered(Level world, BlockPos pos, boolean powered) {
 	}
 
 	@Override
-	public boolean canConnectRedstone(BlockState state, BlockGetter world, BlockPos pos, Direction side) {
+	public boolean canConnectRedstone(BlockState state, BlockGetter world, BlockPos pos, @Nullable Direction side) {
 		return true;
 	}
 

src/main/java/com/mrh0/createaddition/blocks/electric_motor/ElectricMotorBlockEntity.java

@@ -4,8 +4,6 @@
 
 import com.mrh0.createaddition.CreateAddition;
 import com.mrh0.createaddition.blocks.tesla_coil.TeslaCoilBlock;
-import com.mrh0.createaddition.compat.computercraft.ElectricMotorPeripheral;
-import com.mrh0.createaddition.compat.computercraft.Peripherals;
 import com.mrh0.createaddition.config.CommonConfig;
 import com.mrh0.createaddition.energy.InternalEnergyStorage;
 import com.mrh0.createaddition.index.CABlockEntities;
@@ -22,7 +20,6 @@
 
 import net.minecraft.ChatFormatting;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;

src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlock.java

@@ -15,15 +15,13 @@
 import com.simibubi.create.foundation.block.IBE;
 
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.NonNullList;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;
 import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
@@ -70,10 +68,9 @@ public void onPlace(BlockState state, Level world, BlockPos pos, BlockState p_22
 		if (world.isClientSide)
 			return;
 		BlockEntity tileEntity = world.getBlockEntity(pos.above());
-		if (!(tileEntity instanceof BasinBlockEntity))
+		if (!(tileEntity instanceof BasinBlockEntity basin))
 			return;
-		BasinBlockEntity basin = (BasinBlockEntity) tileEntity;
-		basin.notifyChangeOfContents();
+        basin.notifyChangeOfContents();
 	}
 
 	@Override
@@ -144,11 +141,10 @@ public static InteractionResultHolder<ItemStack> tryInsert(BlockState state, Lev
 			return InteractionResultHolder.fail(ItemStack.EMPTY);
 
 		BlockEntity te = level.getBlockEntity(pos);
-		if (!(te instanceof LiquidBlazeBurnerBlockEntity))
+		if (!(te instanceof LiquidBlazeBurnerBlockEntity burnerTE))
 			return InteractionResultHolder.fail(ItemStack.EMPTY);
-		LiquidBlazeBurnerBlockEntity burnerTE = (LiquidBlazeBurnerBlockEntity) te;
 
-		if (burnerTE.isCreativeFuel(stack)) {
+        if (burnerTE.isCreativeFuel(stack)) {
 			if (!simulate)
 				burnerTE.applyCreativeFuel();
 			return InteractionResultHolder.success(ItemStack.EMPTY);
@@ -202,8 +198,8 @@ public void animateTick(BlockState state, Level world, BlockPos pos, Random rand
 		if (!state.getValue(HEAT_LEVEL)
 			.isAtLeast(BlazeBurnerBlock.HeatLevel.SMOULDERING))
 			return;
-		world.playLocalSound((double) ((float) pos.getX() + 0.5F), (double) ((float) pos.getY() + 0.5F),
-			(double) ((float) pos.getZ() + 0.5F), SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS,
+		world.playLocalSound((float) pos.getX() + 0.5F, (float) pos.getY() + 0.5F,
+                (float) pos.getZ() + 0.5F, SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS,
 			0.5F + random.nextFloat(), random.nextFloat() * 0.7F + 0.6F, false);
 	}
 }

src/main/java/com/mrh0/createaddition/blocks/liquid_blaze_burner/LiquidBlazeBurnerBlockEntity.java

@@ -379,8 +379,8 @@ protected BlazeBurnerBlock.HeatLevel getHeatLevelFromFuelType(FuelType fuel) {
 			boolean lowPercent = (double) remainingBurnTime / MAX_HEAT_CAPACITY < 0.0125;
 			level = lowPercent ? BlazeBurnerBlock.HeatLevel.FADING : BlazeBurnerBlock.HeatLevel.KINDLED;
 			break;
-		default:
 		case NONE:
+		default:
 			break;
 		}
 		return level;
@@ -415,8 +415,7 @@ protected void spawnParticles(BlazeBurnerBlock.HeatLevel heatLevel, double burst
 		} else if (heatLevel.isAtLeast(BlazeBurnerBlock.HeatLevel.FADING)) {
 			level.addParticle(ParticleTypes.FLAME, v2.x, v2.y, v2.z, 0, yMotion, 0);
 		}
-		return;
-	}
+    }
 
 	public void spawnParticleBurst(boolean soulFlame) {
 		Vec3 c = VecHelper.getCenterOf(worldPosition);

src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/CAConnectivityHandler.java

@@ -38,7 +38,7 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void formMul
 		BlockGetter level, SearchCache<T> cache, List<T> frontier) {
 		PriorityQueue<Pair<Integer, T>> creationQueue = makeCreationQueue();
 		Set<BlockPos> visited = new HashSet<>();
-		Direction.Axis mainAxis = frontier.get(0)
+		Direction.Axis mainAxis = frontier.getFirst()
 			.getMainConnectionAxis();
 
 		// essentially, if it's a vertical multi then the search won't be restricted by
@@ -55,17 +55,17 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void formMul
 			minZ = Math.min(pos.getZ(), minZ);
 		}
 		if (mainAxis == Direction.Axis.Y)
-			minX -= frontier.get(0)
+			minX -= frontier.getFirst()
 				.getMaxWidth();
 		if (mainAxis != Direction.Axis.Y)
-			minY -= frontier.get(0)
+			minY -= frontier.getFirst()
 				.getMaxWidth();
 		if (mainAxis == Direction.Axis.Y)
-			minZ -= frontier.get(0)
+			minZ -= frontier.getFirst()
 				.getMaxWidth();
 
 		while (!frontier.isEmpty()) {
-			T part = frontier.remove(0);
+			T part = frontier.removeFirst();
 			BlockPos partPos = part.getBlockPos();
 			if (visited.contains(partPos))
 				continue;
@@ -323,7 +323,7 @@ private static <T extends BlockEntity & IMultiBlockEntityContainer> void splitMu
 					partAt.removeController(true);
 
 					if (partAt != be) {
-						int copy = toDistribute;
+						int copy;
 						InternalEnergyStorage tank =
 							(partAt instanceof ModularAccumulatorBlockEntity ienergyPart ? ienergyPart.getEnergy() : null);
 							int split = Math.min(maxCapacity, toDistribute);

src/main/java/com/mrh0/createaddition/blocks/modular_accumulator/ModularAccumulatorBlockEntity.java

@@ -1,8 +1,6 @@
 package com.mrh0.createaddition.blocks.modular_accumulator;
 
 import com.mrh0.createaddition.CreateAddition;
-import com.mrh0.createaddition.compat.computercraft.ModularAccumulatorPeripheral;
-import com.mrh0.createaddition.compat.computercraft.Peripherals;
 import com.mrh0.createaddition.config.CommonConfig;
 import com.mrh0.createaddition.debug.IDebugDrawer;
 import com.mrh0.createaddition.energy.IMultiTileEnergyContainer;
@@ -37,7 +35,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.neoforged.api.distmarker.Dist;
 import net.neoforged.neoforge.capabilities.BlockCapabilityCache;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
@@ -101,7 +98,7 @@ public void updateCache() {
 					getBlockPos().relative(side),
 					side.getOpposite(),
 					() -> !this.isRemoved(),
-					() -> { invalidSides.add(side); }
+					() -> invalidSides.add(side)
 			));
 		}
 	}