diff --git a/src/main/java/dan200/computercraft/client/SoundManager.java b/src/main/java/dan200/computercraft/client/SoundManager.java
index e2fddf623..d4ccf7cac 100644
--- a/src/main/java/dan200/computercraft/client/SoundManager.java
+++ b/src/main/java/dan200/computercraft/client/SoundManager.java
@@ -60,7 +60,7 @@ public class SoundManager
             setPosition( position );
             this.volume = volume;
             this.pitch = pitch;
-            attenuation = SoundInstance.Attenuation.LINEAR;
+            attenuation = Attenuation.LINEAR;
         }
 
         void setPosition( Vec3 position )
diff --git a/src/main/java/dan200/computercraft/shared/TurtlePermissions.java b/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
index 38659c400..98e4cd135 100644
--- a/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
+++ b/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
@@ -16,7 +16,7 @@ public final class TurtlePermissions
     public static boolean isBlockEnterable( Level world, BlockPos pos, Player player )
     {
         MinecraftServer server = world.getServer();
-        return server == null || world.isClientSide || world instanceof ServerLevel && !server.isUnderSpawnProtection( (ServerLevel) world, pos, player );
+        return server == null || world.isClientSide || (world instanceof ServerLevel && !server.isUnderSpawnProtection( (ServerLevel) world, pos, player ));
     }
 
     public static boolean isBlockEditable( Level world, BlockPos pos, Player player )
diff --git a/src/main/java/dan200/computercraft/shared/command/builder/ArgCommand.java b/src/main/java/dan200/computercraft/shared/command/builder/ArgCommand.java
index ea834c4c8..c478b67b5 100644
--- a/src/main/java/dan200/computercraft/shared/command/builder/ArgCommand.java
+++ b/src/main/java/dan200/computercraft/shared/command/builder/ArgCommand.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.command.builder;
 
 import com.mojang.brigadier.Command;
diff --git a/src/main/java/dan200/computercraft/shared/command/builder/CommandNodeBuilder.java b/src/main/java/dan200/computercraft/shared/command/builder/CommandNodeBuilder.java
index dc10a5eea..f2e108727 100644
--- a/src/main/java/dan200/computercraft/shared/command/builder/CommandNodeBuilder.java
+++ b/src/main/java/dan200/computercraft/shared/command/builder/CommandNodeBuilder.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.command.builder;
 
 import com.mojang.brigadier.tree.CommandNode;
diff --git a/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java b/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java
index a1dca6e4f..90478f3bb 100644
--- a/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java
+++ b/src/main/java/dan200/computercraft/shared/common/IBundledRedstoneBlock.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.common;
 
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/dan200/computercraft/shared/common/ITerminal.java b/src/main/java/dan200/computercraft/shared/common/ITerminal.java
index 2a6a9a9e0..48577e5da 100644
--- a/src/main/java/dan200/computercraft/shared/common/ITerminal.java
+++ b/src/main/java/dan200/computercraft/shared/common/ITerminal.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.common;
 
 import dan200.computercraft.core.terminal.Terminal;
diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerTile.java b/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerTile.java
index ba3e4fc0d..40e0dca90 100644
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerTile.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/IComputerTile.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.computer.blocks;
 
 import dan200.computercraft.shared.computer.core.ComputerFamily;
diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ClientComputerRegistry.java b/src/main/java/dan200/computercraft/shared/computer/core/ClientComputerRegistry.java
index 725a8c7a5..fa87eb642 100644
--- a/src/main/java/dan200/computercraft/shared/computer/core/ClientComputerRegistry.java
+++ b/src/main/java/dan200/computercraft/shared/computer/core/ClientComputerRegistry.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.computer.core;
 
 public class ClientComputerRegistry extends ComputerRegistry<ClientComputer>
diff --git a/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java b/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java
index 03e534461..e25f4f891 100644
--- a/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/BlockNamedEntityLootCondition.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.data;
 
 import net.minecraft.world.Nameable;
diff --git a/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java b/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java
index 8480a3a57..ea3ab1333 100644
--- a/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java
+++ b/src/main/java/dan200/computercraft/shared/data/ConstantLootConditionSerializer.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.data;
 
 import com.google.gson.JsonDeserializationContext;
