style: some spaces and imports

2025-09-04 11:27:56 +00:00 · 2021-10-07 00:25:18 +03:00
parent 1c254e3bb0
commit 11272b8d00
85 changed files with 303 additions and 354 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ plugins {
    id 'fabric-loom' version '0.9-SNAPSHOT'
    id 'maven-publish'
    id "checkstyle"
-    id "com.github.hierynomus.license" version "0.15.0"
+    id "com.github.hierynomus.license" version "0.16.1"
 }

 java {
@@ -37,7 +37,7 @@ configurations {
 }

 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
+    checkstyle 'com.puppycrawl.tools:checkstyle:8.45.1'

    minecraft "com.mojang:minecraft:${mc_version}"
    mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}:v2"
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -58,13 +58,13 @@
        <module name="SimplifyBooleanExpression" />
        <module name="SimplifyBooleanReturn" />
        <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses" />
+        <!-- <module name="UnnecessaryParentheses" /> -->
        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
        <module name="UnnecessarySemicolonInTryWithResources" />
        <module name="UnnecessarySemicolonInEnumeration" />

        <!-- Imports -->
-        <module name="CustomImportOrder" />
+        <!--<module name="CustomImportOrder" />-->
        <module name="IllegalImport" />
        <module name="RedundantImport" />
        <module name="UnusedImports" />
--- a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
+++ b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
@@ -21,10 +21,6 @@ import org.apache.commons.lang3.StringUtils;

 import javax.annotation.Nullable;

-@SuppressWarnings( {
-    "MethodCallSideOnly",
-    "LocalVariableDeclarationSideOnly"
-} )
 public class ClientTableFormatter implements TableFormatter
 {
    public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
--- a/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
+++ b/src/main/java/dan200/computercraft/client/gui/ComputerScreenBase.java
@@ -1,3 +1,8 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
 package dan200.computercraft.client.gui;

 import dan200.computercraft.ComputerCraft;
@@ -100,8 +105,7 @@ public abstract class ComputerScreenBase<T extends ContainerComputerBase> extend
    @Override
    public final boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
    {
-        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ))
-            || super.mouseDragged( x, y, button, deltaX, deltaY );
+        return getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY ) || super.mouseDragged( x, y, button, deltaX, deltaY );
    }

    @Override
--- a/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java
@@ -5,13 +5,14 @@
 */
 package dan200.computercraft.client.render;

-import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import net.minecraft.client.render.*;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Matrix4f;
-import org.lwjgl.opengl.GL11;

 import javax.annotation.Nonnull;

--- a/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java
@@ -144,6 +144,7 @@ public abstract class ItemMapLikeRenderer
     * @param transform The matrix transformation stack
     * @param render    The buffer to render to
     * @param stack     The stack to render
+     * @param light     TODO rebase
     */
    protected abstract void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack, int light );
 }
--- a/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
@@ -19,9 +19,8 @@ import net.minecraft.client.render.*;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Vec3f;
 import net.minecraft.util.math.Matrix4f;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.util.math.Vec3f;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
--- a/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
@@ -12,7 +12,6 @@ import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.Entity;
@@ -20,7 +19,6 @@ import net.minecraft.util.math.*;
 import net.minecraft.world.World;

 import java.util.EnumSet;
