Merge pull request #922 from L-Lawlite/1.21.1

1.21.1

Author: mrh0

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