diff --git a/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java b/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
index a2221e74b..4127ec6ef 100644
--- a/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/HasComputerIdLootCondition.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.data;
 
 import dan200.computercraft.shared.computer.blocks.IComputerTile;
diff --git a/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java b/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java
index 006c8779a..3666ffbb6 100644
--- a/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java
+++ b/src/main/java/dan200/computercraft/shared/data/PlayerCreativeLootCondition.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.data;
 
 import net.minecraft.world.entity.Entity;
diff --git a/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java
index 1368866bc..d3349cdfc 100644
--- a/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/ComputerClientMessage.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.network.client;
 
 import dan200.computercraft.ComputerCraft;
diff --git a/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java b/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java
index 04f9a2af3..3650b2a52 100644
--- a/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/HeldItemContainerData.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.network.container;
 
 import dan200.computercraft.shared.common.ContainerHeldItem;
diff --git a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
index 842783c1a..dd0c995f5 100644
--- a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.network.container;
 
 import dan200.computercraft.core.terminal.Terminal;
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java b/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
index eca38e63f..406d62466 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/generic/SaturatedMethod.java
@@ -44,9 +44,8 @@ final class SaturatedMethod
     public boolean equals( Object obj )
     {
         if( obj == this ) return true;
-        if( !(obj instanceof SaturatedMethod) ) return false;
+        if( !(obj instanceof SaturatedMethod other) ) return false;
 
-        SaturatedMethod other = (SaturatedMethod) obj;
         return method == other.method && target.equals( other.target );
     }
 
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java
index 132cb0718..3c456ab4b 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/CableModemVariant.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.peripheral.modem.wired;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java
index f31a7d14d..7ed7f6939 100644
--- a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketModemPeripheral.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.pocket.peripherals;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
diff --git a/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java b/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java
index 8ea8006f0..8076f0445 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.turtle.blocks;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCommandQueueEntry.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCommandQueueEntry.java
index 17f203329..dfa7d90d7 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCommandQueueEntry.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCommandQueueEntry.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.turtle.core;
 
 import dan200.computercraft.api.turtle.ITurtleCommand;
diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java
index e641cfd04..8f69559cf 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.turtle.core;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
diff --git a/src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java b/src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java
index 92021a9e7..9a6cfce7c 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.turtle.items;
 
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleAxe.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleAxe.java
index cdc91c422..744c04a8c 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleAxe.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleAxe.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.turtle.upgrades;
 
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/dan200/computercraft/shared/util/DefaultInventory.java b/src/main/java/dan200/computercraft/shared/util/DefaultInventory.java
index 6d5b07a86..f8af29947 100644
--- a/src/main/java/dan200/computercraft/shared/util/DefaultInventory.java
+++ b/src/main/java/dan200/computercraft/shared/util/DefaultInventory.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.util;
 
 import net.minecraft.world.Container;
diff --git a/src/main/java/dan200/computercraft/shared/util/DefaultSidedInventory.java b/src/main/java/dan200/computercraft/shared/util/DefaultSidedInventory.java
index 47f92a51d..7a94909a6 100644
--- a/src/main/java/dan200/computercraft/shared/util/DefaultSidedInventory.java
+++ b/src/main/java/dan200/computercraft/shared/util/DefaultSidedInventory.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.util;
 
 import net.minecraft.core.Direction;
diff --git a/src/main/java/dan200/computercraft/shared/util/RecordUtil.java b/src/main/java/dan200/computercraft/shared/util/RecordUtil.java
index afe99a065..4e56e3bb5 100644
--- a/src/main/java/dan200/computercraft/shared/util/RecordUtil.java
+++ b/src/main/java/dan200/computercraft/shared/util/RecordUtil.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.util;
 
 import dan200.computercraft.shared.network.NetworkHandler;
diff --git a/src/main/java/dan200/computercraft/shared/util/ValidatingSlot.java b/src/main/java/dan200/computercraft/shared/util/ValidatingSlot.java
index 79e8c0cf1..42ca181d4 100644
--- a/src/main/java/dan200/computercraft/shared/util/ValidatingSlot.java
+++ b/src/main/java/dan200/computercraft/shared/util/ValidatingSlot.java
@@ -3,7 +3,6 @@
  * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
-
 package dan200.computercraft.shared.util;
 
 import net.minecraft.world.Container;