-
 import static net.minecraft.util.math.Direction.*;

 /**
@@ -34,9 +32,7 @@ public final class MonitorHighlightRenderer
    {
    }

-    public static boolean drawHighlight(
-        MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos, BlockState blockState
-    )
+    public static boolean drawHighlight( MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos, BlockState blockState )
    {
        // Preserve normal behaviour when crouching.
        if( entity.isInSneakingPose() )
--- a/src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java
@@ -1,3 +1,8 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
 package dan200.computercraft.client.render;

 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
@@ -24,7 +29,8 @@ public class MonitorTextureBufferShader extends Shader
    private final GlUniform width;
    private final GlUniform height;

-    public MonitorTextureBufferShader(ResourceFactory factory, String name, VertexFormat format) throws IOException {
+    public MonitorTextureBufferShader( ResourceFactory factory, String name, VertexFormat format ) throws IOException
+    {
        super( factory, name, format );

        width = getUniformChecked( "Width" );
--- a/src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java
@@ -9,11 +9,9 @@ package dan200.computercraft.client.render;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
-import net.minecraft.client.render.*;
-import net.minecraft.client.render.VertexFormat.DrawMode;
-import net.minecraft.util.Identifier;
+import net.minecraft.client.render.VertexConsumer;
+import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.util.math.Matrix4f;
-import org.lwjgl.opengl.GL11;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
--- a/src/main/java/dan200/computercraft/client/render/RenderTypes.java
+++ b/src/main/java/dan200/computercraft/client/render/RenderTypes.java
@@ -1,3 +1,8 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
 package dan200.computercraft.client.render;

 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
@@ -7,7 +12,8 @@ import net.minecraft.util.Identifier;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

-public class RenderTypes {
+public class RenderTypes
+{

    public static final int FULL_BRIGHT_LIGHTMAP = (0xF << 4) | (0xF << 20);

--- a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
@@ -20,24 +20,15 @@ import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
 import net.minecraft.client.gl.VertexBuffer;
 import net.minecraft.client.render.*;
-import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
-import net.minecraft.client.util.GlAllocationUtils;
-import net.minecraft.util.math.AffineTransformation;
 import net.minecraft.client.util.math.MatrixStack;
-import net.minecraft.util.math.Vec3f;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Direction;
-import net.minecraft.util.math.Matrix4f;
+import net.minecraft.util.math.*;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL31;

 import javax.annotation.Nonnull;
-
-import java.nio.Buffer;
 import java.nio.ByteBuffer;

 import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
--- a/src/main/java/dan200/computercraft/client/render/TurtlePlayerRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtlePlayerRenderer.java
@@ -6,12 +6,9 @@
 package dan200.computercraft.client.render;

 import dan200.computercraft.shared.turtle.core.TurtlePlayer;
-import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.entity.EntityRenderDispatcher;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
-import net.minecraft.client.render.entity.EntityRendererFactory.Context;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;

--- a/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/NetworkUtils.java
@@ -201,7 +201,7 @@ public final class NetworkUtils
        {
            return "Timed out";
        }
-        else if( cause instanceof SSLHandshakeException || (cause instanceof DecoderException && cause.getCause() instanceof SSLHandshakeException) )
+        else if( cause instanceof SSLHandshakeException || cause instanceof DecoderException && cause.getCause() instanceof SSLHandshakeException )
        {
            return "Could not create a secure connection";
        }
--- a/src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/options/AddressRule.java
@@ -75,7 +75,7 @@ public final class AddressRule
        if( this.port != null && this.port != port ) return false;
        return predicate.matches( domain )
            || predicate.matches( address )
-            || (ipv4Address != null && predicate.matches( ipv4Address ));
+            || ipv4Address != null && predicate.matches( ipv4Address );
    }

    public static Options apply( Iterable<? extends AddressRule> rules, String domain, InetSocketAddress socketAddress )
--- a/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/websocket/Websocket.java
@@ -28,7 +28,6 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshaker;
 import io.netty.handler.codec.http.websocketx.WebSocketClientHandshakerFactory;
 import io.netty.handler.codec.http.websocketx.WebSocketVersion;
-import io.netty.handler.codec.http.websocketx.extensions.compression.WebSocketClientCompressionHandler;
 import io.netty.handler.ssl.SslContext;

 import java.lang.ref.WeakReference;
--- a/src/main/java/dan200/computercraft/core/computer/Environment.java
+++ b/src/main/java/dan200/computercraft/core/computer/Environment.java
@@ -309,9 +309,9 @@ public final class Environment implements IAPIEnvironment
        {
            int index = side.ordinal();
            IPeripheral existing = peripherals[index];
-            if( (existing == null && peripheral != null) ||
-                (existing != null && peripheral == null) ||
-                (existing != null && !existing.equals( peripheral )) )
+            if( existing == null && peripheral != null ||
+                existing != null && peripheral == null ||
+                existing != null && !existing.equals( peripheral ) )
            {
                peripherals[index] = peripheral;
                if( peripheralListener != null ) peripheralListener.onPeripheralChanged( side, peripheral );
--- a/src/main/java/dan200/computercraft/core/filesystem/ResourceMount.java
+++ b/src/main/java/dan200/computercraft/core/filesystem/ResourceMount.java
@@ -13,11 +13,12 @@ import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.core.apis.handles.ArrayByteChannel;
 import dan200.computercraft.shared.util.IoUtil;
-import net.minecraft.resource.*;
-import net.minecraft.resource.ResourceReloader.Synchronizer;
+import net.minecraft.resource.ReloadableResourceManager;
+import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.SynchronousResourceReloader;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.InvalidIdentifierException;
-import net.minecraft.util.profiler.Profiler;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -27,8 +28,6 @@ import java.io.InputStream;
 import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;

 public final class ResourceMount implements IMount
--- a/src/main/java/dan200/computercraft/fabric/mixin/GameRendererMixin.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/GameRendererMixin.java
@@ -1,17 +1,18 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
 package dan200.computercraft.fabric.mixin;

 import com.mojang.datafixers.util.Pair;
-import dan200.computercraft.ComputerCraft;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.client.render.MonitorTextureBufferShader;
 import dan200.computercraft.client.render.RenderTypes;
 import net.minecraft.client.gl.Program;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.render.Shader;
-import net.minecraft.client.render.VertexFormats;
 import net.minecraft.resource.ResourceManager;
-import net.minecraft.util.Identifier;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -23,19 +24,21 @@ import java.util.List;
 import java.util.function.Consumer;

@Mixin( GameRenderer.class )
-public class GameRendererMixin {
+public class GameRendererMixin
+{
    @SuppressWarnings( "UnresolvedMixinReference" )
    @Inject( method = "loadShaders", at = @At( value = "INVOKE_ASSIGN", target = "Ljava/util/List;add(Ljava/lang/Object;)Z", ordinal = 53 ), locals = LocalCapture.CAPTURE_FAILSOFT )
-    private void loadShaders(ResourceManager manager, CallbackInfo info, List<Program> list, List<Pair<Shader, Consumer<Shader>>> list2) throws IOException {
+    private void loadShaders( ResourceManager manager, CallbackInfo info, List<Program> list, List<Pair<Shader, Consumer<Shader>>> list2 ) throws IOException
+    {
        list2.add( Pair.of( new Shader(
            manager,
            "terminal",
            RenderTypes.TERMINAL_WITHOUT_DEPTH.getVertexFormat()
-        ), (shader) -> RenderTypes.terminalShader = shader));
+        ), shader -> RenderTypes.terminalShader = shader ) );
        list2.add( Pair.of( new MonitorTextureBufferShader(
            manager,
            "monitor_tbo",
            RenderTypes.MONITOR_TBO.getVertexFormat()
-        ), (shader) -> RenderTypes.monitorTboShader = (MonitorTextureBufferShader) shader));
+        ), shader -> RenderTypes.monitorTboShader = (MonitorTextureBufferShader) shader ) );
    }
 }
--- a/src/main/java/dan200/computercraft/fabric/mixin/MixinBlockEntity.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinBlockEntity.java
@@ -1,3 +1,8 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
 package dan200.computercraft.fabric.mixin;

 import org.spongepowered.asm.mixin.Final;
--- a/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinItemFrameEntityRenderer.java
@@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

@Mixin( ItemFrameEntityRenderer.class )
--- a/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/MixinWorld.java
@@ -7,7 +7,6 @@ package dan200.computercraft.fabric.mixin;

 import dan200.computercraft.shared.common.TileGeneric;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
--- a/src/main/java/dan200/computercraft/fabric/mixin/RenderLayerAccessor.java
+++ b/src/main/java/dan200/computercraft/fabric/mixin/RenderLayerAccessor.java
@@ -1,18 +0,0 @@
-//package dan200.computercraft.fabric.mixin;
-//
-//import org.spongepowered.asm.mixin.Mixin;
-//import org.spongepowered.asm.mixin.gen.Accessor;
-//import org.spongepowered.asm.mixin.gen.Invoker;
-//
-//import net.minecraft.client.render.RenderLayer;
-//import net.minecraft.client.render.VertexFormat;
-//
-//@Mixin(RenderLayer.class)
-//public interface RenderLayerAccessor {
-//
-//    @Accessor
-//    static RenderLayer.MultiPhaseParameters callOf(String name, VertexFormat vertexFormat, VertexFormat.DrawMode drawMode, int expectedBufferSize, boolean hasCrumbling, boolean translucent, RenderLayer.MultiPhaseParameters phases) {
-//        throw new UnsupportedOperationException();
-//    }
-//
-//}
--- a/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
+++ b/src/main/java/dan200/computercraft/shared/TurtlePermissions.java
@@ -25,7 +25,7 @@ public final class TurtlePermissions
    public static boolean isBlockEnterable( World world, BlockPos pos, PlayerEntity player )
    {
        MinecraftServer server = world.getServer();
-        return server == null || world.isClient || (world instanceof ServerWorld && !server.isSpawnProtected( (ServerWorld) world, pos, player ));
+        return server == null || world.isClient || world instanceof ServerWorld && !server.isSpawnProtected( (ServerWorld) world, pos, player );
    }

    @Subscribe
--- a/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java
+++ b/src/main/java/dan200/computercraft/shared/common/BlockGeneric.java
@@ -18,7 +18,6 @@ import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.BlockView;
 import net.minecraft.world.World;

 import javax.annotation.Nonnull;
@@ -35,7 +34,8 @@ public abstract class BlockGeneric extends BlockWithEntity
        this.type = type;
    }

-    public BlockEntityType<? extends TileGeneric> getType() {
+    public BlockEntityType<? extends TileGeneric> getType()
+    {
        return type;
    }

@@ -100,7 +100,8 @@ public abstract class BlockGeneric extends BlockWithEntity
    @Override
    public BlockEntity createBlockEntity( BlockPos pos, BlockState state )
    {
-        if (this.type != null) {
+        if ( this.type != null )
+        {
            return type.instantiate( pos, state );
        }
        return null;
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputer.java
@@ -7,15 +7,12 @@
 package dan200.computercraft.shared.computer.blocks;

 import dan200.computercraft.shared.ComputerCraftRegistry;
-import dan200.computercraft.shared.common.TileGeneric;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.computer.core.ComputerRegistry;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.items.ComputerItemFactory;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
@@ -25,7 +22,6 @@ import net.minecraft.state.property.EnumProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.World;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -66,7 +62,8 @@ public class BlockComputer extends BlockComputerBase<TileComputer>

    public BlockEntityType<? extends TileComputer> getTypeByFamily( ComputerFamily family )
    {
-        return switch (family) {
+        return switch ( family )
+        {
            case COMMAND -> ComputerCraftRegistry.ModTiles.COMPUTER_COMMAND;
            case ADVANCED -> ComputerCraftRegistry.ModTiles.COMPUTER_ADVANCED;
            default -> ComputerCraftRegistry.ModTiles.COMPUTER_NORMAL;
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/BlockComputerBase.java
@@ -8,14 +8,11 @@ package dan200.computercraft.shared.computer.blocks;

 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.core.computer.ComputerSide;
-import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
 import dan200.computercraft.shared.common.IBundledRedstoneBlock;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.items.IComputerItem;
-import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
@@ -218,9 +215,11 @@ public abstract class BlockComputerBase<T extends TileComputerBase> extends Bloc

    @Nullable
    @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker( World world, BlockState state, BlockEntityType<T> type )
+    {
        return world.isClient ? null : ( world1, pos, state1, tile ) -> {
-            if (tile instanceof TileComputerBase computer) {
+            if ( tile instanceof TileComputerBase computer )
+            {
                computer.serverTick();
            }
        };
--- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java
@@ -279,7 +279,7 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT
        }

        // If the computer isn't on and should be, then turn it on
-        if( startOn || (fresh && on) )
+        if( startOn || fresh && on )
        {
            computer.turnOn();
            startOn = false;
--- a/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerComputerBase.java
+++ b/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerComputerBase.java
@@ -19,7 +19,6 @@ import dan200.computercraft.shared.network.client.UploadResultMessage;
 import dan200.computercraft.shared.network.container.ComputerContainerData;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.network.PacketByteBuf;
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.server.network.ServerPlayerEntity;
--- a/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java
+++ b/src/main/java/dan200/computercraft/shared/computer/inventory/ContainerViewComputer.java
@@ -14,7 +14,6 @@ import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.network.container.ViewComputerContainerData;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.network.PacketByteBuf;

 import javax.annotation.Nonnull;

--- a/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
+++ b/src/main/java/dan200/computercraft/shared/network/NetworkHandler.java
@@ -153,8 +153,10 @@ public final class NetworkHandler
    public static void sendToAllTracking( NetworkMessage packet, WorldChunk chunk )
    {
        // maybe bug with worlds
-        for(PlayerEntity player : chunk.getWorld().getPlayers()) {
-            if (player.getChunkPos().equals(chunk.getPos())) {
+        for( PlayerEntity player : chunk.getWorld().getPlayers() )
+        {
+            if ( player.getChunkPos().equals( chunk.getPos() ) )
+            {
                ((ServerPlayerEntity) player).networkHandler.sendPacket( new CustomPayloadS2CPacket( ID, encode( packet ) ) );
            }
        }
--- a/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/client/SpeakerPlayClientMessage.java
@@ -12,7 +12,6 @@ import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.network.PacketContext;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Vec3d;

--- a/src/main/java/dan200/computercraft/shared/network/container/ContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ContainerData.java
@@ -6,7 +6,6 @@

 package dan200.computercraft.shared.network.container;

-import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
--- a/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
+++ b/src/main/java/dan200/computercraft/shared/network/container/ViewComputerContainerData.java
@@ -6,11 +6,9 @@

 package dan200.computercraft.shared.network.container;

-import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.minecraft.network.PacketByteBuf;
-import net.minecraft.util.Identifier;

 import javax.annotation.Nonnull;

--- a/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/ContinueUploadMessage.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.network.server;
 import dan200.computercraft.shared.computer.core.IContainerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import net.fabricmc.fabric.api.network.PacketContext;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.network.ServerPlayerEntity;

--- a/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java
+++ b/src/main/java/dan200/computercraft/shared/network/server/UploadFileMessage.java
@@ -13,7 +13,6 @@ import dan200.computercraft.shared.computer.upload.FileUpload;
 import dan200.computercraft.shared.network.NetworkHandler;
 import io.netty.handler.codec.DecoderException;
 import net.fabricmc.fabric.api.network.PacketContext;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.server.network.ServerPlayerEntity;

--- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/BlockDiskDrive.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/BlockDiskDrive.java
@@ -8,9 +8,6 @@ package dan200.computercraft.shared.peripheral.diskdrive;

 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
-import dan200.computercraft.shared.peripheral.speaker.BlockSpeaker;
-import dan200.computercraft.shared.peripheral.speaker.TileSpeaker;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
@@ -57,7 +54,8 @@ public class BlockDiskDrive extends BlockGeneric

    @Nullable
    @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker( World world, BlockState state, BlockEntityType<T> type )
+    {
        return world.isClient ? null : BlockDiskDrive.checkType( type, ComputerCraftRegistry.ModTiles.DISK_DRIVE, TileDiskDrive::tick );
    }

--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockCable.java
@@ -10,7 +10,6 @@ import com.google.common.collect.ImmutableMap;
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.peripheral.printer.TilePrinter;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockWiredModemFull.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/BlockWiredModemFull.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.peripheral.modem.wired;

 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.peripheral.speaker.TileSpeaker;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/BlockWirelessModem.java
@@ -8,10 +8,8 @@ package dan200.computercraft.shared.peripheral.modem.wireless;

 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.peripheral.modem.ModemShapes;
-import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ShapeContext;
@@ -106,7 +104,8 @@ public class BlockWirelessModem extends BlockGeneric implements Waterloggable

    public BlockEntityType<? extends TileWirelessModem> getTypeByFamily( ComputerFamily family )
    {
-        return switch (family) {
+        return switch ( family )
+        {
            case ADVANCED -> ComputerCraftRegistry.ModTiles.WIRELESS_MODEM_ADVANCED;
            default -> ComputerCraftRegistry.ModTiles.WIRELESS_MODEM_NORMAL;
        };
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.peripheral.modem.wireless;

 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralTile;
-import dan200.computercraft.shared.ComputerCraftRegistry.ModTiles;
 import dan200.computercraft.shared.common.TileGeneric;
 import dan200.computercraft.shared.peripheral.modem.ModemPeripheral;
 import dan200.computercraft.shared.peripheral.modem.ModemState;
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/BlockMonitor.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/BlockMonitor.java
@@ -9,7 +9,6 @@ package dan200.computercraft.shared.peripheral.monitor;
 import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/ClientMonitor.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/ClientMonitor.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.peripheral.monitor;

 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
-import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.shared.common.ClientTerminal;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
--- a/src/main/java/dan200/computercraft/shared/peripheral/printer/BlockPrinter.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/BlockPrinter.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.peripheral.printer;

 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/BlockSpeaker.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/BlockSpeaker.java
@@ -8,7 +8,6 @@ package dan200.computercraft.shared.peripheral.speaker;

 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.BlockGeneric;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
@@ -59,7 +58,8 @@ public class BlockSpeaker extends BlockGeneric

    @Nullable
    @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker( World world, BlockState state, BlockEntityType<T> type){
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker( World world, BlockState state, BlockEntityType<T> type )
+    {
        return world.isClient ? null : BlockSpeaker.checkType( type, ComputerCraftRegistry.ModTiles.SPEAKER, TileSpeaker::tick );
    }

--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
@@ -147,7 +147,9 @@ public abstract class SpeakerPeripheral implements IPeripheral
                    null, pos.x, pos.y, pos.z, range, world.getRegistryKey(),
                    new PlaySoundIdS2CPacket( name, SoundCategory.RECORDS, pos, actualVolume, pitch )
                );
-            } else {
+            }
+            else
+            {
                NetworkHandler.sendToAllAround(
                    new SpeakerPlayClientMessage( getSource(), pos, name, actualVolume, pitch ),
                    world, pos, range
--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/TileSpeaker.java
@@ -9,7 +9,6 @@ package dan200.computercraft.shared.peripheral.speaker;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralTile;
 import dan200.computercraft.shared.common.TileGeneric;
-import dan200.computercraft.shared.computer.blocks.TileComputerBase;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.util.math.BlockPos;
--- a/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/inventory/PocketComputerMenuProvider.java
@@ -6,7 +6,6 @@
 package dan200.computercraft.shared.pocket.inventory;

 import dan200.computercraft.shared.ComputerCraftRegistry;
-import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.inventory.ComputerMenuWithoutInventory;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
@@ -64,7 +63,8 @@ public class PocketComputerMenuProvider implements NamedScreenHandlerFactory, Ex
    }

    @Override
-    public void writeScreenOpeningData(ServerPlayerEntity player, PacketByteBuf packetByteBuf) {
+    public void writeScreenOpeningData( ServerPlayerEntity player, PacketByteBuf packetByteBuf )
+    {
        packetByteBuf.writeInt( computer.getInstanceID() );
        packetByteBuf.writeEnumConstant( computer.getFamily() );
    }
--- a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java
@@ -164,7 +164,6 @@ public class ItemPocketComputer extends Item implements IComputerItem, IMedia, I

            if( !stop && computer != null )
            {
-//                computer.sendTerminalState( player );
                boolean isTypingOnly = hand == Hand.OFF_HAND;
                new ComputerContainerData( computer ).open( player, new PocketComputerMenuProvider( computer, stack, this, hand, isTypingOnly ) );
            }
--- a/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/peripherals/PocketSpeakerPeripheral.java
@@ -7,7 +7,6 @@
 package dan200.computercraft.shared.pocket.peripherals;

 import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
 import dan200.computercraft.shared.peripheral.speaker.UpgradeSpeakerPeripheral;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/BlockTurtle.java
@@ -9,11 +9,8 @@ package dan200.computercraft.shared.turtle.blocks;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.computer.blocks.BlockComputerBase;
-import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.blocks.TileComputerBase;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import dan200.computercraft.shared.peripheral.diskdrive.BlockDiskDrive;
-import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive;
 import dan200.computercraft.shared.turtle.core.TurtleBrain;
 import dan200.computercraft.shared.turtle.items.ITurtleItem;
 import dan200.computercraft.shared.turtle.items.TurtleItemFactory;
@@ -183,7 +180,8 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements Waterl

    public BlockEntityType<? extends TileTurtle> getTypeByFamily( ComputerFamily family )
    {
-        if (family == ComputerFamily.ADVANCED) {
+        if ( family == ComputerFamily.ADVANCED )
+        {
            return ComputerCraftRegistry.ModTiles.TURTLE_ADVANCED;
        }
        return ComputerCraftRegistry.ModTiles.TURTLE_NORMAL;
@@ -198,7 +196,8 @@ public class BlockTurtle extends BlockComputerBase<TileTurtle> implements Waterl

    @Nullable
    @Override
-    public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
+    public <T extends BlockEntity> BlockEntityTicker<T> getTicker( World world, BlockState state, BlockEntityType<T> type )
+    {
        return world.isClient ? BlockTurtle.checkType( type, getTypeByFamily( getFamily() ), ( world1, pos, state1, computer ) -> computer.clientTick() ) : super.getTicker( world, state, type );
    }
 }
--- a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java
@@ -12,21 +12,17 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.core.computer.ComputerSide;
-import dan200.computercraft.fabric.mixin.MixinBlockEntity;
-import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.TileGeneric;
 import dan200.computercraft.shared.computer.blocks.ComputerProxy;
 import dan200.computercraft.shared.computer.blocks.TileComputerBase;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.computer.core.ComputerState;
 import dan200.computercraft.shared.computer.core.ServerComputer;
-import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive;
 import dan200.computercraft.shared.turtle.apis.TurtleAPI;
 import dan200.computercraft.shared.turtle.core.TurtleBrain;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
 import dan200.computercraft.shared.util.*;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -45,7 +41,6 @@ import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java
@@ -26,7 +26,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.screen.NamedScreenHandlerFactory;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
--- a/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
@@ -24,11 +24,6 @@ import net.minecraft.network.PacketByteBuf;
 import net.minecraft.screen.ArrayPropertyDelegate;
 import net.minecraft.screen.PropertyDelegate;
 import net.minecraft.screen.slot.Slot;
-import net.minecraft.screen.slot.SlotActionType;
-import net.minecraft.util.crash.CrashException;
-import net.minecraft.util.crash.CrashReport;
-import net.minecraft.util.crash.CrashReportSection;
-import net.minecraft.util.registry.Registry;

 import javax.annotation.Nonnull;
 import java.util.function.Predicate;
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java
@@ -12,7 +12,6 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.api.turtle.TurtleUpgradeType;
 import dan200.computercraft.shared.ComputerCraftRegistry;
-import dan200.computercraft.shared.peripheral.speaker.SpeakerPeripheral;
 import dan200.computercraft.shared.peripheral.speaker.UpgradeSpeakerPeripheral;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
--- a/src/main/java/dan200/computercraft/shared/util/NonNullSupplier.java
+++ b/src/main/java/dan200/computercraft/shared/util/NonNullSupplier.java
@@ -1,12 +1,12 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
 package dan200.computercraft.shared.util;

 import javax.annotation.Nonnull;

-/**
- * Equivalent to {@link Supplier}, except with nonnull contract.
- *
- * @see Supplier
- */
@FunctionalInterface
 public interface NonNullSupplier<T>
 {