Reformat everything

src/main/java/dan200/computercraft/ComputerCraft.java

@@ -6,15 +6,6 @@
 
 package dan200.computercraft;
 
-import static dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
-import static dan200.computercraft.shared.ComputerCraftRegistry.init;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 import dan200.computercraft.api.turtle.event.TurtleAction;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRule;
@@ -32,22 +23,31 @@ import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
 import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
 import dan200.computercraft.shared.turtle.recipes.TurtleRecipe;
 import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
-import dan200.computercraft.shared.util.*;
+import dan200.computercraft.shared.util.ImpostorRecipe;
-import org.apache.logging.log4j.LogManager;
+import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
-import org.apache.logging.log4j.Logger;
-
-import net.minecraft.item.ItemGroup;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
-
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
 import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
 import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-public final class ComputerCraft implements ModInitializer {
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
+import static dan200.computercraft.shared.ComputerCraftRegistry.init;
+
+public final class ComputerCraft implements ModInitializer
+{
     public static final String MOD_ID = "computercraft";
 
     // Configuration fields
@@ -61,16 +61,15 @@ public final class ComputerCraft implements ModInitializer {
     public static boolean commandRequireCreative = true;
 
     public static int computerThreads = 1;
-    public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos(10);
+    public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
-    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos(5);
+    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
 
     public static boolean httpEnabled = true;
     public static boolean httpWebsocketEnabled = true;
     public static List<AddressRule> httpRules = Collections.unmodifiableList( Arrays.asList(
-            AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
+        AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
-            AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
+        AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
-    ));
+    ) );
-
     public static int httpMaxRequests = 16;
     public static int httpMaxWebsockets = 4;
 
@@ -89,7 +88,7 @@ public final class ComputerCraft implements ModInitializer {
     public static int advancedTurtleFuelLimit = 100000;
     public static boolean turtlesObeyBlockProtection = true;
     public static boolean turtlesCanPush = true;
-    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf(TurtleAction.class);
+    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );
 
     public static int computerTermWidth = 51;
     public static int computerTermHeight = 19;
@@ -99,7 +98,6 @@ public final class ComputerCraft implements ModInitializer {
 
     public static int pocketTermWidth = 26;
     public static int pocketTermHeight = 20;
-
     public static int monitorWidth = 8;
     public static int monitorHeight = 6;
 
@@ -108,30 +106,32 @@ public final class ComputerCraft implements ModInitializer {
     public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
 
     // Logging
-    public static final Logger log = LogManager.getLogger(MOD_ID);
+    public static final Logger log = LogManager.getLogger( MOD_ID );
 
-    public static ItemGroup MAIN_GROUP = FabricItemGroupBuilder.build(new Identifier(MOD_ID, "main"), () -> new ItemStack(ModBlocks.COMPUTER_NORMAL));
+    public static ItemGroup MAIN_GROUP = FabricItemGroupBuilder.build( new Identifier( MOD_ID, "main" ), () -> new ItemStack( ModBlocks.COMPUTER_NORMAL ) );
 
     @Override
-    public void onInitialize() {
+    public void onInitialize()
+    {
         ComputerCraftProxyCommon.init();
-
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "colour" ), ColourableRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "colour"), ColourableRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "computer_upgrade" ), ComputerUpgradeRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "computer_upgrade"), ComputerUpgradeRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER,
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "pocket_computer_upgrade"), PocketComputerUpgradeRecipe.SERIALIZER);
+            new Identifier( ComputerCraft.MOD_ID, "pocket_computer_upgrade" ),
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "disk"), DiskRecipe.SERIALIZER);
+            PocketComputerUpgradeRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "printout"), PrintoutRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "disk" ), DiskRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "turtle"), TurtleRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "printout" ), PrintoutRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "turtle_upgrade"), TurtleUpgradeRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "turtle" ), TurtleRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "impostor_shaped"), ImpostorRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "turtle_upgrade" ), TurtleUpgradeRecipe.SERIALIZER );
-        Registry.register(Registry.RECIPE_SERIALIZER, new Identifier(ComputerCraft.MOD_ID, "impostor_shapeless"), ImpostorShapelessRecipe.SERIALIZER);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "impostor_shaped" ), ImpostorRecipe.SERIALIZER );
-        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "block_named"), BlockNamedEntityLootCondition.TYPE);
+        Registry.register( Registry.RECIPE_SERIALIZER, new Identifier( ComputerCraft.MOD_ID, "impostor_shapeless" ), ImpostorShapelessRecipe.SERIALIZER );
-        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "player_creative"), PlayerCreativeLootCondition.TYPE);
+        Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "block_named" ), BlockNamedEntityLootCondition.TYPE );
-        Registry.register(Registry.LOOT_CONDITION_TYPE, new Identifier(ComputerCraft.MOD_ID, "has_id"), HasComputerIdLootCondition.TYPE);
+        Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "player_creative" ), PlayerCreativeLootCondition.TYPE );
+        Registry.register( Registry.LOOT_CONDITION_TYPE, new Identifier( ComputerCraft.MOD_ID, "has_id" ), HasComputerIdLootCondition.TYPE );
         init();
-        FabricLoader.getInstance().getModContainer(MOD_ID).ifPresent(modContainer -> {
+        FabricLoader.getInstance().getModContainer( MOD_ID ).ifPresent( modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier(MOD_ID, "classic"), modContainer, ResourcePackActivationType.NORMAL);
+            ResourceManagerHelper.registerBuiltinResourcePack( new Identifier( MOD_ID, "classic" ), modContainer, ResourcePackActivationType.NORMAL );
-            ResourceManagerHelper.registerBuiltinResourcePack(new Identifier(MOD_ID, "overhaul"), modContainer, ResourcePackActivationType.NORMAL);
+            ResourceManagerHelper.registerBuiltinResourcePack( new Identifier( MOD_ID, "overhaul" ), modContainer, ResourcePackActivationType.NORMAL );
-        });
+        } );
     }
-}
+}

src/main/java/dan200/computercraft/ComputerCraftAPIImpl.java

@@ -6,13 +6,6 @@
 
 package dan200.computercraft;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
@@ -31,18 +24,14 @@ import dan200.computercraft.core.asm.GenericMethod;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.ResourceMount;
 import dan200.computercraft.fabric.mixin.MinecraftServerAccess;
-import dan200.computercraft.shared.BundledRedstone;
+import dan200.computercraft.shared.*;
-import dan200.computercraft.shared.MediaProviders;
-import dan200.computercraft.shared.Peripherals;
-import dan200.computercraft.shared.PocketUpgrades;
-import dan200.computercraft.shared.TurtleUpgrades;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
 import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils;
-
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.resource.ReloadableResourceManager;
 import net.minecraft.server.MinecraftServer;
@@ -52,24 +41,35 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-import net.fabricmc.loader.api.FabricLoader;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 
-public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
+public final class ComputerCraftAPIImpl implements IComputerCraftAPI
+{
     public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
 
     private String version;
 
-    private ComputerCraftAPIImpl() {
+    private ComputerCraftAPIImpl()
+    {
     }
 
-    public static InputStream getResourceFile(String domain, String subPath) {
+    public static InputStream getResourceFile( String domain, String subPath )
+    {
         MinecraftServer server = GameInstanceUtils.getServer();
-        if (server != null) {
+        if( server != null )
-            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess)server).getServerResourceManager().getResourceManager();
+        {
-            try {
+            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) server).getServerResourceManager().getResourceManager();
-                return manager.getResource(new Identifier(domain, subPath))
+            try
-                              .getInputStream();
+            {
-            } catch (IOException ignored) {
+                return manager.getResource( new Identifier( domain, subPath ) )
+                    .getInputStream();
+            }
+            catch( IOException ignored )
+            {
                 return null;
             }
         }
@@ -78,71 +78,86 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
 
     @Nonnull
     @Override
-    public String getInstalledVersion() {
+    public String getInstalledVersion()
-        if (this.version != null) {
+    {
+        if( this.version != null )
+        {
             return this.version;
         }
         return this.version = FabricLoader.getInstance()
-                                          .getModContainer(ComputerCraft.MOD_ID)
+            .getModContainer( ComputerCraft.MOD_ID )
-                                          .map(x -> x.getMetadata()
+            .map( x -> x.getMetadata()
-                                                .getVersion()
+                .getVersion()
-                                                .toString())
+                .toString() )
-                                          .orElse("unknown");
+            .orElse( "unknown" );
     }
 
     @Override
-    public int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath) {
+    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
-        return IDAssigner.getNextId(parentSubPath);
+    {
+        return IDAssigner.getNextId( parentSubPath );
     }
 
     @Override
-    public IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity) {
+    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
-        try {
+    {
-            return new FileMount(new File(IDAssigner.getDir(), subPath), capacity);
+        try
-        } catch (Exception e) {
+        {
+            return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
+        }
+        catch( Exception e )
+        {
             return null;
         }
     }
 
     @Override
-    public IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath) {
+    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
+    {
         MinecraftServer server = GameInstanceUtils.getServer();
-        if (server != null) {
+        if( server != null )
-            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess)server).getServerResourceManager().getResourceManager();
+        {
-            ResourceMount mount = ResourceMount.get(domain, subPath, manager);
+            ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) server).getServerResourceManager().getResourceManager();
-            return mount.exists("") ? mount : null;
+            ResourceMount mount = ResourceMount.get( domain, subPath, manager );
+            return mount.exists( "" ) ? mount : null;
         }
         return null;
     }
 
     @Override
-    public void registerPeripheralProvider(@Nonnull IPeripheralProvider provider) {
+    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-        Peripherals.register(provider);
+    {
+        Peripherals.register( provider );
     }
 
     @Override
-    public void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade) {
+    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-        TurtleUpgrades.register(upgrade);
+    {
+        TurtleUpgrades.register( upgrade );
     }
 
     @Override
-    public void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider) {
+    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-        BundledRedstone.register(provider);
+    {
+        BundledRedstone.register( provider );
     }
 
     @Override
-    public int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+    public int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
-        return BundledRedstone.getDefaultOutput(world, pos, side);
+    {
+        return BundledRedstone.getDefaultOutput( world, pos, side );
     }
 
     @Override
-    public void registerMediaProvider(@Nonnull IMediaProvider provider) {
+    public void registerMediaProvider( @Nonnull IMediaProvider provider )
-        MediaProviders.register(provider);
+    {
+        MediaProviders.register( provider );
     }
 
     @Override
-    public void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-        PocketUpgrades.register(upgrade);
+    {
+        PocketUpgrades.register( upgrade );
     }
 
     @Override
@@ -153,28 +168,35 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
 
     @Nonnull
     @Override
-    public IPacketNetwork getWirelessNetwork() {
+    public IPacketNetwork getWirelessNetwork()
+    {
         return WirelessNetwork.getUniversal();
     }
 
     @Override
-    public void registerAPIFactory(@Nonnull ILuaAPIFactory factory) {
+    public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-        ApiFactories.register(factory);
+    {
+        ApiFactories.register( factory );
     }
 
     @Nonnull
     @Override
-    public IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element) {
+    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-        return new WiredNode(element);
+    {
+        return new WiredNode( element );
     }
 
     @Nullable
     @Override
-    public IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+    public IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side )
-        BlockEntity tile = world.getBlockEntity(pos);
+    {
-        if (tile instanceof TileCable) {
+        BlockEntity tile = world.getBlockEntity( pos );
-            return ((TileCable) tile).getElement(side);
+        if( tile instanceof TileCable )
-        } else if (tile instanceof TileWiredModemFull) {
+        {
+            return ((TileCable) tile).getElement( side );
+        }
+        else if( tile instanceof TileWiredModemFull )
+        {
             return ((TileWiredModemFull) tile).getElement();
         }
         return null;

src/main/java/dan200/computercraft/api/ComputerCraftAPI.java

@@ -6,9 +6,6 @@
 
 package dan200.computercraft.api;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.lua.GenericSource;
@@ -24,43 +21,53 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * The static entry point to the ComputerCraft API.
  *
  * Members in this class must be called after mod_ComputerCraft has been initialised, but may be called before it is fully loaded.
  */
-public final class ComputerCraftAPI {
+public final class ComputerCraftAPI
+{
     private static IComputerCraftAPI instance;
 
     @Nonnull
     @Deprecated
-    public static String getAPIVersion() {
+    public static String getAPIVersion()
+    {
         return getInstalledVersion();
     }
 
     @Nonnull
-    public static String getInstalledVersion() {
+    public static String getInstalledVersion()
+    {
         return getInstance().getInstalledVersion();
     }
 
     @Nonnull
-    private static IComputerCraftAPI getInstance() {
+    private static IComputerCraftAPI getInstance()
-        if (instance != null) {
+    {
+        if( instance != null )
+        {
             return instance;
         }
 
-        try {
+        try
-            return instance = (IComputerCraftAPI) Class.forName("dan200.computercraft.ComputerCraftAPIImpl")
+        {
-                                                       .getField("INSTANCE")
+            return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
-                                                       .get(null);
+                .getField( "INSTANCE" )
-        } catch (ReflectiveOperationException e) {
+                .get( null );
-            throw new IllegalStateException("Cannot find ComputerCraft API", e);
+        }
+        catch( ReflectiveOperationException e )
+        {
+            throw new IllegalStateException( "Cannot find ComputerCraft API", e );
         }
     }
 
@@ -69,15 +76,16 @@ public final class ComputerCraftAPI {
      *
      * Use in conjunction with createSaveDirMount() to create a unique place for your peripherals or media items to store files.
      *
-     * @param world The world for which the save dir should be created. This should be the server side world object.
+     * @param world         The world for which the save dir should be created. This should be the server side world object.
      * @param parentSubPath The folder path within the save directory where the new directory should be created. eg: "computercraft/disk"
      * @return The numerical value of the name of the new folder, or -1 if the folder could not be created for some reason.
      *
-     *     eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now available for writing.
+     * eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now available for writing.
      * @see #createSaveDirMount(World, String, long)
      */
-    public static int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath) {
+    public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
-        return getInstance().createUniqueNumberedSaveDir(world, parentSubPath);
+    {
+        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
     }
 
     /**
@@ -86,12 +94,12 @@ public final class ComputerCraftAPI {
      * Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a folder from the users save directory onto a computers
      * file system.
      *
-     * @param world The world for which the save dir can be found. This should be the server side world object.
+     * @param world    The world for which the save dir can be found. This should be the server side world object.
-     * @param subPath The folder path within the save directory that the mount should map to. eg: "computer/disk/42". Use createUniqueNumberedSaveDir()
+     * @param subPath  The folder path within the save directory that the mount should map to. eg: "computer/disk/42". Use createUniqueNumberedSaveDir()
-     *     to create a new numbered folder to use.
+     *                 to create a new numbered folder to use.
      * @param capacity The amount of data that can be stored in the directory before it fills up, in bytes.
      * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable() to mount this on a
-     *     Computers' file system.
+     * Computers' file system.
      * @see #createUniqueNumberedSaveDir(World, String)
      * @see IComputerAccess#mount(String, IMount)
      * @see IComputerAccess#mountWritable(String, IWritableMount)
@@ -99,8 +107,9 @@ public final class ComputerCraftAPI {
      * @see IWritableMount
      */
     @Nullable
-    public static IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity) {
+    public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
-        return getInstance().createSaveDirMount(world, subPath, capacity);
+    {
+        return getInstance().createSaveDirMount( world, subPath, capacity );
     }
 
     /**
@@ -114,7 +123,7 @@ public final class ComputerCraftAPI {
      * "/data/computercraft/lua/rom". We construct a mount for that with
      * {@code createResourceMount("computercraft", "lua/rom")}.
      *
-     * @param domain The domain under which to look for resources. eg: "mymod".
+     * @param domain  The domain under which to look for resources. eg: "mymod".
      * @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
      * @return The mount, or {@code null} if it could be created for some reason.
      * @see IComputerAccess#mount(String, IMount)
@@ -122,8 +131,9 @@ public final class ComputerCraftAPI {
      * @see IMount
      */
     @Nullable
-    public static IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath) {
+    public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
-        return getInstance().createResourceMount(domain, subPath);
+    {
+        return getInstance().createResourceMount( domain, subPath );
     }
 
     /**
@@ -133,8 +143,9 @@ public final class ComputerCraftAPI {
      * @see IPeripheral
      * @see IPeripheralProvider
      */
-    public static void registerPeripheralProvider(@Nonnull IPeripheralProvider provider) {
+    public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-        getInstance().registerPeripheralProvider(provider);
+    {
+        getInstance().registerPeripheralProvider( provider );
     }
 
     /**
@@ -155,8 +166,9 @@ public final class ComputerCraftAPI {
      * @param upgrade The turtle upgrade to register.
      * @see ITurtleUpgrade
      */
-    public static void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade) {
+    public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-        getInstance().registerTurtleUpgrade(upgrade);
+    {
+        getInstance().registerTurtleUpgrade( upgrade );
     }
 
     /**
@@ -165,22 +177,24 @@ public final class ComputerCraftAPI {
      * @param provider The bundled redstone provider to register.
      * @see IBundledRedstoneProvider
      */
-    public static void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider) {
+    public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-        getInstance().registerBundledRedstoneProvider(provider);
+    {
+        getInstance().registerBundledRedstoneProvider( provider );
     }
 
     /**
      * If there is a Computer or Turtle at a certain position in the world, get it's bundled redstone output.
      *
      * @param world The world this block is in.
-     * @param pos The position this block is at.
+     * @param pos   The position this block is at.
-     * @param side The side to extract the bundled redstone output from.
+     * @param side  The side to extract the bundled redstone output from.
      * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned. If there is no block
-     *     capable of emitting bundled redstone at the location, -1 will be returned.
+     * capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side )
-        return getInstance().getBundledRedstoneOutput(world, pos, side);
+    {
+        return getInstance().getBundledRedstoneOutput( world, pos, side );
     }
 
     /**
@@ -189,12 +203,14 @@ public final class ComputerCraftAPI {
      * @param provider The media provider to register.
      * @see IMediaProvider
      */
-    public static void registerMediaProvider(@Nonnull IMediaProvider provider) {
+    public static void registerMediaProvider( @Nonnull IMediaProvider provider )
-        getInstance().registerMediaProvider(provider);
+    {
+        getInstance().registerMediaProvider( provider );
     }
 
-    public static void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-        getInstance().registerPocketUpgrade(upgrade);
+    {
+        getInstance().registerPocketUpgrade( upgrade );
     }
 
     /**
@@ -202,12 +218,14 @@ public final class ComputerCraftAPI {
      *
      * @return The global wireless network, or {@code null} if it could not be fetched.
      */
-    public static IPacketNetwork getWirelessNetwork() {
+    public static IPacketNetwork getWirelessNetwork()
+    {
         return getInstance().getWirelessNetwork();
     }
 
-    public static void registerAPIFactory(@Nonnull ILuaAPIFactory factory) {
+    public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-        getInstance().registerAPIFactory(factory);
+    {
+        getInstance().registerAPIFactory( factory );
     }
 
     /**
@@ -218,59 +236,62 @@ public final class ComputerCraftAPI {
      * @see IWiredElement#getNode()
      */
     @Nonnull
-    public static IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element) {
+    public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-        return getInstance().createWiredNodeForElement(element);
+    {
+        return getInstance().createWiredNodeForElement( element );
     }
 
     /**
      * Get the wired network element for a block in world.
      *
      * @param world The world the block exists in
-     * @param pos The position the block exists in
+     * @param pos   The position the block exists in
-     * @param side The side to extract the network element from
+     * @param side  The side to extract the network element from
      * @return The element's node
      * @see IWiredElement#getNode()
      */
     @Nullable
-    public static IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side) {
+    public static IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side )
-        return getInstance().getWiredElementAt(world, pos, side);
+    {
+        return getInstance().getWiredElementAt( world, pos, side );
     }
 
-    public interface IComputerCraftAPI {
+    public interface IComputerCraftAPI
+    {
         @Nonnull
         String getInstalledVersion();
 
-        int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath);
+        int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath );
 
         @Nullable
-        IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity);
+        IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity );
 
         @Nullable
-        IMount createResourceMount(@Nonnull String domain, @Nonnull String subPath);
+        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
 
-        void registerPeripheralProvider(@Nonnull IPeripheralProvider provider);
+        void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
 
         void registerGenericSource( @Nonnull GenericSource source );
 
-        void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade);
+        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
 
-        void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider);
+        void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
 
-        int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
+        int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
 
-        void registerMediaProvider(@Nonnull IMediaProvider provider);
+        void registerMediaProvider( @Nonnull IMediaProvider provider );
 
-        void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade);
+        void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
 
         @Nonnull
         IPacketNetwork getWirelessNetwork();
 
-        void registerAPIFactory(@Nonnull ILuaAPIFactory factory);
+        void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
 
         @Nonnull
-        IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element);
+        IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
 
         @Nullable
-        IWiredElement getWiredElementAt(@Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side);
+        IWiredElement getWiredElementAt( @Nonnull BlockView world, @Nonnull BlockPos pos, @Nonnull Direction side );
     }
 }

src/main/java/dan200/computercraft/api/client/TransformedModel.java

@@ -6,12 +6,9 @@
 
 package dan200.computercraft.api.client;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.fabric.mixin.AffineTransformationAccess;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedModelManager;
@@ -20,64 +17,78 @@ import net.minecraft.client.util.math.AffineTransformation;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 
-import net.fabricmc.api.EnvType;
+import javax.annotation.Nonnull;
-import net.fabricmc.api.Environment;
+import java.util.Objects;
 
 /**
  * A model to render, combined with a transformation matrix to apply.
  */
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public final class TransformedModel {
+public final class TransformedModel
+{
     private final BakedModel model;
     private final AffineTransformation matrix;
 
-    public TransformedModel(@Nonnull BakedModel model, @Nonnull AffineTransformation matrix) {
+    public TransformedModel( @Nonnull BakedModel model, @Nonnull AffineTransformation matrix )
-        this.model = Objects.requireNonNull(model);
+    {
-        this.matrix = Objects.requireNonNull(matrix);
+        this.model = Objects.requireNonNull( model );
+        this.matrix = Objects.requireNonNull( matrix );
     }
 
-    public TransformedModel(@Nonnull BakedModel model) {
+    public TransformedModel( @Nonnull BakedModel model )
-        this.model = Objects.requireNonNull(model);
+    {
+        this.model = Objects.requireNonNull( model );
         this.matrix = AffineTransformation.identity();
     }
 
-    public static TransformedModel of(@Nonnull ModelIdentifier location) {
+    public static TransformedModel of( @Nonnull ModelIdentifier location )
+    {
         BakedModelManager modelManager = MinecraftClient.getInstance()
-                                                        .getBakedModelManager();
+            .getBakedModelManager();
-        return new TransformedModel(modelManager.getModel(location));
+        return new TransformedModel( modelManager.getModel( location ) );
     }
 
-    public static TransformedModel of(@Nonnull ItemStack item, @Nonnull AffineTransformation transform) {
+    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull AffineTransformation transform )
+    {
         BakedModel model = MinecraftClient.getInstance()
-                                          .getItemRenderer()
+            .getItemRenderer()
-                                          .getModels()
+            .getModels()
-                                          .getModel(item);
+            .getModel( item );
-        return new TransformedModel(model, transform);
+        return new TransformedModel( model, transform );
     }
 
     @Nonnull
-    public BakedModel getModel() {
+    public BakedModel getModel()
+    {
         return this.model;
     }
 
     @Nonnull
-    public AffineTransformation getMatrix() {
+    public AffineTransformation getMatrix()
+    {
         return this.matrix;
     }
 
-    public void push(MatrixStack matrixStack) {
+    public void push( MatrixStack matrixStack )
+    {
         matrixStack.push();
 
         AffineTransformationAccess access = (AffineTransformationAccess) (Object) this.matrix;
-        if (access.getTranslation() != null)
+        if( access.getTranslation() != null )
-            matrixStack.translate(access.getTranslation().getX(), access.getTranslation().getY(), access.getTranslation().getZ());
+        {
+            matrixStack.translate( access.getTranslation().getX(), access.getTranslation().getY(), access.getTranslation().getZ() );
+        }
 
-        matrixStack.multiply(this.matrix.getRotation2());
+        matrixStack.multiply( this.matrix.getRotation2() );
 
-        if (access.getScale() != null)
+        if( access.getScale() != null )
-            matrixStack.scale(access.getScale().getX(), access.getScale().getY(), access.getScale().getZ());
+        {
+            matrixStack.scale( access.getScale().getX(), access.getScale().getY(), access.getScale().getZ() );
+        }
 
-        if (access.getRotation1() != null)
+        if( access.getRotation1() != null )
-            matrixStack.multiply(access.getRotation1());
+        {
+            matrixStack.multiply( access.getRotation1() );
+        }
     }
 }

src/main/java/dan200/computercraft/api/filesystem/FileAttributes.java

@@ -13,59 +13,70 @@ import java.time.Instant;
 /**
  * A simple version of {@link BasicFileAttributes}, which provides what information a {@link IMount} already exposes.
  */
-final class FileAttributes implements BasicFileAttributes {
+final class FileAttributes implements BasicFileAttributes
-    private static final FileTime EPOCH = FileTime.from(Instant.EPOCH);
+{
+    private static final FileTime EPOCH = FileTime.from( Instant.EPOCH );
 
     private final boolean isDirectory;
     private final long size;
 
-    FileAttributes(boolean isDirectory, long size) {
+    FileAttributes( boolean isDirectory, long size )
+    {
         this.isDirectory = isDirectory;
         this.size = size;
     }
 
     @Override
-    public FileTime lastModifiedTime() {
+    public FileTime lastModifiedTime()
+    {
         return EPOCH;
     }
 
     @Override
-    public FileTime lastAccessTime() {
+    public FileTime lastAccessTime()
+    {
         return EPOCH;
     }
 
     @Override
-    public FileTime creationTime() {
+    public FileTime creationTime()
+    {
         return EPOCH;
     }
 
     @Override
-    public boolean isRegularFile() {
+    public boolean isRegularFile()
+    {
         return !this.isDirectory;
     }
 
     @Override
-    public boolean isDirectory() {
+    public boolean isDirectory()
+    {
         return this.isDirectory;
     }
 
     @Override
-    public boolean isSymbolicLink() {
+    public boolean isSymbolicLink()
+    {
         return false;
     }
 
     @Override
-    public boolean isOther() {
+    public boolean isOther()
+    {
         return false;
     }
 
     @Override
-    public long size() {
+    public long size()
+    {
         return this.size;
     }
 
     @Override
-    public Object fileKey() {
+    public Object fileKey()
+    {
         return null;
     }
 }

src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java

@@ -6,34 +6,37 @@
 
 package dan200.computercraft.api.filesystem;
 
-import java.io.IOException;
-import java.util.Objects;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.io.IOException;
+import java.util.Objects;
 
 /**
  * An {@link IOException} which occurred on a specific file.
  *
  * This may be thrown from a {@link IMount} or {@link IWritableMount} to give more information about a failure.
  */
-public class FileOperationException extends IOException {
+public class FileOperationException extends IOException
+{
     private static final long serialVersionUID = -8809108200853029849L;
 
     private final String filename;
 
-    public FileOperationException(@Nullable String filename, @Nonnull String message) {
+    public FileOperationException( @Nullable String filename, @Nonnull String message )
-        super(Objects.requireNonNull(message, "message cannot be null"));
+    {
+        super( Objects.requireNonNull( message, "message cannot be null" ) );
         this.filename = filename;
     }
 
-    public FileOperationException(@Nonnull String message) {
+    public FileOperationException( @Nonnull String message )
-        super(Objects.requireNonNull(message, "message cannot be null"));
+    {
+        super( Objects.requireNonNull( message, "message cannot be null" ) );
         this.filename = null;
     }
 
     @Nullable
-    public String getFilename() {
+    public String getFilename()
+    {
         return this.filename;
     }
 }

src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java

@@ -13,31 +13,32 @@ import java.io.IOException;
  *
  * This exists for use by various APIs - one should not attempt to mount it.
  */
-public interface IFileSystem extends IWritableMount {
+public interface IFileSystem extends IWritableMount
+{
     /**
      * Combine two paths together, reducing them into a normalised form.
      *
-     * @param path The main path.
+     * @param path  The main path.
      * @param child The path to append.
      * @return The combined, normalised path.
      */
-    String combine(String path, String child);
+    String combine( String path, String child );
 
     /**
      * Copy files from one location to another.
      *
      * @param from The location to copy from.
-     * @param to The location to copy to. This should not exist.
+     * @param to   The location to copy to. This should not exist.
      * @throws IOException If the copy failed.
      */
-    void copy(String from, String to) throws IOException;
+    void copy( String from, String to ) throws IOException;
 
     /**
      * Move files from one location to another.
      *
      * @param from The location to move from.
-     * @param to The location to move to. This should not exist.
+     * @param to   The location to move to. This should not exist.
      * @throws IOException If the move failed.
      */
-    void move(String from, String to) throws IOException;
+    void move( String from, String to ) throws IOException;
 }

src/main/java/dan200/computercraft/api/filesystem/IMount.java

@@ -6,18 +6,16 @@
 
 package dan200.computercraft.api.filesystem;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import net.minecraft.world.World;
+
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
 
-import javax.annotation.Nonnull;
-
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-
-import net.minecraft.world.World;
-
 /**
  * Represents a read only part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)}.
  *
@@ -29,26 +27,27 @@ import net.minecraft.world.World;
  * @see IComputerAccess#mount(String, IMount)
  * @see IWritableMount
  */
-public interface IMount {
+public interface IMount
+{
     /**
      * Returns the file names of all the files in a directory.
      *
-     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
+     * @param path     A file path in normalised format, relative to the mount location. ie: "programs/myprograms".
      * @param contents A list of strings. Add all the file names to this list.
      * @throws IOException If the file was not a directory, or could not be listed.
      */
-    void list(@Nonnull String path, @Nonnull List<String> contents) throws IOException;
+    void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link ReadableByteChannel} representing its contents.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
      * @return A channel representing the contents of the file. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to
-     *     seek to arbitrary positions when using binary mode.
+     * seek to arbitrary positions when using binary mode.
      * @throws IOException If the file does not exist, or could not be opened.
      */
     @Nonnull
-    ReadableByteChannel openForRead(@Nonnull String path) throws IOException;
+    ReadableByteChannel openForRead( @Nonnull String path ) throws IOException;
 
     /**
      * Get attributes about the given file.
@@ -58,11 +57,13 @@ public interface IMount {
      * @throws IOException If the file does not exist, or attributes could not be fetched.
      */
     @Nonnull
-    default BasicFileAttributes getAttributes(@Nonnull String path) throws IOException {
+    default BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
-        if (!this.exists(path)) {
+    {
-            throw new FileOperationException(path, "No such file");
+        if( !this.exists( path ) )
+        {
+            throw new FileOperationException( path, "No such file" );
         }
-        return new FileAttributes(this.isDirectory(path), this.getSize(path));
+        return new FileAttributes( this.isDirectory( path ), this.getSize( path ) );
     }
 
     /**
@@ -72,7 +73,7 @@ public interface IMount {
      * @return If the file exists.
      * @throws IOException If an error occurs when checking the existence of the file.
      */
-    boolean exists(@Nonnull String path) throws IOException;
+    boolean exists( @Nonnull String path ) throws IOException;
 
     /**
      * Returns whether a file with a given path is a directory or not.
@@ -81,7 +82,7 @@ public interface IMount {
      * @return If the file exists and is a directory
      * @throws IOException If an error occurs when checking whether the file is a directory.
      */
-    boolean isDirectory(@Nonnull String path) throws IOException;
+    boolean isDirectory( @Nonnull String path ) throws IOException;
 
     /**
      * Returns the size of a file with a given path, in bytes.
@@ -90,5 +91,5 @@ public interface IMount {
      * @return The size of the file, in bytes.
      * @throws IOException If the file does not exist, or its size could not be determined.
      */
-    long getSize(@Nonnull String path) throws IOException;
+    long getSize( @Nonnull String path ) throws IOException;
 }

src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java

@@ -6,18 +6,16 @@
 
 package dan200.computercraft.api.filesystem;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+import dan200.computercraft.api.peripheral.IComputerAccess;
+import net.minecraft.world.World;
+
+import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.channels.WritableByteChannel;
 import java.util.OptionalLong;
 
-import javax.annotation.Nonnull;
-
-import dan200.computercraft.api.ComputerCraftAPI;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-
-import net.minecraft.world.World;
-
 /**
  * Represents a part of a virtual filesystem that can be mounted onto a computer using {@link IComputerAccess#mount(String, IMount)} or {@link
  * IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
@@ -30,14 +28,15 @@ import net.minecraft.world.World;
  * @see IComputerAccess#mountWritable(String, IWritableMount)
  * @see IMount
  */
-public interface IWritableMount extends IMount {
+public interface IWritableMount extends IMount
+{
     /**
      * Creates a directory at a given path inside the virtual file system.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/mynewprograms".
      * @throws IOException If the directory already exists or could not be created.
      */
-    void makeDirectory(@Nonnull String path) throws IOException;
+    void makeDirectory( @Nonnull String path ) throws IOException;
 
     /**
      * Deletes a directory at a given path inside the virtual file system.
@@ -45,29 +44,29 @@ public interface IWritableMount extends IMount {
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myoldprograms".
      * @throws IOException If the file does not exist or could not be deleted.
      */
-    void delete(@Nonnull String path) throws IOException;
+    void delete( @Nonnull String path ) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for writing to it.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
      * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
-     *     positions when using binary mode.
+     * positions when using binary mode.
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForWrite(@Nonnull String path) throws IOException;
+    WritableByteChannel openForWrite( @Nonnull String path ) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for appending to it.
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
      * @return A stream for writing to. If the channel implements {@link java.nio.channels.SeekableByteChannel}, one will be able to seek to arbitrary
-     *     positions when using binary mode.
+     * positions when using binary mode.
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForAppend(@Nonnull String path) throws IOException;
+    WritableByteChannel openForAppend( @Nonnull String path ) throws IOException;
 
     /**
      * Get the amount of free space on the mount, in bytes. You should decrease this value as the user writes to the mount, and write operations should fail
@@ -84,7 +83,8 @@ public interface IWritableMount extends IMount {
      * @return The capacity of this mount, in bytes.
      */
     @Nonnull
-    default OptionalLong getCapacity() {
+    default OptionalLong getCapacity()
+    {
         return OptionalLong.empty();
     }
 }

src/main/java/dan200/computercraft/api/lua/IArguments.java

@@ -6,19 +6,19 @@
 
 package dan200.computercraft.api.lua;
 
-import static dan200.computercraft.api.lua.LuaValues.checkFinite;
+import javax.annotation.Nonnull;
-
+import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Optional;
 
-import javax.annotation.Nonnull;
+import static dan200.computercraft.api.lua.LuaValues.checkFinite;
-import javax.annotation.Nullable;
 
 /**
  * The arguments passed to a function.
  */
-public interface IArguments {
+public interface IArguments
+{
     /**
      * Drop a number of arguments. The returned arguments instance will access arguments at position {@code i + count}, rather than {@code i}. However,
      * errors will still use the given argument index.
@@ -26,12 +26,14 @@ public interface IArguments {
      * @param count The number of arguments to drop.
      * @return The new {@link IArguments} instance.
      */
-    IArguments drop(int count);
+    IArguments drop( int count );
 
-    default Object[] getAll() {
+    default Object[] getAll()
+    {
         Object[] result = new Object[this.count()];
-        for (int i = 0; i < result.length; i++) {
+        for( int i = 0; i < result.length; i++ )
-            result[i] = this.get(i);
+        {
+            result[i] = this.get( i );
         }
         return result;
     }
@@ -58,7 +60,7 @@ public interface IArguments {
      * @return The argument's value, or {@code null} if not present.
      */
     @Nullable
-    Object get(int index);
+    Object get( int index );
 
     /**
      * Get an argument as an integer.
@@ -67,8 +69,9 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not an integer.
      */
-    default int getInt(int index) throws LuaException {
+    default int getInt( int index ) throws LuaException
-        return (int) this.getLong(index);
+    {
+        return (int) this.getLong( index );
     }
 
     /**
@@ -78,13 +81,15 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not a long.
      */
-    default long getLong(int index) throws LuaException {
+    default long getLong( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (!(value instanceof Number)) {
+        Object value = this.get( index );
-            throw LuaValues.badArgumentOf(index, "number", value);
+        if( !(value instanceof Number) )
+        {
+            throw LuaValues.badArgumentOf( index, "number", value );
         }
-        return LuaValues.checkFiniteNum(index, (Number) value)
+        return LuaValues.checkFiniteNum( index, (Number) value )
-                        .longValue();
+            .longValue();
     }
 
     /**
@@ -94,8 +99,9 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not finite.
      */
-    default double getFiniteDouble(int index) throws LuaException {
+    default double getFiniteDouble( int index ) throws LuaException
-        return checkFinite(index, this.getDouble(index));
+    {
+        return checkFinite( index, this.getDouble( index ) );
     }
 
     /**
@@ -106,10 +112,12 @@ public interface IArguments {
      * @throws LuaException If the value is not a number.
      * @see #getFiniteDouble(int) if you require this to be finite (i.e. not infinite or NaN).
      */
-    default double getDouble(int index) throws LuaException {
+    default double getDouble( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (!(value instanceof Number)) {
+        Object value = this.get( index );
-            throw LuaValues.badArgumentOf(index, "number", value);
+        if( !(value instanceof Number) )
+        {
+            throw LuaValues.badArgumentOf( index, "number", value );
         }
         return ((Number) value).doubleValue();
     }
@@ -121,10 +129,12 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not a boolean.
      */
-    default boolean getBoolean(int index) throws LuaException {
+    default boolean getBoolean( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (!(value instanceof Boolean)) {
+        Object value = this.get( index );
-            throw LuaValues.badArgumentOf(index, "boolean", value);
+        if( !(value instanceof Boolean) )
+        {
+            throw LuaValues.badArgumentOf( index, "boolean", value );
         }
         return (Boolean) value;
     }
@@ -137,8 +147,9 @@ public interface IArguments {
      * @throws LuaException If the value is not a string.
      */
     @Nonnull
-    default ByteBuffer getBytes(int index) throws LuaException {
+    default ByteBuffer getBytes( int index ) throws LuaException
-        return LuaValues.encode(this.getString(index));
+    {
+        return LuaValues.encode( this.getString( index ) );
     }
 
     /**
@@ -149,10 +160,12 @@ public interface IArguments {
      * @throws LuaException If the value is not a string.
      */
     @Nonnull
-    default String getString(int index) throws LuaException {
+    default String getString( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (!(value instanceof String)) {
+        Object value = this.get( index );
-            throw LuaValues.badArgumentOf(index, "string", value);
+        if( !(value instanceof String) )
+        {
+            throw LuaValues.badArgumentOf( index, "string", value );
         }
         return (String) value;
     }
@@ -162,13 +175,14 @@ public interface IArguments {
      *
      * @param index The argument number.
      * @param klass The type of enum to parse.
-     * @param <T> The type of enum to parse.
+     * @param <T>   The type of enum to parse.
      * @return The argument's value.
      * @throws LuaException If the value is not a string or not a valid option for this enum.
      */
     @Nonnull
-    default <T extends Enum<T>> T getEnum(int index, Class<T> klass) throws LuaException {
+    default <T extends Enum<T>> T getEnum( int index, Class<T> klass ) throws LuaException
-        return LuaValues.checkEnum(index, klass, this.getString(index));
+    {
+        return LuaValues.checkEnum( index, klass, this.getString( index ) );
     }
 
     /**
@@ -179,10 +193,12 @@ public interface IArguments {
      * @throws LuaException If the value is not a table.
      */
     @Nonnull
-    default Map<?, ?> getTable(int index) throws LuaException {
+    default Map<?, ?> getTable( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (!(value instanceof Map)) {
+        Object value = this.get( index );
-            throw LuaValues.badArgumentOf(index, "table", value);
+        if( !(value instanceof Map) )
+        {
+            throw LuaValues.badArgumentOf( index, "table", value );
         }
         return (Map<?, ?>) value;
     }
@@ -194,8 +210,9 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present. This is a <em>read only</em> buffer.
      * @throws LuaException If the value is not a string.
      */
-    default Optional<ByteBuffer> optBytes(int index) throws LuaException {
+    default Optional<ByteBuffer> optBytes( int index ) throws LuaException
-        return this.optString(index).map(LuaValues::encode);
+    {
+        return this.optString( index ).map( LuaValues::encode );
     }
 
     /**
@@ -205,15 +222,18 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not a string.
      */
-    default Optional<String> optString(int index) throws LuaException {
+    default Optional<String> optString( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (value == null) {
+        Object value = this.get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof String)) {
+        if( !(value instanceof String) )
-            throw LuaValues.badArgumentOf(index, "string", value);
+        {
+            throw LuaValues.badArgumentOf( index, "string", value );
         }
-        return Optional.of((String) value);
+        return Optional.of( (String) value );
     }
 
     /**
@@ -221,26 +241,28 @@ public interface IArguments {
      *
      * @param index The argument number.
      * @param klass The type of enum to parse.
-     * @param <T> The type of enum to parse.
+     * @param <T>   The type of enum to parse.
      * @return The argument's value.
      * @throws LuaException If the value is not a string or not a valid option for this enum.
      */
     @Nonnull
-    default <T extends Enum<T>> Optional<T> optEnum(int index, Class<T> klass) throws LuaException {
+    default <T extends Enum<T>> Optional<T> optEnum( int index, Class<T> klass ) throws LuaException
-        Optional<String> str = this.optString(index);
+    {
-        return str.isPresent() ? Optional.of(LuaValues.checkEnum(index, klass, str.get())) : Optional.empty();
+        Optional<String> str = this.optString( index );
+        return str.isPresent() ? Optional.of( LuaValues.checkEnum( index, klass, str.get() ) ) : Optional.empty();
     }
 
     /**
      * Get an argument as a double.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a number.
      */
-    default double optDouble(int index, double def) throws LuaException {
+    default double optDouble( int index, double def ) throws LuaException
-        return this.optDouble(index).orElse(def);
+    {
+        return this.optDouble( index ).orElse( def );
     }
 
     /**
@@ -251,27 +273,31 @@ public interface IArguments {
      * @throws LuaException If the value is not a number.
      */
     @Nonnull
-    default Optional<Double> optDouble(int index) throws LuaException {
+    default Optional<Double> optDouble( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (value == null) {
+        Object value = this.get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Number)) {
+        if( !(value instanceof Number) )
-            throw LuaValues.badArgumentOf(index, "number", value);
+        {
+            throw LuaValues.badArgumentOf( index, "number", value );
         }
-        return Optional.of(((Number) value).doubleValue());
+        return Optional.of( ((Number) value).doubleValue() );
     }
 
     /**
      * Get an argument as an int.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a number.
      */
-    default int optInt(int index, int def) throws LuaException {
+    default int optInt( int index, int def ) throws LuaException
-        return this.optInt(index).orElse(def);
+    {
+        return this.optInt( index ).orElse( def );
     }
 
     /**
@@ -282,8 +308,9 @@ public interface IArguments {
      * @throws LuaException If the value is not a number.
      */
     @Nonnull
-    default Optional<Integer> optInt(int index) throws LuaException {
+    default Optional<Integer> optInt( int index ) throws LuaException
-        return this.optLong(index).map(Long::intValue);
+    {
+        return this.optLong( index ).map( Long::intValue );
     }
 
     /**
@@ -293,40 +320,45 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not a number.
      */
-    default Optional<Long> optLong(int index) throws LuaException {
+    default Optional<Long> optLong( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (value == null) {
+        Object value = this.get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Number)) {
+        if( !(value instanceof Number) )
-            throw LuaValues.badArgumentOf(index, "number", value);
+        {
+            throw LuaValues.badArgumentOf( index, "number", value );
         }
-        return Optional.of(LuaValues.checkFiniteNum(index, (Number) value)
+        return Optional.of( LuaValues.checkFiniteNum( index, (Number) value )
-                                    .longValue());
+            .longValue() );
     }
 
     /**
      * Get an argument as a long.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a number.
      */
-    default long optLong(int index, long def) throws LuaException {
+    default long optLong( int index, long def ) throws LuaException
-        return this.optLong(index).orElse(def);
+    {
+        return this.optLong( index ).orElse( def );
     }
 
     /**
      * Get an argument as a finite number (not infinite or NaN).
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not finite.
      */
-    default double optFiniteDouble(int index, double def) throws LuaException {
+    default double optFiniteDouble( int index, double def ) throws LuaException
-        return this.optFiniteDouble(index).orElse(def);
+    {
+        return this.optFiniteDouble( index ).orElse( def );
     }
 
     /**
@@ -336,10 +368,12 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not finite.
      */
-    default Optional<Double> optFiniteDouble(int index) throws LuaException {
+    default Optional<Double> optFiniteDouble( int index ) throws LuaException
-        Optional<Double> value = this.optDouble(index);
+    {
-        if (value.isPresent()) {
+        Optional<Double> value = this.optDouble( index );
-            LuaValues.checkFiniteNum(index, value.get());
+        if( value.isPresent() )
+        {
+            LuaValues.checkFiniteNum( index, value.get() );
         }
         return value;
     }
@@ -348,12 +382,13 @@ public interface IArguments {
      * Get an argument as a boolean.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a boolean.
      */
-    default boolean optBoolean(int index, boolean def) throws LuaException {
+    default boolean optBoolean( int index, boolean def ) throws LuaException
-        return this.optBoolean(index).orElse(def);
+    {
+        return this.optBoolean( index ).orElse( def );
     }
 
     /**
@@ -363,39 +398,44 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not a boolean.
      */
-    default Optional<Boolean> optBoolean(int index) throws LuaException {
+    default Optional<Boolean> optBoolean( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (value == null) {
+        Object value = this.get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Boolean)) {
+        if( !(value instanceof Boolean) )
-            throw LuaValues.badArgumentOf(index, "boolean", value);
+        {
+            throw LuaValues.badArgumentOf( index, "boolean", value );
         }
-        return Optional.of((Boolean) value);
+        return Optional.of( (Boolean) value );
     }
 
     /**
      * Get an argument as a string.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a string.
      */
-    default String optString(int index, String def) throws LuaException {
+    default String optString( int index, String def ) throws LuaException
-        return this.optString(index).orElse(def);
+    {
+        return this.optString( index ).orElse( def );
     }
 
     /**
      * Get an argument as a table.
      *
      * @param index The argument number.
-     * @param def The default value, if this argument is not given.
+     * @param def   The default value, if this argument is not given.
      * @return The argument's value, or {@code def} if none was provided.
      * @throws LuaException If the value is not a table.
      */
-    default Map<?, ?> optTable(int index, Map<Object, Object> def) throws LuaException {
+    default Map<?, ?> optTable( int index, Map<Object, Object> def ) throws LuaException
-        return this.optTable(index).orElse(def);
+    {
+        return this.optTable( index ).orElse( def );
     }
 
     /**
@@ -405,14 +445,17 @@ public interface IArguments {
      * @return The argument's value, or {@link Optional#empty()} if not present.
      * @throws LuaException If the value is not a table.
      */
-    default Optional<Map<?, ?>> optTable(int index) throws LuaException {
+    default Optional<Map<?, ?>> optTable( int index ) throws LuaException
-        Object value = this.get(index);
+    {
-        if (value == null) {
+        Object value = this.get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Map)) {
+        if( !(value instanceof Map) )
-            throw LuaValues.badArgumentOf(index, "map", value);
+        {
+            throw LuaValues.badArgumentOf( index, "map", value );
         }
-        return Optional.of((Map<?, ?>) value);
+        return Optional.of( (Map<?, ?>) value );
     }
 }

src/main/java/dan200/computercraft/api/lua/IComputerSystem.java

@@ -6,15 +6,16 @@
 
 package dan200.computercraft.api.lua;
 
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.filesystem.IFileSystem;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 
+import javax.annotation.Nullable;
+
 /**
  * An interface passed to {@link ILuaAPIFactory} in order to provide additional information about a computer.
  */
-public interface IComputerSystem extends IComputerAccess {
+public interface IComputerSystem extends IComputerAccess
+{
     /**
      * Get the file system for this computer.
      *

src/main/java/dan200/computercraft/api/lua/IDynamicLuaObject.java

@@ -6,17 +6,18 @@
 
 package dan200.computercraft.api.lua;
 
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.peripheral.IDynamicPeripheral;
 
+import javax.annotation.Nonnull;
+
 /**
  * An interface for representing custom objects returned by peripherals or other Lua objects.
  *
  * Generally, one does not need to implement this type - it is sufficient to return an object with some methods annotated with {@link LuaFunction}. {@link
  * IDynamicLuaObject} is useful when you wish your available methods to change at runtime.
  */
-public interface IDynamicLuaObject {
+public interface IDynamicLuaObject
+{
     /**
      * Get the names of the methods that this object implements. This should not change over the course of the object's lifetime.
      *
@@ -29,12 +30,12 @@ public interface IDynamicLuaObject {
     /**
      * Called when a user calls one of the methods that this object implements.
      *
-     * @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
+     * @param context   The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
-     * @param method An integer identifying which method index from {@link #getMethodNames()} the computer wishes to call.
+     * @param method    An integer identifying which method index from {@link #getMethodNames()} the computer wishes to call.
      * @param arguments The arguments for this method.
      * @return The result of this function. Either an immediate value ({@link MethodResult#of(Object...)} or an instruction to yield.
      * @throws LuaException If the function threw an exception.
      */
     @Nonnull
-    MethodResult callMethod(@Nonnull ILuaContext context, int method, @Nonnull IArguments arguments) throws LuaException;
+    MethodResult callMethod( @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaAPI.java

@@ -18,7 +18,8 @@ import dan200.computercraft.api.ComputerCraftAPI;
  * @see ILuaAPIFactory
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
-public interface ILuaAPI {
+public interface ILuaAPI
+{
     /**
      * Get the globals this API will be assigned to. This will override any other global, so you should
      *
@@ -31,13 +32,15 @@ public interface ILuaAPI {
      *
      * One should only interact with the file system.
      */
-    default void startup() {
+    default void startup()
+    {
     }
 
     /**
      * Called every time the computer is ticked. This can be used to process various.
      */
-    default void update() {
+    default void update()
+    {
     }
 
     /**
@@ -45,6 +48,7 @@ public interface ILuaAPI {
      *
      * This should reset the state of the object, disposing any remaining file handles, or other resources.
      */
-    default void shutdown() {
+    default void shutdown()
+    {
     }
 }

src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java

@@ -6,11 +6,11 @@
 
 package dan200.computercraft.api.lua;
 
+import dan200.computercraft.api.ComputerCraftAPI;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import dan200.computercraft.api.ComputerCraftAPI;
-
 /**
  * Construct an {@link ILuaAPI} for a specific computer.
  *
@@ -18,7 +18,8 @@ import dan200.computercraft.api.ComputerCraftAPI;
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
 @FunctionalInterface
-public interface ILuaAPIFactory {
+public interface ILuaAPIFactory
+{
     /**
      * Create a new API instance for a given computer.
      *
@@ -26,5 +27,5 @@ public interface ILuaAPIFactory {
      * @return The created API, or {@code null} if one should not be injected.
      */
     @Nullable
-    ILuaAPI create(@Nonnull IComputerSystem computer);
+    ILuaAPI create( @Nonnull IComputerSystem computer );
 }

src/main/java/dan200/computercraft/api/lua/ILuaCallback.java

@@ -13,7 +13,8 @@ import javax.annotation.Nonnull;
  *
  * @see MethodResult#yield(Object[], ILuaCallback)
  */
-public interface ILuaCallback {
+public interface ILuaCallback
+{
     /**
      * Resume this coroutine.
      *
@@ -22,5 +23,5 @@ public interface ILuaCallback {
      * @throws LuaException On an error.
      */
     @Nonnull
-    MethodResult resume(Object[] args) throws LuaException;
+    MethodResult resume( Object[] args ) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaContext.java

@@ -12,7 +12,8 @@ import javax.annotation.Nonnull;
  * An interface passed to peripherals and {@link IDynamicLuaObject}s by computers or turtles, providing methods that allow the peripheral call to interface
  * with the computer.
  */
-public interface ILuaContext {
+public interface ILuaContext
+{
     /**
      * Queue a task to be executed on the main server thread at the beginning of next tick, but do not wait for it to complete. This should be used when you
      * need to interact with the world in a thread-safe manner but do not care about the result or you wish to run asynchronously.
@@ -25,5 +26,5 @@ public interface ILuaContext {
      * @throws LuaException If the task could not be queued.
      * @see LuaFunction#mainThread() To run functions on the main thread and return their results synchronously.
      */
-    long issueMainThreadTask(@Nonnull ILuaTask task) throws LuaException;
+    long issueMainThreadTask( @Nonnull ILuaTask task ) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaFunction.java

@@ -15,7 +15,8 @@ import javax.annotation.Nonnull;
  * @see MethodResult#of(Object)
  */
 @FunctionalInterface
-public interface ILuaFunction {
+public interface ILuaFunction
+{
     /**
      * Call this function with a series of arguments. Note, this will <em>always</em> be called on the computer thread, and so its implementation must be
      * thread-safe.
@@ -25,5 +26,5 @@ public interface ILuaFunction {
      * @throws LuaException Upon Lua errors.
      */
     @Nonnull
-    MethodResult call(@Nonnull IArguments arguments) throws LuaException;
+    MethodResult call( @Nonnull IArguments arguments ) throws LuaException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaObject.java

@@ -8,10 +8,11 @@ package dan200.computercraft.api.lua;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public interface ILuaObject {
+public interface ILuaObject
+{
     @Nonnull
     String[] getMethodNames();
 
     @Nullable
-    Object[] callMethod(@Nonnull ILuaContext context, int method, @Nonnull Object[] arguments) throws LuaException, InterruptedException;
+    Object[] callMethod( @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException;
 }

src/main/java/dan200/computercraft/api/lua/ILuaTask.java

@@ -15,13 +15,14 @@ import javax.annotation.Nullable;
  * @see ILuaContext#issueMainThreadTask(ILuaTask)
  */
 @FunctionalInterface
-public interface ILuaTask {
+public interface ILuaTask
+{
     /**
      * Execute this task.
      *
      * @return The arguments to add to the {@code task_completed} event.
      * @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
-     *     to throw appropriate errors if the wrong arguments are supplied to your method.
+     *                      to throw appropriate errors if the wrong arguments are supplied to your method.
      */
     @Nullable
     Object[] execute() throws LuaException;

src/main/java/dan200/computercraft/api/lua/LuaException.java

@@ -11,19 +11,22 @@ import javax.annotation.Nullable;
 /**
  * An exception representing an error in Lua, like that raised by the {@code error()} function.
  */
-public class LuaException extends Exception {
+public class LuaException extends Exception
+{
     private static final long serialVersionUID = -6136063076818512651L;
     private final boolean hasLevel;
     private final int level;
 
-    public LuaException(@Nullable String message) {
+    public LuaException( @Nullable String message )
-        super(message);
+    {
+        super( message );
         this.hasLevel = false;
         this.level = 1;
     }
 
-    public LuaException(@Nullable String message, int level) {
+    public LuaException( @Nullable String message, int level )
-        super(message);
+    {
+        super( message );
         this.hasLevel = true;
         this.level = level;
     }
@@ -33,7 +36,8 @@ public class LuaException extends Exception {
      *
      * @return Whether this has an explicit level.
      */
-    public boolean hasLevel() {
+    public boolean hasLevel()
+    {
         return this.hasLevel;
     }
 
@@ -42,7 +46,8 @@ public class LuaException extends Exception {
      *
      * @return The level to raise the error at.
      */
-    public int getLevel() {
+    public int getLevel()
+    {
         return this.level;
     }
 }

src/main/java/dan200/computercraft/api/lua/LuaFunction.java

@@ -6,17 +6,13 @@
 
 package dan200.computercraft.api.lua;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Map;
-import java.util.Optional;
-
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 
+import java.lang.annotation.*;
+import java.util.Map;
+import java.util.Optional;
+
 /**
  * Used to mark a Java function which is callable from Lua.
  *
@@ -41,9 +37,10 @@ import dan200.computercraft.api.peripheral.IPeripheral;
  * {@link MethodResult#of(Object...)}.
  */
 @Documented
-@Retention (RetentionPolicy.RUNTIME)
+@Retention( RetentionPolicy.RUNTIME )
-@Target (ElementType.METHOD)
+@Target( ElementType.METHOD )
-public @interface LuaFunction {
+public @interface LuaFunction
+{
     /**
      * Explicitly specify the method names of this function. If not given, it uses the name of the annotated method.
      *

src/main/java/dan200/computercraft/api/lua/LuaValues.java

@@ -6,19 +6,20 @@
 
 package dan200.computercraft.api.lua;
 
-import java.nio.ByteBuffer;
-import java.util.Map;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.Map;
 
 /**
  * Various utility functions for operating with Lua values.
  *
  * @see IArguments
  */
-public final class LuaValues {
+public final class LuaValues
-    private LuaValues() {
+{
+    private LuaValues()
+    {
     }
 
     /**
@@ -28,41 +29,45 @@ public final class LuaValues {
      * @return The encoded string.
      */
     @Nonnull
-    public static ByteBuffer encode(@Nonnull String string) {
+    public static ByteBuffer encode( @Nonnull String string )
+    {
         byte[] chars = new byte[string.length()];
-        for (int i = 0; i < chars.length; i++) {
+        for( int i = 0; i < chars.length; i++ )
-            char c = string.charAt(i);
+        {
+            char c = string.charAt( i );
             chars[i] = c < 256 ? (byte) c : 63;
         }
 
-        return ByteBuffer.wrap(chars)
+        return ByteBuffer.wrap( chars )
-                         .asReadOnlyBuffer();
+            .asReadOnlyBuffer();
     }
 
     /**
      * Construct a "bad argument" exception, from an expected type and the actual value provided.
      *
-     * @param index The argument number, starting from 0.
+     * @param index    The argument number, starting from 0.
      * @param expected The expected type for this argument.
-     * @param actual The actual value provided for this argument.
+     * @param actual   The actual value provided for this argument.
      * @return The constructed exception, which should be thrown immediately.
      */
     @Nonnull
-    public static LuaException badArgumentOf(int index, @Nonnull String expected, @Nullable Object actual) {
+    public static LuaException badArgumentOf( int index, @Nonnull String expected, @Nullable Object actual )
-        return badArgument(index, expected, getType(actual));
+    {
+        return badArgument( index, expected, getType( actual ) );
     }
 
     /**
      * Construct a "bad argument" exception, from an expected and actual type.
      *
-     * @param index The argument number, starting from 0.
+     * @param index    The argument number, starting from 0.
      * @param expected The expected type for this argument.
-     * @param actual The provided type for this argument.
+     * @param actual   The provided type for this argument.
      * @return The constructed exception, which should be thrown immediately.
      */
     @Nonnull
-    public static LuaException badArgument(int index, @Nonnull String expected, @Nonnull String actual) {
+    public static LuaException badArgument( int index, @Nonnull String expected, @Nonnull String actual )
-        return new LuaException("bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")");
+    {
+        return new LuaException( "bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")" );
     }
 
     /**
@@ -72,20 +77,26 @@ public final class LuaValues {
      * @return A string representation of the given value's type, in a similar format to that provided by Lua's {@code type} function.
      */
     @Nonnull
-    public static String getType(@Nullable Object value) {
+    public static String getType( @Nullable Object value )
-        if (value == null) {
+    {
+        if( value == null )
+        {
             return "nil";
         }
-        if (value instanceof String) {
+        if( value instanceof String )
+        {
             return "string";
         }
-        if (value instanceof Boolean) {
+        if( value instanceof Boolean )
+        {
             return "boolean";
         }
-        if (value instanceof Number) {
+        if( value instanceof Number )
+        {
             return "number";
         }
-        if (value instanceof Map) {
+        if( value instanceof Map )
+        {
             return "table";
         }
         return "userdata";
@@ -99,8 +110,9 @@ public final class LuaValues {
      * @return The input {@code value}.
      * @throws LuaException If this is not a finite number.
      */
-    public static Number checkFiniteNum(int index, Number value) throws LuaException {
+    public static Number checkFiniteNum( int index, Number value ) throws LuaException
-        checkFinite(index, value.doubleValue());
+    {
+        checkFinite( index, value.doubleValue() );
         return value;
     }
 
@@ -112,9 +124,11 @@ public final class LuaValues {
      * @return The input {@code value}.
      * @throws LuaException If this is not a finite number.
      */
-    public static double checkFinite(int index, double value) throws LuaException {
+    public static double checkFinite( int index, double value ) throws LuaException
-        if (!Double.isFinite(value)) {
+    {
-            throw badArgument(index, "number", getNumericType(value));
+        if( !Double.isFinite( value ) )
+        {
+            throw badArgument( index, "number", getNumericType( value ) );
         }
         return value;
     }
@@ -127,14 +141,18 @@ public final class LuaValues {
      * @return This value's numeric type.
      */
     @Nonnull
-    public static String getNumericType(double value) {
+    public static String getNumericType( double value )
-        if (Double.isNaN(value)) {
+    {
+        if( Double.isNaN( value ) )
+        {
             return "nan";
         }
-        if (value == Double.POSITIVE_INFINITY) {
+        if( value == Double.POSITIVE_INFINITY )
+        {
             return "inf";
         }
-        if (value == Double.NEGATIVE_INFINITY) {
+        if( value == Double.NEGATIVE_INFINITY )
+        {
             return "-inf";
         }
         return "number";
@@ -146,18 +164,21 @@ public final class LuaValues {
      * @param index The argument index to check.
      * @param klass The class of the enum instance.
      * @param value The value to extract.
-     * @param <T> The type of enum we are extracting.
+     * @param <T>   The type of enum we are extracting.
      * @return The parsed enum value.
      * @throws LuaException If this is not a known enum value.
      */
-    public static <T extends Enum<T>> T checkEnum(int index, Class<T> klass, String value) throws LuaException {
+    public static <T extends Enum<T>> T checkEnum( int index, Class<T> klass, String value ) throws LuaException
-        for (T possibility : klass.getEnumConstants()) {
+    {
-            if (possibility.name()
+        for( T possibility : klass.getEnumConstants() )
-                           .equalsIgnoreCase(value)) {
+        {
+            if( possibility.name()
+                .equalsIgnoreCase( value ) )
+            {
                 return possibility;
             }
         }
 
-        throw new LuaException("bad argument #" + (index + 1) + " (unknown option " + value + ")");
+        throw new LuaException( "bad argument #" + (index + 1) + " (unknown option " + value + ")" );
     }
 }

src/main/java/dan200/computercraft/api/lua/MethodResult.java

@@ -6,36 +6,38 @@
 
 package dan200.computercraft.api.lua;
 
+import dan200.computercraft.api.peripheral.IComputerAccess;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.nio.ByteBuffer;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import dan200.computercraft.api.peripheral.IComputerAccess;
-
 /**
  * The result of invoking a Lua method.
  *
  * Method results either return a value immediately ({@link #of(Object...)} or yield control to the parent coroutine. When the current coroutine is resumed,
  * we invoke the provided {@link ILuaCallback#resume(Object[])} callback.
  */
-public final class MethodResult {
+public final class MethodResult
-    private static final MethodResult empty = new MethodResult(null, null);
+{
+    private static final MethodResult empty = new MethodResult( null, null );
 
     private final Object[] result;
     private final ILuaCallback callback;
     private final int adjust;
 
-    private MethodResult(Object[] arguments, ILuaCallback callback) {
+    private MethodResult( Object[] arguments, ILuaCallback callback )
+    {
         this.result = arguments;
         this.callback = callback;
         this.adjust = 0;
     }
 
-    private MethodResult(Object[] arguments, ILuaCallback callback, int adjust) {
+    private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
+    {
         this.result = arguments;
         this.callback = callback;
         this.adjust = adjust;
@@ -47,7 +49,8 @@ public final class MethodResult {
      * @return A method result which returns immediately with no values.
      */
     @Nonnull
-    public static MethodResult of() {
+    public static MethodResult of()
+    {
         return empty;
     }
 
@@ -64,8 +67,9 @@ public final class MethodResult {
      * @return A method result which returns immediately with the given value.
      */
     @Nonnull
-    public static MethodResult of(@Nullable Object value) {
+    public static MethodResult of( @Nullable Object value )
-        return new MethodResult(new Object[] {value}, null);
+    {
+        return new MethodResult( new Object[] { value }, null );
     }
 
     /**
@@ -75,43 +79,47 @@ public final class MethodResult {
      * @return A method result which returns immediately with the given values.
      */
     @Nonnull
-    public static MethodResult of(@Nullable Object... values) {
+    public static MethodResult of( @Nullable Object... values )
-        return values == null || values.length == 0 ? empty : new MethodResult(values, null);
+    {
+        return values == null || values.length == 0 ? empty : new MethodResult( values, null );
     }
 
     /**
      * Wait for an event to occur on the computer, suspending the thread until it arises. This method is exactly equivalent to {@code os.pullEvent()} in
      * lua.
      *
-     * @param filter A specific event to wait for, or null to wait for any event.
+     * @param filter   A specific event to wait for, or null to wait for any event.
      * @param callback The callback to resume with the name of the event that occurred, and any event parameters.
      * @return The method result which represents this yield.
      * @see IComputerAccess#queueEvent(String, Object[])
      */
     @Nonnull
-    public static MethodResult pullEvent(@Nullable String filter, @Nonnull ILuaCallback callback) {
+    public static MethodResult pullEvent( @Nullable String filter, @Nonnull ILuaCallback callback )
-        Objects.requireNonNull(callback, "callback cannot be null");
+    {
-        return new MethodResult(new Object[] {filter}, results -> {
+        Objects.requireNonNull( callback, "callback cannot be null" );
-            if (results.length >= 1 && results[0].equals("terminate")) {
+        return new MethodResult( new Object[] { filter }, results -> {
-                throw new LuaException("Terminated", 0);
+            if( results.length >= 1 && results[0].equals( "terminate" ) )
+            {
+                throw new LuaException( "Terminated", 0 );
             }
-            return callback.resume(results);
+            return callback.resume( results );
-        });
+        } );
     }
 
     /**
      * The same as {@link #pullEvent(String, ILuaCallback)}, except "terminated" events are ignored. Only use this if you want to prevent program
      * termination, which is not recommended. This method is exactly equivalent to {@code os.pullEventRaw()} in Lua.
      *
-     * @param filter A specific event to wait for, or null to wait for any event.
+     * @param filter   A specific event to wait for, or null to wait for any event.
      * @param callback The callback to resume with the name of the event that occurred, and any event parameters.
      * @return The method result which represents this yield.
      * @see #pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    public static MethodResult pullEventRaw(@Nullable String filter, @Nonnull ILuaCallback callback) {
+    public static MethodResult pullEventRaw( @Nullable String filter, @Nonnull ILuaCallback callback )
-        Objects.requireNonNull(callback, "callback cannot be null");
+    {
-        return new MethodResult(new Object[] {filter}, callback);
+        Objects.requireNonNull( callback, "callback cannot be null" );
+        return new MethodResult( new Object[] { filter }, callback );
     }
 
     /**
@@ -119,27 +127,31 @@ public final class MethodResult {
      * {@code pullEvent()} if you wish to wait for events.
      *
      * @param arguments An object array containing the arguments to pass to coroutine.yield()
-     * @param callback The callback to resume with an array containing the return values from coroutine.yield()
+     * @param callback  The callback to resume with an array containing the return values from coroutine.yield()
      * @return The method result which represents this yield.
      * @see #pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    public static MethodResult yield(@Nullable Object[] arguments, @Nonnull ILuaCallback callback) {
+    public static MethodResult yield( @Nullable Object[] arguments, @Nonnull ILuaCallback callback )
-        Objects.requireNonNull(callback, "callback cannot be null");
+    {
-        return new MethodResult(arguments, callback);
+        Objects.requireNonNull( callback, "callback cannot be null" );
+        return new MethodResult( arguments, callback );
     }
 
     @Nullable
-    public Object[] getResult() {
+    public Object[] getResult()
+    {
         return this.result;
     }
 
     @Nullable
-    public ILuaCallback getCallback() {
+    public ILuaCallback getCallback()
+    {
         return this.callback;
     }
 
-    public int getErrorAdjust() {
+    public int getErrorAdjust()
+    {
         return this.adjust;
     }
 
@@ -150,13 +162,16 @@ public final class MethodResult {
      * @return The new {@link MethodResult} with an adjusted error. This has no effect on immediate results.
      */
     @Nonnull
-    public MethodResult adjustError(int adjust) {
+    public MethodResult adjustError( int adjust )
-        if (adjust < 0) {
+    {
-            throw new IllegalArgumentException("cannot adjust by a negative amount");
+        if( adjust < 0 )
+        {
+            throw new IllegalArgumentException( "cannot adjust by a negative amount" );
         }
-        if (adjust == 0 || this.callback == null) {
+        if( adjust == 0 || this.callback == null )
+        {
             return this;
         }
-        return new MethodResult(this.result, this.callback, this.adjust + adjust);
+        return new MethodResult( this.result, this.callback, this.adjust + adjust );
     }
 }

src/main/java/dan200/computercraft/api/lua/ObjectArguments.java

@@ -6,61 +6,71 @@
 
 package dan200.computercraft.api.lua;
 
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.Nullable;
-
 /**
  * An implementation of {@link IArguments} which wraps an array of {@link Object}.
  */
-public final class ObjectArguments implements IArguments {
+public final class ObjectArguments implements IArguments
+{
     private static final IArguments EMPTY = new ObjectArguments();
     private final List<Object> args;
 
     @Deprecated
-    @SuppressWarnings ("unused")
+    @SuppressWarnings( "unused" )
-    public ObjectArguments(IArguments arguments) {
+    public ObjectArguments( IArguments arguments )
+    {
         throw new IllegalStateException();
     }
 
-    public ObjectArguments(Object... args) {
+    public ObjectArguments( Object... args )
-        this.args = Arrays.asList(args);
+    {
+        this.args = Arrays.asList( args );
     }
 
-    public ObjectArguments(List<Object> args) {
+    public ObjectArguments( List<Object> args )
-        this.args = Objects.requireNonNull(args);
+    {
+        this.args = Objects.requireNonNull( args );
     }
 
     @Override
-    public IArguments drop(int count) {
+    public IArguments drop( int count )
-        if (count < 0) {
+    {
-            throw new IllegalStateException("count cannot be negative");
+        if( count < 0 )
+        {
+            throw new IllegalStateException( "count cannot be negative" );
         }
-        if (count == 0) {
+        if( count == 0 )
+        {
             return this;
         }
-        if (count >= this.args.size()) {
+        if( count >= this.args.size() )
+        {
             return EMPTY;
         }
 
-        return new ObjectArguments(this.args.subList(count, this.args.size()));
+        return new ObjectArguments( this.args.subList( count, this.args.size() ) );
     }
 
     @Override
-    public Object[] getAll() {
+    public Object[] getAll()
+    {
         return this.args.toArray();
     }
 
     @Override
-    public int count() {
+    public int count()
+    {
         return this.args.size();
     }
 
     @Nullable
     @Override
-    public Object get(int index) {
+    public Object get( int index )
-        return index >= this.args.size() ? null : this.args.get(index);
+    {
+        return index >= this.args.size() ? null : this.args.get( index );
     }
 }

src/main/java/dan200/computercraft/api/media/IMedia.java

@@ -6,22 +6,22 @@
 
 package dan200.computercraft.api.media;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.filesystem.IMount;
-
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Represents an item that can be placed in a disk drive and used by a Computer.
  *
  * Implement this interface on your {@link Item} class to allow it to be used in the drive. Alternatively, register a {@link IMediaProvider}.
  */
-public interface IMedia {
+public interface IMedia
+{
     /**
      * Get a string representing the label of this item. Will be called via {@code disk.getLabel()} in lua.
      *
@@ -29,7 +29,7 @@ public interface IMedia {
      * @return The label. ie: "Dan's Programs".
      */
     @Nullable
-    String getLabel(@Nonnull ItemStack stack);
+    String getLabel( @Nonnull ItemStack stack );
 
     /**
      * Set a string representing the label of this item. Will be called vi {@code disk.setLabel()} in lua.
@@ -38,7 +38,8 @@ public interface IMedia {
      * @param label The string to set the label to.
      * @return true if the label was updated, false if the label may not be modified.
      */
-    default boolean setLabel(@Nonnull ItemStack stack, @Nullable String label) {
+    default boolean setLabel( @Nonnull ItemStack stack, @Nullable String label )
+    {
         return false;
     }
 
@@ -49,7 +50,8 @@ public interface IMedia {
      * @return The name, or null if this item does not represent an item with audio.
      */
     @Nullable
-    default String getAudioTitle(@Nonnull ItemStack stack) {
+    default String getAudioTitle( @Nonnull ItemStack stack )
+    {
         return null;
     }
 
@@ -60,7 +62,8 @@ public interface IMedia {
      * @return The name, or null if this item does not represent an item with audio.
      */
     @Nullable
-    default SoundEvent getAudio(@Nonnull ItemStack stack) {
+    default SoundEvent getAudio( @Nonnull ItemStack stack )
+    {
         return null;
     }
 
@@ -71,14 +74,15 @@ public interface IMedia {
      * @param stack The {@link ItemStack} to modify.
      * @param world The world in which the item and disk drive reside.
      * @return The mount, or null if this item does not represent an item with data. If the mount returned also implements {@link
-     *     dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
+     * dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
      * @see IMount
      * @see dan200.computercraft.api.filesystem.IWritableMount
      * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(String, String)
      */
     @Nullable
-    default IMount createDataMount(@Nonnull ItemStack stack, @Nonnull World world) {
+    default IMount createDataMount( @Nonnull ItemStack stack, @Nonnull World world )
+    {
         return null;
     }
 }

src/main/java/dan200/computercraft/api/media/IMediaProvider.java

@@ -6,18 +6,19 @@
 
 package dan200.computercraft.api.media;
 
+import net.minecraft.item.ItemStack;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.minecraft.item.ItemStack;
-
 /**
  * This interface is used to provide {@link IMedia} implementations for {@link ItemStack}.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
  */
 @FunctionalInterface
-public interface IMediaProvider {
+public interface IMediaProvider
+{
     /**
      * Produce an IMedia implementation from an ItemStack.
      *
@@ -26,5 +27,5 @@ public interface IMediaProvider {
      * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
      */
     @Nullable
-    IMedia getMedia(@Nonnull ItemStack stack);
+    IMedia getMedia( @Nonnull ItemStack stack );
 }

src/main/java/dan200/computercraft/api/network/IPacketNetwork.java

@@ -14,20 +14,21 @@ import javax.annotation.Nonnull;
  * @see Packet
  * @see IPacketReceiver
  */
-public interface IPacketNetwork {
+public interface IPacketNetwork
+{
     /**
      * Add a receiver to the network.
      *
      * @param receiver The receiver to register to the network.
      */
-    void addReceiver(@Nonnull IPacketReceiver receiver);
+    void addReceiver( @Nonnull IPacketReceiver receiver );
 
     /**
      * Remove a receiver from the network.
      *
      * @param receiver The device to remove from the network.
      */
-    void removeReceiver(@Nonnull IPacketReceiver receiver);
+    void removeReceiver( @Nonnull IPacketReceiver receiver );
 
     /**
      * Determine whether this network is wireless.
@@ -41,11 +42,11 @@ public interface IPacketNetwork {
      * interdimensional ones).
      *
      * @param packet The packet to send.
-     * @param range The maximum distance this packet will be sent.
+     * @param range  The maximum distance this packet will be sent.
      * @see #transmitInterdimensional(Packet)
      * @see IPacketReceiver#receiveSameDimension(Packet, double)
      */
-    void transmitSameDimension(@Nonnull Packet packet, double range);
+    void transmitSameDimension( @Nonnull Packet packet, double range );
 
     /**
      * Submit a packet for transmitting across the network. This will route the packet through the network, sending it to all receivers across all
@@ -55,5 +56,5 @@ public interface IPacketNetwork {
      * @see #transmitSameDimension(Packet, double)
      * @see IPacketReceiver#receiveDifferentDimension(Packet)
      */
-    void transmitInterdimensional(@Nonnull Packet packet);
+    void transmitInterdimensional( @Nonnull Packet packet );
 }

src/main/java/dan200/computercraft/api/network/IPacketReceiver.java

@@ -6,15 +6,16 @@
 
 package dan200.computercraft.api.network;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+
 /**
  * An object on an {@link IPacketNetwork}, capable of receiving packets.
  */
-public interface IPacketReceiver {
+public interface IPacketReceiver
+{
     /**
      * Get the world in which this packet receiver exists.
      *
@@ -59,25 +60,25 @@ public interface IPacketReceiver {
     /**
      * Receive a network packet from the same dimension.
      *
-     * @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
+     * @param packet   The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
-     *     modem event.
+     *                 modem event.
      * @param distance The distance this packet has travelled from the source.
      * @see Packet
      * @see #getRange()
      * @see IPacketNetwork#transmitSameDimension(Packet, double)
      * @see IPacketNetwork#transmitInterdimensional(Packet)
      */
-    void receiveSameDimension(@Nonnull Packet packet, double distance);
+    void receiveSameDimension( @Nonnull Packet packet, double distance );
 
     /**
      * Receive a network packet from a different dimension.
      *
      * @param packet The packet to receive. Generally you should check that you are listening on the given channel and, if so, queue the appropriate
-     *     modem event.
+     *               modem event.
      * @see Packet
      * @see IPacketNetwork#transmitInterdimensional(Packet)
      * @see IPacketNetwork#transmitSameDimension(Packet, double)
      * @see #isInterdimensional()
      */
-    void receiveDifferentDimension(@Nonnull Packet packet);
+    void receiveDifferentDimension( @Nonnull Packet packet );
 }

src/main/java/dan200/computercraft/api/network/IPacketSender.java

@@ -6,15 +6,16 @@
 
 package dan200.computercraft.api.network;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+
 /**
  * An object on a {@link IPacketNetwork}, capable of sending packets.
  */
-public interface IPacketSender {
+public interface IPacketSender
+{
     /**
      * Get the world in which this packet sender exists.
      *

src/main/java/dan200/computercraft/api/network/Packet.java

@@ -6,10 +6,9 @@
 
 package dan200.computercraft.api.network;
 
-import java.util.Objects;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Objects;
 
 /**
  * Represents a packet which may be sent across a {@link IPacketNetwork}.
@@ -20,7 +19,8 @@ import javax.annotation.Nullable;
  * @see IPacketReceiver#receiveDifferentDimension(Packet)
  * @see IPacketReceiver#receiveSameDimension(Packet, double)
  */
-public class Packet {
+public class Packet
+{
     private final int channel;
     private final int replyChannel;
     private final Object payload;
@@ -30,14 +30,15 @@ public class Packet {
     /**
      * Create a new packet, ready for transmitting across the network.
      *
-     * @param channel The channel to send the packet along. Receiving devices should only process packets from on channels they are listening to.
+     * @param channel      The channel to send the packet along. Receiving devices should only process packets from on channels they are listening to.
      * @param replyChannel The channel to reply on.
-     * @param payload The contents of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral
+     * @param payload      The contents of this packet. This should be a "valid" Lua object, safe for queuing as an event or returning from a peripheral
-     *     call.
+     *                     call.
-     * @param sender The object which sent this packet.
+     * @param sender       The object which sent this packet.
      */
-    public Packet(int channel, int replyChannel, @Nullable Object payload, @Nonnull IPacketSender sender) {
+    public Packet( int channel, int replyChannel, @Nullable Object payload, @Nonnull IPacketSender sender )
-        Objects.requireNonNull(sender, "sender cannot be null");
+    {
+        Objects.requireNonNull( sender, "sender cannot be null" );
 
         this.channel = channel;
         this.replyChannel = replyChannel;
@@ -50,7 +51,8 @@ public class Packet {
      *
      * @return This packet's channel.
      */
-    public int getChannel() {
+    public int getChannel()
+    {
         return this.channel;
     }
 
@@ -59,7 +61,8 @@ public class Packet {
      *
      * @return This channel to reply on.
      */
-    public int getReplyChannel() {
+    public int getReplyChannel()
+    {
         return this.replyChannel;
     }
 
@@ -69,7 +72,8 @@ public class Packet {
      * @return The packet's payload
      */
     @Nullable
-    public Object getPayload() {
+    public Object getPayload()
+    {
         return this.payload;
     }
 
@@ -79,12 +83,14 @@ public class Packet {
      * @return The sending object.
      */
     @Nonnull
-    public IPacketSender getSender() {
+    public IPacketSender getSender()
+    {
         return this.sender;
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         int result;
         result = this.channel;
         result = 31 * result + this.replyChannel;
@@ -94,25 +100,31 @@ public class Packet {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals( Object o )
-        if (this == o) {
+    {
+        if( this == o )
+        {
             return true;
         }
-        if (o == null || this.getClass() != o.getClass()) {
+        if( o == null || this.getClass() != o.getClass() )
+        {
             return false;
         }
 
         Packet packet = (Packet) o;
 
-        if (this.channel != packet.channel) {
+        if( this.channel != packet.channel )
+        {
             return false;
         }
-        if (this.replyChannel != packet.replyChannel) {
+        if( this.replyChannel != packet.replyChannel )
+        {
             return false;
         }
-        if (!Objects.equals(this.payload, packet.payload)) {
+        if( !Objects.equals( this.payload, packet.payload ) )
+        {
             return false;
         }
-        return this.sender.equals(packet.sender);
+        return this.sender.equals( packet.sender );
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredElement.java

@@ -6,10 +6,10 @@
 
 package dan200.computercraft.api.network.wired;
 
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.ComputerCraftAPI;
 
+import javax.annotation.Nonnull;
+
 /**
  * An object which may be part of a wired network.
  *
@@ -19,13 +19,15 @@ import dan200.computercraft.api.ComputerCraftAPI;
  * Elements are generally tied to a block or tile entity in world. In such as case, one should provide the {@link IWiredElement} capability for the
  * appropriate sides.
  */
-public interface IWiredElement extends IWiredSender {
+public interface IWiredElement extends IWiredSender
+{
     /**
      * Called when objects on the network change. This may occur when network nodes are added or removed, or when peripherals change.
      *
      * @param change The change which occurred.
      * @see IWiredNetworkChange
      */
-    default void networkChanged(@Nonnull IWiredNetworkChange change) {
+    default void networkChanged( @Nonnull IWiredNetworkChange change )
+    {
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredNetwork.java

@@ -6,11 +6,10 @@
 
 package dan200.computercraft.api.network.wired;
 
-import java.util.Map;
+import dan200.computercraft.api.peripheral.IPeripheral;
 
 import javax.annotation.Nonnull;
-
+import java.util.Map;
-import dan200.computercraft.api.peripheral.IPeripheral;
 
 /**
  * A wired network is composed of one of more {@link IWiredNode}s, a set of connections between them, and a series of peripherals.
@@ -24,28 +23,29 @@ import dan200.computercraft.api.peripheral.IPeripheral;
  *
  * @see IWiredNode#getNetwork()
  */
-public interface IWiredNetwork {
+public interface IWiredNetwork
+{
     /**
      * Create a connection between two nodes.
      *
      * This should only be used on the server thread.
      *
-     * @param left The first node to connect
+     * @param left  The first node to connect
      * @param right The second node to connect
      * @return {@code true} if a connection was created or {@code false} if the connection already exists.
-     * @throws IllegalStateException If neither node is on the network.
+     * @throws IllegalStateException    If neither node is on the network.
      * @throws IllegalArgumentException If {@code left} and {@code right} are equal.
      * @see IWiredNode#connectTo(IWiredNode)
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      */
-    boolean connect(@Nonnull IWiredNode left, @Nonnull IWiredNode right);
+    boolean connect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
 
     /**
      * Destroy a connection between this node and another.
      *
      * This should only be used on the server thread.
      *
-     * @param left The first node in the connection.
+     * @param left  The first node in the connection.
      * @param right The second node in the connection.
      * @return {@code true} if a connection was destroyed or {@code false} if no connection exists.
      * @throws IllegalArgumentException If either node is not on the network.
@@ -53,7 +53,7 @@ public interface IWiredNetwork {
      * @see IWiredNode#disconnectFrom(IWiredNode)
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      */
-    boolean disconnect(@Nonnull IWiredNode left, @Nonnull IWiredNode right);
+    boolean disconnect( @Nonnull IWiredNode left, @Nonnull IWiredNode right );
 
     /**
      * Sever all connections this node has, removing it from this network.
@@ -65,17 +65,17 @@ public interface IWiredNetwork {
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNode#remove()
      */
-    boolean remove(@Nonnull IWiredNode node);
+    boolean remove( @Nonnull IWiredNode node );
 
     /**
      * Update the peripherals a node provides.
      *
      * This should only be used on the server thread. You should only call this on nodes that your network element owns.
      *
-     * @param node The node to attach peripherals for.
+     * @param node        The node to attach peripherals for.
      * @param peripherals The new peripherals for this node.
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNode#updatePeripherals(Map)
      */
-    void updatePeripherals(@Nonnull IWiredNode node, @Nonnull Map<String, IPeripheral> peripherals);
+    void updatePeripherals( @Nonnull IWiredNode node, @Nonnull Map<String, IPeripheral> peripherals );
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredNetworkChange.java

@@ -6,18 +6,18 @@
 
 package dan200.computercraft.api.network.wired;
 
-import java.util.Map;
+import dan200.computercraft.api.peripheral.IPeripheral;
 
 import javax.annotation.Nonnull;
-
+import java.util.Map;
-import dan200.computercraft.api.peripheral.IPeripheral;
 
 /**
  * Represents a change to the objects on a wired network.
  *
  * @see IWiredElement#networkChanged(IWiredNetworkChange)
  */
-public interface IWiredNetworkChange {
+public interface IWiredNetworkChange
+{
     /**
      * A set of peripherals which have been removed. Note that there may be entries with the same name in the added and removed set, but with a different
      * peripheral.

src/main/java/dan200/computercraft/api/network/wired/IWiredNode.java

@@ -6,13 +6,12 @@
 
 package dan200.computercraft.api.network.wired;
 
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.network.IPacketNetwork;
 import dan200.computercraft.api.peripheral.IPeripheral;
 
+import javax.annotation.Nonnull;
+import java.util.Map;
+
 /**
  * Wired nodes act as a layer between {@link IWiredElement}s and {@link IWiredNetwork}s.
  *
@@ -25,7 +24,8 @@ import dan200.computercraft.api.peripheral.IPeripheral;
  *
  * Wired nodes also provide several convenience methods for interacting with a wired network. These should only ever be used on the main server thread.
  */
-public interface IWiredNode extends IPacketNetwork {
+public interface IWiredNode extends IPacketNetwork
+{
     /**
      * The associated element for this network node.
      *
@@ -44,8 +44,9 @@ public interface IWiredNode extends IPacketNetwork {
      * @see IWiredNetwork#connect(IWiredNode, IWiredNode)
      * @see IWiredNode#disconnectFrom(IWiredNode)
      */
-    default boolean connectTo(@Nonnull IWiredNode node) {
+    default boolean connectTo( @Nonnull IWiredNode node )
-        return this.getNetwork().connect(this, node);
+    {
+        return this.getNetwork().connect( this, node );
     }
 
     /**
@@ -69,8 +70,9 @@ public interface IWiredNode extends IPacketNetwork {
      * @see IWiredNetwork#disconnect(IWiredNode, IWiredNode)
      * @see IWiredNode#connectTo(IWiredNode)
      */
-    default boolean disconnectFrom(@Nonnull IWiredNode node) {
+    default boolean disconnectFrom( @Nonnull IWiredNode node )
-        return this.getNetwork().disconnect(this, node);
+    {
+        return this.getNetwork().disconnect( this, node );
     }
 
     /**
@@ -82,8 +84,9 @@ public interface IWiredNode extends IPacketNetwork {
      * @throws IllegalArgumentException If the node is not in the network.
      * @see IWiredNetwork#remove(IWiredNode)
      */
-    default boolean remove() {
+    default boolean remove()
-        return this.getNetwork().remove(this);
+    {
+        return this.getNetwork().remove( this );
     }
 
     /**
@@ -94,7 +97,8 @@ public interface IWiredNode extends IPacketNetwork {
      * @param peripherals The new peripherals for this node.
      * @see IWiredNetwork#updatePeripherals(IWiredNode, Map)
      */
-    default void updatePeripherals(@Nonnull Map<String, IPeripheral> peripherals) {
+    default void updatePeripherals( @Nonnull Map<String, IPeripheral> peripherals )
-        this.getNetwork().updatePeripherals(this, peripherals);
+    {
+        this.getNetwork().updatePeripherals( this, peripherals );
     }
 }

src/main/java/dan200/computercraft/api/network/wired/IWiredSender.java

@@ -6,16 +6,17 @@
 
 package dan200.computercraft.api.network.wired;
 
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.network.IPacketSender;
 
+import javax.annotation.Nonnull;
+
 /**
  * An object on a {@link IWiredNetwork} capable of sending packets.
  *
  * Unlike a regular {@link IPacketSender}, this must be associated with the node you are attempting to to send the packet from.
  */
-public interface IWiredSender extends IPacketSender {
+public interface IWiredSender extends IPacketSender
+{
     /**
      * The node in the network representing this object.
      *

src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java

@@ -6,11 +6,6 @@
 
 package dan200.computercraft.api.peripheral;
 
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
@@ -18,21 +13,25 @@ import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.ILuaTask;
 import dan200.computercraft.api.lua.MethodResult;
-
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Map;
+
 /**
  * The interface passed to peripherals by computers or turtles, providing methods that they can call. This should not be implemented by your classes. Do not
  * interact with computers except via this interface.
  */
-public interface IComputerAccess {
+public interface IComputerAccess
+{
     /**
      * Mount a mount onto the computer's file system in a read only mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount The mount object to mount on the computer.
+     * @param mount           The mount object to mount on the computer.
      * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
-     *     Store this value if you wish to unmount the mount later.
+     * Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -42,18 +41,19 @@ public interface IComputerAccess {
      * @see IMount
      */
     @Nullable
-    default String mount(@Nonnull String desiredLocation, @Nonnull IMount mount) {
+    default String mount( @Nonnull String desiredLocation, @Nonnull IMount mount )
-        return this.mount(desiredLocation, mount, this.getAttachmentName());
+    {
+        return this.mount( desiredLocation, mount, this.getAttachmentName() );
     }
 
     /**
      * Mount a mount onto the computer's file system in a read only mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount The mount object to mount on the computer.
+     * @param mount           The mount object to mount on the computer.
-     * @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
+     * @param driveName       A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
      * @return The location on the computer's file system where you the mount mounted, or {@code null} if there was already a file in the desired location.
-     *     Store this value if you wish to unmount the mount later.
+     * Store this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -63,7 +63,7 @@ public interface IComputerAccess {
      * @see IMount
      */
     @Nullable
-    String mount(@Nonnull String desiredLocation, @Nonnull IMount mount, @Nonnull String driveName);
+    String mount( @Nonnull String desiredLocation, @Nonnull IMount mount, @Nonnull String driveName );
 
     /**
      * Get a string, unique to the computer, by which the computer refers to this peripheral. For directly attached peripherals this will be
@@ -80,9 +80,9 @@ public interface IComputerAccess {
      * Mount a mount onto the computer's file system in a writable mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount The mount object to mount on the computer.
+     * @param mount           The mount object to mount on the computer.
      * @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
-     *     this value if you wish to unmount the mount later.
+     * this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -91,18 +91,19 @@ public interface IComputerAccess {
      * @see IMount
      */
     @Nullable
-    default String mountWritable(@Nonnull String desiredLocation, @Nonnull IWritableMount mount) {
+    default String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount )
-        return this.mountWritable(desiredLocation, mount, this.getAttachmentName());
+    {
+        return this.mountWritable( desiredLocation, mount, this.getAttachmentName() );
     }
 
     /**
      * Mount a mount onto the computer's file system in a writable mode.
      *
      * @param desiredLocation The location on the computer's file system where you would like the mount to be mounted.
-     * @param mount The mount object to mount on the computer.
+     * @param mount           The mount object to mount on the computer.
-     * @param driveName A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
+     * @param driveName       A custom name to give for this mount location, as returned by {@code fs.getDrive()}.
      * @return The location on the computer's file system where you the mount mounted, or null if there was already a file in the desired location. Store
-     *     this value if you wish to unmount the mount later.
+     * this value if you wish to unmount the mount later.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see ComputerCraftAPI#createResourceMount(String, String)
@@ -110,7 +111,7 @@ public interface IComputerAccess {
      * @see #unmount(String)
      * @see IMount
      */
-    String mountWritable(@Nonnull String desiredLocation, @Nonnull IWritableMount mount, @Nonnull String driveName);
+    String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount, @Nonnull String driveName );
 
     /**
      * Unmounts a directory previously mounted onto the computers file system by {@link #mount(String, IMount)} or {@link #mountWritable(String,
@@ -122,13 +123,13 @@ public interface IComputerAccess {
      * Note that you cannot unmount another peripheral's mounts.
      *
      * @param location The desired location in the computers file system of the directory to unmount. This must be the location of a directory
-     *     previously mounted by {@link #mount(String, IMount)} or {@link #mountWritable(String, IWritableMount)}, as indicated by their return value.
+     *                 previously mounted by {@link #mount(String, IMount)} or {@link #mountWritable(String, IWritableMount)}, as indicated by their return value.
-     * @throws NotAttachedException If the peripheral has been detached.
+     * @throws NotAttachedException  If the peripheral has been detached.
      * @throws IllegalStateException If the mount does not exist, or was mounted by another peripheral.
      * @see #mount(String, IMount)
      * @see #mountWritable(String, IWritableMount)
      */
-    void unmount(@Nullable String location);
+    void unmount( @Nullable String location );
 
     /**
      * Returns the numerical ID of this computer.
@@ -144,17 +145,17 @@ public interface IComputerAccess {
      * Causes an event to be raised on this computer, which the computer can respond to by calling {@code os.pullEvent()}. This can be used to notify the
      * computer when things happen in the world or to this peripheral.
      *
-     * @param event A string identifying the type of event that has occurred, this will be returned as the first value from {@code os.pullEvent()}. It
+     * @param event     A string identifying the type of event that has occurred, this will be returned as the first value from {@code os.pullEvent()}. It
-     *     is recommended that you you choose a name that is unique, and recognisable as originating from your peripheral. eg: If your peripheral type is
+     *                  is recommended that you you choose a name that is unique, and recognisable as originating from your peripheral. eg: If your peripheral type is
-     *     "button", a suitable event would be "button_pressed".
+     *                  "button", a suitable event would be "button_pressed".
      * @param arguments In addition to a name, you may pass an array of extra arguments to the event, that will be supplied as extra return values to
-     *     os.pullEvent(). Objects in the array will be converted to lua data types in the same fashion as the return values of IPeripheral.callMethod().
+     *                  os.pullEvent(). Objects in the array will be converted to lua data types in the same fashion as the return values of IPeripheral.callMethod().
      *
-     *     You may supply {@code null} to indicate that no arguments are to be supplied.
+     *                  You may supply {@code null} to indicate that no arguments are to be supplied.
      * @throws NotAttachedException If the peripheral has been detached.
      * @see MethodResult#pullEvent(String, ILuaCallback)
      */
-    void queueEvent(@Nonnull String event, @Nullable Object... arguments);
+    void queueEvent( @Nonnull String event, @Nullable Object... arguments );
 
     /**
      * Get a set of peripherals that this computer access can "see", along with their attachment name.
@@ -178,7 +179,7 @@ public interface IComputerAccess {
      * @see #getAvailablePeripherals()
      */
     @Nullable
-    IPeripheral getAvailablePeripheral(@Nonnull String name);
+    IPeripheral getAvailablePeripheral( @Nonnull String name );
 
     /**
      * Get a {@link IWorkMonitor} for tasks your peripheral might execute on the main (server) thread.

src/main/java/dan200/computercraft/api/peripheral/IDynamicPeripheral.java

@@ -6,14 +6,9 @@
 
 package dan200.computercraft.api.peripheral;
 
-import javax.annotation.Nonnull;
+import dan200.computercraft.api.lua.*;
 
-import dan200.computercraft.api.lua.IArguments;
+import javax.annotation.Nonnull;
-import dan200.computercraft.api.lua.IDynamicLuaObject;
-import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.LuaException;
-import dan200.computercraft.api.lua.LuaFunction;
-import dan200.computercraft.api.lua.MethodResult;
 
 /**
  * A peripheral whose methods are not known at runtime.
@@ -21,7 +16,8 @@ import dan200.computercraft.api.lua.MethodResult;
  * This behaves similarly to {@link IDynamicLuaObject}, though also accepting the current {@link IComputerAccess}. Generally one may use {@link LuaFunction}
  * instead of implementing this interface.
  */
-public interface IDynamicPeripheral extends IPeripheral {
+public interface IDynamicPeripheral extends IPeripheral
+{
     /**
      * Should return an array of strings that identify the methods that this peripheral exposes to Lua. This will be called once before each attachment, and
      * should not change when called multiple times.
@@ -38,16 +34,16 @@ public interface IDynamicPeripheral extends IPeripheral {
      *
      * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting with Minecraft objects.
      *
-     * @param computer The interface to the computer that is making the call. Remember that multiple computers can be attached to a peripheral at once.
+     * @param computer  The interface to the computer that is making the call. Remember that multiple computers can be attached to a peripheral at once.
-     * @param context The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
+     * @param context   The context of the currently running lua thread. This can be used to wait for events or otherwise yield.
-     * @param method An integer identifying which of the methods from getMethodNames() the computercraft wishes to call. The integer indicates the index
+     * @param method    An integer identifying which of the methods from getMethodNames() the computercraft wishes to call. The integer indicates the index
-     *     into the getMethodNames() table that corresponds to the string passed into peripheral.call()
+     *                  into the getMethodNames() table that corresponds to the string passed into peripheral.call()
      * @param arguments The arguments for this method.
      * @return A {@link MethodResult} containing the values to return or the action to perform.
      * @throws LuaException If you throw any exception from this function, a lua error will be raised with the same message as your exception. Use this
-     *     to throw appropriate errors if the wrong arguments are supplied to your method.
+     *                      to throw appropriate errors if the wrong arguments are supplied to your method.
      * @see #getMethodNames()
      */
     @Nonnull
-    MethodResult callMethod(@Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments) throws LuaException;
+    MethodResult callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull IArguments arguments ) throws LuaException;
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java

@@ -6,11 +6,11 @@
 
 package dan200.computercraft.api.peripheral;
 
+import dan200.computercraft.api.lua.LuaFunction;
+
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import dan200.computercraft.api.lua.LuaFunction;
-
 /**
  * The interface that defines a peripheral.
  *
@@ -19,7 +19,8 @@ import dan200.computercraft.api.lua.LuaFunction;
  *
  * Peripherals should provide a series of methods to the user, either using {@link LuaFunction} or by implementing {@link IDynamicPeripheral}.
  */
-public interface IPeripheral {
+public interface IPeripheral
+{
     /**
      * Should return a string that uniquely identifies this type of peripheral. This can be queried from lua by calling {@code peripheral.getType()}
      *
@@ -42,7 +43,8 @@ public interface IPeripheral {
      * @param computer The interface to the computer that is being attached. Remember that multiple computers can be attached to a peripheral at once.
      * @see #detach
      */
-    default void attach(@Nonnull IComputerAccess computer) {
+    default void attach( @Nonnull IComputerAccess computer )
+    {
     }
 
     /**
@@ -58,7 +60,8 @@ public interface IPeripheral {
      * @param computer The interface to the computer that is being detached. Remember that multiple computers can be attached to a peripheral at once.
      * @see #attach
      */
-    default void detach(@Nonnull IComputerAccess computer) {
+    default void detach( @Nonnull IComputerAccess computer )
+    {
     }
 
     /**
@@ -67,7 +70,8 @@ public interface IPeripheral {
      * @return The object this peripheral targets
      */
     @Nullable
-    default Object getTarget() {
+    default Object getTarget()
+    {
         return null;
     }
 
@@ -80,5 +84,5 @@ public interface IPeripheral {
      * @param other The peripheral to compare against. This may be {@code null}.
      * @return Whether these peripherals are equivalent.
      */
-    boolean equals(@Nullable IPeripheral other);
+    boolean equals( @Nullable IPeripheral other );
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java

@@ -6,15 +6,14 @@
 
 package dan200.computercraft.api.peripheral;
 
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import java.util.Optional;
+
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
@@ -23,16 +22,17 @@ import net.minecraft.world.World;
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
 @FunctionalInterface
-public interface IPeripheralProvider {
+public interface IPeripheralProvider
+{
     /**
      * Produce an peripheral implementation from a block location.
      *
      * @param world The world the block is in.
-     * @param pos The position the block is at.
+     * @param pos   The position the block is at.
-     * @param side The side to get the peripheral from.
+     * @param side  The side to get the peripheral from.
      * @return A peripheral, or {@link Optional#empty()} if there is not a peripheral here you'd like to handle.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
      */
     @Nonnull
-    IPeripheral getPeripheral(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
+    IPeripheral getPeripheral( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
 }

src/main/java/dan200/computercraft/api/peripheral/IPeripheralTile.java

@@ -5,19 +5,20 @@
  */
 package dan200.computercraft.api.peripheral;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 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;
+
 /**
  * A {@link net.minecraft.block.entity.BlockEntity} which may act as a peripheral.
  *
  * If you need more complex capabilities (such as handling TEs not belonging to your mod), you should use {@link IPeripheralProvider}.
  */
-public interface IPeripheralTile {
+public interface IPeripheralTile
+{
     /**
      * Get the peripheral on the given {@code side}.
      *
@@ -26,5 +27,5 @@ public interface IPeripheralTile {
      * @see IPeripheralProvider#getPeripheral(World, BlockPos, Direction)
      */
     @Nullable
-    IPeripheral getPeripheral(@Nonnull Direction side);
+    IPeripheral getPeripheral( @Nonnull Direction side );
 }

src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java

@@ -6,11 +6,10 @@
 
 package dan200.computercraft.api.peripheral;
 
+import javax.annotation.Nonnull;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import javax.annotation.Nonnull;
-
 /**
  * Monitors "work" associated with a computer, keeping track of how much a computer has done, and ensuring every computer receives a fair share of any
  * processing time.
@@ -25,7 +24,8 @@ import javax.annotation.Nonnull;
  *
  * @see IComputerAccess#getMainThreadMonitor()
  */
-public interface IWorkMonitor {
+public interface IWorkMonitor
+{
     /**
      * If the owning computer is currently allowed to execute work, and has ample time to do so.
      *
@@ -42,17 +42,22 @@ public interface IWorkMonitor {
      * @param runnable The task to run.
      * @return If the task was actually run (namely, {@link #canWork()} returned {@code true}).
      */
-    default boolean runWork(@Nonnull Runnable runnable) {
+    default boolean runWork( @Nonnull Runnable runnable )
-        Objects.requireNonNull(runnable, "runnable should not be null");
+    {
-        if (!this.canWork()) {
+        Objects.requireNonNull( runnable, "runnable should not be null" );
+        if( !this.canWork() )
+        {
             return false;
         }
 
         long start = System.nanoTime();
-        try {
+        try
+        {
             runnable.run();
-        } finally {
+        }
-            this.trackWork(System.nanoTime() - start, TimeUnit.NANOSECONDS);
+        finally
+        {
+            this.trackWork( System.nanoTime() - start, TimeUnit.NANOSECONDS );
         }
 
         return true;
@@ -71,5 +76,5 @@ public interface IWorkMonitor {
      * @param time The time some task took to run
      * @param unit The unit that {@code time} was measured in.
      */
-    void trackWork(long time, @Nonnull TimeUnit unit);
+    void trackWork( long time, @Nonnull TimeUnit unit );
 }

src/main/java/dan200/computercraft/api/peripheral/NotAttachedException.java

@@ -9,14 +9,17 @@ package dan200.computercraft.api.peripheral;
 /**
  * Thrown when performing operations on {@link IComputerAccess} when the current peripheral is no longer attached to the computer.
  */
-public class NotAttachedException extends IllegalStateException {
+public class NotAttachedException extends IllegalStateException
+{
     private static final long serialVersionUID = 1221244785535553536L;
 
-    public NotAttachedException() {
+    public NotAttachedException()
-        super("You are not attached to this computer");
+    {
+        super( "You are not attached to this computer" );
     }
 
-    public NotAttachedException(String s) {
+    public NotAttachedException( String s )
-        super(s);
+    {
+        super( s );
     }
 }

src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java

@@ -6,34 +6,38 @@
 
 package dan200.computercraft.api.pocket;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
+import javax.annotation.Nonnull;
+
 /**
  * A base class for {@link IPocketUpgrade}s.
  *
  * One does not have to use this, but it does provide a convenient template.
  */
-public abstract class AbstractPocketUpgrade implements IPocketUpgrade {
+public abstract class AbstractPocketUpgrade implements IPocketUpgrade
+{
     private final Identifier id;
     private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractPocketUpgrade(Identifier id, ItemConvertible item) {
+    protected AbstractPocketUpgrade( Identifier id, ItemConvertible item )
-        this(id, Util.createTranslationKey("upgrade", id) + ".adjective", item);
+    {
+        this( id, Util.createTranslationKey( "upgrade", id ) + ".adjective", item );
     }
 
-    protected AbstractPocketUpgrade(Identifier id, String adjective, ItemConvertible item) {
+    protected AbstractPocketUpgrade( Identifier id, String adjective, ItemConvertible item )
+    {
         this.id = id;
         this.adjective = adjective;
-        this.stack = new ItemStack(item);
+        this.stack = new ItemStack( item );
     }
 
-    protected AbstractPocketUpgrade(Identifier id, String adjective, ItemStack stack) {
+    protected AbstractPocketUpgrade( Identifier id, String adjective, ItemStack stack )
+    {
         this.id = id;
         this.adjective = adjective;
         this.stack = stack;
@@ -42,19 +46,22 @@ public abstract class AbstractPocketUpgrade implements IPocketUpgrade {
 
     @Nonnull
     @Override
-    public final Identifier getUpgradeID() {
+    public final Identifier getUpgradeID()
+    {
         return this.id;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective() {
+    public final String getUnlocalisedAdjective()
+    {
         return this.adjective;
     }
 
     @Nonnull
     @Override
-    public final ItemStack getCraftingItem() {
+    public final ItemStack getCraftingItem()
+    {
         return this.stack;
     }
 }

src/main/java/dan200/computercraft/api/pocket/IPocketAccess.java

@@ -6,21 +6,20 @@
 
 package dan200.computercraft.api.pocket;
 
-import java.util.Map;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.peripheral.IPeripheral;
-
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.Identifier;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Map;
+
 /**
  * Wrapper class for pocket computers.
  */
-public interface IPocketAccess {
+public interface IPocketAccess
+{
     /**
      * Gets the entity holding this item.
      *
@@ -43,10 +42,10 @@ public interface IPocketAccess {
      * Set the colour of the pocket computer to a RGB number.
      *
      * @param colour The colour this pocket computer should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or
-     *     -1 to reset to the default colour.
+     *               -1 to reset to the default colour.
      * @see #getColour()
      */
-    void setColour(int colour);
+    void setColour( int colour );
 
     /**
      * Get the colour of this pocket computer's light as a RGB number.
@@ -60,10 +59,10 @@ public interface IPocketAccess {
      * Set the colour of the pocket computer's light to a RGB number.
      *
      * @param colour The colour this modem's light will be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1
-     *     to reset to the default colour.
+     *               to reset to the default colour.
      * @see #getLight()
      */
-    void setLight(int colour);
+    void setLight( int colour );
 
     /**
      * Get the upgrade-specific NBT.

src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java

@@ -6,15 +6,14 @@
 
 package dan200.computercraft.api.pocket;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.IUpgradeBase;
 import dan200.computercraft.api.peripheral.IPeripheral;
-
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 /**
  * Additional peripherals for pocket computers.
  *
@@ -33,29 +32,31 @@ public interface IPocketUpgrade extends IUpgradeBase
      * @see #update(IPocketAccess, IPeripheral)
      */
     @Nullable
-    IPeripheral createPeripheral(@Nonnull IPocketAccess access);
+    IPeripheral createPeripheral( @Nonnull IPocketAccess access );
 
     /**
      * Called when the pocket computer item stack updates.
      *
-     * @param access The access object for the pocket item stack.
+     * @param access     The access object for the pocket item stack.
      * @param peripheral The peripheral for this upgrade.
      * @see #createPeripheral(IPocketAccess)
      */
-    default void update(@Nonnull IPocketAccess access, @Nullable IPeripheral peripheral) {
+    default void update( @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
+    {
     }
 
     /**
      * Called when the pocket computer is right clicked.
      *
-     * @param world The world the computer is in.
+     * @param world      The world the computer is in.
-     * @param access The access object for the pocket item stack.
+     * @param access     The access object for the pocket item stack.
      * @param peripheral The peripheral for this upgrade.
      * @return {@code true} to stop the GUI from opening, otherwise false. You should always provide some code path which returns {@code false}, such as
-     *     requiring the player to be sneaking - otherwise they will be unable to access the GUI.
+     * requiring the player to be sneaking - otherwise they will be unable to access the GUI.
      * @see #createPeripheral(IPocketAccess)
      */
-    default boolean onRightClick(@Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral) {
+    default boolean onRightClick( @Nonnull World world, @Nonnull IPocketAccess access, @Nullable IPeripheral peripheral )
+    {
         return false;
     }
 }

src/main/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java

@@ -6,27 +6,28 @@
 
 package dan200.computercraft.api.redstone;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+
 /**
  * This interface is used to provide bundled redstone output for blocks.
  *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
  */
 @FunctionalInterface
-public interface IBundledRedstoneProvider {
+public interface IBundledRedstoneProvider
+{
     /**
      * Produce an bundled redstone output from a block location.
      *
      * @param world The world this block is in.
-     * @param pos The position this block is at.
+     * @param pos   The position this block is at.
-     * @param side The side to extract the bundled redstone output from.
+     * @param side  The side to extract the bundled redstone output from.
      * @return A number in the range 0-65535 to indicate this block is providing output, or -1 if you do not wish to handle this block.
      * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider)
      */
-    int getBundledRedstoneOutput(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side);
+    int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull Direction side );
 }

src/main/java/dan200/computercraft/api/turtle/AbstractTurtleUpgrade.java

@@ -6,65 +6,74 @@
 
 package dan200.computercraft.api.turtle;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.item.ItemConvertible;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 
+import javax.annotation.Nonnull;
+
 /**
  * A base class for {@link ITurtleUpgrade}s.
  *
  * One does not have to use this, but it does provide a convenient template.
  */
-public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade {
+public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
+{
     private final Identifier id;
     private final TurtleUpgradeType type;
     private final String adjective;
     private final ItemStack stack;
 
-    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, String adjective, ItemConvertible item) {
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemConvertible item )
-        this(id, type, adjective, new ItemStack(item));
+    {
+        this( id, type, adjective, new ItemStack( item ) );
     }
 
-    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, String adjective, ItemStack stack) {
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, String adjective, ItemStack stack )
+    {
         this.id = id;
         this.type = type;
         this.adjective = adjective;
         this.stack = stack;
     }
 
-    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, ItemConvertible item) {
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemConvertible item )
-        this(id, type, new ItemStack(item));
+    {
+        this( id, type, new ItemStack( item ) );
     }
 
-    protected AbstractTurtleUpgrade(Identifier id, TurtleUpgradeType type, ItemStack stack) {
+    protected AbstractTurtleUpgrade( Identifier id, TurtleUpgradeType type, ItemStack stack )
-        this(id, type, Util.createTranslationKey("upgrade", id) + ".adjective", stack);
+    {
+        this( id, type, Util.createTranslationKey( "upgrade", id ) + ".adjective", stack );
     }
 
 
     @Nonnull
     @Override
-    public final Identifier getUpgradeID() {
+    public final Identifier getUpgradeID()
+    {
         return this.id;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective() {
+    public final String getUnlocalisedAdjective()
+    {
         return this.adjective;
     }
 
     @Nonnull
     @Override
-    public final TurtleUpgradeType getType() {
+    public final TurtleUpgradeType getType()
+    {
         return this.type;
     }
 
     @Nonnull
     @Override
-    public final ItemStack getCraftingItem() {
+    public final ItemStack getCraftingItem()
+    {
         return this.stack;
     }
 }

src/main/java/dan200/computercraft/api/turtle/FakePlayer.java

@@ -5,18 +5,10 @@
  */
 package dan200.computercraft.api.turtle;
 
-import java.util.Collection;
-import java.util.OptionalInt;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-import javax.crypto.Cipher;
-
 import com.mojang.authlib.GameProfile;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
-
 import net.minecraft.block.entity.CommandBlockBlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.command.argument.EntityAnchorArgumentType;
@@ -26,11 +18,7 @@ import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.ClientConnection;
+import net.minecraft.network.*;
-import net.minecraft.network.MessageType;
-import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
-import net.minecraft.network.Packet;
 import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
 import net.minecraft.recipe.Recipe;
@@ -50,15 +38,23 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.village.TradeOfferList;
 import net.minecraft.world.GameMode;
 
+import javax.annotation.Nullable;
+import javax.crypto.Cipher;
+import java.util.Collection;
+import java.util.OptionalInt;
+import java.util.UUID;
+
 /**
  * A wrapper for {@link ServerPlayerEntity} which denotes a "fake" player.
  *
  * Please note that this does not implement any of the traditional fake player behaviour. It simply exists to prevent me passing in normal players.
  */
-public class FakePlayer extends ServerPlayerEntity {
+public class FakePlayer extends ServerPlayerEntity
-    public FakePlayer(ServerWorld world, GameProfile gameProfile) {
+{
-        super(world.getServer(), world, gameProfile, new ServerPlayerInteractionManager(world));
+    public FakePlayer( ServerWorld world, GameProfile gameProfile )
-        this.networkHandler = new FakeNetHandler(this);
+    {
+        super( world.getServer(), world, gameProfile, new ServerPlayerInteractionManager( world ) );
+        this.networkHandler = new FakeNetHandler( this );
     }
 
     // region Direct networkHandler access
@@ -75,20 +71,23 @@ public class FakePlayer extends ServerPlayerEntity {
     public void playerTick() { }
 
     @Override
-    public void onDeath(DamageSource damage) { }
+    public void onDeath( DamageSource damage ) { }
 
     @Override
-    public Entity moveToWorld(ServerWorld destination) {
+    public Entity moveToWorld( ServerWorld destination )
+    {
         return this;
     }
 
     @Override
-    public void wakeUp(boolean bl, boolean updateSleepingPlayers) {
+    public void wakeUp( boolean bl, boolean updateSleepingPlayers )
+    {
 
     }
 
     @Override
-    public boolean startRiding(Entity entity, boolean flag) {
+    public boolean startRiding( Entity entity, boolean flag )
+    {
         return false;
     }
 
@@ -96,33 +95,34 @@ public class FakePlayer extends ServerPlayerEntity {
     public void stopRiding() { }
 
     @Override
-    public void openEditSignScreen(SignBlockEntity tile) { }
+    public void openEditSignScreen( SignBlockEntity tile ) { }
 
     @Override
-    public OptionalInt openHandledScreen(@Nullable NamedScreenHandlerFactory container) {
+    public OptionalInt openHandledScreen( @Nullable NamedScreenHandlerFactory container )
+    {
         return OptionalInt.empty();
     }
 
     @Override
-    public void sendTradeOffers(int id, TradeOfferList list, int level, int experience, boolean levelled, boolean refreshable) { }
+    public void sendTradeOffers( int id, TradeOfferList list, int level, int experience, boolean levelled, boolean refreshable ) { }
 
     @Override
-    public void openHorseInventory(HorseBaseEntity horse, Inventory inventory) { }
+    public void openHorseInventory( HorseBaseEntity horse, Inventory inventory ) { }
 
     @Override
-    public void openEditBookScreen(ItemStack stack, Hand hand) { }
+    public void openEditBookScreen( ItemStack stack, Hand hand ) { }
 
     @Override
-    public void openCommandBlockScreen(CommandBlockBlockEntity block) { }
+    public void openCommandBlockScreen( CommandBlockBlockEntity block ) { }
 
     @Override
-    public void onSlotUpdate(ScreenHandler container, int slot, ItemStack stack) { }
+    public void onSlotUpdate( ScreenHandler container, int slot, ItemStack stack ) { }
 
     @Override
-    public void onHandlerRegistered(ScreenHandler container, DefaultedList<ItemStack> defaultedList) { }
+    public void onHandlerRegistered( ScreenHandler container, DefaultedList<ItemStack> defaultedList ) { }
 
     @Override
-    public void onPropertyUpdate(ScreenHandler container, int key, int value) { }
+    public void onPropertyUpdate( ScreenHandler container, int key, int value ) { }
 
     @Override
     public void closeHandledScreen() { }
@@ -131,136 +131,154 @@ public class FakePlayer extends ServerPlayerEntity {
     public void updateCursorStack() { }
 
     @Override
-    public int unlockRecipes(Collection<Recipe<?>> recipes) {
+    public int unlockRecipes( Collection<Recipe<?>> recipes )
+    {
         return 0;
     }
 
     // Indirect
     @Override
-    public int lockRecipes(Collection<Recipe<?>> recipes) {
+    public int lockRecipes( Collection<Recipe<?>> recipes )
+    {
         return 0;
     }
 
     @Override
-    public void sendMessage(Text textComponent, boolean status) { }
+    public void sendMessage( Text textComponent, boolean status ) { }
 
     @Override
     protected void consumeItem() { }
 
     @Override
-    public void lookAt(EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d) {}
+    public void lookAt( EntityAnchorArgumentType.EntityAnchor anchor, Vec3d vec3d ) {}
 
     @Override
-    public void method_14222(EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target) { }
+    public void method_14222( EntityAnchorArgumentType.EntityAnchor self, Entity entity, EntityAnchorArgumentType.EntityAnchor target ) { }
 
     @Override
-    protected void onStatusEffectApplied(StatusEffectInstance statusEffectInstance) { }
+    protected void onStatusEffectApplied( StatusEffectInstance statusEffectInstance ) { }
 
     @Override
-    protected void onStatusEffectUpgraded(StatusEffectInstance statusEffectInstance, boolean particles) { }
+    protected void onStatusEffectUpgraded( StatusEffectInstance statusEffectInstance, boolean particles ) { }
 
     @Override
-    protected void onStatusEffectRemoved(StatusEffectInstance statusEffectInstance) { }
+    protected void onStatusEffectRemoved( StatusEffectInstance statusEffectInstance ) { }
 
     @Override
-    public void requestTeleport(double x, double y, double z) { }
+    public void requestTeleport( double x, double y, double z ) { }
 
     @Override
-    public void setGameMode(GameMode gameMode) { }
+    public void setGameMode( GameMode gameMode ) { }
 
     @Override
-    public void sendMessage(Text message, MessageType type, UUID senderUuid) {
+    public void sendMessage( Text message, MessageType type, UUID senderUuid )
+    {
 
     }
 
     @Override
-    public String getIp() {
+    public String getIp()
+    {
         return "[Fake Player]";
     }
 
     @Override
-    public void sendResourcePackUrl(String url, String hash) { }
+    public void sendResourcePackUrl( String url, String hash ) { }
 
     @Override
-    public void onStoppedTracking(Entity entity) { }
+    public void onStoppedTracking( Entity entity ) { }
 
     @Override
-    public void setCameraEntity(Entity entity) { }
+    public void setCameraEntity( Entity entity ) { }
 
     @Override
-    public void teleport(ServerWorld serverWorld, double x, double y, double z, float pitch, float yaw) { }
+    public void teleport( ServerWorld serverWorld, double x, double y, double z, float pitch, float yaw ) { }
 
     @Override
-    public void sendInitialChunkPackets(ChunkPos chunkPos, Packet<?> packet, Packet<?> packet2) { }
+    public void sendInitialChunkPackets( ChunkPos chunkPos, Packet<?> packet, Packet<?> packet2 ) { }
 
     @Override
-    public void sendUnloadChunkPacket(ChunkPos chunkPos) { }
+    public void sendUnloadChunkPacket( ChunkPos chunkPos ) { }
 
     @Override
-    public void playSound(SoundEvent soundEvent, SoundCategory soundCategory, float volume, float pitch) { }
+    public void playSound( SoundEvent soundEvent, SoundCategory soundCategory, float volume, float pitch ) { }
 
-    private static class FakeNetHandler extends ServerPlayNetworkHandler {
+    private static class FakeNetHandler extends ServerPlayNetworkHandler
-        FakeNetHandler(ServerPlayerEntity player) {
+    {
-            super(player.server, new FakeConnection(), player);
+        FakeNetHandler( ServerPlayerEntity player )
+        {
+            super( player.server, new FakeConnection(), player );
         }
 
         @Override
-        public void disconnect(Text message) { }
+        public void disconnect( Text message ) { }
 
         @Override
-        public void onVehicleMove(VehicleMoveC2SPacket move) { }
+        public void onVehicleMove( VehicleMoveC2SPacket move ) { }
 
         @Override
-        public void onRequestCommandCompletions(RequestCommandCompletionsC2SPacket packet) { }
+        public void onRequestCommandCompletions( RequestCommandCompletionsC2SPacket packet ) { }
 
         @Override
-        public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) { }
+        public void sendPacket( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener ) { }
     }
 
-    private static class FakeConnection extends ClientConnection {
+    private static class FakeConnection extends ClientConnection
-        FakeConnection() {
+    {
-            super(NetworkSide.CLIENTBOUND);
+        FakeConnection()
+        {
+            super( NetworkSide.CLIENTBOUND );
         }
 
         @Override
-        public void channelActive(ChannelHandlerContext active) {
+        public void channelActive( ChannelHandlerContext active )
+        {
         }
 
         @Override
-        public void setState(NetworkState state) {
+        public void setState( NetworkState state )
+        {
         }
 
         @Override
-        public void exceptionCaught(ChannelHandlerContext context, Throwable err) {
+        public void exceptionCaught( ChannelHandlerContext context, Throwable err )
+        {
         }
 
         @Override
-        protected void channelRead0(ChannelHandlerContext context, Packet<?> packet) {
+        protected void channelRead0( ChannelHandlerContext context, Packet<?> packet )
+        {
         }
 
         @Override
-        public void send(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) {
+        public void send( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
+        {
         }
 
         @Override
-        public void tick() {
+        public void tick()
+        {
         }
 
         @Override
-        public void disconnect(Text message) {
+        public void disconnect( Text message )
+        {
         }
 
         @Override
-        public void setupEncryption(Cipher cipher, Cipher cipher2) {
+        public void setupEncryption( Cipher cipher, Cipher cipher2 )
-            super.setupEncryption(cipher, cipher2);
+        {
+            super.setupEncryption( cipher, cipher2 );
         }
 
         @Override
-        public void disableAutoRead() {
+        public void disableAutoRead()
+        {
         }
 
         @Override
-        public void setCompressionThreshold(int size) {
+        public void setCompressionThreshold( int size )
+        {
         }
     }
 }

src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java

@@ -6,15 +6,11 @@
 
 package dan200.computercraft.api.turtle;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.mojang.authlib.GameProfile;
 import dan200.computercraft.api.lua.ILuaCallback;
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.shared.util.ItemStorage;
-
 import net.minecraft.inventory.Inventory;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
@@ -22,12 +18,16 @@ 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;
+
 /**
  * The interface passed to turtle by turtles, providing methods that they can call.
  *
  * This should not be implemented by your classes. Do not interact with turtles except via this interface and {@link ITurtleUpgrade}.
  */
-public interface ITurtleAccess {
+public interface ITurtleAccess
+{
     /**
      * Returns the world in which the turtle resides.
      *
@@ -51,11 +51,11 @@ public interface ITurtleAccess {
      * using {@link #playAnimation(TurtleAnimation)}.
      *
      * @param world The new world to move it to
-     * @param pos The new position to move it to.
+     * @param pos   The new position to move it to.
      * @return Whether the movement was successful. It may fail if the block was not loaded or the block placement was cancelled.
      * @throws UnsupportedOperationException When attempting to teleport on the client side.
      */
-    boolean teleportTo(@Nonnull World world, @Nonnull BlockPos pos);
+    boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos );
 
     /**
      * Returns a vector containing the floating point co-ordinates at which the turtle is rendered. This will shift when the turtle is moving.
@@ -65,7 +65,7 @@ public interface ITurtleAccess {
      * @see #getVisualYaw(float)
      */
     @Nonnull
-    Vec3d getVisualPosition(float f);
+    Vec3d getVisualPosition( float f );
 
     /**
      * Returns the yaw the turtle is facing when it is rendered.
@@ -74,7 +74,7 @@ public interface ITurtleAccess {
      * @return The yaw the turtle is facing.
      * @see #getVisualPosition(float)
      */
-    float getVisualYaw(float f);
+    float getVisualYaw( float f );
 
     /**
      * Returns the world direction the turtle is currently facing.
@@ -92,7 +92,7 @@ public interface ITurtleAccess {
      * @param dir The new direction to set. This should be on either the x or z axis (so north, south, east or west).
      * @see #getDirection()
      */
-    void setDirection(@Nonnull Direction dir);
+    void setDirection( @Nonnull Direction dir );
 
     /**
      * Get the currently selected slot in the turtle's inventory.
@@ -111,7 +111,7 @@ public interface ITurtleAccess {
      * @see #getInventory()
      * @see #getSelectedSlot()
      */
-    void setSelectedSlot(int slot);
+    void setSelectedSlot( int slot );
 
     /**
      * Get the colour of this turtle as a RGB number.
@@ -125,10 +125,10 @@ public interface ITurtleAccess {
      * Set the colour of the turtle to a RGB number.
      *
      * @param colour The colour this turtle should be changed to. This should be a RGB colour between {@code 0x000000} and {@code 0xFFFFFF} or -1 to
-     *     reset to the default colour.
+     *               reset to the default colour.
      * @see #getColour()
      */
-    void setColour(int colour);
+    void setColour( int colour );
 
     /**
      * Get the player who owns this turtle, namely whoever placed it.
@@ -165,7 +165,7 @@ public interface ITurtleAccess {
      * @see #addFuel(int)
      * @see #consumeFuel(int)
      */
-    void setFuelLevel(int fuel);
+    void setFuelLevel( int fuel );
 
     /**
      * Get the maximum amount of fuel a turtle can hold.
@@ -179,10 +179,10 @@ public interface ITurtleAccess {
      *
      * @param fuel The amount of fuel to consume.
      * @return Whether the turtle was able to consume the amount of fuel specified. Will return false if you supply a number greater than the current fuel
-     *     level of the turtle. No fuel will be consumed if {@code false} is returned.
+     * level of the turtle. No fuel will be consumed if {@code false} is returned.
      * @throws UnsupportedOperationException When attempting to consume fuel on the client side.
      */
-    boolean consumeFuel(int fuel);
+    boolean consumeFuel( int fuel );
 
     /**
      * Increase the turtle's fuel level by the given amount.
@@ -190,7 +190,7 @@ public interface ITurtleAccess {
      * @param fuel The amount to refuel with.
      * @throws UnsupportedOperationException When attempting to refuel on the client side.
      */
-    void addFuel(int fuel);
+    void addFuel( int fuel );
 
     /**
      * Adds a custom command to the turtles command queue. Unlike peripheral methods, these custom commands will be executed on the main thread, so are
@@ -205,7 +205,7 @@ public interface ITurtleAccess {
      * @see MethodResult#pullEvent(String, ILuaCallback)
      */
     @Nonnull
-    MethodResult executeCommand(@Nonnull ITurtleCommand command);
+    MethodResult executeCommand( @Nonnull ITurtleCommand command );
 
     /**
      * Start playing a specific animation. This will prevent other turtle commands from executing until it is finished.
@@ -214,7 +214,7 @@ public interface ITurtleAccess {
      * @throws UnsupportedOperationException When attempting to execute play an animation on the client side.
      * @see TurtleAnimation
      */
-    void playAnimation(@Nonnull TurtleAnimation animation);
+    void playAnimation( @Nonnull TurtleAnimation animation );
 
     /**
      * Returns the turtle on the specified side of the turtle, if there is one.
@@ -224,16 +224,16 @@ public interface ITurtleAccess {
      * @see #setUpgrade(TurtleSide, ITurtleUpgrade)
      */
     @Nullable
-    ITurtleUpgrade getUpgrade(@Nonnull TurtleSide side);
+    ITurtleUpgrade getUpgrade( @Nonnull TurtleSide side );
 
     /**
      * Set the upgrade for a given side, resetting peripherals and clearing upgrade specific data.
      *
-     * @param side The side to set the upgrade on.
+     * @param side    The side to set the upgrade on.
      * @param upgrade The upgrade to set, may be {@code null} to clear.
      * @see #getUpgrade(TurtleSide)
      */
-    void setUpgrade(@Nonnull TurtleSide side, @Nullable ITurtleUpgrade upgrade);
+    void setUpgrade( @Nonnull TurtleSide side, @Nullable ITurtleUpgrade upgrade );
 
     /**
      * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one.
@@ -242,7 +242,7 @@ public interface ITurtleAccess {
      * @return The peripheral created by the upgrade on the specified side of the turtle, {@code null} if none exists.
      */
     @Nullable
-    IPeripheral getPeripheral(@Nonnull TurtleSide side);
+    IPeripheral getPeripheral( @Nonnull TurtleSide side );
 
     /**
      * Get an upgrade-specific NBT compound, which can be used to store arbitrary data.
@@ -255,7 +255,7 @@ public interface ITurtleAccess {
      * @see #updateUpgradeNBTData(TurtleSide)
      */
     @Nonnull
-    CompoundTag getUpgradeNBTData(@Nullable TurtleSide side);
+    CompoundTag getUpgradeNBTData( @Nullable TurtleSide side );
 
     /**
      * Mark the upgrade-specific data as dirty on a specific side. This is required for the data to be synced to the client and persisted.
@@ -263,10 +263,11 @@ public interface ITurtleAccess {
      * @param side The side to mark dirty.
      * @see #updateUpgradeNBTData(TurtleSide)
      */
-    void updateUpgradeNBTData(@Nonnull TurtleSide side);
+    void updateUpgradeNBTData( @Nonnull TurtleSide side );
 
-    default ItemStorage getItemHandler() {
+    default ItemStorage getItemHandler()
-        return ItemStorage.wrap(this.getInventory());
+    {
+        return ItemStorage.wrap( this.getInventory() );
     }
 
     /**

src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java

@@ -14,7 +14,8 @@ import javax.annotation.Nonnull;
  * @see ITurtleAccess#executeCommand(ITurtleCommand)
  */
 @FunctionalInterface
-public interface ITurtleCommand {
+public interface ITurtleCommand
+{
     /**
      * Will be called by the turtle on the main thread when it is time to execute the custom command.
      *
@@ -29,5 +30,5 @@ public interface ITurtleCommand {
      * @see TurtleCommandResult
      */
     @Nonnull
-    TurtleCommandResult execute(@Nonnull ITurtleAccess turtle);
+    TurtleCommandResult execute( @Nonnull ITurtleAccess turtle );
 }

src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java

@@ -6,18 +6,16 @@
 
 package dan200.computercraft.api.turtle;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.IUpgradeBase;
 import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.peripheral.IPeripheral;
-
-import net.minecraft.util.math.Direction;
-
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.minecraft.util.math.Direction;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * The primary interface for defining an update for Turtles. A turtle update can either be a new tool, or a new peripheral.
@@ -42,28 +40,30 @@ public interface ITurtleUpgrade extends IUpgradeBase
      * TurtleSide)}. It will be attached, detached and have methods called in the same manner as a Computer peripheral.
      *
      * @param turtle Access to the turtle that the peripheral is being created for.
-     * @param side Which side of the turtle (left or right) that the upgrade resides on.
+     * @param side   Which side of the turtle (left or right) that the upgrade resides on.
      * @return The newly created peripheral. You may return {@code null} if this upgrade is a Tool and this method is not expected to be called.
      */
     @Nullable
-    default IPeripheral createPeripheral(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side) {
+    default IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
+    {
         return null;
     }
 
     /**
      * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called by the turtle, and the tool is required to do some work.
      *
-     * @param turtle Access to the turtle that the tool resides on.
+     * @param turtle    Access to the turtle that the tool resides on.
-     * @param side Which side of the turtle (left or right) the tool resides on.
+     * @param side      Which side of the turtle (left or right) the tool resides on.
-     * @param verb Which action (dig or attack) the turtle is being called on to perform.
+     * @param verb      Which action (dig or attack) the turtle is being called on to perform.
      * @param direction Which world direction the action should be performed in, relative to the turtles position. This will either be up, down, or the
-     *     direction the turtle is facing, depending on whether dig, digUp or digDown was called.
+     *                  direction the turtle is facing, depending on whether dig, digUp or digDown was called.
      * @return Whether the turtle was able to perform the action, and hence whether the {@code turtle.dig()} or {@code turtle.attack()} lua method should
-     *     return true. If true is returned, the tool will perform a swinging animation. You may return {@code null} if this turtle is a Peripheral  and
+     * return true. If true is returned, the tool will perform a swinging animation. You may return {@code null} if this turtle is a Peripheral  and
-     *     this method is not expected to be called.
+     * this method is not expected to be called.
      */
     @Nonnull
-    default TurtleCommandResult useTool(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction) {
+    default TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side, @Nonnull TurtleVerb verb, @Nonnull Direction direction )
+    {
         return TurtleCommandResult.failure();
     }
 
@@ -71,19 +71,20 @@ public interface ITurtleUpgrade extends IUpgradeBase
      * Called to obtain the model to be used when rendering a turtle peripheral.
      *
      * @param turtle Access to the turtle that the upgrade resides on. This will be null when getting item models!
-     * @param side Which side of the turtle (left or right) the upgrade resides on.
+     * @param side   Which side of the turtle (left or right) the upgrade resides on.
      * @return The model that you wish to be used to render your upgrade.
      */
     @Nonnull
-    @Environment (EnvType.CLIENT)
+    @Environment( EnvType.CLIENT )
-    TransformedModel getModel(@Nullable ITurtleAccess turtle, @Nonnull TurtleSide side);
+    TransformedModel getModel( @Nullable ITurtleAccess turtle, @Nonnull TurtleSide side );
 
     /**
      * Called once per tick for each turtle which has the upgrade equipped.
      *
      * @param turtle Access to the turtle that the upgrade resides on.
-     * @param side Which side of the turtle (left or right) the upgrade resides on.
+     * @param side   Which side of the turtle (left or right) the upgrade resides on.
      */
-    default void update(@Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side) {
+    default void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide side )
+    {
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java

@@ -13,7 +13,8 @@ package dan200.computercraft.api.turtle;
  *
  * @see ITurtleAccess#playAnimation(TurtleAnimation)
  */
-public enum TurtleAnimation {
+public enum TurtleAnimation
+{
     /**
      * An animation which does nothing. This takes no time to complete.
      *

src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java

@@ -15,14 +15,16 @@ import javax.annotation.Nullable;
  * @see ITurtleCommand#execute(ITurtleAccess)
  * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
  */
-public final class TurtleCommandResult {
+public final class TurtleCommandResult
-    private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult(true, null, null);
+{
-    private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult(false, null, null);
+    private static final TurtleCommandResult EMPTY_SUCCESS = new TurtleCommandResult( true, null, null );
+    private static final TurtleCommandResult EMPTY_FAILURE = new TurtleCommandResult( false, null, null );
     private final boolean success;
     private final String errorMessage;
     private final Object[] results;
 
-    private TurtleCommandResult(boolean success, String errorMessage, Object[] results) {
+    private TurtleCommandResult( boolean success, String errorMessage, Object[] results )
+    {
         this.success = success;
         this.errorMessage = errorMessage;
         this.results = results;
@@ -34,7 +36,8 @@ public final class TurtleCommandResult {
      * @return A successful command result with no values.
      */
     @Nonnull
-    public static TurtleCommandResult success() {
+    public static TurtleCommandResult success()
+    {
         return EMPTY_SUCCESS;
     }
 
@@ -45,11 +48,13 @@ public final class TurtleCommandResult {
      * @return A successful command result with the given values.
      */
     @Nonnull
-    public static TurtleCommandResult success(@Nullable Object[] results) {
+    public static TurtleCommandResult success( @Nullable Object[] results )
-        if (results == null || results.length == 0) {
+    {
+        if( results == null || results.length == 0 )
+        {
             return EMPTY_SUCCESS;
         }
-        return new TurtleCommandResult(true, null, results);
+        return new TurtleCommandResult( true, null, results );
     }
 
     /**
@@ -58,7 +63,8 @@ public final class TurtleCommandResult {
      * @return A failed command result with no message.
      */
     @Nonnull
-    public static TurtleCommandResult failure() {
+    public static TurtleCommandResult failure()
+    {
         return EMPTY_FAILURE;
     }
 
@@ -69,11 +75,13 @@ public final class TurtleCommandResult {
      * @return A failed command result with a message.
      */
     @Nonnull
-    public static TurtleCommandResult failure(@Nullable String errorMessage) {
+    public static TurtleCommandResult failure( @Nullable String errorMessage )
-        if (errorMessage == null) {
+    {
+        if( errorMessage == null )
+        {
             return EMPTY_FAILURE;
         }
-        return new TurtleCommandResult(false, errorMessage, null);
+        return new TurtleCommandResult( false, errorMessage, null );
     }
 
     /**
@@ -81,7 +89,8 @@ public final class TurtleCommandResult {
      *
      * @return If the command was successful.
      */
-    public boolean isSuccess() {
+    public boolean isSuccess()
+    {
         return this.success;
     }
 
@@ -91,7 +100,8 @@ public final class TurtleCommandResult {
      * @return The command's error message, or {@code null} if it was a success.
      */
     @Nullable
-    public String getErrorMessage() {
+    public String getErrorMessage()
+    {
         return this.errorMessage;
     }
 
@@ -101,7 +111,8 @@ public final class TurtleCommandResult {
      * @return The command's result, or {@code null} if it was a failure.
      */
     @Nullable
-    public Object[] getResults() {
+    public Object[] getResults()
+    {
         return this.results;
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleSide.java

@@ -9,7 +9,8 @@ package dan200.computercraft.api.turtle;
 /**
  * An enum representing the two sides of the turtle that a turtle turtle might reside.
  */
-public enum TurtleSide {
+public enum TurtleSide
+{
     /**
      * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
      */

src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java

@@ -11,7 +11,8 @@ package dan200.computercraft.api.turtle;
  *
  * @see ITurtleUpgrade#getType()
  */
-public enum TurtleUpgradeType {
+public enum TurtleUpgradeType
+{
     /**
      * A tool is rendered as an item on the side of the turtle, and responds to the {@code turtle.dig()} and {@code turtle.attack()} methods (Such as
      * pickaxe or sword on Mining and Melee turtles).
@@ -30,11 +31,13 @@ public enum TurtleUpgradeType {
      */
     BOTH;
 
-    public boolean isTool() {
+    public boolean isTool()
+    {
         return this == TOOL || this == BOTH;
     }
 
-    public boolean isPeripheral() {
+    public boolean isPeripheral()
+    {
         return this == PERIPHERAL || this == BOTH;
     }
 }

src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java

@@ -12,7 +12,8 @@ package dan200.computercraft.api.turtle;
  * @see ITurtleUpgrade#getType()
  * @see ITurtleUpgrade#useTool(ITurtleAccess, TurtleSide, TurtleVerb, Direction)
  */
-public enum TurtleVerb {
+public enum TurtleVerb
+{
     /**
      * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}.
      */

src/main/java/dan200/computercraft/api/turtle/event/TurtleAction.java

@@ -11,7 +11,8 @@ package dan200.computercraft.api.turtle.event;
  *
  * @see TurtleActionEvent
  */
-public enum TurtleAction {
+public enum TurtleAction
+{
     /**
      * A turtle moves to a new position.
      *

src/main/java/dan200/computercraft/api/turtle/event/TurtleActionEvent.java

@@ -6,30 +6,32 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import dan200.computercraft.api.turtle.TurtleCommandResult;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
+import java.util.Objects;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.TurtleCommandResult;
 
 /**
  * An event fired when a turtle is performing a known action.
  */
-public class TurtleActionEvent extends TurtleEvent {
+public class TurtleActionEvent extends TurtleEvent
+{
     private final TurtleAction action;
     private String failureMessage;
     private boolean cancelled = false;
 
-    public TurtleActionEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action) {
+    public TurtleActionEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action )
-        super(turtle);
+    {
+        super( turtle );
 
-        Objects.requireNonNull(action, "action cannot be null");
+        Objects.requireNonNull( action, "action cannot be null" );
         this.action = action;
     }
 
-    public TurtleAction getAction() {
+    public TurtleAction getAction()
+    {
         return this.action;
     }
 
@@ -43,8 +45,9 @@ public class TurtleActionEvent extends TurtleEvent {
      * @deprecated Use {@link #setCanceled(boolean, String)} instead.
      */
     @Deprecated
-    public void setCanceled(boolean cancel) {
+    public void setCanceled( boolean cancel )
-        this.setCanceled(cancel, null);
+    {
+        this.setCanceled( cancel, null );
     }
 
     /**
@@ -52,11 +55,12 @@ public class TurtleActionEvent extends TurtleEvent {
      *
      * If {@code cancel} is {@code true}, this action will not be carried out.
      *
-     * @param cancel The new canceled value.
+     * @param cancel         The new canceled value.
      * @param failureMessage The message to return to the user explaining the failure.
      * @see TurtleCommandResult#failure(String)
      */
-    public void setCanceled(boolean cancel, @Nullable String failureMessage) {
+    public void setCanceled( boolean cancel, @Nullable String failureMessage )
+    {
         this.cancelled = true;
         this.failureMessage = cancel ? failureMessage : null;
     }
@@ -69,11 +73,13 @@ public class TurtleActionEvent extends TurtleEvent {
      * @see #setCanceled(boolean, String)
      */
     @Nullable
-    public String getFailureMessage() {
+    public String getFailureMessage()
+    {
         return this.failureMessage;
     }
 
-    public boolean isCancelled() {
+    public boolean isCancelled()
+    {
         return this.cancelled;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleAttackEvent.java

@@ -6,33 +6,33 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-
 import net.minecraft.entity.Entity;
 
+import javax.annotation.Nonnull;
+import java.util.Objects;
+
 /**
  * Fired when a turtle attempts to attack an entity.
  *
  * @see TurtleAction#ATTACK
  */
-public class TurtleAttackEvent extends TurtlePlayerEvent {
+public class TurtleAttackEvent extends TurtlePlayerEvent
+{
     private final Entity target;
     private final ITurtleUpgrade upgrade;
     private final TurtleSide side;
 
-    public TurtleAttackEvent(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Entity target, @Nonnull ITurtleUpgrade upgrade,
+    public TurtleAttackEvent( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull Entity target, @Nonnull ITurtleUpgrade upgrade,
-                             @Nonnull TurtleSide side) {
+                              @Nonnull TurtleSide side )
-        super(turtle, TurtleAction.ATTACK, player);
+    {
-        Objects.requireNonNull(target, "target cannot be null");
+        super( turtle, TurtleAction.ATTACK, player );
-        Objects.requireNonNull(upgrade, "upgrade cannot be null");
+        Objects.requireNonNull( target, "target cannot be null" );
-        Objects.requireNonNull(side, "side cannot be null");
+        Objects.requireNonNull( upgrade, "upgrade cannot be null" );
+        Objects.requireNonNull( side, "side cannot be null" );
         this.target = target;
         this.upgrade = upgrade;
         this.side = side;
@@ -44,7 +44,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The entity being attacked.
      */
     @Nonnull
-    public Entity getTarget() {
+    public Entity getTarget()
+    {
         return this.target;
     }
 
@@ -54,7 +55,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The upgrade responsible for attacking.
      */
     @Nonnull
-    public ITurtleUpgrade getUpgrade() {
+    public ITurtleUpgrade getUpgrade()
+    {
         return this.upgrade;
     }
 
@@ -64,7 +66,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The upgrade's side.
      */
     @Nonnull
-    public TurtleSide getSide() {
+    public TurtleSide getSide()
+    {
         return this.side;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleBlockEvent.java

@@ -6,22 +6,20 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
-
 import net.minecraft.block.BlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * A general event for when a turtle interacts with a block or region.
  *
@@ -31,16 +29,18 @@ import net.minecraft.world.World;
  *
  * Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact with a block, simply objects within that block space.
  */
-public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
+public abstract class TurtleBlockEvent extends TurtlePlayerEvent
+{
     private final World world;
     private final BlockPos pos;
 
-    protected TurtleBlockEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
+    protected TurtleBlockEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
-                               @Nonnull BlockPos pos) {
+                                @Nonnull BlockPos pos )
-        super(turtle, action, player);
+    {
+        super( turtle, action, player );
 
-        Objects.requireNonNull(world, "world cannot be null");
+        Objects.requireNonNull( world, "world cannot be null" );
-        Objects.requireNonNull(pos, "pos cannot be null");
+        Objects.requireNonNull( pos, "pos cannot be null" );
         this.world = world;
         this.pos = pos;
     }
@@ -50,7 +50,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @return The world the turtle is interacting in.
      */
-    public World getWorld() {
+    public World getWorld()
+    {
         return this.world;
     }
 
@@ -59,7 +60,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @return The position the turtle is interacting with.
      */
-    public BlockPos getPos() {
+    public BlockPos getPos()
+    {
         return this.pos;
     }
 
@@ -68,18 +70,20 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @see TurtleAction#DIG
      */
-    public static class Dig extends TurtleBlockEvent {
+    public static class Dig extends TurtleBlockEvent
+    {
         private final BlockState block;
         private final ITurtleUpgrade upgrade;
         private final TurtleSide side;
 
-        public Dig(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block,
+        public Dig( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState block,
-                   @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side) {
+                    @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
-            super(turtle, TurtleAction.DIG, player, world, pos);
+        {
+            super( turtle, TurtleAction.DIG, player, world, pos );
 
-            Objects.requireNonNull(block, "block cannot be null");
+            Objects.requireNonNull( block, "block cannot be null" );
-            Objects.requireNonNull(upgrade, "upgrade cannot be null");
+            Objects.requireNonNull( upgrade, "upgrade cannot be null" );
-            Objects.requireNonNull(side, "side cannot be null");
+            Objects.requireNonNull( side, "side cannot be null" );
             this.block = block;
             this.upgrade = upgrade;
             this.side = side;
@@ -91,7 +95,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The block which is going to be broken.
          */
         @Nonnull
-        public BlockState getBlock() {
+        public BlockState getBlock()
+        {
             return this.block;
         }
 
@@ -101,7 +106,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The upgrade doing the digging.
          */
         @Nonnull
-        public ITurtleUpgrade getUpgrade() {
+        public ITurtleUpgrade getUpgrade()
+        {
             return this.upgrade;
         }
 
@@ -111,7 +117,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The upgrade's side.
          */
         @Nonnull
-        public TurtleSide getSide() {
+        public TurtleSide getSide()
+        {
             return this.side;
         }
     }
@@ -121,9 +128,11 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @see TurtleAction#MOVE
      */
-    public static class Move extends TurtleBlockEvent {
+    public static class Move extends TurtleBlockEvent
-        public Move(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos) {
+    {
-            super(turtle, TurtleAction.MOVE, player, world, pos);
+        public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
+        {
+            super( turtle, TurtleAction.MOVE, player, world, pos );
         }
     }
 
@@ -132,13 +141,15 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @see TurtleAction#PLACE
      */
-    public static class Place extends TurtleBlockEvent {
+    public static class Place extends TurtleBlockEvent
+    {
         private final ItemStack stack;
 
-        public Place(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack) {
+        public Place( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull ItemStack stack )
-            super(turtle, TurtleAction.PLACE, player, world, pos);
+        {
+            super( turtle, TurtleAction.PLACE, player, world, pos );
 
-            Objects.requireNonNull(stack, "stack cannot be null");
+            Objects.requireNonNull( stack, "stack cannot be null" );
             this.stack = stack;
         }
 
@@ -148,7 +159,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The item stack to be placed.
          */
         @Nonnull
-        public ItemStack getStack() {
+        public ItemStack getStack()
+        {
             return this.stack;
         }
     }
@@ -160,16 +172,18 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @see TurtleAction#INSPECT
      */
-    public static class Inspect extends TurtleBlockEvent {
+    public static class Inspect extends TurtleBlockEvent
+    {
         private final BlockState state;
         private final Map<String, Object> data;
 
-        public Inspect(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state,
+        public Inspect( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull BlockState state,
-                       @Nonnull Map<String, Object> data) {
+                        @Nonnull Map<String, Object> data )
-            super(turtle, TurtleAction.INSPECT, player, world, pos);
+        {
+            super( turtle, TurtleAction.INSPECT, player, world, pos );
 
-            Objects.requireNonNull(state, "state cannot be null");
+            Objects.requireNonNull( state, "state cannot be null" );
-            Objects.requireNonNull(data, "data cannot be null");
+            Objects.requireNonNull( data, "data cannot be null" );
             this.data = data;
             this.state = state;
         }
@@ -180,7 +194,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The inspected block state.
          */
         @Nonnull
-        public BlockState getState() {
+        public BlockState getState()
+        {
             return this.state;
         }
 
@@ -190,7 +205,8 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return This block's inspection data.
          */
         @Nonnull
-        public Map<String, Object> getData() {
+        public Map<String, Object> getData()
+        {
             return this.data;
         }
 
@@ -199,9 +215,10 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          *
          * @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
          */
-        public void addData(@Nonnull Map<String, ?> newData) {
+        public void addData( @Nonnull Map<String, ?> newData )
-            Objects.requireNonNull(newData, "newData cannot be null");
+        {
-            this.data.putAll(newData);
+            Objects.requireNonNull( newData, "newData cannot be null" );
+            this.data.putAll( newData );
         }
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java

@@ -6,13 +6,12 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import com.google.common.eventbus.EventBus;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 
+import javax.annotation.Nonnull;
+import java.util.Objects;
+
 /**
  * A base class for all events concerning a turtle. This will only ever constructed and fired on the server side, so sever specific methods on {@link
  * ITurtleAccess} are safe to use.
@@ -21,18 +20,21 @@ import dan200.computercraft.api.turtle.ITurtleAccess;
  *
  * @see TurtleActionEvent
  */
-public abstract class TurtleEvent {
+public abstract class TurtleEvent
+{
     public static final EventBus EVENT_BUS = new EventBus();
 
     private final ITurtleAccess turtle;
 
-    protected TurtleEvent(@Nonnull ITurtleAccess turtle) {
+    protected TurtleEvent( @Nonnull ITurtleAccess turtle )
-        Objects.requireNonNull(turtle, "turtle cannot be null");
+    {
+        Objects.requireNonNull( turtle, "turtle cannot be null" );
         this.turtle = turtle;
     }
 
-    public static boolean post(TurtleActionEvent event) {
+    public static boolean post( TurtleActionEvent event )
-        EVENT_BUS.post(event);
+    {
+        EVENT_BUS.post( event );
         return event.isCancelled();
     }
 
@@ -42,7 +44,8 @@ public abstract class TurtleEvent {
      * @return The access for this turtle.
      */
     @Nonnull
-    public ITurtleAccess getTurtle() {
+    public ITurtleAccess getTurtle()
+    {
         return this.turtle;
     }
 

src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java

@@ -6,16 +6,14 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.lua.MethodResult;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-
 import net.minecraft.item.ItemStack;
 
+import javax.annotation.Nonnull;
+import java.util.Map;
+import java.util.Objects;
+
 /**
  * Fired when a turtle gathers data on an item in its inventory.
  *
@@ -24,21 +22,24 @@ import net.minecraft.item.ItemStack;
  *
  * @see TurtleAction#INSPECT_ITEM
  */
-public class TurtleInspectItemEvent extends TurtleActionEvent {
+public class TurtleInspectItemEvent extends TurtleActionEvent
+{
     private final ItemStack stack;
     private final Map<String, Object> data;
     private final boolean mainThread;
 
     @Deprecated
-    public TurtleInspectItemEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data) {
+    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data )
-        this(turtle, stack, data, false);
+    {
+        this( turtle, stack, data, false );
     }
 
-    public TurtleInspectItemEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data, boolean mainThread) {
+    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data, boolean mainThread )
-        super(turtle, TurtleAction.INSPECT_ITEM);
+    {
+        super( turtle, TurtleAction.INSPECT_ITEM );
 
-        Objects.requireNonNull(stack, "stack cannot be null");
+        Objects.requireNonNull( stack, "stack cannot be null" );
-        Objects.requireNonNull(data, "data cannot be null");
+        Objects.requireNonNull( data, "data cannot be null" );
         this.stack = stack;
         this.data = data;
         this.mainThread = mainThread;
@@ -50,7 +51,8 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      * @return The item stack which is being inspected. This should <b>not</b> be modified.
      */
     @Nonnull
-    public ItemStack getStack() {
+    public ItemStack getStack()
+    {
         return this.stack;
     }
 
@@ -60,7 +62,8 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      * @return This items's inspection data.
      */
     @Nonnull
-    public Map<String, Object> getData() {
+    public Map<String, Object> getData()
+    {
         return this.data;
     }
 
@@ -69,7 +72,8 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      *
      * @return If this is run on the main thread.
      */
-    public boolean onMainThread() {
+    public boolean onMainThread()
+    {
         return this.mainThread;
     }
 
@@ -78,8 +82,9 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      *
      * @param newData The data to add. Note all values should be convertible to Lua (see {@link MethodResult#of(Object)}).
      */
-    public void addData(@Nonnull Map<String, ?> newData) {
+    public void addData( @Nonnull Map<String, ?> newData )
-        Objects.requireNonNull(newData, "newData cannot be null");
+    {
-        this.data.putAll(newData);
+        Objects.requireNonNull( newData, "newData cannot be null" );
+        this.data.putAll( newData );
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleInventoryEvent.java

@@ -6,28 +6,28 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
-
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.Objects;
+
 /**
  * Fired when a turtle attempts to interact with an inventory.
  */
-public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
+public abstract class TurtleInventoryEvent extends TurtleBlockEvent
+{
     private final Inventory handler;
 
-    protected TurtleInventoryEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
+    protected TurtleInventoryEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player, @Nonnull World world,
-                                   @Nonnull BlockPos pos, @Nullable Inventory handler) {
+                                    @Nonnull BlockPos pos, @Nullable Inventory handler )
-        super(turtle, action, player, world, pos);
+    {
+        super( turtle, action, player, world, pos );
         this.handler = handler;
     }
 
@@ -37,7 +37,8 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
      * @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
      */
     @Nullable
-    public Inventory getItemHandler() {
+    public Inventory getItemHandler()
+    {
         return this.handler;
     }
 
@@ -46,9 +47,11 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
      *
      * @see TurtleAction#SUCK
      */
-    public static class Suck extends TurtleInventoryEvent {
+    public static class Suck extends TurtleInventoryEvent
-        public Suck(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler) {
+    {
-            super(turtle, TurtleAction.SUCK, player, world, pos, handler);
+        public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler )
+        {
+            super( turtle, TurtleAction.SUCK, player, world, pos, handler );
         }
     }
 
@@ -57,14 +60,16 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
      *
      * @see TurtleAction#DROP
      */
-    public static class Drop extends TurtleInventoryEvent {
+    public static class Drop extends TurtleInventoryEvent
+    {
         private final ItemStack stack;
 
-        public Drop(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler,
+        public Drop( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler,
-                    @Nonnull ItemStack stack) {
+                     @Nonnull ItemStack stack )
-            super(turtle, TurtleAction.DROP, player, world, pos, handler);
+        {
+            super( turtle, TurtleAction.DROP, player, world, pos, handler );
 
-            Objects.requireNonNull(stack, "stack cannot be null");
+            Objects.requireNonNull( stack, "stack cannot be null" );
             this.stack = stack;
         }
 
@@ -74,7 +79,8 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
          * @return The item stack which will be dropped. This should <b>not</b> be modified.
          */
         @Nonnull
-        public ItemStack getStack() {
+        public ItemStack getStack()
+        {
             return this.stack;
         }
     }

src/main/java/dan200/computercraft/api/turtle/event/TurtlePlayerEvent.java

@@ -6,25 +6,26 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.turtle.FakePlayer;
 import dan200.computercraft.api.turtle.ITurtleAccess;
 
+import javax.annotation.Nonnull;
+import java.util.Objects;
+
 /**
  * An action done by a turtle which is normally done by a player.
  *
  * {@link #getPlayer()} may be used to modify the player's attributes or perform permission checks.
  */
-public abstract class TurtlePlayerEvent extends TurtleActionEvent {
+public abstract class TurtlePlayerEvent extends TurtleActionEvent
+{
     private final FakePlayer player;
 
-    protected TurtlePlayerEvent(@Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player) {
+    protected TurtlePlayerEvent( @Nonnull ITurtleAccess turtle, @Nonnull TurtleAction action, @Nonnull FakePlayer player )
-        super(turtle, action);
+    {
+        super( turtle, action );
 
-        Objects.requireNonNull(player, "player cannot be null");
+        Objects.requireNonNull( player, "player cannot be null" );
         this.player = player;
     }
 
@@ -36,7 +37,8 @@ public abstract class TurtlePlayerEvent extends TurtleActionEvent {
      * @return A {@link FakePlayer} representing this turtle.
      */
     @Nonnull
-    public FakePlayer getPlayer() {
+    public FakePlayer getPlayer()
+    {
         return this.player;
     }
 }

src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java

@@ -6,14 +6,12 @@
 
 package dan200.computercraft.api.turtle.event;
 
-import java.util.Objects;
+import dan200.computercraft.api.turtle.ITurtleAccess;
+import net.minecraft.item.ItemStack;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-
+import java.util.Objects;
-import dan200.computercraft.api.turtle.ITurtleAccess;
-
-import net.minecraft.item.ItemStack;
 
 /**
  * Fired when a turtle attempts to refuel from an item.
@@ -21,14 +19,16 @@ import net.minecraft.item.ItemStack;
  * One may use {@link #setCanceled(boolean, String)} to prevent refueling from this specific item. Additionally, you may use {@link #setHandler(Handler)} to
  * register a custom fuel provider.
  */
-public class TurtleRefuelEvent extends TurtleActionEvent {
+public class TurtleRefuelEvent extends TurtleActionEvent
+{
     private final ItemStack stack;
     private Handler handler;
 
-    public TurtleRefuelEvent(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack) {
+    public TurtleRefuelEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack )
-        super(turtle, TurtleAction.REFUEL);
+    {
+        super( turtle, TurtleAction.REFUEL );
 
-        Objects.requireNonNull(turtle, "turtle cannot be null");
+        Objects.requireNonNull( turtle, "turtle cannot be null" );
         this.stack = stack;
     }
 
@@ -39,7 +39,8 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      *
      * @return The stack to refuel from.
      */
-    public ItemStack getStack() {
+    public ItemStack getStack()
+    {
         return this.stack;
     }
 
@@ -50,7 +51,8 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      * @see #setHandler(Handler)
      */
     @Nullable
-    public Handler getHandler() {
+    public Handler getHandler()
+    {
         return this.handler;
     }
 
@@ -62,7 +64,8 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      * @param handler The new refuel handler.
      * @see #getHandler()
      */
-    public void setHandler(@Nullable Handler handler) {
+    public void setHandler( @Nullable Handler handler )
+    {
         this.handler = handler;
     }
 
@@ -70,16 +73,17 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      * Handles refuelling a turtle from a specific item.
      */
     @FunctionalInterface
-    public interface Handler {
+    public interface Handler
+    {
         /**
          * Refuel a turtle using an item.
          *
          * @param turtle The turtle to refuel.
-         * @param stack The stack to refuel with.
+         * @param stack  The stack to refuel with.
-         * @param slot The slot the stack resides within. This may be used to modify the inventory afterwards.
+         * @param slot   The slot the stack resides within. This may be used to modify the inventory afterwards.
-         * @param limit The maximum number of refuel operations to perform. This will often correspond to the number of items to consume.
+         * @param limit  The maximum number of refuel operations to perform. This will often correspond to the number of items to consume.
          * @return The amount of fuel gained.
          */
-        int refuel(@Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit);
+        int refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit );
     }
 }

src/main/java/dan200/computercraft/client/ClientRegistry.java

@@ -6,9 +6,6 @@
 
 package dan200.computercraft.client;
 
-import java.util.HashSet;
-import java.util.function.Consumer;
-
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.common.IColouredItem;
@@ -16,7 +13,8 @@ import dan200.computercraft.shared.media.items.ItemDisk;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-
+import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelLoader;
@@ -27,17 +25,18 @@ import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import java.util.HashSet;
-import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
+import java.util.function.Consumer;
 
 /**
  * Registers textures and models for items.
  */
-@SuppressWarnings ({
+@SuppressWarnings( {
     "MethodCallSideOnly",
     "LocalVariableDeclarationSideOnly"
-})
+} )
-public final class ClientRegistry {
+public final class ClientRegistry
+{
     private static final String[] EXTRA_MODELS = new String[] {
         "turtle_modem_normal_off_left",
         "turtle_modem_normal_on_left",
@@ -56,7 +55,7 @@ public final class ClientRegistry {
 
         "turtle_colour",
         "turtle_elf_overlay",
-        };
+    };
 
     private static final String[] EXTRA_TEXTURES = new String[] {
         // TODO: Gather these automatically from the model. Sadly the model loader isn't available
@@ -65,59 +64,66 @@ public final class ClientRegistry {
         "block/turtle_elf_overlay",
         "block/turtle_crafty_face",
         "block/turtle_speaker_face",
-        };
+    };
 
     private ClientRegistry() {}
 
-    public static void onTextureStitchEvent(SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry) {
+    public static void onTextureStitchEvent( SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry )
-        for (String extra : EXTRA_TEXTURES) {
+    {
-            registry.register(new Identifier(ComputerCraft.MOD_ID, extra));
+        for( String extra : EXTRA_TEXTURES )
+        {
+            registry.register( new Identifier( ComputerCraft.MOD_ID, extra ) );
         }
     }
 
-    @SuppressWarnings ("NewExpressionSideOnly")
+    @SuppressWarnings( "NewExpressionSideOnly" )
-    public static void onModelBakeEvent(ResourceManager manager, Consumer<ModelIdentifier> out) {
+    public static void onModelBakeEvent( ResourceManager manager, Consumer<ModelIdentifier> out )
-        for (String model : EXTRA_MODELS) {
+    {
-            out.accept(new ModelIdentifier(new Identifier(ComputerCraft.MOD_ID, model), "inventory"));
+        for( String model : EXTRA_MODELS )
+        {
+            out.accept( new ModelIdentifier( new Identifier( ComputerCraft.MOD_ID, model ), "inventory" ) );
         }
     }
 
-    public static void onItemColours() {
+    public static void onItemColours()
-        ColorProviderRegistry.ITEM.register((stack, layer) -> {
+    {
-            return layer == 1 ? ((ItemDisk) stack.getItem()).getColour(stack) : 0xFFFFFF;
+        ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
-        }, ComputerCraftRegistry.ModItems.DISK);
+            return layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF;
+        }, ComputerCraftRegistry.ModItems.DISK );
 
-        ColorProviderRegistry.ITEM.register((stack, layer) -> layer == 1 ? ItemTreasureDisk.getColour(stack) : 0xFFFFFF,
+        ColorProviderRegistry.ITEM.register( ( stack, layer ) -> layer == 1 ? ItemTreasureDisk.getColour( stack ) : 0xFFFFFF,
-                                            ComputerCraftRegistry.ModItems.TREASURE_DISK);
+            ComputerCraftRegistry.ModItems.TREASURE_DISK );
 
-        ColorProviderRegistry.ITEM.register((stack, layer) -> {
+        ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
-            switch (layer) {
+            switch( layer )
-            case 0:
-            default:
-                return 0xFFFFFF;
-            case 1: // Frame colour
-                return IColouredItem.getColourBasic(stack);
-            case 2: // Light colour
             {
-                int light = ItemPocketComputer.getLightState(stack);
+                case 0:
-                return light == -1 ? Colour.BLACK.getHex() : light;
+                default:
+                    return 0xFFFFFF;
+                case 1: // Frame colour
+                    return IColouredItem.getColourBasic( stack );
+                case 2: // Light colour
+                {
+                    int light = ItemPocketComputer.getLightState( stack );
+                    return light == -1 ? Colour.BLACK.getHex() : light;
+                }
             }
-            }
+        }, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
-        }, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED);
 
         // Setup turtle colours
-        ColorProviderRegistry.ITEM.register((stack, tintIndex) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour(stack) : 0xFFFFFF,
+        ColorProviderRegistry.ITEM.register( ( stack, tintIndex ) -> tintIndex == 0 ? ((IColouredItem) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-                                            ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL,
+            ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL,
-                                            ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED);
+            ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED );
     }
 
-    private static BakedModel bake(ModelLoader loader, UnbakedModel model, Identifier identifier) {
+    private static BakedModel bake( ModelLoader loader, UnbakedModel model, Identifier identifier )
-        model.getTextureDependencies(loader::getOrLoadModel, new HashSet<>());
+    {
-        return model.bake(loader,
+        model.getTextureDependencies( loader::getOrLoadModel, new HashSet<>() );
-                          spriteIdentifier -> MinecraftClient.getInstance()
+        return model.bake( loader,
-                                                             .getSpriteAtlas(spriteIdentifier.getAtlasId())
+            spriteIdentifier -> MinecraftClient.getInstance()
-                                                             .apply(spriteIdentifier.getTextureId()),
+                .getSpriteAtlas( spriteIdentifier.getAtlasId() )
-                          ModelRotation.X0_Y0,
+                .apply( spriteIdentifier.getTextureId() ),
-                          identifier);
+            ModelRotation.X0_Y0,
+            identifier );
     }
 }

src/main/java/dan200/computercraft/client/ClientTableFormatter.java

@@ -6,64 +6,70 @@
 
 package dan200.computercraft.client;
 
-import javax.annotation.Nullable;
-
 import dan200.computercraft.fabric.mixin.ChatHudAccess;
 import dan200.computercraft.shared.command.text.ChatHelpers;
 import dan200.computercraft.shared.command.text.TableBuilder;
 import dan200.computercraft.shared.command.text.TableFormatter;
 import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
-import org.apache.commons.lang3.StringUtils;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.hud.ChatHud;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.MathHelper;
+import org.apache.commons.lang3.StringUtils;
 
-@SuppressWarnings ({
+import javax.annotation.Nullable;
+
+@SuppressWarnings( {
     "MethodCallSideOnly",
     "LocalVariableDeclarationSideOnly"
-})
+} )
-public class ClientTableFormatter implements TableFormatter {
+public class ClientTableFormatter implements TableFormatter
+{
     public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
 
     private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
 
     @Override
     @Nullable
-    public Text getPadding(Text component, int width) {
+    public Text getPadding( Text component, int width )
-        int extraWidth = width - this.getWidth(component);
+    {
-        if (extraWidth <= 0) {
+        int extraWidth = width - this.getWidth( component );
+        if( extraWidth <= 0 )
+        {
             return null;
         }
 
         TextRenderer renderer = renderer();
 
-        float spaceWidth = renderer.getWidth(" ");
+        float spaceWidth = renderer.getWidth( " " );
-        int spaces = MathHelper.floor(extraWidth / spaceWidth);
+        int spaces = MathHelper.floor( extraWidth / spaceWidth );
         int extra = extraWidth - (int) (spaces * spaceWidth);
 
-        return ChatHelpers.coloured(StringUtils.repeat(' ', spaces) + StringUtils.repeat((char) 712, extra), Formatting.GRAY);
+        return ChatHelpers.coloured( StringUtils.repeat( ' ', spaces ) + StringUtils.repeat( (char) 712, extra ), Formatting.GRAY );
     }
 
-    private static TextRenderer renderer() {
+    private static TextRenderer renderer()
+    {
         return MinecraftClient.getInstance().textRenderer;
     }
 
     @Override
-    public int getColumnPadding() {
+    public int getColumnPadding()
+    {
         return 3;
     }
 
     @Override
-    public int getWidth(Text component) {
+    public int getWidth( Text component )
-        return renderer().getWidth(component);
+    {
+        return renderer().getWidth( component );
     }
 
     @Override
-    public void writeLine(int id, Text component) {
+    public void writeLine( int id, Text component )
+    {
         MinecraftClient mc = MinecraftClient.getInstance();
         ChatHud chat = mc.inGameHud.getChatHud();
 
@@ -71,20 +77,22 @@ public class ClientTableFormatter implements TableFormatter {
         // int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getScale() );
         // List<ITextProperties> list = RenderComponentsUtil.func_238505_a_( component, maxWidth, mc.fontRenderer );
         // if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
-        ((ChatHudAccess)chat).callAddMessage(component, id);
+        ((ChatHudAccess) chat).callAddMessage( component, id );
     }
 
     @Override
-    public int display(TableBuilder table) {
+    public int display( TableBuilder table )
+    {
         ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud();
 
-        int lastHeight = lastHeights.get(table.getId());
+        int lastHeight = lastHeights.get( table.getId() );
 
-        int height = TableFormatter.super.display(table);
+        int height = TableFormatter.super.display( table );
-        lastHeights.put(table.getId(), height);
+        lastHeights.put( table.getId(), height );
 
-        for (int i = height; i < lastHeight; i++) {
+        for( int i = height; i < lastHeight; i++ )
-            ((ChatHudAccess)chat).callRemoveMessage(i + table.getId());
+        {
+            ((ChatHudAccess) chat).callRemoveMessage( i + table.getId() );
         }
         return height;
     }

src/main/java/dan200/computercraft/client/FrameInfo.java

@@ -8,38 +8,46 @@ package dan200.computercraft.client;
 
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 
-public final class FrameInfo {
+public final class FrameInfo
+{
     private static int tick;
     private static long renderFrame;
 
-    static {
+    static
+    {
 
     }
 
-    private FrameInfo() {
+    private FrameInfo()
+    {
     }
 
-    public static void init() {
+    public static void init()
-        ClientTickEvents.START_CLIENT_TICK.register(m -> {
+    {
+        ClientTickEvents.START_CLIENT_TICK.register( m -> {
             tick++;
-        });
+        } );
     }
 
-    public static boolean getGlobalCursorBlink() {
+    public static boolean getGlobalCursorBlink()
+    {
         return (tick / 8) % 2 == 0;
     }
 
-    public static long getRenderFrame() {
+    public static long getRenderFrame()
+    {
         return renderFrame;
     }
 
     // TODO Call this in a callback
-    public static void onTick() {
+    public static void onTick()
+    {
         tick++;
     }
 
     // TODO Call this in a callback
-    public static void onRenderFrame() {
+    public static void onRenderFrame()
+    {
         renderFrame++;
     }
 }

src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java

@@ -6,159 +6,175 @@
 
 package dan200.computercraft.client.gui;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.Palette;
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.RenderLayer;
+import net.minecraft.client.render.*;
-import net.minecraft.client.render.RenderPhase;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.VertexFormat;
-import net.minecraft.client.render.VertexFormats;
 import net.minecraft.client.util.math.AffineTransformation;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.opengl.GL11;
 
-public final class FixedWidthFontRenderer {
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public final class FixedWidthFontRenderer
+{
     public static final int FONT_HEIGHT = 9;
     public static final int FONT_WIDTH = 6;
     public static final float WIDTH = 256.0f;
     public static final float BACKGROUND_START = (WIDTH - 6.0f) / WIDTH;
     public static final float BACKGROUND_END = (WIDTH - 4.0f) / WIDTH;
     private static final Matrix4f IDENTITY = AffineTransformation.identity()
-                                                                 .getMatrix();
+        .getMatrix();
-    private static final Identifier FONT = new Identifier("computercraft", "textures/gui/term_font.png");
+    private static final Identifier FONT = new Identifier( "computercraft", "textures/gui/term_font.png" );
     public static final RenderLayer TYPE = Type.MAIN;
 
 
-    private FixedWidthFontRenderer() {
+    private FixedWidthFontRenderer()
+    {
     }
 
-    public static void drawString(float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
+    public static void drawString( float x, float y, @Nonnull TextBuffer text, @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour,
-                                  @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize) {
+                                   @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize )
+    {
         bindFont();
 
         VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
-                                                                   .getBufferBuilders()
+            .getBufferBuilders()
-                                                                   .getEntityVertexConsumers();
+            .getEntityVertexConsumers();
-        drawString(IDENTITY,
+        drawString( IDENTITY,
-                   ((VertexConsumerProvider) renderer).getBuffer(TYPE),
+            ((VertexConsumerProvider) renderer).getBuffer( TYPE ),
-                   x,
+            x,
-                   y,
+            y,
-                   text,
+            text,
-                   textColour,
+            textColour,
-                   backgroundColour,
+            backgroundColour,
-                   palette,
+            palette,
-                   greyscale,
+            greyscale,
-                   leftMarginSize,
+            leftMarginSize,
-                   rightMarginSize);
+            rightMarginSize );
         renderer.draw();
     }
 
-    private static void bindFont() {
+    private static void bindFont()
+    {
         MinecraftClient.getInstance()
-                       .getTextureManager()
+            .getTextureManager()
-                       .bindTexture(FONT);
+            .bindTexture( FONT );
-        RenderSystem.texParameter(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP);
+        RenderSystem.texParameter( GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_CLAMP );
     }
 
-    public static void drawString(@Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y, @Nonnull TextBuffer text,
+    public static void drawString( @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y, @Nonnull TextBuffer text,
-                                  @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
+                                   @Nonnull TextBuffer textColour, @Nullable TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale,
-                                  float leftMarginSize, float rightMarginSize) {
+                                   float leftMarginSize, float rightMarginSize )
-        if (backgroundColour != null) {
+    {
-            drawBackground(transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT);
+        if( backgroundColour != null )
+        {
+            drawBackground( transform, renderer, x, y, backgroundColour, palette, greyscale, leftMarginSize, rightMarginSize, FONT_HEIGHT );
         }
 
-        for (int i = 0; i < text.length(); i++) {
+        for( int i = 0; i < text.length(); i++ )
-            double[] colour = palette.getColour(getColour(textColour.charAt(i), Colour.BLACK));
+        {
+            double[] colour = palette.getColour( getColour( textColour.charAt( i ), Colour.BLACK ) );
             float r, g, b;
-            if (greyscale) {
+            if( greyscale )
-                r = g = b = toGreyscale(colour);
+            {
-            } else {
+                r = g = b = toGreyscale( colour );
+            }
+            else
+            {
                 r = (float) colour[0];
                 g = (float) colour[1];
                 b = (float) colour[2];
             }
 
             // Draw char
-            int index = text.charAt(i);
+            int index = text.charAt( i );
-            if (index > 255) {
+            if( index > 255 )
+            {
                 index = '?';
             }
-            drawChar(transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b);
+            drawChar( transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b );
         }
 
     }
 
-    private static void drawBackground(@Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
+    private static void drawBackground( @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
-                                       @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale, float leftMarginSize,
+                                        @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale, float leftMarginSize,
-                                       float rightMarginSize, float height) {
+                                        float rightMarginSize, float height )
-        if (leftMarginSize > 0) {
+    {
-            drawQuad(transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt(0));
+        if( leftMarginSize > 0 )
+        {
+            drawQuad( transform, renderer, x - leftMarginSize, y, leftMarginSize, height, palette, greyscale, backgroundColour.charAt( 0 ) );
         }
 
-        if (rightMarginSize > 0) {
+        if( rightMarginSize > 0 )
-            drawQuad(transform,
+        {
-                     renderer,
+            drawQuad( transform,
-                     x + backgroundColour.length() * FONT_WIDTH,
+                renderer,
-                     y,
+                x + backgroundColour.length() * FONT_WIDTH,
-                     rightMarginSize,
+                y,
-                     height,
+                rightMarginSize,
-                     palette,
+                height,
-                     greyscale,
+                palette,
-                     backgroundColour.charAt(backgroundColour.length() - 1));
+                greyscale,
+                backgroundColour.charAt( backgroundColour.length() - 1 ) );
         }
 
         // Batch together runs of identical background cells.
         int blockStart = 0;
         char blockColour = '\0';
-        for (int i = 0; i < backgroundColour.length(); i++) {
+        for( int i = 0; i < backgroundColour.length(); i++ )
-            char colourIndex = backgroundColour.charAt(i);
+        {
-            if (colourIndex == blockColour) {
+            char colourIndex = backgroundColour.charAt( i );
+            if( colourIndex == blockColour )
+            {
                 continue;
             }
 
-            if (blockColour != '\0') {
+            if( blockColour != '\0' )
-                drawQuad(transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour);
+            {
+                drawQuad( transform, renderer, x + blockStart * FONT_WIDTH, y, FONT_WIDTH * (i - blockStart), height, palette, greyscale, blockColour );
             }
 
             blockColour = colourIndex;
             blockStart = i;
         }
 
-        if (blockColour != '\0') {
+        if( blockColour != '\0' )
-            drawQuad(transform,
+        {
-                     renderer,
+            drawQuad( transform,
-                     x + blockStart * FONT_WIDTH,
+                renderer,
-                     y,
+                x + blockStart * FONT_WIDTH,
-                     FONT_WIDTH * (backgroundColour.length() - blockStart),
+                y,
-                     height,
+                FONT_WIDTH * (backgroundColour.length() - blockStart),
-                     palette,
+                height,
-                     greyscale,
+                palette,
-                     blockColour);
+                greyscale,
+                blockColour );
         }
     }
 
-    public static int getColour(char c, Colour def) {
+    public static int getColour( char c, Colour def )
-        return 15 - Terminal.getColour(c, def);
+    {
+        return 15 - Terminal.getColour( c, def );
     }
 
-    public static float toGreyscale(double[] rgb) {
+    public static float toGreyscale( double[] rgb )
+    {
         return (float) ((rgb[0] + rgb[1] + rgb[2]) / 3);
     }
 
-    private static void drawChar(Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b) {
+    private static void drawChar( Matrix4f transform, VertexConsumer buffer, float x, float y, int index, float r, float g, float b )
+    {
         // Short circuit to avoid the common case - the texture should be blank here after all.
-        if (index == '\0' || index == ' ') {
+        if( index == '\0' || index == ' ' )
+        {
             return;
         }
 
@@ -168,217 +184,238 @@ public final class FixedWidthFontRenderer {
         int xStart = 1 + column * (FONT_WIDTH + 2);
         int yStart = 1 + row * (FONT_HEIGHT + 2);
 
-        buffer.vertex(transform, x, y, 0f)
+        buffer.vertex( transform, x, y, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture(xStart / WIDTH, yStart / WIDTH)
+            .texture( xStart / WIDTH, yStart / WIDTH )
-              .next();
+            .next();
-        buffer.vertex(transform, x, y + FONT_HEIGHT, 0f)
+        buffer.vertex( transform, x, y + FONT_HEIGHT, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture(xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+            .texture( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
-              .next();
+            .next();
-        buffer.vertex(transform, x + FONT_WIDTH, y, 0f)
+        buffer.vertex( transform, x + FONT_WIDTH, y, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture((xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH)
+            .texture( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH )
-              .next();
+            .next();
-        buffer.vertex(transform, x + FONT_WIDTH, y, 0f)
+        buffer.vertex( transform, x + FONT_WIDTH, y, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture((xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH)
+            .texture( (xStart + FONT_WIDTH) / WIDTH, yStart / WIDTH )
-              .next();
+            .next();
-        buffer.vertex(transform, x, y + FONT_HEIGHT, 0f)
+        buffer.vertex( transform, x, y + FONT_HEIGHT, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture(xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+            .texture( xStart / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
-              .next();
+            .next();
-        buffer.vertex(transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f)
+        buffer.vertex( transform, x + FONT_WIDTH, y + FONT_HEIGHT, 0f )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .texture((xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH)
+            .texture( (xStart + FONT_WIDTH) / WIDTH, (yStart + FONT_HEIGHT) / WIDTH )
-              .next();
+            .next();
     }
 
-    private static void drawQuad(Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette,
+    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, Palette palette,
-                                 boolean greyscale, char colourIndex) {
+                                  boolean greyscale, char colourIndex )
-        double[] colour = palette.getColour(getColour(colourIndex, Colour.BLACK));
+    {
+        double[] colour = palette.getColour( getColour( colourIndex, Colour.BLACK ) );
         float r, g, b;
-        if (greyscale) {
+        if( greyscale )
-            r = g = b = toGreyscale(colour);
+        {
-        } else {
+            r = g = b = toGreyscale( colour );
+        }
+        else
+        {
             r = (float) colour[0];
             g = (float) colour[1];
             b = (float) colour[2];
         }
 
-        drawQuad(transform, buffer, x, y, width, height, r, g, b);
+        drawQuad( transform, buffer, x, y, width, height, r, g, b );
     }
 
-    private static void drawQuad(Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b) {
+    private static void drawQuad( Matrix4f transform, VertexConsumer buffer, float x, float y, float width, float height, float r, float g, float b )
-        buffer.vertex(transform, x, y, 0)
+    {
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x, y, 0 )
-              .texture(BACKGROUND_START, BACKGROUND_START)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_START, BACKGROUND_START )
-        buffer.vertex(transform, x, y + height, 0)
+            .next();
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x, y + height, 0 )
-              .texture(BACKGROUND_START, BACKGROUND_END)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_START, BACKGROUND_END )
-        buffer.vertex(transform, x + width, y, 0)
+            .next();
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x + width, y, 0 )
-              .texture(BACKGROUND_END, BACKGROUND_START)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_END, BACKGROUND_START )
-        buffer.vertex(transform, x + width, y, 0)
+            .next();
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x + width, y, 0 )
-              .texture(BACKGROUND_END, BACKGROUND_START)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_END, BACKGROUND_START )
-        buffer.vertex(transform, x, y + height, 0)
+            .next();
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x, y + height, 0 )
-              .texture(BACKGROUND_START, BACKGROUND_END)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_START, BACKGROUND_END )
-        buffer.vertex(transform, x + width, y + height, 0)
+            .next();
-              .color(r, g, b, 1.0f)
+        buffer.vertex( transform, x + width, y + height, 0 )
-              .texture(BACKGROUND_END, BACKGROUND_END)
+            .color( r, g, b, 1.0f )
-              .next();
+            .texture( BACKGROUND_END, BACKGROUND_END )
+            .next();
     }
 
-    public static void drawTerminalWithoutCursor(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
+    public static void drawTerminalWithoutCursor( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
-                                                 @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
+                                                  @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
-                                                 float leftMarginSize, float rightMarginSize) {
+                                                  float leftMarginSize, float rightMarginSize )
+    {
         Palette palette = terminal.getPalette();
         int height = terminal.getHeight();
 
         // Top and bottom margins
-        drawBackground(transform,
+        drawBackground( transform,
-                       buffer,
+            buffer,
-                       x,
+            x,
-                       y - topMarginSize,
+            y - topMarginSize,
-                       terminal.getBackgroundColourLine(0),
+            terminal.getBackgroundColourLine( 0 ),
-                       palette,
+            palette,
-                       greyscale,
+            greyscale,
-                       leftMarginSize,
+            leftMarginSize,
-                       rightMarginSize,
+            rightMarginSize,
-                       topMarginSize);
+            topMarginSize );
 
-        drawBackground(transform,
+        drawBackground( transform,
-                       buffer,
+            buffer,
-                       x,
+            x,
-                       y + height * FONT_HEIGHT,
+            y + height * FONT_HEIGHT,
-                       terminal.getBackgroundColourLine(height - 1),
+            terminal.getBackgroundColourLine( height - 1 ),
-                       palette,
+            palette,
-                       greyscale,
+            greyscale,
-                       leftMarginSize,
+            leftMarginSize,
-                       rightMarginSize,
+            rightMarginSize,
-                       bottomMarginSize);
+            bottomMarginSize );
 
         // The main text
-        for (int i = 0; i < height; i++) {
+        for( int i = 0; i < height; i++ )
-            drawString(transform,
+        {
-                       buffer,
+            drawString( transform,
-                       x,
+                buffer,
-                       y + FixedWidthFontRenderer.FONT_HEIGHT * i,
+                x,
-                       terminal.getLine(i),
+                y + FixedWidthFontRenderer.FONT_HEIGHT * i,
-                       terminal.getTextColourLine(i),
+                terminal.getLine( i ),
-                       terminal.getBackgroundColourLine(i),
+                terminal.getTextColourLine( i ),
-                       palette,
+                terminal.getBackgroundColourLine( i ),
-                       greyscale,
+                palette,
-                       leftMarginSize,
+                greyscale,
-                       rightMarginSize);
+                leftMarginSize,
+                rightMarginSize );
         }
     }
 
-    public static void drawCursor(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
+    public static void drawCursor( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
-                                  boolean greyscale) {
+                                   boolean greyscale )
+    {
         Palette palette = terminal.getPalette();
         int width = terminal.getWidth();
         int height = terminal.getHeight();
 
         int cursorX = terminal.getCursorX();
         int cursorY = terminal.getCursorY();
-        if (terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink()) {
+        if( terminal.getCursorBlink() && cursorX >= 0 && cursorX < width && cursorY >= 0 && cursorY < height && FrameInfo.getGlobalCursorBlink() )
-            double[] colour = palette.getColour(15 - terminal.getTextColour());
+        {
+            double[] colour = palette.getColour( 15 - terminal.getTextColour() );
             float r, g, b;
-            if (greyscale) {
+            if( greyscale )
-                r = g = b = toGreyscale(colour);
+            {
-            } else {
+                r = g = b = toGreyscale( colour );
+            }
+            else
+            {
                 r = (float) colour[0];
                 g = (float) colour[1];
                 b = (float) colour[2];
             }
 
-            drawChar(transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b);
+            drawChar( transform, buffer, x + cursorX * FONT_WIDTH, y + cursorY * FONT_HEIGHT, '_', r, g, b );
         }
     }
 
-    public static void drawTerminal(@Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
+    public static void drawTerminal( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y, @Nonnull Terminal terminal,
-                                    boolean greyscale, float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize) {
+                                     boolean greyscale, float topMarginSize, float bottomMarginSize, float leftMarginSize, float rightMarginSize )
-        drawTerminalWithoutCursor(transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
+    {
-        drawCursor(transform, buffer, x, y, terminal, greyscale);
+        drawTerminalWithoutCursor( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
+        drawCursor( transform, buffer, x, y, terminal, greyscale );
     }
 
-    public static void drawTerminal(@Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize,
+    public static void drawTerminal( @Nonnull Matrix4f transform, float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize,
-                                    float bottomMarginSize, float leftMarginSize, float rightMarginSize) {
+                                     float bottomMarginSize, float leftMarginSize, float rightMarginSize )
+    {
         bindFont();
 
         VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
-                                                                   .getBufferBuilders()
+            .getBufferBuilders()
-                                                                   .getEntityVertexConsumers();
+            .getEntityVertexConsumers();
-        VertexConsumer buffer = renderer.getBuffer(TYPE);
+        VertexConsumer buffer = renderer.getBuffer( TYPE );
-        drawTerminal(transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
+        drawTerminal( transform, buffer, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
-        renderer.draw(TYPE);
+        renderer.draw( TYPE );
     }
 
-    public static void drawTerminal(float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
+    public static void drawTerminal( float x, float y, @Nonnull Terminal terminal, boolean greyscale, float topMarginSize, float bottomMarginSize,
-                                    float leftMarginSize, float rightMarginSize) {
+                                     float leftMarginSize, float rightMarginSize )
-        drawTerminal(IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize);
+    {
+        drawTerminal( IDENTITY, x, y, terminal, greyscale, topMarginSize, bottomMarginSize, leftMarginSize, rightMarginSize );
     }
 
-    public static void drawEmptyTerminal(float x, float y, float width, float height) {
+    public static void drawEmptyTerminal( float x, float y, float width, float height )
-        drawEmptyTerminal(IDENTITY, x, y, width, height);
+    {
+        drawEmptyTerminal( IDENTITY, x, y, width, height );
     }
 
-    public static void drawEmptyTerminal(@Nonnull Matrix4f transform, float x, float y, float width, float height) {
+    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, float x, float y, float width, float height )
+    {
         bindFont();
 
         VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
-                                                                   .getBufferBuilders()
+            .getBufferBuilders()
-                                                                   .getEntityVertexConsumers();
+            .getEntityVertexConsumers();
-        drawEmptyTerminal(transform, renderer, x, y, width, height);
+        drawEmptyTerminal( transform, renderer, x, y, width, height );
         renderer.draw();
     }
 
-    public static void drawEmptyTerminal(@Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width,
+    public static void drawEmptyTerminal( @Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width,
-                                         float height) {
+                                          float height )
+    {
         Colour colour = Colour.BLACK;
-        drawQuad(transform, renderer.getBuffer(TYPE), x, y, width, height, colour.getR(), colour.getG(), colour.getB());
+        drawQuad( transform, renderer.getBuffer( TYPE ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
     }
 
-    public static void drawBlocker(@Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width, float height) {
+    public static void drawBlocker( @Nonnull Matrix4f transform, @Nonnull VertexConsumerProvider renderer, float x, float y, float width, float height )
+    {
         Colour colour = Colour.BLACK;
-        drawQuad(transform, renderer.getBuffer(Type.BLOCKER), x, y, width, height, colour.getR(), colour.getG(), colour.getB());
+        drawQuad( transform, renderer.getBuffer( Type.BLOCKER ), x, y, width, height, colour.getR(), colour.getG(), colour.getB() );
     }
 
-    private static final class Type extends RenderPhase {
+    private static final class Type extends RenderPhase
+    {
         private static final int GL_MODE = GL11.GL_TRIANGLES;
 
         private static final VertexFormat FORMAT = VertexFormats.POSITION_COLOR_TEXTURE;
 
-        static final RenderLayer MAIN = RenderLayer.of("terminal_font", FORMAT, GL_MODE, 1024, false, false, // useDelegate, needsSorting
+        static final RenderLayer MAIN = RenderLayer.of( "terminal_font", FORMAT, GL_MODE, 1024, false, false, // useDelegate, needsSorting
-                                                       RenderLayer.MultiPhaseParameters.builder()
+            RenderLayer.MultiPhaseParameters.builder()
-                                                                                       .texture(new RenderPhase.Texture(FONT,
+                .texture( new RenderPhase.Texture( FONT,
-                                                                                                                        false,
+                    false,
-                                                                                                                        false)) // blur, minimap
+                    false ) ) // blur, minimap
-                                                                                       .alpha(ONE_TENTH_ALPHA)
+                .alpha( ONE_TENTH_ALPHA )
-                                                                                       .lightmap(DISABLE_LIGHTMAP)
+                .lightmap( DISABLE_LIGHTMAP )
-                                                                                       .writeMaskState(COLOR_MASK)
+                .writeMaskState( COLOR_MASK )
-                                                                                       .build(false));
+                .build( false ) );
 
-        static final RenderLayer BLOCKER = RenderLayer.of("terminal_blocker", FORMAT, GL_MODE, 256, false, false, // useDelegate, needsSorting
+        static final RenderLayer BLOCKER = RenderLayer.of( "terminal_blocker", FORMAT, GL_MODE, 256, false, false, // useDelegate, needsSorting
-                                                          RenderLayer.MultiPhaseParameters.builder()
+            RenderLayer.MultiPhaseParameters.builder()
-                                                                                          .texture(new RenderPhase.Texture(FONT,
+                .texture( new RenderPhase.Texture( FONT,
-                                                                                                                           false,
+                    false,
-                                                                                                                           false)) // blur, minimap
+                    false ) ) // blur, minimap
-                                                                                          .alpha(ONE_TENTH_ALPHA)
+                .alpha( ONE_TENTH_ALPHA )
-                                                                                          .writeMaskState(DEPTH_MASK)
+                .writeMaskState( DEPTH_MASK )
-                                                                                          .lightmap(DISABLE_LIGHTMAP)
+                .lightmap( DISABLE_LIGHTMAP )
-                                                                                          .build(false));
+                .build( false ) );
 
-        private Type(String name, Runnable setup, Runnable destroy) {
+        private Type( String name, Runnable setup, Runnable destroy )
-            super(name, setup, destroy);
+        {
+            super( name, setup, destroy );
         }
     }
 }

src/main/java/dan200/computercraft/client/gui/GuiComputer.java

@@ -6,11 +6,6 @@
 
 package dan200.computercraft.client.gui;
 
-import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
-
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -22,14 +17,19 @@ import dan200.computercraft.shared.computer.inventory.ContainerComputer;
 import dan200.computercraft.shared.computer.inventory.ContainerComputerBase;
 import dan200.computercraft.shared.computer.inventory.ContainerViewComputer;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
-import org.lwjgl.glfw.GLFW;
-
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
+import org.lwjgl.glfw.GLFW;
 
-public final class GuiComputer<T extends ContainerComputerBase> extends HandledScreen<T> {
+import javax.annotation.Nonnull;
+
+import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
+
+public final class GuiComputer<T extends ContainerComputerBase> extends HandledScreen<T>
+{
     private final ComputerFamily family;
     private final ClientComputer computer;
     private final int termWidth;
@@ -38,8 +38,9 @@ public final class GuiComputer<T extends ContainerComputerBase> extends HandledS
     private WidgetTerminal terminal;
     private WidgetWrapper terminalWrapper;
 
-    private GuiComputer(T container, PlayerInventory player, Text title, int termWidth, int termHeight) {
+    private GuiComputer( T container, PlayerInventory player, Text title, int termWidth, int termHeight )
-        super(container, player, title);
+    {
+        super( container, player, title );
         this.family = container.getFamily();
         this.computer = (ClientComputer) container.getComputer();
         this.termWidth = termWidth;
@@ -47,22 +48,26 @@ public final class GuiComputer<T extends ContainerComputerBase> extends HandledS
         this.terminal = null;
     }
 
-    public static GuiComputer<ContainerComputer> create(ContainerComputer container, PlayerInventory inventory, Text component) {
+    public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, Text component )
-        return new GuiComputer<>(container, inventory, component, ComputerCraft.computerTermWidth, ComputerCraft.computerTermHeight);
+    {
+        return new GuiComputer<>( container, inventory, component, ComputerCraft.computerTermWidth, ComputerCraft.computerTermHeight );
     }
 
-    public static GuiComputer<ContainerPocketComputer> createPocket(ContainerPocketComputer container, PlayerInventory inventory, Text component) {
+    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, Text component )
-        return new GuiComputer<>(container, inventory, component, ComputerCraft.pocketTermWidth, ComputerCraft.pocketTermHeight);
+    {
+        return new GuiComputer<>( container, inventory, component, ComputerCraft.pocketTermWidth, ComputerCraft.pocketTermHeight );
     }
 
-    public static GuiComputer<ContainerViewComputer> createView(ContainerViewComputer container, PlayerInventory inventory, Text component) {
+    public static GuiComputer<ContainerViewComputer> createView( ContainerViewComputer container, PlayerInventory inventory, Text component )
-        return new GuiComputer<>(container, inventory, component, container.getWidth(), container.getHeight());
+    {
+        return new GuiComputer<>( container, inventory, component, container.getWidth(), container.getHeight() );
     }
 
 
     @Override
-    protected void init() {
+    protected void init()
-        this.client.keyboard.setRepeatEvents(true);
+    {
+        this.client.keyboard.setRepeatEvents( true );
 
         int termPxWidth = this.termWidth * FixedWidthFontRenderer.FONT_WIDTH;
         int termPxHeight = this.termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
@@ -72,67 +77,76 @@ public final class GuiComputer<T extends ContainerComputerBase> extends HandledS
 
         super.init();
 
-        this.terminal = new WidgetTerminal(this.client, () -> this.computer, this.termWidth, this.termHeight, MARGIN, MARGIN, MARGIN, MARGIN);
+        this.terminal = new WidgetTerminal( this.client, () -> this.computer, this.termWidth, this.termHeight, MARGIN, MARGIN, MARGIN, MARGIN );
-        this.terminalWrapper = new WidgetWrapper(this.terminal, MARGIN + BORDER + this.x, MARGIN + BORDER + this.y, termPxWidth, termPxHeight);
+        this.terminalWrapper = new WidgetWrapper( this.terminal, MARGIN + BORDER + this.x, MARGIN + BORDER + this.y, termPxWidth, termPxHeight );
 
-        this.children.add(this.terminalWrapper);
+        this.children.add( this.terminalWrapper );
-        this.setFocused(this.terminalWrapper);
+        this.setFocused( this.terminalWrapper );
     }
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
-        super.render(stack, mouseX, mouseY, partialTicks);
+    {
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
+        super.render( stack, mouseX, mouseY, partialTicks );
+        this.drawMouseoverTooltip( stack, mouseX, mouseY );
     }
 
     @Override
-    protected void drawForeground(@Nonnull MatrixStack transform, int mouseX, int mouseY) {
+    protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
         // Skip rendering labels.
     }
 
     @Override
-    public void drawBackground(@Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY) {
+    public void drawBackground( @Nonnull MatrixStack stack, float partialTicks, int mouseX, int mouseY )
+    {
         // Draw terminal
-        this.terminal.draw(this.terminalWrapper.getX(), this.terminalWrapper.getY());
+        this.terminal.draw( this.terminalWrapper.getX(), this.terminalWrapper.getY() );
 
         // Draw a border around the terminal
-        RenderSystem.color4f(1, 1, 1, 1);
+        RenderSystem.color4f( 1, 1, 1, 1 );
         this.client.getTextureManager()
-                   .bindTexture(ComputerBorderRenderer.getTexture(this.family));
+            .bindTexture( ComputerBorderRenderer.getTexture( this.family ) );
-        ComputerBorderRenderer.render(this.terminalWrapper.getX() - MARGIN, this.terminalWrapper.getY() - MARGIN,
+        ComputerBorderRenderer.render( this.terminalWrapper.getX() - MARGIN, this.terminalWrapper.getY() - MARGIN,
-                                      this.getZOffset(), this.terminalWrapper.getWidth() + MARGIN * 2, this.terminalWrapper.getHeight() + MARGIN * 2);
+            this.getZOffset(), this.terminalWrapper.getWidth() + MARGIN * 2, this.terminalWrapper.getHeight() + MARGIN * 2 );
     }
 
     @Override
-    public boolean mouseDragged(double x, double y, int button, double deltaX, double deltaY) {
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
-        return (this.getFocused() != null && this.getFocused().mouseDragged(x, y, button, deltaX, deltaY)) || super.mouseDragged(x, y, button, deltaX, deltaY);
+    {
+        return (this.getFocused() != null && this.getFocused().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY );
     }
 
-	@Override
+    @Override
-	public boolean mouseReleased(double mouseX, double mouseY, int button) {
+    public boolean mouseReleased( double mouseX, double mouseY, int button )
-		return (this.getFocused() != null && this.getFocused().mouseReleased(mouseX, mouseY, button)) || super.mouseReleased(x, y, button);
+    {
-	}
+        return (this.getFocused() != null && this.getFocused().mouseReleased( mouseX, mouseY, button )) || super.mouseReleased( x, y, button );
+    }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
         // Forward the tab key to the terminal, rather than moving between controls.
-        if (key == GLFW.GLFW_KEY_TAB && this.getFocused() != null && this.getFocused() == this.terminalWrapper) {
+        if( key == GLFW.GLFW_KEY_TAB && this.getFocused() != null && this.getFocused() == this.terminalWrapper )
-            return this.getFocused().keyPressed(key, scancode, modifiers);
+        {
+            return this.getFocused().keyPressed( key, scancode, modifiers );
         }
 
-        return super.keyPressed(key, scancode, modifiers);
+        return super.keyPressed( key, scancode, modifiers );
     }
 
     @Override
-    public void removed() {
+    public void removed()
+    {
         super.removed();
-        this.children.remove(this.terminal);
+        this.children.remove( this.terminal );
         this.terminal = null;
-        this.client.keyboard.setRepeatEvents(false);
+        this.client.keyboard.setRepeatEvents( false );
     }
 
     @Override
-    public void tick() {
+    public void tick()
+    {
         super.tick();
         this.terminal.update();
     }

src/main/java/dan200/computercraft/client/gui/GuiDiskDrive.java

@@ -6,36 +6,39 @@
 
 package dan200.computercraft.client.gui;
 
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
-
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-public class GuiDiskDrive extends HandledScreen<ContainerDiskDrive> {
+import javax.annotation.Nonnull;
-    private static final Identifier BACKGROUND = new Identifier("computercraft", "textures/gui/disk_drive.png");
 
-    public GuiDiskDrive(ContainerDiskDrive container, PlayerInventory player, Text title) {
+public class GuiDiskDrive extends HandledScreen<ContainerDiskDrive>
-        super(container, player, title);
+{
+    private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/disk_drive.png" );
+
+    public GuiDiskDrive( ContainerDiskDrive container, PlayerInventory player, Text title )
+    {
+        super( container, player, title );
     }
 
     @Override
-    public void render(@Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks) {
+    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
-        this.renderBackground(transform);
+    {
-        super.render(transform, mouseX, mouseY, partialTicks);
+        this.renderBackground( transform );
-        this.drawMouseoverTooltip(transform, mouseX, mouseY);
+        super.render( transform, mouseX, mouseY, partialTicks );
+        this.drawMouseoverTooltip( transform, mouseX, mouseY );
     }
 
     @Override
-    protected void drawBackground(@Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+    {
+        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
         this.client.getTextureManager()
-                   .bindTexture(BACKGROUND);
+            .bindTexture( BACKGROUND );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        this.drawTexture( transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight );
     }
 }

src/main/java/dan200/computercraft/client/gui/GuiPrinter.java

@@ -6,22 +6,23 @@
 
 package dan200.computercraft.client.gui;
 
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
-
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
 
-public class GuiPrinter extends HandledScreen<ContainerPrinter> {
+import javax.annotation.Nonnull;
-    private static final Identifier BACKGROUND = new Identifier("computercraft", "textures/gui/printer.png");
 
-    public GuiPrinter(ContainerPrinter container, PlayerInventory player, Text title) {
+public class GuiPrinter extends HandledScreen<ContainerPrinter>
-        super(container, player, title);
+{
+    private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/printer.png" );
+
+    public GuiPrinter( ContainerPrinter container, PlayerInventory player, Text title )
+    {
+        super( container, player, title );
     }
 
     /*@Override
@@ -33,21 +34,24 @@ public class GuiPrinter extends HandledScreen<ContainerPrinter> {
     }*/
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
-        this.renderBackground(stack);
+    {
-        super.render(stack, mouseX, mouseY, partialTicks);
+        this.renderBackground( stack );
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
+        super.render( stack, mouseX, mouseY, partialTicks );
+        this.drawMouseoverTooltip( stack, mouseX, mouseY );
     }
 
     @Override
-    protected void drawBackground(@Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+    {
+        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
         this.client.getTextureManager()
-                   .bindTexture(BACKGROUND);
+            .bindTexture( BACKGROUND );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        this.drawTexture( transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight );
 
-        if (this.getScreenHandler().isPrinting()) {
+        if( this.getScreenHandler().isPrinting() )
-            this.drawTexture(transform, this.x + 34, this.y + 21, 176, 0, 25, 45);
+        {
+            this.drawTexture( transform, this.x + 34, this.y + 21, 176, 0, 25, 45 );
         }
     }
 }

src/main/java/dan200/computercraft/client/gui/GuiPrintout.java

@@ -6,20 +6,10 @@
 
 package dan200.computercraft.client.gui;
 
-import static dan200.computercraft.client.render.PrintoutRenderer.X_TEXT_MARGIN;
-import static dan200.computercraft.client.render.PrintoutRenderer.Y_SIZE;
-import static dan200.computercraft.client.render.PrintoutRenderer.Y_TEXT_MARGIN;
-import static dan200.computercraft.client.render.PrintoutRenderer.drawBorder;
-import static dan200.computercraft.client.render.PrintoutRenderer.drawText;
-
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.common.ContainerHeldItem;
 import dan200.computercraft.shared.media.items.ItemPrintout;
-import org.lwjgl.glfw.GLFW;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.render.VertexConsumerProvider;
@@ -27,53 +17,68 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.glfw.GLFW;
 
-public class GuiPrintout extends HandledScreen<ContainerHeldItem> {
+import javax.annotation.Nonnull;
+
+import static dan200.computercraft.client.render.PrintoutRenderer.*;
+
+public class GuiPrintout extends HandledScreen<ContainerHeldItem>
+{
     private final boolean m_book;
     private final int m_pages;
     private final TextBuffer[] m_text;
     private final TextBuffer[] m_colours;
     private int m_page;
 
-    public GuiPrintout(ContainerHeldItem container, PlayerInventory player, Text title) {
+    public GuiPrintout( ContainerHeldItem container, PlayerInventory player, Text title )
-        super(container, player, title);
+    {
+        super( container, player, title );
 
         this.backgroundHeight = Y_SIZE;
 
-        String[] text = ItemPrintout.getText(container.getStack());
+        String[] text = ItemPrintout.getText( container.getStack() );
         this.m_text = new TextBuffer[text.length];
-        for (int i = 0; i < this.m_text.length; i++) {
+        for( int i = 0; i < this.m_text.length; i++ )
-            this.m_text[i] = new TextBuffer(text[i]);
+        {
+            this.m_text[i] = new TextBuffer( text[i] );
         }
 
-        String[] colours = ItemPrintout.getColours(container.getStack());
+        String[] colours = ItemPrintout.getColours( container.getStack() );
         this.m_colours = new TextBuffer[colours.length];
-        for (int i = 0; i < this.m_colours.length; i++) {
+        for( int i = 0; i < this.m_colours.length; i++ )
-            this.m_colours[i] = new TextBuffer(colours[i]);
+        {
+            this.m_colours[i] = new TextBuffer( colours[i] );
         }
 
         this.m_page = 0;
-        this.m_pages = Math.max(this.m_text.length / ItemPrintout.LINES_PER_PAGE, 1);
+        this.m_pages = Math.max( this.m_text.length / ItemPrintout.LINES_PER_PAGE, 1 );
         this.m_book = ((ItemPrintout) container.getStack()
-                                               .getItem()).getType() == ItemPrintout.Type.BOOK;
+            .getItem()).getType() == ItemPrintout.Type.BOOK;
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double delta) {
+    public boolean mouseScrolled( double x, double y, double delta )
-        if (super.mouseScrolled(x, y, delta)) {
+    {
+        if( super.mouseScrolled( x, y, delta ) )
+        {
             return true;
         }
-        if (delta < 0) {
+        if( delta < 0 )
+        {
             // Scroll up goes to the next page
-            if (this.m_page < this.m_pages - 1) {
+            if( this.m_page < this.m_pages - 1 )
+            {
                 this.m_page++;
             }
             return true;
         }
 
-        if (delta > 0) {
+        if( delta > 0 )
+        {
             // Scroll down goes to the previous page
-            if (this.m_page > 0) {
+            if( this.m_page > 0 )
+            {
                 this.m_page--;
             }
             return true;
@@ -83,51 +88,60 @@ public class GuiPrintout extends HandledScreen<ContainerHeldItem> {
     }
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    {
         // We must take the background further back in order to not overlap with our printed pages.
-        this.setZOffset(this.getZOffset() - 1);
+        this.setZOffset( this.getZOffset() - 1 );
-        this.renderBackground(stack);
+        this.renderBackground( stack );
-        this.setZOffset(this.getZOffset() + 1);
+        this.setZOffset( this.getZOffset() + 1 );
 
-        super.render(stack, mouseX, mouseY, partialTicks);
+        super.render( stack, mouseX, mouseY, partialTicks );
     }
 
     @Override
-    protected void drawForeground(@Nonnull MatrixStack transform, int mouseX, int mouseY) {
+    protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
         // Skip rendering labels.
     }
 
     @Override
-    protected void drawBackground(@Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    {
         // Draw the printout
-        RenderSystem.color4f(1.0f, 1.0f, 1.0f, 1.0f);
+        RenderSystem.color4f( 1.0f, 1.0f, 1.0f, 1.0f );
         RenderSystem.enableDepthTest();
 
         VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
-                                                                   .getBufferBuilders()
+            .getBufferBuilders()
-                                                                   .getEntityVertexConsumers();
+            .getEntityVertexConsumers();
         Matrix4f matrix = transform.peek()
-                                   .getModel();
+            .getModel();
-        drawBorder(matrix, renderer, this.x, this.y, this.getZOffset(), this.m_page, this.m_pages, this.m_book);
+        drawBorder( matrix, renderer, this.x, this.y, this.getZOffset(), this.m_page, this.m_pages, this.m_book );
-        drawText(matrix, renderer, this.x + X_TEXT_MARGIN, this.y + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * this.m_page, this.m_text, this.m_colours);
+        drawText( matrix, renderer, this.x + X_TEXT_MARGIN, this.y + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * this.m_page, this.m_text, this.m_colours );
         renderer.draw();
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
-        if (super.keyPressed(key, scancode, modifiers)) {
+    {
+        if( super.keyPressed( key, scancode, modifiers ) )
+        {
             return true;
         }
 
-        if (key == GLFW.GLFW_KEY_RIGHT) {
+        if( key == GLFW.GLFW_KEY_RIGHT )
-            if (this.m_page < this.m_pages - 1) {
+        {
+            if( this.m_page < this.m_pages - 1 )
+            {
                 this.m_page++;
             }
             return true;
         }
 
-        if (key == GLFW.GLFW_KEY_LEFT) {
+        if( key == GLFW.GLFW_KEY_LEFT )
-            if (this.m_page > 0) {
+        {
+            if( this.m_page > 0 )
+            {
                 this.m_page--;
             }
             return true;

src/main/java/dan200/computercraft/client/gui/GuiTurtle.java

@@ -6,8 +6,6 @@
 
 package dan200.computercraft.client.gui;
 
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.widgets.WidgetTerminal;
@@ -15,25 +13,28 @@ import dan200.computercraft.client.gui.widgets.WidgetWrapper;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-import org.lwjgl.glfw.GLFW;
-
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
+import org.lwjgl.glfw.GLFW;
 
-public class GuiTurtle extends HandledScreen<ContainerTurtle> {
+import javax.annotation.Nonnull;
-    private static final Identifier BACKGROUND_NORMAL = new Identifier("computercraft", "textures/gui/turtle_normal.png");
+
-    private static final Identifier BACKGROUND_ADVANCED = new Identifier("computercraft", "textures/gui/turtle_advanced.png");
+public class GuiTurtle extends HandledScreen<ContainerTurtle>
+{
+    private static final Identifier BACKGROUND_NORMAL = new Identifier( "computercraft", "textures/gui/turtle_normal.png" );
+    private static final Identifier BACKGROUND_ADVANCED = new Identifier( "computercraft", "textures/gui/turtle_advanced.png" );
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
     private ContainerTurtle m_container;
     private WidgetTerminal terminal;
     private WidgetWrapper terminalWrapper;
 
-    public GuiTurtle(ContainerTurtle container, PlayerInventory player, Text title) {
+    public GuiTurtle( ContainerTurtle container, PlayerInventory player, Text title )
-        super(container, player, title);
+    {
+        super( container, player, title );
 
         this.m_container = container;
         this.m_family = container.getFamily();
@@ -44,82 +45,92 @@ public class GuiTurtle extends HandledScreen<ContainerTurtle> {
     }
 
     @Override
-    protected void init() {
+    protected void init()
+    {
         super.init();
-        this.client.keyboard.setRepeatEvents(true);
+        this.client.keyboard.setRepeatEvents( true );
 
         int termPxWidth = ComputerCraft.turtleTermWidth * FixedWidthFontRenderer.FONT_WIDTH;
         int termPxHeight = ComputerCraft.turtleTermHeight * FixedWidthFontRenderer.FONT_HEIGHT;
 
-        this.terminal = new WidgetTerminal(this.client, () -> this.m_computer, ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight, 2, 2, 2, 2);
+        this.terminal = new WidgetTerminal( this.client, () -> this.m_computer, ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight, 2, 2, 2, 2 );
-        this.terminalWrapper = new WidgetWrapper(this.terminal, 2 + 8 + this.x, 2 + 8 + this.y, termPxWidth, termPxHeight);
+        this.terminalWrapper = new WidgetWrapper( this.terminal, 2 + 8 + this.x, 2 + 8 + this.y, termPxWidth, termPxHeight );
 
-        this.children.add(this.terminalWrapper);
+        this.children.add( this.terminalWrapper );
-        this.setFocused(this.terminalWrapper);
+        this.setFocused( this.terminalWrapper );
     }
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
-        this.renderBackground(stack);
+    {
-        super.render(stack, mouseX, mouseY, partialTicks);
+        this.renderBackground( stack );
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
+        super.render( stack, mouseX, mouseY, partialTicks );
+        this.drawMouseoverTooltip( stack, mouseX, mouseY );
     }
 
     @Override
-    protected void drawForeground(@Nonnull MatrixStack transform, int mouseX, int mouseY) {
+    protected void drawForeground( @Nonnull MatrixStack transform, int mouseX, int mouseY )
+    {
         // Skip rendering labels.
     }
 
     @Override
-    protected void drawBackground(@Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY) {
+    protected void drawBackground( @Nonnull MatrixStack transform, float partialTicks, int mouseX, int mouseY )
+    {
         // Draw term
         Identifier texture = this.m_family == ComputerFamily.ADVANCED ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
-        this.terminal.draw(this.terminalWrapper.getX(), this.terminalWrapper.getY());
+        this.terminal.draw( this.terminalWrapper.getX(), this.terminalWrapper.getY() );
 
         // Draw border/inventory
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
         this.client.getTextureManager()
-                   .bindTexture(texture);
+            .bindTexture( texture );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        this.drawTexture( transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight );
 
         // Draw selection slot
         int slot = this.m_container.getSelectedSlot();
-        if (slot >= 0) {
+        if( slot >= 0 )
+        {
             int slotX = slot % 4;
             int slotY = slot / 4;
-            this.drawTexture(transform, this.x + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, this.y + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
+            this.drawTexture( transform, this.x + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, this.y + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
-                             0,
+                0,
-                             217,
+                217,
-                             24,
+                24,
-                             24);
+                24 );
         }
     }
 
     @Override
-    public boolean mouseDragged(double x, double y, int button, double deltaX, double deltaY) {
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
-        return (this.getFocused() != null && this.getFocused().mouseDragged(x, y, button, deltaX, deltaY)) || super.mouseDragged(x, y, button, deltaX, deltaY);
+    {
+        return (this.getFocused() != null && this.getFocused().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY );
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
         // Forward the tab key to the terminal, rather than moving between controls.
-        if (key == GLFW.GLFW_KEY_TAB && this.getFocused() != null && this.getFocused() == this.terminalWrapper) {
+        if( key == GLFW.GLFW_KEY_TAB && this.getFocused() != null && this.getFocused() == this.terminalWrapper )
-            return this.getFocused().keyPressed(key, scancode, modifiers);
+        {
+            return this.getFocused().keyPressed( key, scancode, modifiers );
         }
 
-        return super.keyPressed(key, scancode, modifiers);
+        return super.keyPressed( key, scancode, modifiers );
     }
 
     @Override
-    public void removed() {
+    public void removed()
+    {
         super.removed();
-        this.children.remove(this.terminal);
+        this.children.remove( this.terminal );
         this.terminal = null;
-        this.client.keyboard.setRepeatEvents(false);
+        this.client.keyboard.setRepeatEvents( false );
     }
 
     @Override
-    public void tick() {
+    public void tick()
+    {
         super.tick();
         this.terminal.update();
     }

src/main/java/dan200/computercraft/client/gui/widgets/WidgetTerminal.java

@@ -6,23 +6,23 @@
 
 package dan200.computercraft.client.gui.widgets;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-
-import java.util.BitSet;
-import java.util.function.Supplier;
-
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.IComputer;
-import org.lwjgl.glfw.GLFW;
-
 import net.minecraft.SharedConstants;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.Element;
+import org.lwjgl.glfw.GLFW;
 
-public class WidgetTerminal implements Element {
+import java.util.BitSet;
+import java.util.function.Supplier;
+
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
+
+public class WidgetTerminal implements Element
+{
     private static final float TERMINATE_TIME = 0.5f;
 
     private final MinecraftClient client;
@@ -33,7 +33,7 @@ public class WidgetTerminal implements Element {
     private final int rightMargin;
     private final int topMargin;
     private final int bottomMargin;
-    private final BitSet keysDown = new BitSet(256);
+    private final BitSet keysDown = new BitSet( 256 );
     private boolean focused;
     private float terminateTimer = -1;
     private float rebootTimer = -1;
@@ -42,8 +42,9 @@ public class WidgetTerminal implements Element {
     private int lastMouseX = -1;
     private int lastMouseY = -1;
 
-    public WidgetTerminal(MinecraftClient client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin,
+    public WidgetTerminal( MinecraftClient client, Supplier<ClientComputer> computer, int termWidth, int termHeight, int leftMargin, int rightMargin,
-                          int topMargin, int bottomMargin) {
+                           int topMargin, int bottomMargin )
+    {
         this.client = client;
         this.computer = computer;
         this.termWidth = termWidth;
@@ -55,20 +56,23 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked( double mouseX, double mouseY, int button )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer == null || !computer.isColour() || button < 0 || button > 2) {
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 )
+        {
             return false;
         }
 
         Terminal term = computer.getTerminal();
-        if (term != null) {
+        if( term != null )
+        {
             int charX = (int) (mouseX / FONT_WIDTH);
             int charY = (int) (mouseY / FONT_HEIGHT);
-            charX = Math.min(Math.max(charX, 0), term.getWidth() - 1);
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min(Math.max(charY, 0), term.getHeight() - 1);
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            computer.mouseClick(button + 1, charX + 1, charY + 1);
+            computer.mouseClick( button + 1, charX + 1, charY + 1 );
 
             this.lastMouseButton = button;
             this.lastMouseX = charX;
@@ -79,21 +83,25 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+    public boolean mouseReleased( double mouseX, double mouseY, int button )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer == null || !computer.isColour() || button < 0 || button > 2) {
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 )
+        {
             return false;
         }
 
         Terminal term = computer.getTerminal();
-        if (term != null) {
+        if( term != null )
+        {
             int charX = (int) (mouseX / FONT_WIDTH);
             int charY = (int) (mouseY / FONT_HEIGHT);
-            charX = Math.min(Math.max(charX, 0), term.getWidth() - 1);
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min(Math.max(charY, 0), term.getHeight() - 1);
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            if (this.lastMouseButton == button) {
+            if( this.lastMouseButton == button )
-                computer.mouseUp(this.lastMouseButton + 1, charX + 1, charY + 1);
+            {
+                computer.mouseUp( this.lastMouseButton + 1, charX + 1, charY + 1 );
                 this.lastMouseButton = -1;
             }
 
@@ -105,21 +113,25 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean mouseDragged(double mouseX, double mouseY, int button, double v2, double v3) {
+    public boolean mouseDragged( double mouseX, double mouseY, int button, double v2, double v3 )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer == null || !computer.isColour() || button < 0 || button > 2) {
+        if( computer == null || !computer.isColour() || button < 0 || button > 2 )
+        {
             return false;
         }
 
         Terminal term = computer.getTerminal();
-        if (term != null) {
+        if( term != null )
+        {
             int charX = (int) (mouseX / FONT_WIDTH);
             int charY = (int) (mouseY / FONT_HEIGHT);
-            charX = Math.min(Math.max(charX, 0), term.getWidth() - 1);
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min(Math.max(charY, 0), term.getHeight() - 1);
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            if (button == this.lastMouseButton && (charX != this.lastMouseX || charY != this.lastMouseY)) {
+            if( button == this.lastMouseButton && (charX != this.lastMouseX || charY != this.lastMouseY) )
-                computer.mouseDrag(button + 1, charX + 1, charY + 1);
+            {
+                computer.mouseDrag( button + 1, charX + 1, charY + 1 );
                 this.lastMouseX = charX;
                 this.lastMouseY = charY;
             }
@@ -129,20 +141,23 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+    public boolean mouseScrolled( double mouseX, double mouseY, double delta )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer == null || !computer.isColour() || delta == 0) {
+        if( computer == null || !computer.isColour() || delta == 0 )
+        {
             return false;
         }
 
         Terminal term = computer.getTerminal();
-        if (term != null) {
+        if( term != null )
+        {
             int charX = (int) (mouseX / FONT_WIDTH);
             int charY = (int) (mouseY / FONT_HEIGHT);
-            charX = Math.min(Math.max(charX, 0), term.getWidth() - 1);
+            charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
-            charY = Math.min(Math.max(charY, 0), term.getHeight() - 1);
+            charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            computer.mouseScroll(delta < 0 ? 1 : -1, charX + 1, charY + 1);
+            computer.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
 
             this.lastMouseX = charX;
             this.lastMouseY = charY;
@@ -152,65 +167,82 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
-        if (key == GLFW.GLFW_KEY_ESCAPE) {
+    {
+        if( key == GLFW.GLFW_KEY_ESCAPE )
+        {
             return false;
         }
-        if ((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) {
+        if( (modifiers & GLFW.GLFW_MOD_CONTROL) != 0 )
-            switch (key) {
+        {
-            case GLFW.GLFW_KEY_T:
+            switch( key )
-                if (this.terminateTimer < 0) {
+            {
-                    this.terminateTimer = 0;
+                case GLFW.GLFW_KEY_T:
-                }
+                    if( this.terminateTimer < 0 )
-                return true;
+                    {
-            case GLFW.GLFW_KEY_S:
+                        this.terminateTimer = 0;
-                if (this.shutdownTimer < 0) {
-                    this.shutdownTimer = 0;
-                }
-                return true;
-            case GLFW.GLFW_KEY_R:
-                if (this.rebootTimer < 0) {
-                    this.rebootTimer = 0;
-                }
-                return true;
-
-            case GLFW.GLFW_KEY_V:
-                // Ctrl+V for paste
-                String clipboard = this.client.keyboard.getClipboard();
-                if (clipboard != null) {
-                    // Clip to the first occurrence of \r or \n
-                    int newLineIndex1 = clipboard.indexOf("\r");
-                    int newLineIndex2 = clipboard.indexOf("\n");
-                    if (newLineIndex1 >= 0 && newLineIndex2 >= 0) {
-                        clipboard = clipboard.substring(0, Math.min(newLineIndex1, newLineIndex2));
-                    } else if (newLineIndex1 >= 0) {
-                        clipboard = clipboard.substring(0, newLineIndex1);
-                    } else if (newLineIndex2 >= 0) {
-                        clipboard = clipboard.substring(0, newLineIndex2);
                     }
-
-                    // Filter the string
-                    clipboard = SharedConstants.stripInvalidChars(clipboard);
-                    if (!clipboard.isEmpty()) {
-                        // Clip to 512 characters and queue the event
-                        if (clipboard.length() > 512) {
-                            clipboard = clipboard.substring(0, 512);
-                        }
-                        this.queueEvent("paste", clipboard);
-                    }
-
                     return true;
-                }
+                case GLFW.GLFW_KEY_S:
+                    if( this.shutdownTimer < 0 )
+                    {
+                        this.shutdownTimer = 0;
+                    }
+                    return true;
+                case GLFW.GLFW_KEY_R:
+                    if( this.rebootTimer < 0 )
+                    {
+                        this.rebootTimer = 0;
+                    }
+                    return true;
+
+                case GLFW.GLFW_KEY_V:
+                    // Ctrl+V for paste
+                    String clipboard = this.client.keyboard.getClipboard();
+                    if( clipboard != null )
+                    {
+                        // Clip to the first occurrence of \r or \n
+                        int newLineIndex1 = clipboard.indexOf( "\r" );
+                        int newLineIndex2 = clipboard.indexOf( "\n" );
+                        if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
+                        {
+                            clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
+                        }
+                        else if( newLineIndex1 >= 0 )
+                        {
+                            clipboard = clipboard.substring( 0, newLineIndex1 );
+                        }
+                        else if( newLineIndex2 >= 0 )
+                        {
+                            clipboard = clipboard.substring( 0, newLineIndex2 );
+                        }
+
+                        // Filter the string
+                        clipboard = SharedConstants.stripInvalidChars( clipboard );
+                        if( !clipboard.isEmpty() )
+                        {
+                            // Clip to 512 characters and queue the event
+                            if( clipboard.length() > 512 )
+                            {
+                                clipboard = clipboard.substring( 0, 512 );
+                            }
+                            this.queueEvent( "paste", clipboard );
+                        }
+
+                        return true;
+                    }
             }
         }
 
-        if (key >= 0 && this.terminateTimer < 0 && this.rebootTimer < 0 && this.shutdownTimer < 0) {
+        if( key >= 0 && this.terminateTimer < 0 && this.rebootTimer < 0 && this.shutdownTimer < 0 )
+        {
             // Queue the "key" event and add to the down set
-            boolean repeat = this.keysDown.get(key);
+            boolean repeat = this.keysDown.get( key );
-            this.keysDown.set(key);
+            this.keysDown.set( key );
             IComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
-                computer.keyDown(key, repeat);
+            {
+                computer.keyDown( key, repeat );
             }
         }
 
@@ -218,62 +250,73 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean keyReleased(int key, int scancode, int modifiers) {
+    public boolean keyReleased( int key, int scancode, int modifiers )
+    {
         // Queue the "key_up" event and remove from the down set
-        if (key >= 0 && this.keysDown.get(key)) {
+        if( key >= 0 && this.keysDown.get( key ) )
-            this.keysDown.set(key, false);
+        {
+            this.keysDown.set( key, false );
             IComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
-                computer.keyUp(key);
+            {
+                computer.keyUp( key );
             }
         }
 
-        switch (key) {
+        switch( key )
-        case GLFW.GLFW_KEY_T:
+        {
-            this.terminateTimer = -1;
+            case GLFW.GLFW_KEY_T:
-            break;
+                this.terminateTimer = -1;
-        case GLFW.GLFW_KEY_R:
+                break;
-            this.rebootTimer = -1;
+            case GLFW.GLFW_KEY_R:
-            break;
+                this.rebootTimer = -1;
-        case GLFW.GLFW_KEY_S:
+                break;
-            this.shutdownTimer = -1;
+            case GLFW.GLFW_KEY_S:
-            break;
+                this.shutdownTimer = -1;
-        case GLFW.GLFW_KEY_LEFT_CONTROL:
+                break;
-        case GLFW.GLFW_KEY_RIGHT_CONTROL:
+            case GLFW.GLFW_KEY_LEFT_CONTROL:
-            this.terminateTimer = this.rebootTimer = this.shutdownTimer = -1;
+            case GLFW.GLFW_KEY_RIGHT_CONTROL:
-            break;
+                this.terminateTimer = this.rebootTimer = this.shutdownTimer = -1;
+                break;
         }
 
         return true;
     }
 
     @Override
-    public boolean charTyped(char ch, int modifiers) {
+    public boolean charTyped( char ch, int modifiers )
-        if (ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255) // printable chars in byte range
+    {
+        if( ch >= 32 && ch <= 126 || ch >= 160 && ch <= 255 ) // printable chars in byte range
         {
             // Queue the "char" event
-            this.queueEvent("char", Character.toString(ch));
+            this.queueEvent( "char", Character.toString( ch ) );
         }
 
         return true;
     }
 
     @Override
-    public boolean changeFocus(boolean reversed) {
+    public boolean changeFocus( boolean reversed )
-        if (this.focused) {
+    {
+        if( this.focused )
+        {
             // When blurring, we should make all keys go up
-            for (int key = 0; key < this.keysDown.size(); key++) {
+            for( int key = 0; key < this.keysDown.size(); key++ )
-                if (this.keysDown.get(key)) {
+            {
-                    this.queueEvent("key_up", key);
+                if( this.keysDown.get( key ) )
+                {
+                    this.queueEvent( "key_up", key );
                 }
             }
             this.keysDown.clear();
 
             // When blurring, we should make the last mouse button go up
-            if (this.lastMouseButton > 0) {
+            if( this.lastMouseButton > 0 )
+            {
                 IComputer computer = this.computer.get();
-                if (computer != null) {
+                if( computer != null )
-                    computer.mouseUp(this.lastMouseButton + 1, this.lastMouseX + 1, this.lastMouseY + 1);
+                {
+                    computer.mouseUp( this.lastMouseButton + 1, this.lastMouseX + 1, this.lastMouseY + 1 );
                 }
                 this.lastMouseButton = -1;
             }
@@ -285,56 +328,72 @@ public class WidgetTerminal implements Element {
     }
 
     @Override
-    public boolean isMouseOver(double x, double y) {
+    public boolean isMouseOver( double x, double y )
+    {
         return true;
     }
 
-    private void queueEvent(String event, Object... args) {
+    private void queueEvent( String event, Object... args )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer != null) {
+        if( computer != null )
-            computer.queueEvent(event, args);
+        {
+            computer.queueEvent( event, args );
         }
     }
 
-    public void update() {
+    public void update()
-        if (this.terminateTimer >= 0 && this.terminateTimer < TERMINATE_TIME && (this.terminateTimer += 0.05f) > TERMINATE_TIME) {
+    {
-            this.queueEvent("terminate");
+        if( this.terminateTimer >= 0 && this.terminateTimer < TERMINATE_TIME && (this.terminateTimer += 0.05f) > TERMINATE_TIME )
+        {
+            this.queueEvent( "terminate" );
         }
 
-        if (this.shutdownTimer >= 0 && this.shutdownTimer < TERMINATE_TIME && (this.shutdownTimer += 0.05f) > TERMINATE_TIME) {
+        if( this.shutdownTimer >= 0 && this.shutdownTimer < TERMINATE_TIME && (this.shutdownTimer += 0.05f) > TERMINATE_TIME )
+        {
             ClientComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
+            {
                 computer.shutdown();
             }
         }
 
-        if (this.rebootTimer >= 0 && this.rebootTimer < TERMINATE_TIME && (this.rebootTimer += 0.05f) > TERMINATE_TIME) {
+        if( this.rebootTimer >= 0 && this.rebootTimer < TERMINATE_TIME && (this.rebootTimer += 0.05f) > TERMINATE_TIME )
+        {
             ClientComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
+            {
                 computer.reboot();
             }
         }
     }
 
-    private void queueEvent(String event) {
+    private void queueEvent( String event )
+    {
         ClientComputer computer = this.computer.get();
-        if (computer != null) {
+        if( computer != null )
-            computer.queueEvent(event);
+        {
+            computer.queueEvent( event );
         }
     }
 
-    public void draw(int originX, int originY) {
+    public void draw( int originX, int originY )
-        synchronized (this.computer) {
+    {
+        synchronized( this.computer )
+        {
             // Draw the screen contents
             ClientComputer computer = this.computer.get();
             Terminal terminal = computer != null ? computer.getTerminal() : null;
-            if (terminal != null) {
+            if( terminal != null )
-                FixedWidthFontRenderer.drawTerminal(originX, originY, terminal, !computer.isColour(), this.topMargin, this.bottomMargin, this.leftMargin,
+            {
-                                                    this.rightMargin);
+                FixedWidthFontRenderer.drawTerminal( originX, originY, terminal, !computer.isColour(), this.topMargin, this.bottomMargin, this.leftMargin,
-            } else {
+                    this.rightMargin );
-                FixedWidthFontRenderer.drawEmptyTerminal(originX - this.leftMargin,
+            }
-                                                         originY - this.rightMargin, this.termWidth * FONT_WIDTH + this.leftMargin + this.rightMargin,
+            else
-                                                         this.termHeight * FONT_HEIGHT + this.topMargin + this.bottomMargin);
+            {
+                FixedWidthFontRenderer.drawEmptyTerminal( originX - this.leftMargin,
+                    originY - this.rightMargin, this.termWidth * FONT_WIDTH + this.leftMargin + this.rightMargin,
+                    this.termHeight * FONT_HEIGHT + this.topMargin + this.bottomMargin );
             }
         }
     }

src/main/java/dan200/computercraft/client/gui/widgets/WidgetWrapper.java

@@ -8,14 +8,16 @@ package dan200.computercraft.client.gui.widgets;
 
 import net.minecraft.client.gui.Element;
 
-public class WidgetWrapper implements Element {
+public class WidgetWrapper implements Element
+{
     private final Element listener;
     private final int x;
     private final int y;
     private final int width;
     private final int height;
 
-    public WidgetWrapper(Element listener, int x, int y, int width, int height) {
+    public WidgetWrapper( Element listener, int x, int y, int width, int height )
+    {
         this.listener = listener;
         this.x = x;
         this.y = y;
@@ -24,68 +26,81 @@ public class WidgetWrapper implements Element {
     }
 
     @Override
-    public boolean mouseClicked(double x, double y, int button) {
+    public boolean mouseClicked( double x, double y, int button )
+    {
         double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseClicked(dx, dy, button);
+        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseClicked( dx, dy, button );
     }
 
     @Override
-    public boolean mouseReleased(double x, double y, int button) {
+    public boolean mouseReleased( double x, double y, int button )
+    {
         double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseReleased(dx, dy, button);
+        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseReleased( dx, dy, button );
     }
 
     @Override
-    public boolean mouseDragged(double x, double y, int button, double deltaX, double deltaY) {
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
         double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseDragged(dx, dy, button, deltaX, deltaY);
+        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseDragged( dx, dy, button, deltaX, deltaY );
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double delta) {
+    public boolean mouseScrolled( double x, double y, double delta )
+    {
         double dx = x - this.x, dy = y - this.y;
-        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseScrolled(dx, dy, delta);
+        return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height && this.listener.mouseScrolled( dx, dy, delta );
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
-        return this.listener.keyPressed(key, scancode, modifiers);
+    {
+        return this.listener.keyPressed( key, scancode, modifiers );
     }
 
     @Override
-    public boolean keyReleased(int key, int scancode, int modifiers) {
+    public boolean keyReleased( int key, int scancode, int modifiers )
-        return this.listener.keyReleased(key, scancode, modifiers);
+    {
+        return this.listener.keyReleased( key, scancode, modifiers );
     }
 
     @Override
-    public boolean charTyped(char character, int modifiers) {
+    public boolean charTyped( char character, int modifiers )
-        return this.listener.charTyped(character, modifiers);
+    {
+        return this.listener.charTyped( character, modifiers );
     }
 
     @Override
-    public boolean changeFocus(boolean b) {
+    public boolean changeFocus( boolean b )
-        return this.listener.changeFocus(b);
+    {
+        return this.listener.changeFocus( b );
     }
 
     @Override
-    public boolean isMouseOver(double x, double y) {
+    public boolean isMouseOver( double x, double y )
+    {
         double dx = x - this.x, dy = y - this.y;
         return dx >= 0 && dx < this.width && dy >= 0 && dy < this.height;
     }
 
-    public int getX() {
+    public int getX()
+    {
         return this.x;
     }
 
-    public int getY() {
+    public int getY()
+    {
         return this.y;
     }
 
-    public int getWidth() {
+    public int getWidth()
+    {
         return this.width;
     }
 
-    public int getHeight() {
+    public int getHeight()
+    {
         return this.height;
     }
 }

src/main/java/dan200/computercraft/client/proxy/ComputerCraftProxyClient.java

@@ -6,16 +6,10 @@
 
 package dan200.computercraft.client.proxy;
 
-import java.util.function.Supplier;
-
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.ClientRegistry;
 import dan200.computercraft.client.FrameInfo;
-import dan200.computercraft.client.gui.GuiComputer;
+import dan200.computercraft.client.gui.*;
-import dan200.computercraft.client.gui.GuiDiskDrive;
-import dan200.computercraft.client.gui.GuiPrinter;
-import dan200.computercraft.client.gui.GuiPrintout;
-import dan200.computercraft.client.gui.GuiTurtle;
 import dan200.computercraft.client.render.TileEntityMonitorRenderer;
 import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.client.render.TurtleModelLoader;
@@ -33,105 +27,112 @@ import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
 import dan200.computercraft.shared.pocket.inventory.ContainerPocketComputer;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.turtle.inventory.ContainerTurtle;
-
 import dan200.computercraft.shared.util.Config;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientBlockEntityEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
-import net.minecraft.client.item.ModelPredicateProvider;
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.item.Item;
-import net.minecraft.screen.PlayerScreenHandler;
-import net.minecraft.util.Identifier;
-
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientBlockEntityEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
 import net.fabricmc.fabric.api.client.rendereregistry.v1.BlockEntityRendererRegistry;
 import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
 import net.fabricmc.fabric.api.client.screenhandler.v1.ScreenRegistry;
 import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
 import net.fabricmc.fabric.mixin.object.builder.ModelPredicateProviderRegistrySpecificAccessor;
+import net.minecraft.client.item.ModelPredicateProvider;
+import net.minecraft.client.render.RenderLayer;
+import net.minecraft.item.Item;
+import net.minecraft.screen.PlayerScreenHandler;
+import net.minecraft.util.Identifier;
 
-@Environment (EnvType.CLIENT)
+import java.util.function.Supplier;
-public final class ComputerCraftProxyClient implements ClientModInitializer {
 
-    private static void initEvents() {
+@Environment( EnvType.CLIENT )
+public final class ComputerCraftProxyClient implements ClientModInitializer
+{
+
+    private static void initEvents()
+    {
         ClientBlockEntityEvents.BLOCK_ENTITY_UNLOAD.register( ( blockEntity, world ) -> {
-            if(blockEntity instanceof TileGeneric ) {
+            if( blockEntity instanceof TileGeneric )
-                ((TileGeneric)blockEntity).onChunkUnloaded();
+            {
+                ((TileGeneric) blockEntity).onChunkUnloaded();
             }
-        });
+        } );
 
         ClientUnloadWorldEvent.EVENT.register( () -> ClientMonitor.destroyAll() );
 
         // Config
-        ClientLifecycleEvents.CLIENT_STARTED.register(Config::clientStarted);
+        ClientLifecycleEvents.CLIENT_STARTED.register( Config::clientStarted );
     }
 
     @Override
-    public void onInitializeClient() {
+    public void onInitializeClient()
+    {
         FrameInfo.init();
         registerContainers();
 
         // While turtles themselves are not transparent, their upgrades may be.
-        BlockRenderLayerMap.INSTANCE.putBlock(ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL, RenderLayer.getTranslucent());
+        BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.TURTLE_NORMAL, RenderLayer.getTranslucent() );
-        BlockRenderLayerMap.INSTANCE.putBlock(ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED, RenderLayer.getTranslucent());
+        BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.TURTLE_ADVANCED, RenderLayer.getTranslucent() );
 
         // Monitors' textures have transparent fronts and so count as cutouts.
-        BlockRenderLayerMap.INSTANCE.putBlock(ComputerCraftRegistry.ModBlocks.MONITOR_NORMAL, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.MONITOR_NORMAL, RenderLayer.getCutout() );
-        BlockRenderLayerMap.INSTANCE.putBlock(ComputerCraftRegistry.ModBlocks.MONITOR_ADVANCED, RenderLayer.getCutout());
+        BlockRenderLayerMap.INSTANCE.putBlock( ComputerCraftRegistry.ModBlocks.MONITOR_ADVANCED, RenderLayer.getCutout() );
 
         // Setup TESRs
-        BlockEntityRendererRegistry.INSTANCE.register(ComputerCraftRegistry.ModTiles.MONITOR_NORMAL, TileEntityMonitorRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.MONITOR_NORMAL, TileEntityMonitorRenderer::new );
-        BlockEntityRendererRegistry.INSTANCE.register(ComputerCraftRegistry.ModTiles.MONITOR_ADVANCED, TileEntityMonitorRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.MONITOR_ADVANCED, TileEntityMonitorRenderer::new );
-        BlockEntityRendererRegistry.INSTANCE.register(ComputerCraftRegistry.ModTiles.TURTLE_NORMAL, TileEntityTurtleRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.TURTLE_NORMAL, TileEntityTurtleRenderer::new );
-        BlockEntityRendererRegistry.INSTANCE.register(ComputerCraftRegistry.ModTiles.TURTLE_ADVANCED, TileEntityTurtleRenderer::new);
+        BlockEntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModTiles.TURTLE_ADVANCED, TileEntityTurtleRenderer::new );
 
-        ClientSpriteRegistryCallback.event(PlayerScreenHandler.BLOCK_ATLAS_TEXTURE)
+        ClientSpriteRegistryCallback.event( PlayerScreenHandler.BLOCK_ATLAS_TEXTURE )
-                                    .register(ClientRegistry::onTextureStitchEvent);
+            .register( ClientRegistry::onTextureStitchEvent );
-        ModelLoadingRegistry.INSTANCE.registerAppender(ClientRegistry::onModelBakeEvent);
+        ModelLoadingRegistry.INSTANCE.registerAppender( ClientRegistry::onModelBakeEvent );
-        ModelLoadingRegistry.INSTANCE.registerResourceProvider(loader -> (name, context) -> TurtleModelLoader.INSTANCE.accepts(name) ?
+        ModelLoadingRegistry.INSTANCE.registerResourceProvider( loader -> ( name, context ) -> TurtleModelLoader.INSTANCE.accepts( name ) ?
-                                                                                            TurtleModelLoader.INSTANCE.loadModel(
+            TurtleModelLoader.INSTANCE.loadModel(
-            name) : null);
+                name ) : null );
 
-        EntityRendererRegistry.INSTANCE.register(ComputerCraftRegistry.ModEntities.TURTLE_PLAYER, TurtlePlayerRenderer::new);
+        EntityRendererRegistry.INSTANCE.register( ComputerCraftRegistry.ModEntities.TURTLE_PLAYER, TurtlePlayerRenderer::new );
 
-        registerItemProperty("state",
+        registerItemProperty( "state",
-                             (stack, world, player) -> ItemPocketComputer.getState(stack)
+            ( stack, world, player ) -> ItemPocketComputer.getState( stack )
-                                                                         .ordinal(),
+                .ordinal(),
-                             () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
+            () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
-                             () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED);
+            () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
-        registerItemProperty("state",
+        registerItemProperty( "state",
-                             (stack, world, player) -> IColouredItem.getColourBasic(stack) != -1 ? 1 : 0,
+            ( stack, world, player ) -> IColouredItem.getColourBasic( stack ) != -1 ? 1 : 0,
-                             () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
+            () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL,
-                             () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED);
+            () -> ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
         ClientRegistry.onItemColours();
 
         initEvents();
     }
 
     // My IDE doesn't think so, but we do actually need these generics.
-    private static void registerContainers() {
+    private static void registerContainers()
-        ScreenRegistry.<ContainerComputer, GuiComputer<ContainerComputer>>register(ComputerCraftRegistry.ModContainers.COMPUTER, GuiComputer::create);
+    {
-        ScreenRegistry.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register(ComputerCraftRegistry.ModContainers.POCKET_COMPUTER,
+        ScreenRegistry.<ContainerComputer, GuiComputer<ContainerComputer>>register( ComputerCraftRegistry.ModContainers.COMPUTER, GuiComputer::create );
-                                GuiComputer::createPocket);
+        ScreenRegistry.<ContainerPocketComputer, GuiComputer<ContainerPocketComputer>>register( ComputerCraftRegistry.ModContainers.POCKET_COMPUTER,
-        ScreenRegistry.<ContainerTurtle, GuiTurtle>register(ComputerCraftRegistry.ModContainers.TURTLE, GuiTurtle::new);
+            GuiComputer::createPocket );
+        ScreenRegistry.<ContainerTurtle, GuiTurtle>register( ComputerCraftRegistry.ModContainers.TURTLE, GuiTurtle::new );
 
-        ScreenRegistry.<ContainerPrinter, GuiPrinter>register(ComputerCraftRegistry.ModContainers.PRINTER, GuiPrinter::new);
+        ScreenRegistry.<ContainerPrinter, GuiPrinter>register( ComputerCraftRegistry.ModContainers.PRINTER, GuiPrinter::new );
-        ScreenRegistry.<ContainerDiskDrive, GuiDiskDrive>register(ComputerCraftRegistry.ModContainers.DISK_DRIVE, GuiDiskDrive::new);
+        ScreenRegistry.<ContainerDiskDrive, GuiDiskDrive>register( ComputerCraftRegistry.ModContainers.DISK_DRIVE, GuiDiskDrive::new );
-        ScreenRegistry.<ContainerHeldItem, GuiPrintout>register(ComputerCraftRegistry.ModContainers.PRINTOUT, GuiPrintout::new);
+        ScreenRegistry.<ContainerHeldItem, GuiPrintout>register( ComputerCraftRegistry.ModContainers.PRINTOUT, GuiPrintout::new );
 
-        ScreenRegistry.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register(ComputerCraftRegistry.ModContainers.VIEW_COMPUTER,
+        ScreenRegistry.<ContainerViewComputer, GuiComputer<ContainerViewComputer>>register( ComputerCraftRegistry.ModContainers.VIEW_COMPUTER,
-                                                                        GuiComputer::createView);
+            GuiComputer::createView );
     }
 
     @SafeVarargs
-    private static void registerItemProperty(String name, ModelPredicateProvider getter, Supplier<? extends Item>... items) {
+    private static void registerItemProperty( String name, ModelPredicateProvider getter, Supplier<? extends Item>... items )
-        Identifier id = new Identifier(ComputerCraft.MOD_ID, name);
+    {
-        for (Supplier<? extends Item> item : items) {
+        Identifier id = new Identifier( ComputerCraft.MOD_ID, name );
-            ModelPredicateProviderRegistrySpecificAccessor.callRegister(item.get(), id, getter);
+        for( Supplier<? extends Item> item : items )
+        {
+            ModelPredicateProviderRegistrySpecificAccessor.callRegister( item.get(), id, getter );
         }
     }
 }

src/main/java/dan200/computercraft/client/render/CableHighlightRenderer.java

@@ -10,7 +10,8 @@ import dan200.computercraft.shared.ComputerCraftRegistry;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.CableShapes;
 import dan200.computercraft.shared.util.WorldUtil;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.Camera;
@@ -23,48 +24,49 @@ import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.shape.VoxelShape;
 import net.minecraft.world.World;
 
-import net.fabricmc.api.EnvType;
+@Environment( EnvType.CLIENT )
-import net.fabricmc.api.Environment;
+public final class CableHighlightRenderer
-
+{
-@Environment (EnvType.CLIENT)
+    private CableHighlightRenderer()
-public final class CableHighlightRenderer {
+    {
-    private CableHighlightRenderer() {
     }
 
     /**
      * Draw an outline for a specific part of a cable "Multipart".
      */
-    public static boolean drawHighlight(MatrixStack stack, VertexConsumer consumer, Entity entity, double d, double e, double f, BlockPos pos,
+    public static boolean drawHighlight( MatrixStack stack, VertexConsumer consumer, Entity entity, double d, double e, double f, BlockPos pos,
-                                        BlockState state) {
+                                         BlockState state )
+    {
         World world = entity.getEntityWorld();
         Camera info = MinecraftClient.getInstance().gameRenderer.getCamera();
 
         // We only care about instances with both cable and modem.
-        if (state.getBlock() != ComputerCraftRegistry.ModBlocks.CABLE || state.get(BlockCable.MODEM)
+        if( state.getBlock() != ComputerCraftRegistry.ModBlocks.CABLE || state.get( BlockCable.MODEM )
-                                                                              .getFacing() == null || !state.get(BlockCable.CABLE)) {
+            .getFacing() == null || !state.get( BlockCable.CABLE ) )
+        {
             return false;
         }
 
-        VoxelShape shape = WorldUtil.isVecInside(CableShapes.getModemShape(state),
+        VoxelShape shape = WorldUtil.isVecInside( CableShapes.getModemShape( state ),
-                                                 new Vec3d(d, e, f).subtract(pos.getX(),
+            new Vec3d( d, e, f ).subtract( pos.getX(),
-                                                                             pos.getY(),
+                pos.getY(),
-                                                                             pos.getZ())) ? CableShapes.getModemShape(state) : CableShapes.getCableShape(
+                pos.getZ() ) ) ? CableShapes.getModemShape( state ) : CableShapes.getCableShape(
-            state);
+            state );
 
         Vec3d cameraPos = info.getPos();
         double xOffset = pos.getX() - cameraPos.getX();
         double yOffset = pos.getY() - cameraPos.getY();
         double zOffset = pos.getZ() - cameraPos.getZ();
         Matrix4f matrix4f = stack.peek()
-                                 .getModel();
+            .getModel();
-        shape.forEachEdge((x1, y1, z1, x2, y2, z2) -> {
+        shape.forEachEdge( ( x1, y1, z1, x2, y2, z2 ) -> {
-            consumer.vertex(matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset))
+            consumer.vertex( matrix4f, (float) (x1 + xOffset), (float) (y1 + yOffset), (float) (z1 + zOffset) )
-                    .color(0, 0, 0, 0.4f)
+                .color( 0, 0, 0, 0.4f )
-                    .next();
+                .next();
-            consumer.vertex(matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset))
+            consumer.vertex( matrix4f, (float) (x2 + xOffset), (float) (y2 + yOffset), (float) (z2 + zOffset) )
-                    .color(0, 0, 0, 0.4f)
+                .color( 0, 0, 0, 0.4f )
-                    .next();
+                .next();
-        });
+        } );
 
         return true;
     }

src/main/java/dan200/computercraft/client/render/ComputerBorderRenderer.java

@@ -5,25 +5,25 @@
  */
 package dan200.computercraft.client.render;
 
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexFormats;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.opengl.GL11;
 
-public class ComputerBorderRenderer {
+import javax.annotation.Nonnull;
-    public static final Identifier BACKGROUND_NORMAL = new Identifier(ComputerCraft.MOD_ID, "textures/gui/corners_normal.png");
+
-    public static final Identifier BACKGROUND_ADVANCED = new Identifier(ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png");
+public class ComputerBorderRenderer
-    public static final Identifier BACKGROUND_COMMAND = new Identifier(ComputerCraft.MOD_ID, "textures/gui/corners_command.png");
+{
-    public static final Identifier BACKGROUND_COLOUR = new Identifier(ComputerCraft.MOD_ID, "textures/gui/corners_colour.png");
+    public static final Identifier BACKGROUND_NORMAL = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_normal.png" );
+    public static final Identifier BACKGROUND_ADVANCED = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
+    public static final Identifier BACKGROUND_COMMAND = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
+    public static final Identifier BACKGROUND_COLOUR = new Identifier( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
     /**
      * The margin between the terminal and its border.
      */
@@ -44,7 +44,8 @@ public class ComputerBorderRenderer {
     public static final int LIGHT_HEIGHT = 8;
     private static final float TEX_SCALE = 1 / 256.0f;
 
-    static {
+    static
+    {
         IDENTITY.loadIdentity();
     }
 
@@ -53,7 +54,8 @@ public class ComputerBorderRenderer {
     private final int z;
     private final float r, g, b;
 
-    public ComputerBorderRenderer(Matrix4f transform, VertexConsumer builder, int z, float r, float g, float b) {
+    public ComputerBorderRenderer( Matrix4f transform, VertexConsumer builder, int z, float r, float g, float b )
+    {
         this.transform = transform;
         this.builder = builder;
         this.z = z;
@@ -64,34 +66,39 @@ public class ComputerBorderRenderer {
 
 
     @Nonnull
-    public static Identifier getTexture(@Nonnull ComputerFamily family) {
+    public static Identifier getTexture( @Nonnull ComputerFamily family )
-        switch (family) {
+    {
-        case NORMAL:
+        switch( family )
-        default:
+        {
-            return BACKGROUND_NORMAL;
+            case NORMAL:
-        case ADVANCED:
+            default:
-            return BACKGROUND_ADVANCED;
+                return BACKGROUND_NORMAL;
-        case COMMAND:
+            case ADVANCED:
-            return BACKGROUND_COMMAND;
+                return BACKGROUND_ADVANCED;
+            case COMMAND:
+                return BACKGROUND_COMMAND;
         }
     }
 
-    public static void render(int x, int y, int z, int width, int height) {
+    public static void render( int x, int y, int z, int width, int height )
+    {
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE);
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE );
 
-        render(IDENTITY, buffer, x, y, z, width, height);
+        render( IDENTITY, buffer, x, y, z, width, height );
 
         RenderSystem.enableAlphaTest();
         tessellator.draw();
     }
 
-    public static void render(Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height) {
+    public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height )
-        render(transform, buffer, x, y, z, width, height, 1, 1, 1);
+    {
+        render( transform, buffer, x, y, z, width, height, 1, 1, 1 );
     }
 
-    public static void render(Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, float r, float g, float b) {
+    public static void render( Matrix4f transform, VertexConsumer buffer, int x, int y, int z, int width, int height, float r, float g, float b )
+    {
         render( transform, buffer, x, y, z, width, height, false, r, g, b );
     }
 
@@ -106,13 +113,13 @@ public class ComputerBorderRenderer {
         int endY = y + height;
 
         // Vertical bars
-        this.renderLine(x - BORDER, y, 0, CORNER_TOP_Y, BORDER, endY - y);
+        this.renderLine( x - BORDER, y, 0, CORNER_TOP_Y, BORDER, endY - y );
-        this.renderLine(endX, y, BORDER_RIGHT_X, CORNER_TOP_Y, BORDER, endY - y);
+        this.renderLine( endX, y, BORDER_RIGHT_X, CORNER_TOP_Y, BORDER, endY - y );
 
         // Top bar
-        this.renderLine(x, y - BORDER, 0, 0, endX - x, BORDER);
+        this.renderLine( x, y - BORDER, 0, 0, endX - x, BORDER );
-        this.renderCorner(x - BORDER, y - BORDER, CORNER_LEFT_X, CORNER_TOP_Y);
+        this.renderCorner( x - BORDER, y - BORDER, CORNER_LEFT_X, CORNER_TOP_Y );
-        this.renderCorner(endX, y - BORDER, CORNER_RIGHT_X, CORNER_TOP_Y);
+        this.renderCorner( endX, y - BORDER, CORNER_RIGHT_X, CORNER_TOP_Y );
 
         // Bottom bar. We allow for drawing a stretched version, which allows for additional elements (such as the
         // pocket computer's lights).
@@ -124,40 +131,44 @@ public class ComputerBorderRenderer {
         }
         else
         {
-            this.renderLine(x, endY, 0, BORDER, endX - x, BORDER);
+            this.renderLine( x, endY, 0, BORDER, endX - x, BORDER );
-            this.renderCorner(x - BORDER, endY, CORNER_LEFT_X, CORNER_BOTTOM_Y);
+            this.renderCorner( x - BORDER, endY, CORNER_LEFT_X, CORNER_BOTTOM_Y );
-            this.renderCorner(endX, endY, CORNER_RIGHT_X, CORNER_BOTTOM_Y);
+            this.renderCorner( endX, endY, CORNER_RIGHT_X, CORNER_BOTTOM_Y );
         }
     }
 
-    private void renderLine(int x, int y, int u, int v, int width, int height) {
+    private void renderLine( int x, int y, int u, int v, int width, int height )
-        this.renderTexture(x, y, u, v, width, height, BORDER, BORDER);
+    {
+        this.renderTexture( x, y, u, v, width, height, BORDER, BORDER );
     }
 
-    private void renderCorner(int x, int y, int u, int v) {
+    private void renderCorner( int x, int y, int u, int v )
-        this.renderTexture(x, y, u, v, BORDER, BORDER, BORDER, BORDER);
+    {
+        this.renderTexture( x, y, u, v, BORDER, BORDER, BORDER, BORDER );
     }
 
-    private void renderTexture(int x, int y, int u, int v, int width, int height) {
+    private void renderTexture( int x, int y, int u, int v, int width, int height )
-        this.renderTexture(x, y, u, v, width, height, width, height);
+    {
+        this.renderTexture( x, y, u, v, width, height, width, height );
     }
 
-    private void renderTexture(int x, int y, int u, int v, int width, int height, int textureWidth, int textureHeight) {
+    private void renderTexture( int x, int y, int u, int v, int width, int height, int textureWidth, int textureHeight )
-        this.builder.vertex(this.transform, x, y + height, this.z)
+    {
-                    .color(this.r, this.g, this.b, 1.0f)
+        this.builder.vertex( this.transform, x, y + height, this.z )
-                    .texture(u * TEX_SCALE, (v + textureHeight) * TEX_SCALE)
+            .color( this.r, this.g, this.b, 1.0f )
-                    .next();
+            .texture( u * TEX_SCALE, (v + textureHeight) * TEX_SCALE )
-        this.builder.vertex(this.transform, x + width, y + height, this.z)
+            .next();
-                    .color(this.r, this.g, this.b, 1.0f)
+        this.builder.vertex( this.transform, x + width, y + height, this.z )
-                    .texture((u + textureWidth) * TEX_SCALE, (v + textureHeight) * TEX_SCALE)
+            .color( this.r, this.g, this.b, 1.0f )
-                    .next();
+            .texture( (u + textureWidth) * TEX_SCALE, (v + textureHeight) * TEX_SCALE )
-        this.builder.vertex(this.transform, x + width, y, this.z)
+            .next();
-                    .color(this.r, this.g, this.b, 1.0f)
+        this.builder.vertex( this.transform, x + width, y, this.z )
-                    .texture((u + textureWidth) * TEX_SCALE, v * TEX_SCALE)
+            .color( this.r, this.g, this.b, 1.0f )
-                    .next();
+            .texture( (u + textureWidth) * TEX_SCALE, v * TEX_SCALE )
-        this.builder.vertex(this.transform, x, y, this.z)
+            .next();
-                    .color(this.r, this.g, this.b, 1.0f)
+        this.builder.vertex( this.transform, x, y, this.z )
-                    .texture(u * TEX_SCALE, v * TEX_SCALE)
+            .color( this.r, this.g, this.b, 1.0f )
-                    .next();
+            .texture( u * TEX_SCALE, v * TEX_SCALE )
+            .next();
     }
 }

src/main/java/dan200/computercraft/client/render/ItemMapLikeRenderer.java

@@ -7,7 +7,8 @@
 package dan200.computercraft.client.render;
 
 import dan200.computercraft.fabric.mixin.HeldItemRendererAccess;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.item.HeldItemRenderer;
@@ -19,28 +20,30 @@ import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.MathHelper;
 
-import net.fabricmc.api.EnvType;
+@Environment( EnvType.CLIENT )
-import net.fabricmc.api.Environment;
+public abstract class ItemMapLikeRenderer
-
+{
-@Environment (EnvType.CLIENT)
+    public void renderItemFirstPerson( MatrixStack transform, VertexConsumerProvider render, int lightTexture, Hand hand, float pitch, float equipProgress
-public abstract class ItemMapLikeRenderer {
+        , float swingProgress, ItemStack stack )
-    public void renderItemFirstPerson(MatrixStack transform, VertexConsumerProvider render, int lightTexture, Hand hand, float pitch, float equipProgress
+    {
-        , float swingProgress, ItemStack stack) {
         PlayerEntity player = MinecraftClient.getInstance().player;
 
         transform.push();
-        if (hand == Hand.MAIN_HAND && player.getOffHandStack()
+        if( hand == Hand.MAIN_HAND && player.getOffHandStack()
-                                            .isEmpty()) {
+            .isEmpty() )
-            this.renderItemFirstPersonCenter(transform, render, lightTexture, pitch, equipProgress, swingProgress, stack);
+        {
-        } else {
+            this.renderItemFirstPersonCenter( transform, render, lightTexture, pitch, equipProgress, swingProgress, stack );
-            this.renderItemFirstPersonSide(transform,
+        }
-                                           render,
+        else
-                                           lightTexture,
+        {
-                                      hand == Hand.MAIN_HAND ? player.getMainArm() : player.getMainArm()
+            this.renderItemFirstPersonSide( transform,
-                                                                                           .getOpposite(),
+                render,
-                                           equipProgress,
+                lightTexture,
-                                           swingProgress,
+                hand == Hand.MAIN_HAND ? player.getMainArm() : player.getMainArm()
-                                           stack);
+                    .getOpposite(),
+                equipProgress,
+                swingProgress,
+                stack );
         }
         transform.pop();
     }
@@ -48,85 +51,89 @@ public abstract class ItemMapLikeRenderer {
     /**
      * Render an item in the middle of the screen.
      *
-     * @param transform The matrix transformation stack
+     * @param transform     The matrix transformation stack
-     * @param render The buffer to render to
+     * @param render        The buffer to render to
      * @param combinedLight The current light level
-     * @param pitch The pitch of the player
+     * @param pitch         The pitch of the player
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
-     * @param stack The stack to render
+     * @param stack         The stack to render
      */
-    private void renderItemFirstPersonCenter(MatrixStack transform, VertexConsumerProvider render, int combinedLight, float pitch, float equipProgress,
+    private void renderItemFirstPersonCenter( MatrixStack transform, VertexConsumerProvider render, int combinedLight, float pitch, float equipProgress,
-                                             float swingProgress, ItemStack stack) {
+                                              float swingProgress, ItemStack stack )
+    {
         MinecraftClient minecraft = MinecraftClient.getInstance();
         HeldItemRenderer renderer = minecraft.getHeldItemRenderer();
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.
-        float swingRt = MathHelper.sqrt(swingProgress);
+        float swingRt = MathHelper.sqrt( swingProgress );
-        float tX = -0.2f * MathHelper.sin(swingProgress * (float) Math.PI);
+        float tX = -0.2f * MathHelper.sin( swingProgress * (float) Math.PI );
-        float tZ = -0.4f * MathHelper.sin(swingRt * (float) Math.PI);
+        float tZ = -0.4f * MathHelper.sin( swingRt * (float) Math.PI );
-        transform.translate(0, -tX / 2, tZ);
+        transform.translate( 0, -tX / 2, tZ );
 
         HeldItemRendererAccess access = (HeldItemRendererAccess) renderer;
-        float pitchAngle = access.callGetMapAngle(pitch);
+        float pitchAngle = access.callGetMapAngle( pitch );
-        transform.translate(0, 0.04F + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f);
+        transform.translate( 0, 0.04F + equipProgress * -1.2f + pitchAngle * -0.5f, -0.72f );
-        transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(pitchAngle * -85.0f));
+        transform.multiply( Vector3f.POSITIVE_X.getDegreesQuaternion( pitchAngle * -85.0f ) );
-        if (!minecraft.player.isInvisible()) {
+        if( !minecraft.player.isInvisible() )
+        {
             transform.push();
-            transform.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F));
+            transform.multiply( Vector3f.POSITIVE_Y.getDegreesQuaternion( 90.0F ) );
-            access.callRenderArm(transform, render, combinedLight, Arm.RIGHT);
+            access.callRenderArm( transform, render, combinedLight, Arm.RIGHT );
-            access.callRenderArm(transform, render, combinedLight, Arm.LEFT);
+            access.callRenderArm( transform, render, combinedLight, Arm.LEFT );
             transform.pop();
         }
 
-        float rX = MathHelper.sin(swingRt * (float) Math.PI);
+        float rX = MathHelper.sin( swingRt * (float) Math.PI );
-        transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(rX * 20.0F));
+        transform.multiply( Vector3f.POSITIVE_X.getDegreesQuaternion( rX * 20.0F ) );
-        transform.scale(2.0F, 2.0F, 2.0F);
+        transform.scale( 2.0F, 2.0F, 2.0F );
 
-        this.renderItem(transform, render, stack);
+        this.renderItem( transform, render, stack );
     }
 
     /**
      * Renders the item to one side of the player.
      *
-     * @param transform The matrix transformation stack
+     * @param transform     The matrix transformation stack
-     * @param render The buffer to render to
+     * @param render        The buffer to render to
      * @param combinedLight The current light level
-     * @param side The side to render on
+     * @param side          The side to render on
      * @param equipProgress The equip progress of this item
      * @param swingProgress The swing progress of this item
-     * @param stack The stack to render
+     * @param stack         The stack to render
      */
-    private void renderItemFirstPersonSide(MatrixStack transform, VertexConsumerProvider render, int combinedLight, Arm side, float equipProgress,
+    private void renderItemFirstPersonSide( MatrixStack transform, VertexConsumerProvider render, int combinedLight, Arm side, float equipProgress,
-                                           float swingProgress, ItemStack stack) {
+                                            float swingProgress, ItemStack stack )
+    {
         MinecraftClient minecraft = MinecraftClient.getInstance();
         float offset = side == Arm.RIGHT ? 1f : -1f;
-        transform.translate(offset * 0.125f, -0.125f, 0f);
+        transform.translate( offset * 0.125f, -0.125f, 0f );
 
         // If the player is not invisible then render a single arm
-        if (!minecraft.player.isInvisible()) {
+        if( !minecraft.player.isInvisible() )
+        {
             transform.push();
-            transform.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(offset * 10f));
+            transform.multiply( Vector3f.POSITIVE_Z.getDegreesQuaternion( offset * 10f ) );
-            ((HeldItemRendererAccess)minecraft.getHeldItemRenderer())
+            ((HeldItemRendererAccess) minecraft.getHeldItemRenderer())
-                     .callRenderArmHoldingItem(transform, render, combinedLight, equipProgress, swingProgress, side);
+                .callRenderArmHoldingItem( transform, render, combinedLight, equipProgress, swingProgress, side );
             transform.pop();
         }
 
         // Setup the appropriate transformations. This is just copied from the
         // corresponding method in ItemRenderer.
         transform.push();
-        transform.translate(offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f);
+        transform.translate( offset * 0.51f, -0.08f + equipProgress * -1.2f, -0.75f );
-        float f1 = MathHelper.sqrt(swingProgress);
+        float f1 = MathHelper.sqrt( swingProgress );
-        float f2 = MathHelper.sin(f1 * (float) Math.PI);
+        float f2 = MathHelper.sin( f1 * (float) Math.PI );
         float f3 = -0.5f * f2;
-        float f4 = 0.4f * MathHelper.sin(f1 * ((float) Math.PI * 2f));
+        float f4 = 0.4f * MathHelper.sin( f1 * ((float) Math.PI * 2f) );
-        float f5 = -0.3f * MathHelper.sin(swingProgress * (float) Math.PI);
+        float f5 = -0.3f * MathHelper.sin( swingProgress * (float) Math.PI );
-        transform.translate(offset * f3, f4 - 0.3f * f2, f5);
+        transform.translate( offset * f3, f4 - 0.3f * f2, f5 );
-        transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(f2 * -45f));
+        transform.multiply( Vector3f.POSITIVE_X.getDegreesQuaternion( f2 * -45f ) );
-        transform.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(offset * f2 * -30f));
+        transform.multiply( Vector3f.POSITIVE_Y.getDegreesQuaternion( offset * f2 * -30f ) );
 
-        this.renderItem(transform, render, stack);
+        this.renderItem( transform, render, stack );
 
         transform.pop();
     }
@@ -135,8 +142,8 @@ public abstract class ItemMapLikeRenderer {
      * The main rendering method for the item.
      *
      * @param transform The matrix transformation stack
-     * @param render The buffer to render to
+     * @param render    The buffer to render to
-     * @param stack The stack to render
+     * @param stack     The stack to render
      */
-    protected abstract void renderItem(MatrixStack transform, VertexConsumerProvider render, ItemStack stack);
+    protected abstract void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack );
 }

src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java

@@ -6,12 +6,6 @@
 
 package dan200.computercraft.client.render;
 
-import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
-import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
-
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
@@ -20,8 +14,6 @@ import dan200.computercraft.shared.computer.core.ClientComputer;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.util.Colour;
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.Tessellator;
@@ -31,28 +23,37 @@ import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.opengl.GL11;
 
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
 import static dan200.computercraft.client.render.ComputerBorderRenderer.*;
 
 /**
  * Emulates map rendering for pocket computers.
  */
-public final class ItemPocketRenderer extends ItemMapLikeRenderer {
+public final class ItemPocketRenderer extends ItemMapLikeRenderer
+{
     public static final ItemPocketRenderer INSTANCE = new ItemPocketRenderer();
 
-    private ItemPocketRenderer() {
+    private ItemPocketRenderer()
+    {
     }
 
     @Override
-    protected void renderItem(MatrixStack transform, VertexConsumerProvider render, ItemStack stack) {
+    protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
-        ClientComputer computer = ItemPocketComputer.createClientComputer(stack);
+    {
+        ClientComputer computer = ItemPocketComputer.createClientComputer( stack );
         Terminal terminal = computer == null ? null : computer.getTerminal();
 
         int termWidth, termHeight;
-        if (terminal == null) {
+        if( terminal == null )
+        {
             termWidth = ComputerCraft.pocketTermWidth;
             termHeight = ComputerCraft.pocketTermHeight;
-        } else {
+        }
+        else
+        {
             termWidth = terminal.getWidth();
             termHeight = terminal.getHeight();
         }
@@ -63,44 +64,49 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer {
         // Setup various transformations. Note that these are partially adapted from the corresponding method
         // in ItemRenderer
         transform.push();
-        transform.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180f));
+        transform.multiply( Vector3f.POSITIVE_Y.getDegreesQuaternion( 180f ) );
-        transform.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180f));
+        transform.multiply( Vector3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
-        transform.scale(0.5f, 0.5f, 0.5f);
+        transform.scale( 0.5f, 0.5f, 0.5f );
 
-        float scale = 0.75f / Math.max(width + BORDER * 2, height + BORDER * 2 + LIGHT_HEIGHT);
+        float scale = 0.75f / Math.max( width + BORDER * 2, height + BORDER * 2 + LIGHT_HEIGHT );
-        transform.scale(scale, scale, 0);
+        transform.scale( scale, scale, 0 );
-        transform.translate(-0.5 * width, -0.5 * height, 0);
+        transform.translate( -0.5 * width, -0.5 * height, 0 );
 
         // Render the main frame
         ItemPocketComputer item = (ItemPocketComputer) stack.getItem();
         ComputerFamily family = item.getFamily();
-        int frameColour = item.getColour(stack);
+        int frameColour = item.getColour( stack );
 
         Matrix4f matrix = transform.peek()
-                                   .getModel();
+            .getModel();
-        renderFrame(matrix, family, frameColour, width, height);
+        renderFrame( matrix, family, frameColour, width, height );
 
         // Render the light
-        int lightColour = ItemPocketComputer.getLightState(stack);
+        int lightColour = ItemPocketComputer.getLightState( stack );
-        if (lightColour == -1) {
+        if( lightColour == -1 )
+        {
             lightColour = Colour.BLACK.getHex();
         }
-        renderLight(matrix, lightColour, width, height);
+        renderLight( matrix, lightColour, width, height );
 
-        if (computer != null && terminal != null) {
+        if( computer != null && terminal != null )
-            FixedWidthFontRenderer.drawTerminal(matrix, MARGIN, MARGIN, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN);
+        {
-        } else {
+            FixedWidthFontRenderer.drawTerminal( matrix, MARGIN, MARGIN, terminal, !computer.isColour(), MARGIN, MARGIN, MARGIN, MARGIN );
-            FixedWidthFontRenderer.drawEmptyTerminal(matrix, 0, 0, width, height);
+        }
+        else
+        {
+            FixedWidthFontRenderer.drawEmptyTerminal( matrix, 0, 0, width, height );
         }
 
         transform.pop();
     }
 
-    private static void renderFrame(Matrix4f transform, ComputerFamily family, int colour, int width, int height) {
+    private static void renderFrame( Matrix4f transform, ComputerFamily family, int colour, int width, int height )
+    {
         RenderSystem.enableBlend();
         MinecraftClient.getInstance()
-                       .getTextureManager()
+            .getTextureManager()
-                       .bindTexture(colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture(family));
+            .bindTexture( colour != -1 ? ComputerBorderRenderer.BACKGROUND_COLOUR : ComputerBorderRenderer.getTexture( family ) );
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;
         float g = ((colour >>> 8) & 0xFF) / 255.0f;
@@ -108,14 +114,15 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer {
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE);
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR_TEXTURE );
 
-        ComputerBorderRenderer.render(transform, buffer, 0, 0, 0, width, height, true, r, g, b);
+        ComputerBorderRenderer.render( transform, buffer, 0, 0, 0, width, height, true, r, g, b );
 
         tessellator.draw();
     }
 
-    private static void renderLight(Matrix4f transform, int colour, int width, int height) {
+    private static void renderLight( Matrix4f transform, int colour, int width, int height )
+    {
         RenderSystem.disableTexture();
 
         float r = ((colour >>> 16) & 0xFF) / 255.0f;
@@ -124,19 +131,19 @@ public final class ItemPocketRenderer extends ItemMapLikeRenderer {
 
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder buffer = tessellator.getBuffer();
-        buffer.begin(GL11.GL_QUADS, VertexFormats.POSITION_COLOR);
+        buffer.begin( GL11.GL_QUADS, VertexFormats.POSITION_COLOR );
-        buffer.vertex(transform, width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + BORDER / 2.0f, 0)
+        buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .next();
+            .next();
-        buffer.vertex(transform, width, height + LIGHT_HEIGHT + BORDER / 2.0f, 0)
+        buffer.vertex( transform, width, height + LIGHT_HEIGHT + BORDER / 2.0f, 0 )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .next();
+            .next();
-        buffer.vertex(transform, width, height + BORDER / 2.0f, 0)
+        buffer.vertex( transform, width, height + BORDER / 2.0f, 0 )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .next();
+            .next();
-        buffer.vertex(transform, width - LIGHT_HEIGHT * 2, height + BORDER / 2.0f, 0)
+        buffer.vertex( transform, width - LIGHT_HEIGHT * 2, height + BORDER / 2.0f, 0 )
-              .color(r, g, b, 1.0f)
+            .color( r, g, b, 1.0f )
-              .next();
+            .next();
 
         tessellator.draw();
         RenderSystem.enableTexture();

src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java

@@ -6,88 +6,90 @@
 
 package dan200.computercraft.client.render;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-import static dan200.computercraft.client.render.PrintoutRenderer.COVER_SIZE;
-import static dan200.computercraft.client.render.PrintoutRenderer.X_TEXT_MARGIN;
-import static dan200.computercraft.client.render.PrintoutRenderer.Y_TEXT_MARGIN;
-import static dan200.computercraft.client.render.PrintoutRenderer.drawBorder;
-import static dan200.computercraft.client.render.PrintoutRenderer.drawText;
-import static dan200.computercraft.client.render.PrintoutRenderer.offsetAt;
-import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
-import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;
-
 import dan200.computercraft.shared.media.items.ItemPrintout;
-
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.Matrix4f;
 
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
+import static dan200.computercraft.client.render.PrintoutRenderer.*;
+import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
+import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;
+
 /**
  * Emulates map and item-frame rendering for printouts.
  */
-public final class ItemPrintoutRenderer extends ItemMapLikeRenderer {
+public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
+{
     public static final ItemPrintoutRenderer INSTANCE = new ItemPrintoutRenderer();
 
-    private ItemPrintoutRenderer() {
+    private ItemPrintoutRenderer()
+    {
     }
 
     @Override
-    protected void renderItem(MatrixStack transform, VertexConsumerProvider render, ItemStack stack) {
+    protected void renderItem( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
-        transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180f));
+    {
-        transform.scale(0.42f, 0.42f, -0.42f);
+        transform.multiply( Vector3f.POSITIVE_X.getDegreesQuaternion( 180f ) );
-        transform.translate(-0.5f, -0.48f, 0.0f);
+        transform.scale( 0.42f, 0.42f, -0.42f );
+        transform.translate( -0.5f, -0.48f, 0.0f );
 
-        drawPrintout(transform, render, stack);
+        drawPrintout( transform, render, stack );
     }
 
-    private static void drawPrintout(MatrixStack transform, VertexConsumerProvider render, ItemStack stack) {
+    private static void drawPrintout( MatrixStack transform, VertexConsumerProvider render, ItemStack stack )
-        int pages = ItemPrintout.getPageCount(stack);
+    {
+        int pages = ItemPrintout.getPageCount( stack );
         boolean book = ((ItemPrintout) stack.getItem()).getType() == ItemPrintout.Type.BOOK;
 
         double width = LINE_MAX_LENGTH * FONT_WIDTH + X_TEXT_MARGIN * 2;
         double height = LINES_PER_PAGE * FONT_HEIGHT + Y_TEXT_MARGIN * 2;
 
         // Non-books will be left aligned
-        if (!book) {
+        if( !book )
-            width += offsetAt(pages);
+        {
+            width += offsetAt( pages );
         }
 
         double visualWidth = width, visualHeight = height;
 
         // Meanwhile books will be centred
-        if (book) {
+        if( book )
-            visualWidth += 2 * COVER_SIZE + 2 * offsetAt(pages);
+        {
+            visualWidth += 2 * COVER_SIZE + 2 * offsetAt( pages );
             visualHeight += 2 * COVER_SIZE;
         }
 
-        double max = Math.max(visualHeight, visualWidth);
+        double max = Math.max( visualHeight, visualWidth );
 
         // Scale the printout to fit correctly.
         float scale = (float) (1.0 / max);
-        transform.scale(scale, scale, scale);
+        transform.scale( scale, scale, scale );
-        transform.translate((max - width) / 2.0, (max - height) / 2.0, 0.0);
+        transform.translate( (max - width) / 2.0, (max - height) / 2.0, 0.0 );
 
         Matrix4f matrix = transform.peek()
-                                   .getModel();
+            .getModel();
-        drawBorder(matrix, render, 0, 0, -0.01f, 0, pages, book);
+        drawBorder( matrix, render, 0, 0, -0.01f, 0, pages, book );
-        drawText(matrix, render, X_TEXT_MARGIN, Y_TEXT_MARGIN, 0, ItemPrintout.getText(stack), ItemPrintout.getColours(stack));
+        drawText( matrix, render, X_TEXT_MARGIN, Y_TEXT_MARGIN, 0, ItemPrintout.getText( stack ), ItemPrintout.getColours( stack ) );
     }
 
-    public boolean renderInFrame(MatrixStack matrixStack, VertexConsumerProvider consumerProvider, ItemStack stack) {
+    public boolean renderInFrame( MatrixStack matrixStack, VertexConsumerProvider consumerProvider, ItemStack stack )
-        if (!(stack.getItem() instanceof ItemPrintout)) {
+    {
+        if( !(stack.getItem() instanceof ItemPrintout) )
+        {
             return false;
         }
 
         // Move a little bit forward to ensure we're not clipping with the frame
-        matrixStack.translate(0.0f, 0.0f, -0.001f);
+        matrixStack.translate( 0.0f, 0.0f, -0.001f );
-        matrixStack.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180f));
+        matrixStack.multiply( Vector3f.POSITIVE_Z.getDegreesQuaternion( 180f ) );
-        matrixStack.scale(0.95f, 0.95f, -0.95f);
+        matrixStack.scale( 0.95f, 0.95f, -0.95f );
-        matrixStack.translate(-0.5f, -0.5f, 0.0f);
+        matrixStack.translate( -0.5f, -0.5f, 0.0f );
 
-        drawPrintout(matrixStack, consumerProvider, stack);
+        drawPrintout( matrixStack, consumerProvider, stack );
 
         return true;
     }

src/main/java/dan200/computercraft/client/render/ModelTransformer.java

@@ -5,10 +5,9 @@
  */
 package dan200.computercraft.client.render;
 
-import java.util.List;
-
 import dan200.computercraft.fabric.mixin.BakedQuadAccess;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.render.VertexFormat;
 import net.minecraft.client.render.VertexFormatElement;
 import net.minecraft.client.render.VertexFormats;
@@ -16,61 +15,71 @@ import net.minecraft.client.render.model.BakedQuad;
 import net.minecraft.client.util.math.Vector4f;
 import net.minecraft.util.math.Matrix4f;
 
-import net.fabricmc.api.EnvType;
+import java.util.List;
-import net.fabricmc.api.Environment;
 
 /**
  * Transforms vertices of a model, remaining aware of winding order, and rearranging vertices if needed.
  */
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public final class ModelTransformer {
+public final class ModelTransformer
+{
     private static final Matrix4f identity;
 
-    static {
+    static
+    {
         identity = new Matrix4f();
         identity.loadIdentity();
     }
 
-    private ModelTransformer() {
+    private ModelTransformer()
+    {
     }
 
-    public static void transformQuadsTo(List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform) {
+    public static void transformQuadsTo( List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
-        transformQuadsTo(VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, output, input, transform);
+    {
+        transformQuadsTo( VertexFormats.POSITION_COLOR_TEXTURE_LIGHT_NORMAL, output, input, transform );
     }
 
-    public static void transformQuadsTo(VertexFormat format, List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform) {
+    public static void transformQuadsTo( VertexFormat format, List<BakedQuad> output, List<BakedQuad> input, Matrix4f transform )
-        if (transform == null || transform.equals(identity)) {
+    {
-            output.addAll(input);
+        if( transform == null || transform.equals( identity ) )
-        } else {
+        {
-            for (BakedQuad quad : input) {
+            output.addAll( input );
-                output.add(doTransformQuad(format, quad, transform));
+        }
+        else
+        {
+            for( BakedQuad quad : input )
+            {
+                output.add( doTransformQuad( format, quad, transform ) );
             }
         }
     }
 
-    private static BakedQuad doTransformQuad(VertexFormat format, BakedQuad quad, Matrix4f transform) {
+    private static BakedQuad doTransformQuad( VertexFormat format, BakedQuad quad, Matrix4f transform )
+    {
         int[] vertexData = quad.getVertexData().clone();
-        BakedQuad copy = new BakedQuad(vertexData, -1, quad.getFace(), ((BakedQuadAccess)quad).getSprite(), true);
+        BakedQuad copy = new BakedQuad( vertexData, -1, quad.getFace(), ((BakedQuadAccess) quad).getSprite(), true );
 
         int offsetBytes = 0;
-        for (int v = 0; v < 4; ++v) {
+        for( int v = 0; v < 4; ++v )
-            for (VertexFormatElement element : format.getElements()) // For each vertex element
+        {
+            for( VertexFormatElement element : format.getElements() ) // For each vertex element
             {
                 int start = offsetBytes / Integer.BYTES;
-                if (element.getType() == VertexFormatElement.Type.POSITION && element.getFormat() == VertexFormatElement.Format.FLOAT) // When we find a position element
+                if( element.getType() == VertexFormatElement.Type.POSITION && element.getFormat() == VertexFormatElement.Format.FLOAT ) // When we find a position element
                 {
-                    Vector4f pos = new Vector4f(Float.intBitsToFloat(vertexData[start]),
+                    Vector4f pos = new Vector4f( Float.intBitsToFloat( vertexData[start] ),
-                            Float.intBitsToFloat(vertexData[start+1]),
+                        Float.intBitsToFloat( vertexData[start + 1] ),
-                            Float.intBitsToFloat(vertexData[start+2]),
+                        Float.intBitsToFloat( vertexData[start + 2] ),
-                            1);
+                        1 );
 
                     // Transform the position
-                    pos.transform(transform);
+                    pos.transform( transform );
 
                     // Insert the position
-                    vertexData[start] = Float.floatToRawIntBits(pos.getX());
+                    vertexData[start] = Float.floatToRawIntBits( pos.getX() );
-                    vertexData[start+1] = Float.floatToRawIntBits(pos.getY());
+                    vertexData[start + 1] = Float.floatToRawIntBits( pos.getY() );
-                    vertexData[start+2] = Float.floatToRawIntBits(pos.getZ());
+                    vertexData[start + 2] = Float.floatToRawIntBits( pos.getZ() );
                 }
                 offsetBytes += element.getSize();
             }
@@ -78,10 +87,12 @@ public final class ModelTransformer {
         return copy;
     }
 
-    public static BakedQuad transformQuad(VertexFormat format, BakedQuad input, Matrix4f transform) {
+    public static BakedQuad transformQuad( VertexFormat format, BakedQuad input, Matrix4f transform )
-        if (transform == null || transform.equals(identity)) {
+    {
+        if( transform == null || transform.equals( identity ) )
+        {
             return input;
         }
-        return doTransformQuad(format, input, transform);
+        return doTransformQuad( format, input, transform );
     }
 }

src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java

@@ -6,17 +6,9 @@
 
 package dan200.computercraft.client.render;
 
-import static net.minecraft.util.math.Direction.DOWN;
-import static net.minecraft.util.math.Direction.EAST;
-import static net.minecraft.util.math.Direction.NORTH;
-import static net.minecraft.util.math.Direction.SOUTH;
-import static net.minecraft.util.math.Direction.UP;
-import static net.minecraft.util.math.Direction.WEST;
-
-import java.util.EnumSet;
-
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.client.MinecraftClient;
@@ -29,96 +21,118 @@ import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import net.fabricmc.api.EnvType;
+import java.util.EnumSet;
-import net.fabricmc.api.Environment;
+
+import static net.minecraft.util.math.Direction.*;
 
 /**
  * Overrides monitor highlighting to only render the outline of the <em>whole</em> monitor, rather than the current block. This means you do not get an
  * intrusive outline on top of the screen.
  */
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public final class MonitorHighlightRenderer {
+public final class MonitorHighlightRenderer
-    private MonitorHighlightRenderer() {
+{
+    private MonitorHighlightRenderer()
+    {
     }
 
-    public static boolean drawHighlight(MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos
+    public static boolean drawHighlight( MatrixStack matrixStack, VertexConsumer vertexConsumer, Entity entity, double d, double e, double f, BlockPos pos
-        , BlockState blockState) {
+        , BlockState blockState )
+    {
         // Preserve normal behaviour when crouching.
-        if (entity.isInSneakingPose()) {
+        if( entity.isInSneakingPose() )
+        {
             return false;
         }
 
         World world = entity.getEntityWorld();
 
-        BlockEntity tile = world.getBlockEntity(pos);
+        BlockEntity tile = world.getBlockEntity( pos );
-        if (!(tile instanceof TileMonitor)) {
+        if( !(tile instanceof TileMonitor) )
+        {
             return false;
         }
 
         TileMonitor monitor = (TileMonitor) tile;
 
         // Determine which sides are part of the external faces of the monitor, and so which need to be rendered.
-        EnumSet<Direction> faces = EnumSet.allOf(Direction.class);
+        EnumSet<Direction> faces = EnumSet.allOf( Direction.class );
         Direction front = monitor.getFront();
-        faces.remove(front);
+        faces.remove( front );
-        if (monitor.getXIndex() != 0) {
+        if( monitor.getXIndex() != 0 )
-            faces.remove(monitor.getRight()
+        {
-                                .getOpposite());
+            faces.remove( monitor.getRight()
+                .getOpposite() );
         }
-        if (monitor.getXIndex() != monitor.getWidth() - 1) {
+        if( monitor.getXIndex() != monitor.getWidth() - 1 )
-            faces.remove(monitor.getRight());
+        {
+            faces.remove( monitor.getRight() );
         }
-        if (monitor.getYIndex() != 0) {
+        if( monitor.getYIndex() != 0 )
-            faces.remove(monitor.getDown()
+        {
-                                .getOpposite());
+            faces.remove( monitor.getDown()
+                .getOpposite() );
         }
-        if (monitor.getYIndex() != monitor.getHeight() - 1) {
+        if( monitor.getYIndex() != monitor.getHeight() - 1 )
-            faces.remove(monitor.getDown());
+        {
+            faces.remove( monitor.getDown() );
         }
 
         Vec3d cameraPos = MinecraftClient.getInstance().gameRenderer.getCamera()
-                                                                    .getPos();
+            .getPos();
         matrixStack.push();
-        matrixStack.translate(pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ());
+        matrixStack.translate( pos.getX() - cameraPos.getX(), pos.getY() - cameraPos.getY(), pos.getZ() - cameraPos.getZ() );
 
         // I wish I could think of a better way to do this
         Matrix4f transform = matrixStack.peek()
-                                        .getModel();
+            .getModel();
-        if (faces.contains(NORTH) || faces.contains(WEST)) {
+        if( faces.contains( NORTH ) || faces.contains( WEST ) )
-            line(vertexConsumer, transform, 0, 0, 0, UP);
+        {
+            line( vertexConsumer, transform, 0, 0, 0, UP );
         }
-        if (faces.contains(SOUTH) || faces.contains(WEST)) {
+        if( faces.contains( SOUTH ) || faces.contains( WEST ) )
-            line(vertexConsumer, transform, 0, 0, 1, UP);
+        {
+            line( vertexConsumer, transform, 0, 0, 1, UP );
         }
-        if (faces.contains(NORTH) || faces.contains(EAST)) {
+        if( faces.contains( NORTH ) || faces.contains( EAST ) )
-            line(vertexConsumer, transform, 1, 0, 0, UP);
+        {
+            line( vertexConsumer, transform, 1, 0, 0, UP );
         }
-        if (faces.contains(SOUTH) || faces.contains(EAST)) {
+        if( faces.contains( SOUTH ) || faces.contains( EAST ) )
-            line(vertexConsumer, transform, 1, 0, 1, UP);
+        {
+            line( vertexConsumer, transform, 1, 0, 1, UP );
         }
-        if (faces.contains(NORTH) || faces.contains(DOWN)) {
+        if( faces.contains( NORTH ) || faces.contains( DOWN ) )
-            line(vertexConsumer, transform, 0, 0, 0, EAST);
+        {
+            line( vertexConsumer, transform, 0, 0, 0, EAST );
         }
-        if (faces.contains(SOUTH) || faces.contains(DOWN)) {
+        if( faces.contains( SOUTH ) || faces.contains( DOWN ) )
-            line(vertexConsumer, transform, 0, 0, 1, EAST);
+        {
+            line( vertexConsumer, transform, 0, 0, 1, EAST );
         }
-        if (faces.contains(NORTH) || faces.contains(UP)) {
+        if( faces.contains( NORTH ) || faces.contains( UP ) )
-            line(vertexConsumer, transform, 0, 1, 0, EAST);
+        {
+            line( vertexConsumer, transform, 0, 1, 0, EAST );
         }
-        if (faces.contains(SOUTH) || faces.contains(UP)) {
+        if( faces.contains( SOUTH ) || faces.contains( UP ) )
-            line(vertexConsumer, transform, 0, 1, 1, EAST);
+        {
+            line( vertexConsumer, transform, 0, 1, 1, EAST );
         }
-        if (faces.contains(WEST) || faces.contains(DOWN)) {
+        if( faces.contains( WEST ) || faces.contains( DOWN ) )
-            line(vertexConsumer, transform, 0, 0, 0, SOUTH);
+        {
+            line( vertexConsumer, transform, 0, 0, 0, SOUTH );
         }
-        if (faces.contains(EAST) || faces.contains(DOWN)) {
+        if( faces.contains( EAST ) || faces.contains( DOWN ) )
-            line(vertexConsumer, transform, 1, 0, 0, SOUTH);
+        {
+            line( vertexConsumer, transform, 1, 0, 0, SOUTH );
         }
-        if (faces.contains(WEST) || faces.contains(UP)) {
+        if( faces.contains( WEST ) || faces.contains( UP ) )
-            line(vertexConsumer, transform, 0, 1, 0, SOUTH);
+        {
+            line( vertexConsumer, transform, 0, 1, 0, SOUTH );
         }
-        if (faces.contains(EAST) || faces.contains(UP)) {
+        if( faces.contains( EAST ) || faces.contains( UP ) )
-            line(vertexConsumer, transform, 1, 1, 0, SOUTH);
+        {
+            line( vertexConsumer, transform, 1, 1, 0, SOUTH );
         }
 
         matrixStack.pop();
@@ -126,12 +140,13 @@ public final class MonitorHighlightRenderer {
         return true;
     }
 
-    private static void line(VertexConsumer buffer, Matrix4f transform, float x, float y, float z, Direction direction) {
+    private static void line( VertexConsumer buffer, Matrix4f transform, float x, float y, float z, Direction direction )
-        buffer.vertex(transform, x, y, z)
+    {
-              .color(0, 0, 0, 0.4f)
+        buffer.vertex( transform, x, y, z )
-              .next();
+            .color( 0, 0, 0, 0.4f )
-        buffer.vertex(transform, x + direction.getOffsetX(), y + direction.getOffsetY(), z + direction.getOffsetZ())
+            .next();
-              .color(0, 0, 0, 0.4f)
+        buffer.vertex( transform, x + direction.getOffsetX(), y + direction.getOffsetY(), z + direction.getOffsetZ() )
-              .next();
+            .color( 0, 0, 0, 0.4f )
+            .next();
     }
 }

src/main/java/dan200/computercraft/client/render/MonitorTextureBufferShader.java

@@ -5,27 +5,27 @@
  */
 package dan200.computercraft.client.render;
 
-import java.io.InputStream;
-import java.nio.FloatBuffer;
-
 import com.google.common.base.Strings;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.shared.util.Palette;
+import net.minecraft.client.texture.TextureUtil;
+import net.minecraft.util.math.Matrix4f;
 import org.lwjgl.BufferUtils;
 import org.lwjgl.opengl.GL13;
 import org.lwjgl.opengl.GL20;
 
-import net.minecraft.client.texture.TextureUtil;
+import java.io.InputStream;
-import net.minecraft.util.math.Matrix4f;
+import java.nio.FloatBuffer;
 
-class MonitorTextureBufferShader {
+class MonitorTextureBufferShader
+{
     static final int TEXTURE_INDEX = GL13.GL_TEXTURE3;
 
-    private static final FloatBuffer MATRIX_BUFFER = BufferUtils.createFloatBuffer(16);
+    private static final FloatBuffer MATRIX_BUFFER = BufferUtils.createFloatBuffer( 16 );
-    private static final FloatBuffer PALETTE_BUFFER = BufferUtils.createFloatBuffer(16 * 3);
+    private static final FloatBuffer PALETTE_BUFFER = BufferUtils.createFloatBuffer( 16 * 3 );
 
     private static int uniformMv;
 
@@ -39,124 +39,145 @@ class MonitorTextureBufferShader {
     private static boolean ok;
     private static int program;
 
-    static void setupUniform(Matrix4f transform, int width, int height, Palette palette, boolean greyscale) {
+    static void setupUniform( Matrix4f transform, int width, int height, Palette palette, boolean greyscale )
+    {
         MATRIX_BUFFER.rewind();
-        transform.writeToBuffer(MATRIX_BUFFER);
+        transform.writeToBuffer( MATRIX_BUFFER );
         MATRIX_BUFFER.rewind();
-        RenderSystem.glUniformMatrix4(uniformMv, false, MATRIX_BUFFER);
+        RenderSystem.glUniformMatrix4( uniformMv, false, MATRIX_BUFFER );
 
-        RenderSystem.glUniform1i(uniformWidth, width);
+        RenderSystem.glUniform1i( uniformWidth, width );
-        RenderSystem.glUniform1i(uniformHeight, height);
+        RenderSystem.glUniform1i( uniformHeight, height );
 
         PALETTE_BUFFER.rewind();
-        for (int i = 0; i < 16; i++) {
+        for( int i = 0; i < 16; i++ )
-            double[] colour = palette.getColour(i);
+        {
-            if (greyscale) {
+            double[] colour = palette.getColour( i );
-                float f = FixedWidthFontRenderer.toGreyscale(colour);
+            if( greyscale )
-                PALETTE_BUFFER.put(f)
+            {
-                              .put(f)
+                float f = FixedWidthFontRenderer.toGreyscale( colour );
-                              .put(f);
+                PALETTE_BUFFER.put( f )
-            } else {
+                    .put( f )
-                PALETTE_BUFFER.put((float) colour[0])
+                    .put( f );
-                              .put((float) colour[1])
+            }
-                              .put((float) colour[2]);
+            else
+            {
+                PALETTE_BUFFER.put( (float) colour[0] )
+                    .put( (float) colour[1] )
+                    .put( (float) colour[2] );
             }
         }
         PALETTE_BUFFER.flip();
-        RenderSystem.glUniform3(uniformPalette, PALETTE_BUFFER);
+        RenderSystem.glUniform3( uniformPalette, PALETTE_BUFFER );
     }
 
-    static boolean use() {
+    static boolean use()
-        if (initialised) {
+    {
-            if (ok) {
+        if( initialised )
-                GlStateManager.useProgram(program);
+        {
+            if( ok )
+            {
+                GlStateManager.useProgram( program );
             }
             return ok;
         }
 
-        if (ok = load()) {
+        if( ok = load() )
-            GL20.glUseProgram(program);
+        {
-            RenderSystem.glUniform1i(uniformFont, 0);
+            GL20.glUseProgram( program );
-            RenderSystem.glUniform1i(uniformTbo, TEXTURE_INDEX - GL13.GL_TEXTURE0);
+            RenderSystem.glUniform1i( uniformFont, 0 );
+            RenderSystem.glUniform1i( uniformTbo, TEXTURE_INDEX - GL13.GL_TEXTURE0 );
         }
 
         return ok;
     }
 
-    private static boolean load() {
+    private static boolean load()
+    {
         initialised = true;
 
-        try {
+        try
-            int vertexShader = loadShader(GL20.GL_VERTEX_SHADER, "assets/computercraft/shaders/monitor.vert");
+        {
-            int fragmentShader = loadShader(GL20.GL_FRAGMENT_SHADER, "assets/computercraft/shaders/monitor.frag");
+            int vertexShader = loadShader( GL20.GL_VERTEX_SHADER, "assets/computercraft/shaders/monitor.vert" );
+            int fragmentShader = loadShader( GL20.GL_FRAGMENT_SHADER, "assets/computercraft/shaders/monitor.frag" );
 
             program = GlStateManager.createProgram();
-            GlStateManager.attachShader(program, vertexShader);
+            GlStateManager.attachShader( program, vertexShader );
-            GlStateManager.attachShader(program, fragmentShader);
+            GlStateManager.attachShader( program, fragmentShader );
-            GL20.glBindAttribLocation(program, 0, "v_pos");
+            GL20.glBindAttribLocation( program, 0, "v_pos" );
 
-            GlStateManager.linkProgram(program);
+            GlStateManager.linkProgram( program );
-            boolean ok = GlStateManager.getProgram(program, GL20.GL_LINK_STATUS) != 0;
+            boolean ok = GlStateManager.getProgram( program, GL20.GL_LINK_STATUS ) != 0;
-            String log = GlStateManager.getProgramInfoLog(program, Short.MAX_VALUE)
+            String log = GlStateManager.getProgramInfoLog( program, Short.MAX_VALUE )
-                                       .trim();
+                .trim();
-            if (!Strings.isNullOrEmpty(log)) {
+            if( !Strings.isNullOrEmpty( log ) )
-                ComputerCraft.log.warn("Problems when linking monitor shader: {}", log);
+            {
+                ComputerCraft.log.warn( "Problems when linking monitor shader: {}", log );
             }
 
-            GL20.glDetachShader(program, vertexShader);
+            GL20.glDetachShader( program, vertexShader );
-            GL20.glDetachShader(program, fragmentShader);
+            GL20.glDetachShader( program, fragmentShader );
-            GlStateManager.deleteShader(vertexShader);
+            GlStateManager.deleteShader( vertexShader );
-            GlStateManager.deleteShader(fragmentShader);
+            GlStateManager.deleteShader( fragmentShader );
 
-            if (!ok) {
+            if( !ok )
+            {
                 return false;
             }
 
-            uniformMv = getUniformLocation(program, "u_mv");
+            uniformMv = getUniformLocation( program, "u_mv" );
-            uniformFont = getUniformLocation(program, "u_font");
+            uniformFont = getUniformLocation( program, "u_font" );
-            uniformWidth = getUniformLocation(program, "u_width");
+            uniformWidth = getUniformLocation( program, "u_width" );
-            uniformHeight = getUniformLocation(program, "u_height");
+            uniformHeight = getUniformLocation( program, "u_height" );
-            uniformTbo = getUniformLocation(program, "u_tbo");
+            uniformTbo = getUniformLocation( program, "u_tbo" );
-            uniformPalette = getUniformLocation(program, "u_palette");
+            uniformPalette = getUniformLocation( program, "u_palette" );
 
-            ComputerCraft.log.info("Loaded monitor shader.");
+            ComputerCraft.log.info( "Loaded monitor shader." );
             return true;
-        } catch (Exception e) {
+        }
-            ComputerCraft.log.error("Cannot load monitor shaders", e);
+        catch( Exception e )
+        {
+            ComputerCraft.log.error( "Cannot load monitor shaders", e );
             return false;
         }
     }
 
-    private static int loadShader(int kind, String path) {
+    private static int loadShader( int kind, String path )
+    {
         InputStream stream = TileEntityMonitorRenderer.class.getClassLoader()
-                                                            .getResourceAsStream(path);
+            .getResourceAsStream( path );
-        if (stream == null) {
+        if( stream == null )
-            throw new IllegalArgumentException("Cannot find " + path);
+        {
+            throw new IllegalArgumentException( "Cannot find " + path );
         }
-        String contents = TextureUtil.readAllToString(stream);
+        String contents = TextureUtil.readAllToString( stream );
 
-        int shader = GlStateManager.createShader(kind);
+        int shader = GlStateManager.createShader( kind );
 
-        GlStateManager.shaderSource(shader, contents);
+        GlStateManager.shaderSource( shader, contents );
-        GlStateManager.compileShader(shader);
+        GlStateManager.compileShader( shader );
 
-        boolean ok = GlStateManager.getShader(shader, GL20.GL_COMPILE_STATUS) != 0;
+        boolean ok = GlStateManager.getShader( shader, GL20.GL_COMPILE_STATUS ) != 0;
-        String log = GlStateManager.getShaderInfoLog(shader, Short.MAX_VALUE)
+        String log = GlStateManager.getShaderInfoLog( shader, Short.MAX_VALUE )
-                                   .trim();
+            .trim();
-        if (!Strings.isNullOrEmpty(log)) {
+        if( !Strings.isNullOrEmpty( log ) )
-            ComputerCraft.log.warn("Problems when loading monitor shader {}: {}", path, log);
+        {
+            ComputerCraft.log.warn( "Problems when loading monitor shader {}: {}", path, log );
         }
 
-        if (!ok) {
+        if( !ok )
-            throw new IllegalStateException("Cannot compile shader " + path);
+        {
+            throw new IllegalStateException( "Cannot compile shader " + path );
         }
         return shader;
     }
 
-    private static int getUniformLocation(int program, String name) {
+    private static int getUniformLocation( int program, String name )
-        int uniform = GlStateManager.getUniformLocation(program, name);
+    {
-        if (uniform == -1) {
+        int uniform = GlStateManager.getUniformLocation( program, name );
-            throw new IllegalStateException("Cannot find uniform " + name);
+        if( uniform == -1 )
+        {
+            throw new IllegalStateException( "Cannot find uniform " + name );
         }
         return uniform;
     }

src/main/java/dan200/computercraft/client/render/PrintoutRenderer.java

@@ -6,23 +6,19 @@
 
 package dan200.computercraft.client.render;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
-
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
 import dan200.computercraft.core.terminal.TextBuffer;
 import dan200.computercraft.shared.util.Palette;
-import org.lwjgl.opengl.GL11;
+import net.minecraft.client.render.*;
-
-import net.minecraft.client.render.RenderLayer;
-import net.minecraft.client.render.RenderPhase;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.VertexFormats;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.opengl.GL11;
 
-public final class PrintoutRenderer {
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
+import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAGE;
+
+public final class PrintoutRenderer
+{
     /**
      * Width of a page.
      */
@@ -43,7 +39,7 @@ public final class PrintoutRenderer {
      * Size of the leather cover.
      */
     public static final int COVER_SIZE = 12;
-    private static final Identifier BG = new Identifier("computercraft", "textures/gui/printout.png");
+    private static final Identifier BG = new Identifier( "computercraft", "textures/gui/printout.png" );
     private static final float BG_SIZE = 256.0f;
     /**
      * Width of the extra page texture.
@@ -54,146 +50,160 @@ public final class PrintoutRenderer {
 
     private PrintoutRenderer() {}
 
-    public static void drawText(Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, TextBuffer[] text, TextBuffer[] colours) {
+    public static void drawText( Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, TextBuffer[] text, TextBuffer[] colours )
-        VertexConsumer buffer = renderer.getBuffer(FixedWidthFontRenderer.TYPE);
+    {
-        for (int line = 0; line < LINES_PER_PAGE && line < text.length; line++) {
+        VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
-            FixedWidthFontRenderer.drawString(transform,
+        for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
-                                              buffer,
+        {
-                                              x,
+            FixedWidthFontRenderer.drawString( transform,
-                                              y + line * FONT_HEIGHT,
+                buffer,
-                                              text[start + line],
+                x,
-                                              colours[start + line],
+                y + line * FONT_HEIGHT,
-                                              null,
+                text[start + line],
-                                              Palette.DEFAULT,
+                colours[start + line],
-                                              false,
+                null,
-                                              0,
+                Palette.DEFAULT,
-                                              0);
+                false,
+                0,
+                0 );
         }
     }
 
-    public static void drawText(Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, String[] text, String[] colours) {
+    public static void drawText( Matrix4f transform, VertexConsumerProvider renderer, int x, int y, int start, String[] text, String[] colours )
-        VertexConsumer buffer = renderer.getBuffer(FixedWidthFontRenderer.TYPE);
+    {
-        for (int line = 0; line < LINES_PER_PAGE && line < text.length; line++) {
+        VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
-            FixedWidthFontRenderer.drawString(transform,
+        for( int line = 0; line < LINES_PER_PAGE && line < text.length; line++ )
-                                              buffer,
+        {
-                                              x,
+            FixedWidthFontRenderer.drawString( transform,
-                                              y + line * FONT_HEIGHT,
+                buffer,
-                                              new TextBuffer(text[start + line]),
+                x,
-                                              new TextBuffer(colours[start + line]),
+                y + line * FONT_HEIGHT,
-                                              null,
+                new TextBuffer( text[start + line] ),
-                                              Palette.DEFAULT,
+                new TextBuffer( colours[start + line] ),
-                                              false,
+                null,
-                                              0,
+                Palette.DEFAULT,
-                                              0);
+                false,
+                0,
+                0 );
         }
     }
 
-    public static void drawBorder(Matrix4f transform, VertexConsumerProvider renderer, float x, float y, float z, int page, int pages, boolean isBook) {
+    public static void drawBorder( Matrix4f transform, VertexConsumerProvider renderer, float x, float y, float z, int page, int pages, boolean isBook )
+    {
         int leftPages = page;
         int rightPages = pages - page - 1;
 
-        VertexConsumer buffer = renderer.getBuffer(Type.TYPE);
+        VertexConsumer buffer = renderer.getBuffer( Type.TYPE );
 
-        if (isBook) {
+        if( isBook )
+        {
             // Border
-            float offset = offsetAt(pages);
+            float offset = offsetAt( pages );
             float left = x - 4 - offset;
             float right = x + X_SIZE + offset - 4;
 
             // Left and right border
-            drawTexture(transform, buffer, left - 4, y - 8, z - 0.02f, COVER_X, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2);
+            drawTexture( transform, buffer, left - 4, y - 8, z - 0.02f, COVER_X, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2 );
-            drawTexture(transform, buffer, right, y - 8, z - 0.02f, COVER_X + COVER_SIZE, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2);
+            drawTexture( transform, buffer, right, y - 8, z - 0.02f, COVER_X + COVER_SIZE, 0, COVER_SIZE, Y_SIZE + COVER_SIZE * 2 );
 
             // Draw centre panel (just stretched texture, sorry).
-            drawTexture(transform,
+            drawTexture( transform,
-                        buffer,
+                buffer,
-                        x - offset,
+                x - offset,
-                        y,
+                y,
-                        z - 0.02f,
+                z - 0.02f,
-                        X_SIZE + offset * 2,
+                X_SIZE + offset * 2,
-                        Y_SIZE,
+                Y_SIZE,
-                        COVER_X + COVER_SIZE / 2.0f,
+                COVER_X + COVER_SIZE / 2.0f,
-                        COVER_SIZE,
+                COVER_SIZE,
-                        COVER_SIZE,
+                COVER_SIZE,
-                        Y_SIZE);
+                Y_SIZE );
 
             float borderX = left;
-            while (borderX < right) {
+            while( borderX < right )
-                double thisWidth = Math.min(right - borderX, X_SIZE);
+            {
-                drawTexture(transform, buffer, borderX, y - 8, z - 0.02f, 0, COVER_Y, (float) thisWidth, COVER_SIZE);
+                double thisWidth = Math.min( right - borderX, X_SIZE );
-                drawTexture(transform, buffer, borderX, y + Y_SIZE - 4, z - 0.02f, 0, COVER_Y + COVER_SIZE, (float) thisWidth, COVER_SIZE);
+                drawTexture( transform, buffer, borderX, y - 8, z - 0.02f, 0, COVER_Y, (float) thisWidth, COVER_SIZE );
+                drawTexture( transform, buffer, borderX, y + Y_SIZE - 4, z - 0.02f, 0, COVER_Y + COVER_SIZE, (float) thisWidth, COVER_SIZE );
                 borderX += thisWidth;
             }
         }
 
         // Left half
-        drawTexture(transform, buffer, x, y, z, X_FOLD_SIZE * 2, 0, X_SIZE / 2.0f, Y_SIZE);
+        drawTexture( transform, buffer, x, y, z, X_FOLD_SIZE * 2, 0, X_SIZE / 2.0f, Y_SIZE );
-        for (int n = 0; n <= leftPages; n++) {
+        for( int n = 0; n <= leftPages; n++ )
-            drawTexture(transform, buffer, x - offsetAt(n), y, z - 1e-3f * n,
+        {
-                        // Use the left "bold" fold for the outermost page
+            drawTexture( transform, buffer, x - offsetAt( n ), y, z - 1e-3f * n,
-                        n == leftPages ? 0 : X_FOLD_SIZE, 0, X_FOLD_SIZE, Y_SIZE);
+                // Use the left "bold" fold for the outermost page
+                n == leftPages ? 0 : X_FOLD_SIZE, 0, X_FOLD_SIZE, Y_SIZE );
         }
 
         // Right half
-        drawTexture(transform, buffer, x + X_SIZE / 2.0f, y, z, X_FOLD_SIZE * 2 + X_SIZE / 2.0f, 0, X_SIZE / 2.0f, Y_SIZE);
+        drawTexture( transform, buffer, x + X_SIZE / 2.0f, y, z, X_FOLD_SIZE * 2 + X_SIZE / 2.0f, 0, X_SIZE / 2.0f, Y_SIZE );
-        for (int n = 0; n <= rightPages; n++) {
+        for( int n = 0; n <= rightPages; n++ )
-            drawTexture(transform, buffer, x + (X_SIZE - X_FOLD_SIZE) + offsetAt(n), y, z - 1e-3f * n,
+        {
-                        // Two folds, then the main page. Use the right "bold" fold for the outermost page.
+            drawTexture( transform, buffer, x + (X_SIZE - X_FOLD_SIZE) + offsetAt( n ), y, z - 1e-3f * n,
-                        X_FOLD_SIZE * 2 + X_SIZE + (n == rightPages ? X_FOLD_SIZE : 0), 0, X_FOLD_SIZE, Y_SIZE);
+                // Two folds, then the main page. Use the right "bold" fold for the outermost page.
+                X_FOLD_SIZE * 2 + X_SIZE + (n == rightPages ? X_FOLD_SIZE : 0), 0, X_FOLD_SIZE, Y_SIZE );
         }
     }
 
-    public static float offsetAt(int page) {
+    public static float offsetAt( int page )
-        return (float) (32 * (1 - Math.pow(1.2, -page)));
+    {
+        return (float) (32 * (1 - Math.pow( 1.2, -page )));
     }
 
-    private static void drawTexture(Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float u, float v, float width, float height) {
+    private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float u, float v, float width, float height )
-        buffer.vertex(matrix, x, y + height, z)
+    {
-              .texture(u / BG_SIZE, (v + height) / BG_SIZE)
+        buffer.vertex( matrix, x, y + height, z )
-              .next();
+            .texture( u / BG_SIZE, (v + height) / BG_SIZE )
-        buffer.vertex(matrix, x + width, y + height, z)
+            .next();
-              .texture((u + width) / BG_SIZE, (v + height) / BG_SIZE)
+        buffer.vertex( matrix, x + width, y + height, z )
-              .next();
+            .texture( (u + width) / BG_SIZE, (v + height) / BG_SIZE )
-        buffer.vertex(matrix, x + width, y, z)
+            .next();
-              .texture((u + width) / BG_SIZE, v / BG_SIZE)
+        buffer.vertex( matrix, x + width, y, z )
-              .next();
+            .texture( (u + width) / BG_SIZE, v / BG_SIZE )
-        buffer.vertex(matrix, x, y, z)
+            .next();
-              .texture(u / BG_SIZE, v / BG_SIZE)
+        buffer.vertex( matrix, x, y, z )
-              .next();
+            .texture( u / BG_SIZE, v / BG_SIZE )
+            .next();
     }
 
-    private static void drawTexture(Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float width, float height, float u, float v,
+    private static void drawTexture( Matrix4f matrix, VertexConsumer buffer, float x, float y, float z, float width, float height, float u, float v,
-                                    float tWidth, float tHeight) {
+                                     float tWidth, float tHeight )
-        buffer.vertex(matrix, x, y + height, z)
+    {
-              .texture(u / BG_SIZE, (v + tHeight) / BG_SIZE)
+        buffer.vertex( matrix, x, y + height, z )
-              .next();
+            .texture( u / BG_SIZE, (v + tHeight) / BG_SIZE )
-        buffer.vertex(matrix, x + width, y + height, z)
+            .next();
-              .texture((u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE)
+        buffer.vertex( matrix, x + width, y + height, z )
-              .next();
+            .texture( (u + tWidth) / BG_SIZE, (v + tHeight) / BG_SIZE )
-        buffer.vertex(matrix, x + width, y, z)
+            .next();
-              .texture((u + tWidth) / BG_SIZE, v / BG_SIZE)
+        buffer.vertex( matrix, x + width, y, z )
-              .next();
+            .texture( (u + tWidth) / BG_SIZE, v / BG_SIZE )
-        buffer.vertex(matrix, x, y, z)
+            .next();
-              .texture(u / BG_SIZE, v / BG_SIZE)
+        buffer.vertex( matrix, x, y, z )
-              .next();
+            .texture( u / BG_SIZE, v / BG_SIZE )
+            .next();
     }
 
-    private static final class Type extends RenderPhase {
+    private static final class Type extends RenderPhase
-        static final RenderLayer TYPE = RenderLayer.of("printout_background",
+    {
-                                                       VertexFormats.POSITION_TEXTURE,
+        static final RenderLayer TYPE = RenderLayer.of( "printout_background",
-                                                       GL11.GL_QUADS,
+            VertexFormats.POSITION_TEXTURE,
-                                                       1024,
+            GL11.GL_QUADS,
-                                                       false,
+            1024,
-                                                       false,
+            false,
-                                                       // useDelegate, needsSorting
+            false,
-                                                       RenderLayer.MultiPhaseParameters.builder()
+            // useDelegate, needsSorting
-                                                                                       .texture(new RenderPhase.Texture(BG, false, false)) // blur, minimap
+            RenderLayer.MultiPhaseParameters.builder()
-                                                                                       .alpha(ONE_TENTH_ALPHA)
+                .texture( new RenderPhase.Texture( BG, false, false ) ) // blur, minimap
-                                                                                       .lightmap(DISABLE_LIGHTMAP)
+                .alpha( ONE_TENTH_ALPHA )
-                                                                                       .build(false));
+                .lightmap( DISABLE_LIGHTMAP )
+                .build( false ) );
 
-        private Type(String name, Runnable setup, Runnable destroy) {
+        private Type( String name, Runnable setup, Runnable destroy )
-            super(name, setup, destroy);
+        {
+            super( name, setup, destroy );
         }
     }
 }

src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java

@@ -6,14 +6,6 @@
 
 package dan200.computercraft.client.render;
 
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_HEIGHT;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.FONT_WIDTH;
-import static dan200.computercraft.client.gui.FixedWidthFontRenderer.getColour;
-
-import java.nio.ByteBuffer;
-
-import javax.annotation.Nonnull;
-
 import com.mojang.blaze3d.platform.GlStateManager;
 import dan200.computercraft.client.FrameInfo;
 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
@@ -24,17 +16,8 @@ import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import dan200.computercraft.shared.util.Colour;
 import dan200.computercraft.shared.util.DirectionUtil;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL13;
-import org.lwjgl.opengl.GL20;
-import org.lwjgl.opengl.GL31;
-
 import net.minecraft.client.gl.VertexBuffer;
-import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.*;
-import net.minecraft.client.render.Tessellator;
-import net.minecraft.client.render.VertexConsumer;
-import net.minecraft.client.render.VertexConsumerProvider;
-import net.minecraft.client.render.VertexFormats;
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.util.GlAllocationUtils;
@@ -44,27 +27,40 @@ import net.minecraft.client.util.math.Vector3f;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Matrix4f;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL13;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.GL31;
 
-public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor> {
+import javax.annotation.Nonnull;
+import java.nio.ByteBuffer;
+
+import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
+
+public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
+{
     /**
      * {@link TileMonitor#RENDER_MARGIN}, but a tiny bit of additional padding to ensure that there is no space between the monitor frame and contents.
      */
     private static final float MARGIN = (float) (TileMonitor.RENDER_MARGIN * 1.1);
     private static final Matrix4f IDENTITY = AffineTransformation.identity()
-                                                                 .getMatrix();
+        .getMatrix();
     private static ByteBuffer tboContents;
 
-    public TileEntityMonitorRenderer(BlockEntityRenderDispatcher rendererDispatcher) {
+    public TileEntityMonitorRenderer( BlockEntityRenderDispatcher rendererDispatcher )
-        super(rendererDispatcher);
+    {
+        super( rendererDispatcher );
     }
 
     @Override
-    public void render(@Nonnull TileMonitor monitor, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
+    public void render( @Nonnull TileMonitor monitor, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
-                       int lightmapCoord, int overlayLight) {
+                        int lightmapCoord, int overlayLight )
+    {
         // Render from the origin monitor
         ClientMonitor originTerminal = monitor.getClientMonitor();
 
-        if (originTerminal == null) {
+        if( originTerminal == null )
+        {
             return;
         }
         TileMonitor origin = originTerminal.getOrigin();
@@ -74,7 +70,8 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
         // multiple times in a single frame to ensure compatibility with shaders which may run a
         // pass multiple times.
         long renderFrame = FrameInfo.getRenderFrame();
-        if (originTerminal.lastRenderFrame == renderFrame && !monitorPos.equals(originTerminal.lastRenderPos)) {
+        if( originTerminal.lastRenderFrame == renderFrame && !monitorPos.equals( originTerminal.lastRenderPos ) )
+        {
             return;
         }
 
@@ -87,165 +84,179 @@ public class TileEntityMonitorRenderer extends BlockEntityRenderer<TileMonitor>
         Direction dir = origin.getDirection();
         Direction front = origin.getFront();
         float yaw = dir.asRotation();
-        float pitch = DirectionUtil.toPitchAngle(front);
+        float pitch = DirectionUtil.toPitchAngle( front );
 
         // Setup initial transform
         transform.push();
-        transform.translate(originPos.getX() - monitorPos.getX() + 0.5,
+        transform.translate( originPos.getX() - monitorPos.getX() + 0.5,
-                            originPos.getY() - monitorPos.getY() + 0.5,
+            originPos.getY() - monitorPos.getY() + 0.5,
-                            originPos.getZ() - monitorPos.getZ() + 0.5);
+            originPos.getZ() - monitorPos.getZ() + 0.5 );
 
-        transform.multiply(Vector3f.NEGATIVE_Y.getDegreesQuaternion(yaw));
+        transform.multiply( Vector3f.NEGATIVE_Y.getDegreesQuaternion( yaw ) );
-        transform.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(pitch));
+        transform.multiply( Vector3f.POSITIVE_X.getDegreesQuaternion( pitch ) );
-        transform.translate(-0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
+        transform.translate( -0.5 + TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN,
-                            origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN) + 0,
+            origin.getHeight() - 0.5 - (TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN) + 0,
-                            0.5);
+            0.5 );
         double xSize = origin.getWidth() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
         double ySize = origin.getHeight() - 2.0 * (TileMonitor.RENDER_MARGIN + TileMonitor.RENDER_BORDER);
 
         // Draw the contents
         Terminal terminal = originTerminal.getTerminal();
-        if (terminal != null) {
+        if( terminal != null )
+        {
             // Draw a terminal
             int width = terminal.getWidth(), height = terminal.getHeight();
             int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
             double xScale = xSize / pixelWidth;
             double yScale = ySize / pixelHeight;
             transform.push();
-            transform.scale((float) xScale, (float) -yScale, 1.0f);
+            transform.scale( (float) xScale, (float) -yScale, 1.0f );
 
             Matrix4f matrix = transform.peek()
-                                       .getModel();
+                .getModel();
 
             // Sneaky hack here: we get a buffer now in order to flush existing ones and set up the appropriate
             // render state. I've no clue how well this'll work in future versions of Minecraft, but it does the trick
             // for now.
-            VertexConsumer buffer = renderer.getBuffer(FixedWidthFontRenderer.TYPE);
+            VertexConsumer buffer = renderer.getBuffer( FixedWidthFontRenderer.TYPE );
             FixedWidthFontRenderer.TYPE.startDrawing();
 
-            renderTerminal(matrix, originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale));
+            renderTerminal( matrix, originTerminal, (float) (MARGIN / xScale), (float) (MARGIN / yScale) );
 
             // We don't draw the cursor with the VBO, as it's dynamic and so we'll end up refreshing far more than is
             // reasonable.
-            FixedWidthFontRenderer.drawCursor(matrix, buffer, 0, 0, terminal, !originTerminal.isColour());
+            FixedWidthFontRenderer.drawCursor( matrix, buffer, 0, 0, terminal, !originTerminal.isColour() );
 
             transform.pop();
-        } else {
+        }
-            FixedWidthFontRenderer.drawEmptyTerminal(transform.peek()
+        else
-                                                              .getModel(),
+        {
-                                                     renderer,
+            FixedWidthFontRenderer.drawEmptyTerminal( transform.peek()
-                                                     -MARGIN,
+                    .getModel(),
-                                                     MARGIN,
+                renderer,
-                                                     (float) (xSize + 2 * MARGIN),
+                -MARGIN,
-                                                     (float) -(ySize + MARGIN * 2));
+                MARGIN,
+                (float) (xSize + 2 * MARGIN),
+                (float) -(ySize + MARGIN * 2) );
         }
 
-        FixedWidthFontRenderer.drawBlocker(transform.peek()
+        FixedWidthFontRenderer.drawBlocker( transform.peek()
-                                                    .getModel(),
+                .getModel(),
-                                           renderer,
+            renderer,
-                                           (float) -TileMonitor.RENDER_MARGIN,
+            (float) -TileMonitor.RENDER_MARGIN,
-                                           (float) TileMonitor.RENDER_MARGIN,
+            (float) TileMonitor.RENDER_MARGIN,
-                                           (float) (xSize + 2 * TileMonitor.RENDER_MARGIN),
+            (float) (xSize + 2 * TileMonitor.RENDER_MARGIN),
-                                           (float) -(ySize + TileMonitor.RENDER_MARGIN * 2));
+            (float) -(ySize + TileMonitor.RENDER_MARGIN * 2) );
 
         transform.pop();
     }
 
-    private static void renderTerminal(Matrix4f matrix, ClientMonitor monitor, float xMargin, float yMargin) {
+    private static void renderTerminal( Matrix4f matrix, ClientMonitor monitor, float xMargin, float yMargin )
+    {
         Terminal terminal = monitor.getTerminal();
 
         MonitorRenderer renderType = MonitorRenderer.current();
         boolean redraw = monitor.pollTerminalChanged();
-        if (monitor.createBuffer(renderType)) {
+        if( monitor.createBuffer( renderType ) )
+        {
             redraw = true;
         }
 
-        switch (renderType) {
+        switch( renderType )
-        case TBO: {
+        {
-            if (!MonitorTextureBufferShader.use()) {
+            case TBO:
-                return;
+            {
-            }
+                if( !MonitorTextureBufferShader.use() )
-
+                {
-            int width = terminal.getWidth(), height = terminal.getHeight();
+                    return;
-            int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
-
-            if (redraw) {
-                int size = width * height * 3;
-                if (tboContents == null || tboContents.capacity() < size) {
-                    tboContents = GlAllocationUtils.allocateByteBuffer(size);
                 }
 
-                ByteBuffer monitorBuffer = tboContents;
+                int width = terminal.getWidth(), height = terminal.getHeight();
-                monitorBuffer.clear();
+                int pixelWidth = width * FONT_WIDTH, pixelHeight = height * FONT_HEIGHT;
-                for (int y = 0; y < height; y++) {
+
-                    TextBuffer text = terminal.getLine(y), textColour = terminal.getTextColourLine(y), background = terminal.getBackgroundColourLine(y);
+                if( redraw )
-                    for (int x = 0; x < width; x++) {
+                {
-                        monitorBuffer.put((byte) (text.charAt(x) & 0xFF));
+                    int size = width * height * 3;
-                        monitorBuffer.put((byte) getColour(textColour.charAt(x), Colour.WHITE));
+                    if( tboContents == null || tboContents.capacity() < size )
-                        monitorBuffer.put((byte) getColour(background.charAt(x), Colour.BLACK));
+                    {
+                        tboContents = GlAllocationUtils.allocateByteBuffer( size );
                     }
+
+                    ByteBuffer monitorBuffer = tboContents;
+                    monitorBuffer.clear();
+                    for( int y = 0; y < height; y++ )
+                    {
+                        TextBuffer text = terminal.getLine( y ), textColour = terminal.getTextColourLine( y ), background = terminal.getBackgroundColourLine( y );
+                        for( int x = 0; x < width; x++ )
+                        {
+                            monitorBuffer.put( (byte) (text.charAt( x ) & 0xFF) );
+                            monitorBuffer.put( (byte) getColour( textColour.charAt( x ), Colour.WHITE ) );
+                            monitorBuffer.put( (byte) getColour( background.charAt( x ), Colour.BLACK ) );
+                        }
+                    }
+                    monitorBuffer.flip();
+
+                    GlStateManager.bindBuffers( GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer );
+                    GlStateManager.bufferData( GL31.GL_TEXTURE_BUFFER, monitorBuffer, GL20.GL_STATIC_DRAW );
+                    GlStateManager.bindBuffers( GL31.GL_TEXTURE_BUFFER, 0 );
                 }
-                monitorBuffer.flip();
 
-                GlStateManager.bindBuffers(GL31.GL_TEXTURE_BUFFER, monitor.tboBuffer);
+                // Nobody knows what they're doing!
-                GlStateManager.bufferData(GL31.GL_TEXTURE_BUFFER, monitorBuffer, GL20.GL_STATIC_DRAW);
+                GlStateManager.activeTexture( MonitorTextureBufferShader.TEXTURE_INDEX );
-                GlStateManager.bindBuffers(GL31.GL_TEXTURE_BUFFER, 0);
+                GL11.glBindTexture( GL31.GL_TEXTURE_BUFFER, monitor.tboTexture );
-            }
+                GlStateManager.activeTexture( GL13.GL_TEXTURE0 );
 
-            // Nobody knows what they're doing!
+                MonitorTextureBufferShader.setupUniform( matrix, width, height, terminal.getPalette(), !monitor.isColour() );
-            GlStateManager.activeTexture(MonitorTextureBufferShader.TEXTURE_INDEX);
-            GL11.glBindTexture(GL31.GL_TEXTURE_BUFFER, monitor.tboTexture);
-            GlStateManager.activeTexture(GL13.GL_TEXTURE0);
 
-            MonitorTextureBufferShader.setupUniform(matrix, width, height, terminal.getPalette(), !monitor.isColour());
-
-            Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder buffer = tessellator.getBuffer();
-            buffer.begin(GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION);
-            buffer.vertex(-xMargin, -yMargin, 0)
-                  .next();
-            buffer.vertex(-xMargin, pixelHeight + yMargin, 0)
-                  .next();
-            buffer.vertex(pixelWidth + xMargin, -yMargin, 0)
-                  .next();
-            buffer.vertex(pixelWidth + xMargin, pixelHeight + yMargin, 0)
-                  .next();
-            tessellator.draw();
-
-            GlStateManager.useProgram(0);
-            break;
-        }
-
-        case VBO: {
-            VertexBuffer vbo = monitor.buffer;
-            if (redraw) {
                 Tessellator tessellator = Tessellator.getInstance();
-                BufferBuilder builder = tessellator.getBuffer();
+                BufferBuilder buffer = tessellator.getBuffer();
-                builder.begin(FixedWidthFontRenderer.TYPE.getDrawMode(), FixedWidthFontRenderer.TYPE.getVertexFormat());
+                buffer.begin( GL11.GL_TRIANGLE_STRIP, VertexFormats.POSITION );
-                FixedWidthFontRenderer.drawTerminalWithoutCursor(IDENTITY,
+                buffer.vertex( -xMargin, -yMargin, 0 )
-                                                                 builder,
+                    .next();
-                                                                 0,
+                buffer.vertex( -xMargin, pixelHeight + yMargin, 0 )
-                                                                 0,
+                    .next();
-                                                                 terminal,
+                buffer.vertex( pixelWidth + xMargin, -yMargin, 0 )
-                                                                 !monitor.isColour(),
+                    .next();
-                                                                 yMargin,
+                buffer.vertex( pixelWidth + xMargin, pixelHeight + yMargin, 0 )
-                                                                 yMargin,
+                    .next();
-                                                                 xMargin,
+                tessellator.draw();
-                                                                 xMargin);
 
-                builder.end();
+                GlStateManager.useProgram( 0 );
-                vbo.upload(builder);
+                break;
             }
 
-            vbo.bind();
+            case VBO:
-            FixedWidthFontRenderer.TYPE.getVertexFormat()
+            {
-                                       .startDrawing(0L);
+                VertexBuffer vbo = monitor.buffer;
-            vbo.draw(matrix, FixedWidthFontRenderer.TYPE.getDrawMode());
+                if( redraw )
-            VertexBuffer.unbind();
+                {
-            FixedWidthFontRenderer.TYPE.getVertexFormat()
+                    Tessellator tessellator = Tessellator.getInstance();
-                                       .endDrawing();
+                    BufferBuilder builder = tessellator.getBuffer();
-            break;
+                    builder.begin( FixedWidthFontRenderer.TYPE.getDrawMode(), FixedWidthFontRenderer.TYPE.getVertexFormat() );
-        }
+                    FixedWidthFontRenderer.drawTerminalWithoutCursor( IDENTITY,
+                        builder,
+                        0,
+                        0,
+                        terminal,
+                        !monitor.isColour(),
+                        yMargin,
+                        yMargin,
+                        xMargin,
+                        xMargin );
+
+                    builder.end();
+                    vbo.upload( builder );
+                }
+
+                vbo.bind();
+                FixedWidthFontRenderer.TYPE.getVertexFormat()
+                    .startDrawing( 0L );
+                vbo.draw( matrix, FixedWidthFontRenderer.TYPE.getDrawMode() );
+                VertexBuffer.unbind();
+                FixedWidthFontRenderer.TYPE.getVertexFormat()
+                    .endDrawing();
+                break;
+            }
         }
     }
 }

src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java

@@ -6,11 +6,6 @@
 
 package dan200.computercraft.client.render;
 
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
@@ -19,7 +14,6 @@ import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.util.DirectionUtil;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.render.TexturedRenderLayers;
@@ -40,47 +34,62 @@ import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Matrix4f;
 import net.minecraft.util.math.Vec3d;
 
-public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle> {
+import javax.annotation.Nonnull;
-    private static final ModelIdentifier NORMAL_TURTLE_MODEL = new ModelIdentifier("computercraft:turtle_normal", "inventory");
+import java.util.List;
-    private static final ModelIdentifier ADVANCED_TURTLE_MODEL = new ModelIdentifier("computercraft:turtle_advanced", "inventory");
+import java.util.Random;
-    private static final ModelIdentifier COLOUR_TURTLE_MODEL = new ModelIdentifier("computercraft:turtle_colour", "inventory");
-    private static final ModelIdentifier ELF_OVERLAY_MODEL = new ModelIdentifier("computercraft:turtle_elf_overlay", "inventory");
 
-    private final Random random = new Random(0);
+public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle>
+{
+    private static final ModelIdentifier NORMAL_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_normal", "inventory" );
+    private static final ModelIdentifier ADVANCED_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_advanced", "inventory" );
+    private static final ModelIdentifier COLOUR_TURTLE_MODEL = new ModelIdentifier( "computercraft:turtle_colour", "inventory" );
+    private static final ModelIdentifier ELF_OVERLAY_MODEL = new ModelIdentifier( "computercraft:turtle_elf_overlay", "inventory" );
 
-    public TileEntityTurtleRenderer(BlockEntityRenderDispatcher renderDispatcher) {
+    private final Random random = new Random( 0 );
-        super(renderDispatcher);
+
+    public TileEntityTurtleRenderer( BlockEntityRenderDispatcher renderDispatcher )
+    {
+        super( renderDispatcher );
     }
 
-    public static ModelIdentifier getTurtleModel(ComputerFamily family, boolean coloured) {
+    public static ModelIdentifier getTurtleModel( ComputerFamily family, boolean coloured )
-        switch (family) {
+    {
-        case NORMAL:
+        switch( family )
-        default:
+        {
-            return coloured ? COLOUR_TURTLE_MODEL : NORMAL_TURTLE_MODEL;
+            case NORMAL:
-        case ADVANCED:
+            default:
-            return coloured ? COLOUR_TURTLE_MODEL : ADVANCED_TURTLE_MODEL;
+                return coloured ? COLOUR_TURTLE_MODEL : NORMAL_TURTLE_MODEL;
+            case ADVANCED:
+                return coloured ? COLOUR_TURTLE_MODEL : ADVANCED_TURTLE_MODEL;
         }
     }
 
-    public static ModelIdentifier getTurtleOverlayModel(Identifier overlay, boolean christmas) {
+    public static ModelIdentifier getTurtleOverlayModel( Identifier overlay, boolean christmas )
-        if (overlay != null) {
+    {
-            return new ModelIdentifier(overlay, "inventory");
+        if( overlay != null )
+        {
+            return new ModelIdentifier( overlay, "inventory" );
         }
-        if (christmas) {
+        if( christmas )
+        {
             return ELF_OVERLAY_MODEL;
         }
         return null;
     }
 
-    private static void renderQuads(@Nonnull MatrixStack transform, @Nonnull VertexConsumer buffer, int lightmapCoord, int overlayLight,
+    private static void renderQuads( @Nonnull MatrixStack transform, @Nonnull VertexConsumer buffer, int lightmapCoord, int overlayLight,
-                                    List<BakedQuad> quads, int[] tints) {
+                                     List<BakedQuad> quads, int[] tints )
+    {
         MatrixStack.Entry matrix = transform.peek();
 
-        for (BakedQuad bakedquad : quads) {
+        for( BakedQuad bakedquad : quads )
+        {
             int tint = -1;
-            if (tints != null && bakedquad.hasColor()) {
+            if( tints != null && bakedquad.hasColor() )
+            {
                 int idx = bakedquad.getColorIndex();
-                if (idx >= 0 && idx < tints.length) {
+                if( idx >= 0 && idx < tints.length )
+                {
                     tint = tints[bakedquad.getColorIndex()];
                 }
             }
@@ -88,52 +97,54 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle> {
             float f = (float) (tint >> 16 & 255) / 255.0F;
             float f1 = (float) (tint >> 8 & 255) / 255.0F;
             float f2 = (float) (tint & 255) / 255.0F;
-            buffer.quad(matrix,
+            buffer.quad( matrix,
-                        bakedquad,
+                bakedquad,
-                        new float[] {
+                new float[] {
-                            1.0F,
+                    1.0F,
-                            1.0F,
+                    1.0F,
-                            1.0F,
+                    1.0F,
-                            1.0F
+                    1.0F
-                        },
+                },
-                        f,
+                f,
-                        f1,
+                f1,
-                        f2,
+                f2,
-                        new int[] {
+                new int[] {
-                            lightmapCoord,
+                    lightmapCoord,
-                            lightmapCoord,
+                    lightmapCoord,
-                            lightmapCoord,
+                    lightmapCoord,
-                            lightmapCoord
+                    lightmapCoord
-                        },
+                },
-                        overlayLight,
+                overlayLight,
-                        true);
+                true );
         }
     }
 
     @Override
-    public void render(@Nonnull TileTurtle turtle, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
+    public void render( @Nonnull TileTurtle turtle, float partialTicks, @Nonnull MatrixStack transform, @Nonnull VertexConsumerProvider renderer,
-                       int lightmapCoord, int overlayLight) {
+                        int lightmapCoord, int overlayLight )
+    {
         // Render the label
         String label = turtle.createProxy()
-                             .getLabel();
+            .getLabel();
         HitResult hit = this.dispatcher.crosshairTarget;
-        if (label != null && hit.getType() == HitResult.Type.BLOCK && turtle.getPos()
+        if( label != null && hit.getType() == HitResult.Type.BLOCK && turtle.getPos()
-                                                                            .equals(((BlockHitResult) hit).getBlockPos())) {
+            .equals( ((BlockHitResult) hit).getBlockPos() ) )
+        {
             MinecraftClient mc = MinecraftClient.getInstance();
             TextRenderer font = mc.textRenderer;
 
             transform.push();
-            transform.translate(0.5, 1.2, 0.5);
+            transform.translate( 0.5, 1.2, 0.5 );
-            transform.multiply(mc.getEntityRenderDispatcher()
+            transform.multiply( mc.getEntityRenderDispatcher()
-                                 .getRotation());
+                .getRotation() );
-            transform.scale(-0.025f, -0.025f, 0.025f);
+            transform.scale( -0.025f, -0.025f, 0.025f );
 
             Matrix4f matrix = transform.peek()
-                                       .getModel();
+                .getModel();
-            int opacity = (int) (mc.options.getTextBackgroundOpacity(0.25f) * 255) << 24;
+            int opacity = (int) (mc.options.getTextBackgroundOpacity( 0.25f ) * 255) << 24;
-            float width = -font.getWidth(label) / 2.0f;
+            float width = -font.getWidth( label ) / 2.0f;
-            font.draw(label, width, (float) 0, 0x20ffffff, false, matrix, renderer, true, opacity, lightmapCoord);
+            font.draw( label, width, (float) 0, 0x20ffffff, false, matrix, renderer, true, opacity, lightmapCoord );
-            font.draw(label, width, (float) 0, 0xffffffff, false, matrix, renderer, false, 0, lightmapCoord);
+            font.draw( label, width, (float) 0, 0xffffffff, false, matrix, renderer, false, 0, lightmapCoord );
 
             transform.pop();
         }
@@ -141,76 +152,83 @@ public class TileEntityTurtleRenderer extends BlockEntityRenderer<TileTurtle> {
         transform.push();
 
         // Setup the transform.
-        Vec3d offset = turtle.getRenderOffset(partialTicks);
+        Vec3d offset = turtle.getRenderOffset( partialTicks );
-        float yaw = turtle.getRenderYaw(partialTicks);
+        float yaw = turtle.getRenderYaw( partialTicks );
-        transform.translate(offset.x, offset.y, offset.z);
+        transform.translate( offset.x, offset.y, offset.z );
 
-        transform.translate(0.5f, 0.5f, 0.5f);
+        transform.translate( 0.5f, 0.5f, 0.5f );
-        transform.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180.0f - yaw));
+        transform.multiply( Vector3f.POSITIVE_Y.getDegreesQuaternion( 180.0f - yaw ) );
-        if (label != null && (label.equals("Dinnerbone") || label.equals("Grumm"))) {
+        if( label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" )) )
+        {
             // Flip the model
-            transform.scale(1.0f, -1.0f, 1.0f);
+            transform.scale( 1.0f, -1.0f, 1.0f );
         }
-        transform.translate(-0.5f, -0.5f, -0.5f);
+        transform.translate( -0.5f, -0.5f, -0.5f );
 
         // Render the turtle
         int colour = turtle.getColour();
         ComputerFamily family = turtle.getFamily();
         Identifier overlay = turtle.getOverlay();
 
-        VertexConsumer buffer = renderer.getBuffer(TexturedRenderLayers.getEntityTranslucentCull());
+        VertexConsumer buffer = renderer.getBuffer( TexturedRenderLayers.getEntityTranslucentCull() );
-        renderModel(transform, buffer, lightmapCoord, overlayLight, getTurtleModel(family, colour != -1), colour == -1 ? null : new int[] {colour});
+        renderModel( transform, buffer, lightmapCoord, overlayLight, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } );
 
         // Render the overlay
-        ModelIdentifier overlayModel = getTurtleOverlayModel(overlay, HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS);
+        ModelIdentifier overlayModel = getTurtleOverlayModel( overlay, HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS );
-        if (overlayModel != null) {
+        if( overlayModel != null )
-            renderModel(transform, buffer, lightmapCoord, overlayLight, overlayModel, null);
+        {
+            renderModel( transform, buffer, lightmapCoord, overlayLight, overlayModel, null );
         }
 
         // Render the upgrades
-        renderUpgrade(transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.LEFT, partialTicks);
+        renderUpgrade( transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.LEFT, partialTicks );
-        renderUpgrade(transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.RIGHT, partialTicks);
+        renderUpgrade( transform, buffer, lightmapCoord, overlayLight, turtle, TurtleSide.RIGHT, partialTicks );
 
         transform.pop();
     }
 
-    public static void renderUpgrade(@Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, TileTurtle turtle,
+    public static void renderUpgrade( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, TileTurtle turtle,
-                               TurtleSide side, float f) {
+                                      TurtleSide side, float f )
-        ITurtleUpgrade upgrade = turtle.getUpgrade(side);
+    {
-        if (upgrade == null) {
+        ITurtleUpgrade upgrade = turtle.getUpgrade( side );
+        if( upgrade == null )
+        {
             return;
         }
         transform.push();
 
-        float toolAngle = turtle.getToolRenderAngle(side, f);
+        float toolAngle = turtle.getToolRenderAngle( side, f );
-        transform.translate(0.0f, 0.5f, 0.5f);
+        transform.translate( 0.0f, 0.5f, 0.5f );
-        transform.multiply(Vector3f.NEGATIVE_X.getDegreesQuaternion(toolAngle));
+        transform.multiply( Vector3f.NEGATIVE_X.getDegreesQuaternion( toolAngle ) );
-        transform.translate(0.0f, -0.5f, -0.5f);
+        transform.translate( 0.0f, -0.5f, -0.5f );
 
-        TransformedModel model = upgrade.getModel(turtle.getAccess(), side);
+        TransformedModel model = upgrade.getModel( turtle.getAccess(), side );
-        model.push(transform);
+        model.push( transform );
-        TileEntityTurtleRenderer.renderModel(transform, renderer, lightmapCoord, overlayLight, model.getModel(), null);
+        TileEntityTurtleRenderer.renderModel( transform, renderer, lightmapCoord, overlayLight, model.getModel(), null );
         transform.pop();
 
         transform.pop();
     }
 
-    public static void renderModel(@Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight,
+    public static void renderModel( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight,
-                             ModelIdentifier modelLocation, int[] tints) {
+                                    ModelIdentifier modelLocation, int[] tints )
+    {
         BakedModelManager modelManager = MinecraftClient.getInstance()
-                                                        .getItemRenderer()
+            .getItemRenderer()
-                                                        .getModels()
+            .getModels()
-                                                        .getModelManager();
+            .getModelManager();
-        renderModel(transform, renderer, lightmapCoord, overlayLight, modelManager.getModel(modelLocation), tints);
+        renderModel( transform, renderer, lightmapCoord, overlayLight, modelManager.getModel( modelLocation ), tints );
     }
 
-    public static void renderModel(@Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, BakedModel model,
+    public static void renderModel( @Nonnull MatrixStack transform, @Nonnull VertexConsumer renderer, int lightmapCoord, int overlayLight, BakedModel model,
-                             int[] tints) {
+                                    int[] tints )
+    {
         Random random = new Random();
-        random.setSeed(0);
+        random.setSeed( 0 );
-        renderQuads(transform, renderer, lightmapCoord, overlayLight, model.getQuads(null, null, random), tints);
+        renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, null, random ), tints );
-        for (Direction facing : DirectionUtil.FACINGS) {
+        for( Direction facing : DirectionUtil.FACINGS )
-            renderQuads(transform, renderer, lightmapCoord, overlayLight, model.getQuads(null, facing, random), tints);
+        {
+            renderQuads( transform, renderer, lightmapCoord, overlayLight, model.getQuads( null, facing, random ), tints );
         }
     }
 }

src/main/java/dan200/computercraft/client/render/TurtleModelLoader.java

@@ -6,17 +6,10 @@
 
 package dan200.computercraft.client.render;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nonnull;
-
 import com.mojang.datafixers.util.Pair;
 import dan200.computercraft.ComputerCraft;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.ModelBakeSettings;
 import net.minecraft.client.render.model.ModelLoader;
@@ -25,70 +18,84 @@ import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.SpriteIdentifier;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.api.EnvType;
+import javax.annotation.Nonnull;
-import net.fabricmc.api.Environment;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public final class TurtleModelLoader {
+public final class TurtleModelLoader
+{
     public static final TurtleModelLoader INSTANCE = new TurtleModelLoader();
-    private static final Identifier NORMAL_TURTLE_MODEL = new Identifier(ComputerCraft.MOD_ID, "block/turtle_normal");
+    private static final Identifier NORMAL_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_normal" );
-    private static final Identifier ADVANCED_TURTLE_MODEL = new Identifier(ComputerCraft.MOD_ID, "block/turtle_advanced");
+    private static final Identifier ADVANCED_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_advanced" );
-    private static final Identifier COLOUR_TURTLE_MODEL = new Identifier(ComputerCraft.MOD_ID, "block/turtle_colour");
+    private static final Identifier COLOUR_TURTLE_MODEL = new Identifier( ComputerCraft.MOD_ID, "block/turtle_colour" );
 
-    private TurtleModelLoader() {
+    private TurtleModelLoader()
+    {
     }
 
-    public boolean accepts(@Nonnull Identifier name) {
+    public boolean accepts( @Nonnull Identifier name )
+    {
         return name.getNamespace()
-                   .equals(ComputerCraft.MOD_ID) && (name.getPath()
+            .equals( ComputerCraft.MOD_ID ) && (name.getPath()
-                                                         .equals("item/turtle_normal") || name.getPath()
+            .equals( "item/turtle_normal" ) || name.getPath()
-                                                                                              .equals("item/turtle_advanced"));
+            .equals( "item/turtle_advanced" ));
     }
 
     @Nonnull
-    public UnbakedModel loadModel(@Nonnull Identifier name) {
+    public UnbakedModel loadModel( @Nonnull Identifier name )
-        if (name.getNamespace()
+    {
-                .equals(ComputerCraft.MOD_ID)) {
+        if( name.getNamespace()
-            switch (name.getPath()) {
+            .equals( ComputerCraft.MOD_ID ) )
-            case "item/turtle_normal":
+        {
-                return new TurtleModel(NORMAL_TURTLE_MODEL);
+            switch( name.getPath() )
-            case "item/turtle_advanced":
+            {
-                return new TurtleModel(ADVANCED_TURTLE_MODEL);
+                case "item/turtle_normal":
+                    return new TurtleModel( NORMAL_TURTLE_MODEL );
+                case "item/turtle_advanced":
+                    return new TurtleModel( ADVANCED_TURTLE_MODEL );
             }
         }
 
-        throw new IllegalStateException("Loader does not accept " + name);
+        throw new IllegalStateException( "Loader does not accept " + name );
     }
 
-    private static final class TurtleModel implements UnbakedModel {
+    private static final class TurtleModel implements UnbakedModel
+    {
         private final Identifier family;
 
-        private TurtleModel(Identifier family) {this.family = family;}
+        private TurtleModel( Identifier family ) {this.family = family;}
 
         @Override
-        public Collection<SpriteIdentifier> getTextureDependencies(Function<Identifier, UnbakedModel> modelGetter,
+        public Collection<SpriteIdentifier> getTextureDependencies( Function<Identifier, UnbakedModel> modelGetter,
-                                                                   Set<Pair<String, String>> missingTextureErrors) {
+                                                                    Set<Pair<String, String>> missingTextureErrors )
+        {
             return this.getModelDependencies()
-                       .stream()
+                .stream()
-                       .flatMap(x -> modelGetter.apply(x)
+                .flatMap( x -> modelGetter.apply( x )
-                                                .getTextureDependencies(modelGetter, missingTextureErrors)
+                    .getTextureDependencies( modelGetter, missingTextureErrors )
-                                                .stream())
+                    .stream() )
-                       .collect(Collectors.toSet());
+                .collect( Collectors.toSet() );
         }
 
         @Nonnull
         @Override
-        public Collection<Identifier> getModelDependencies() {
+        public Collection<Identifier> getModelDependencies()
-            return Arrays.asList(this.family, COLOUR_TURTLE_MODEL);
+        {
+            return Arrays.asList( this.family, COLOUR_TURTLE_MODEL );
         }
 
         @Override
-        public BakedModel bake(@Nonnull ModelLoader loader, @Nonnull Function<SpriteIdentifier, Sprite> spriteGetter, @Nonnull ModelBakeSettings state,
+        public BakedModel bake( @Nonnull ModelLoader loader, @Nonnull Function<SpriteIdentifier, Sprite> spriteGetter, @Nonnull ModelBakeSettings state,
-                               Identifier modelId) {
+                                Identifier modelId )
-            return new TurtleSmartItemModel(loader.getOrLoadModel(this.family)
+        {
-                                                  .bake(loader, spriteGetter, state, modelId),
+            return new TurtleSmartItemModel( loader.getOrLoadModel( this.family )
-                                            loader.getOrLoadModel(COLOUR_TURTLE_MODEL)
+                .bake( loader, spriteGetter, state, modelId ),
-                                                  .bake(loader, spriteGetter, state, modelId));
+                loader.getOrLoadModel( COLOUR_TURTLE_MODEL )
+                    .bake( loader, spriteGetter, state, modelId ) );
         }
     }
 }

src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java

@@ -6,16 +6,9 @@
 
 package dan200.computercraft.client.render;
 
-import java.util.ArrayList;
-import java.util.EnumMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.client.TransformedModel;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.client.render.model.BakedQuad;
@@ -24,21 +17,23 @@ import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.math.AffineTransformation;
 import net.minecraft.util.math.Direction;
 
-import net.fabricmc.api.EnvType;
+import javax.annotation.Nonnull;
-import net.fabricmc.api.Environment;
+import java.util.*;
 
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public class TurtleMultiModel implements BakedModel {
+public class TurtleMultiModel implements BakedModel
+{
     private final BakedModel m_baseModel;
     private final BakedModel m_overlayModel;
     private final AffineTransformation m_generalTransform;
     private final TransformedModel m_leftUpgradeModel;
     private final TransformedModel m_rightUpgradeModel;
     private List<BakedQuad> m_generalQuads = null;
-    private Map<Direction, List<BakedQuad>> m_faceQuads = new EnumMap<>(Direction.class);
+    private Map<Direction, List<BakedQuad>> m_faceQuads = new EnumMap<>( Direction.class );
 
-    public TurtleMultiModel(BakedModel baseModel, BakedModel overlayModel, AffineTransformation generalTransform, TransformedModel leftUpgradeModel,
+    public TurtleMultiModel( BakedModel baseModel, BakedModel overlayModel, AffineTransformation generalTransform, TransformedModel leftUpgradeModel,
-                            TransformedModel rightUpgradeModel) {
+                             TransformedModel rightUpgradeModel )
+    {
         // Get the models
         this.m_baseModel = baseModel;
         this.m_overlayModel = overlayModel;
@@ -49,81 +44,98 @@ public class TurtleMultiModel implements BakedModel {
 
     @Nonnull
     @Override
-    public List<BakedQuad> getQuads(BlockState state, Direction side, @Nonnull Random rand) {
+    public List<BakedQuad> getQuads( BlockState state, Direction side, @Nonnull Random rand )
-        if (side != null) {
+    {
-            if (!this.m_faceQuads.containsKey(side)) {
+        if( side != null )
-                this.m_faceQuads.put(side, this.buildQuads(state, side, rand));
+        {
+            if( !this.m_faceQuads.containsKey( side ) )
+            {
+                this.m_faceQuads.put( side, this.buildQuads( state, side, rand ) );
             }
-            return this.m_faceQuads.get(side);
+            return this.m_faceQuads.get( side );
-        } else {
+        }
-            if (this.m_generalQuads == null) {
+        else
-                this.m_generalQuads = this.buildQuads(state, side, rand);
+        {
+            if( this.m_generalQuads == null )
+            {
+                this.m_generalQuads = this.buildQuads( state, side, rand );
             }
             return this.m_generalQuads;
         }
     }
 
-    private List<BakedQuad> buildQuads(BlockState state, Direction side, Random rand) {
+    private List<BakedQuad> buildQuads( BlockState state, Direction side, Random rand )
+    {
         ArrayList<BakedQuad> quads = new ArrayList<>();
 
 
-        ModelTransformer.transformQuadsTo(quads, this.m_baseModel.getQuads(state, side, rand), this.m_generalTransform.getMatrix());
+        ModelTransformer.transformQuadsTo( quads, this.m_baseModel.getQuads( state, side, rand ), this.m_generalTransform.getMatrix() );
-        if (this.m_overlayModel != null) {
+        if( this.m_overlayModel != null )
-            ModelTransformer.transformQuadsTo(quads, this.m_overlayModel.getQuads(state, side, rand), this.m_generalTransform.getMatrix());
+        {
+            ModelTransformer.transformQuadsTo( quads, this.m_overlayModel.getQuads( state, side, rand ), this.m_generalTransform.getMatrix() );
         }
-        if (this.m_leftUpgradeModel != null) {
+        if( this.m_leftUpgradeModel != null )
-            AffineTransformation upgradeTransform = this.m_generalTransform.multiply(this.m_leftUpgradeModel.getMatrix());
+        {
-            ModelTransformer.transformQuadsTo(quads, this.m_leftUpgradeModel.getModel()
+            AffineTransformation upgradeTransform = this.m_generalTransform.multiply( this.m_leftUpgradeModel.getMatrix() );
-                                                                            .getQuads(state, side, rand),
+            ModelTransformer.transformQuadsTo( quads, this.m_leftUpgradeModel.getModel()
-                                              upgradeTransform.getMatrix());
+                    .getQuads( state, side, rand ),
+                upgradeTransform.getMatrix() );
         }
-        if (this.m_rightUpgradeModel != null) {
+        if( this.m_rightUpgradeModel != null )
-            AffineTransformation upgradeTransform = this.m_generalTransform.multiply(this.m_rightUpgradeModel.getMatrix());
+        {
-            ModelTransformer.transformQuadsTo(quads, this.m_rightUpgradeModel.getModel()
+            AffineTransformation upgradeTransform = this.m_generalTransform.multiply( this.m_rightUpgradeModel.getMatrix() );
-                                                                             .getQuads(state, side, rand),
+            ModelTransformer.transformQuadsTo( quads, this.m_rightUpgradeModel.getModel()
-                                              upgradeTransform.getMatrix());
+                    .getQuads( state, side, rand ),
+                upgradeTransform.getMatrix() );
         }
         quads.trimToSize();
         return quads;
     }
 
     @Override
-    public boolean useAmbientOcclusion() {
+    public boolean useAmbientOcclusion()
+    {
         return this.m_baseModel.useAmbientOcclusion();
     }
 
     @Override
-    public boolean hasDepth() {
+    public boolean hasDepth()
+    {
         return this.m_baseModel.hasDepth();
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean isSideLit()
+    {
         return this.m_baseModel.isSideLit();
     }
 
     @Override
-    public boolean isBuiltin() {
+    public boolean isBuiltin()
+    {
         return this.m_baseModel.isBuiltin();
     }
 
     @Nonnull
     @Override
     @Deprecated
-    public Sprite getSprite() {
+    public Sprite getSprite()
+    {
         return this.m_baseModel.getSprite();
     }
 
     @Nonnull
     @Override
     @Deprecated
-    public net.minecraft.client.render.model.json.ModelTransformation getTransformation() {
+    public net.minecraft.client.render.model.json.ModelTransformation getTransformation()
+    {
         return this.m_baseModel.getTransformation();
     }
 
     @Nonnull
     @Override
-    public ModelOverrideList getOverrides() {
+    public ModelOverrideList getOverrides()
+    {
         return ModelOverrideList.EMPTY;
     }
 }

src/main/java/dan200/computercraft/client/render/TurtlePlayerRenderer.java

@@ -5,35 +5,38 @@
  */
 package dan200.computercraft.client.render;
 
-import javax.annotation.Nonnull;
-
 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.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 
-import net.fabricmc.fabric.api.client.rendereregistry.v1.EntityRendererRegistry;
+import javax.annotation.Nonnull;
 
-public class TurtlePlayerRenderer extends EntityRenderer<TurtlePlayer> {
+public class TurtlePlayerRenderer extends EntityRenderer<TurtlePlayer>
-    public TurtlePlayerRenderer(EntityRenderDispatcher renderManager) {
+{
-        super(renderManager);
+    public TurtlePlayerRenderer( EntityRenderDispatcher renderManager )
+    {
+        super( renderManager );
     }
 
-    public TurtlePlayerRenderer(EntityRenderDispatcher entityRenderDispatcher, EntityRendererRegistry.Context context) {
+    public TurtlePlayerRenderer( EntityRenderDispatcher entityRenderDispatcher, EntityRendererRegistry.Context context )
-        super(entityRenderDispatcher);
+    {
+        super( entityRenderDispatcher );
     }
 
     @Override
-    public void render(@Nonnull TurtlePlayer entityIn, float entityYaw, float partialTicks, @Nonnull MatrixStack transform,
+    public void render( @Nonnull TurtlePlayer entityIn, float entityYaw, float partialTicks, @Nonnull MatrixStack transform,
-                       @Nonnull VertexConsumerProvider buffer, int packedLightIn) {
+                        @Nonnull VertexConsumerProvider buffer, int packedLightIn )
+    {
     }
 
     @Nonnull
     @Override
-    public Identifier getTexture(@Nonnull TurtlePlayer entity) {
+    public Identifier getTexture( @Nonnull TurtlePlayer entity )
+    {
         return ComputerBorderRenderer.BACKGROUND_NORMAL;
     }
 }

src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java

@@ -6,23 +6,15 @@
 
 package dan200.computercraft.client.render;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Random;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import com.google.common.base.Objects;
 import dan200.computercraft.api.client.TransformedModel;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
 import dan200.computercraft.api.turtle.TurtleSide;
 import dan200.computercraft.shared.turtle.items.ItemTurtle;
-import dan200.computercraft.shared.turtle.upgrades.TurtleTool;
 import dan200.computercraft.shared.util.Holiday;
 import dan200.computercraft.shared.util.HolidayUtil;
-
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.render.model.BakedModel;
@@ -40,121 +32,142 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Direction;
 
-import net.fabricmc.api.EnvType;
+import javax.annotation.Nonnull;
-import net.fabricmc.api.Environment;
+import javax.annotation.Nullable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Random;
 
-@Environment (EnvType.CLIENT)
+@Environment( EnvType.CLIENT )
-public class TurtleSmartItemModel implements BakedModel {
+public class TurtleSmartItemModel implements BakedModel
+{
     private static final AffineTransformation identity, flip;
 
-    static {
+    static
+    {
         MatrixStack stack = new MatrixStack();
-        stack.scale(0, -1, 0);
+        stack.scale( 0, -1, 0 );
-        stack.translate(0, 0, 1);
+        stack.translate( 0, 0, 1 );
 
         identity = AffineTransformation.identity();
-        flip = new AffineTransformation(stack.peek()
+        flip = new AffineTransformation( stack.peek()
-                                             .getModel());
+            .getModel() );
     }
 
     private final BakedModel familyModel;
     private final BakedModel colourModel;
     private final HashMap<TurtleModelCombination, BakedModel> m_cachedModels = new HashMap<>();
     private final ModelOverrideList m_overrides;
-    public TurtleSmartItemModel(BakedModel familyModel, BakedModel colourModel) {
+
+    public TurtleSmartItemModel( BakedModel familyModel, BakedModel colourModel )
+    {
         this.familyModel = familyModel;
         this.colourModel = colourModel;
 
         // this actually works I think, trust me
-        this.m_overrides = new ModelOverrideList(null, null, null, Collections.emptyList()) {
+        this.m_overrides = new ModelOverrideList( null, null, null, Collections.emptyList() )
+        {
             @Nonnull
             @Override
-            public BakedModel apply(@Nonnull BakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world,
+            public BakedModel apply( @Nonnull BakedModel originalModel, @Nonnull ItemStack stack, @Nullable ClientWorld world,
-                                    @Nullable LivingEntity entity) {
+                                     @Nullable LivingEntity entity )
+            {
                 ItemTurtle turtle = (ItemTurtle) stack.getItem();
-                int colour = turtle.getColour(stack);
+                int colour = turtle.getColour( stack );
-                ITurtleUpgrade leftUpgrade = turtle.getUpgrade(stack, TurtleSide.LEFT);
+                ITurtleUpgrade leftUpgrade = turtle.getUpgrade( stack, TurtleSide.LEFT );
-                ITurtleUpgrade rightUpgrade = turtle.getUpgrade(stack, TurtleSide.RIGHT);
+                ITurtleUpgrade rightUpgrade = turtle.getUpgrade( stack, TurtleSide.RIGHT );
-                Identifier overlay = turtle.getOverlay(stack);
+                Identifier overlay = turtle.getOverlay( stack );
                 boolean christmas = HolidayUtil.getCurrentHoliday() == Holiday.CHRISTMAS;
-                String label = turtle.getLabel(stack);
+                String label = turtle.getLabel( stack );
                 // TODO make upside down turtle items render properly (currently inivisible)
                 //boolean flip = label != null && (label.equals("Dinnerbone") || label.equals("Grumm"));
                 boolean flip = false;
-                TurtleModelCombination combo = new TurtleModelCombination(colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip);
+                TurtleModelCombination combo = new TurtleModelCombination( colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip );
 
-                BakedModel model = TurtleSmartItemModel.this.m_cachedModels.get(combo);
+                BakedModel model = TurtleSmartItemModel.this.m_cachedModels.get( combo );
-                if (model == null) {
+                if( model == null )
-                    TurtleSmartItemModel.this.m_cachedModels.put(combo, model = TurtleSmartItemModel.this.buildModel(combo));
+                {
+                    TurtleSmartItemModel.this.m_cachedModels.put( combo, model = TurtleSmartItemModel.this.buildModel( combo ) );
                 }
                 return model;
             }
         };
     }
 
-    private BakedModel buildModel(TurtleModelCombination combo) {
+    private BakedModel buildModel( TurtleModelCombination combo )
+    {
         MinecraftClient mc = MinecraftClient.getInstance();
         BakedModelManager modelManager = mc.getItemRenderer()
-                                           .getModels()
+            .getModels()
-                                           .getModelManager();
+            .getModelManager();
-        ModelIdentifier overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel(combo.m_overlay, combo.m_christmas);
+        ModelIdentifier overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
 
         BakedModel baseModel = combo.m_colour ? this.colourModel : this.familyModel;
-        BakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel(overlayModelLocation) : null;
+        BakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
         AffineTransformation transform = combo.m_flip ? flip : identity;
-        TransformedModel leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel(null, TurtleSide.LEFT) : null;
+        TransformedModel leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel( null, TurtleSide.LEFT ) : null;
-        TransformedModel rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel(null, TurtleSide.RIGHT) : null;
+        TransformedModel rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel( null, TurtleSide.RIGHT ) : null;
-        return new TurtleMultiModel(baseModel, overlayModel, transform, leftModel, rightModel);
+        return new TurtleMultiModel( baseModel, overlayModel, transform, leftModel, rightModel );
     }
 
     @Nonnull
     @Override
     @Deprecated
-    public List<BakedQuad> getQuads(BlockState state, Direction facing, @Nonnull Random rand) {
+    public List<BakedQuad> getQuads( BlockState state, Direction facing, @Nonnull Random rand )
-        return this.familyModel.getQuads(state, facing, rand);
+    {
+        return this.familyModel.getQuads( state, facing, rand );
     }
 
     @Override
-    public boolean useAmbientOcclusion() {
+    public boolean useAmbientOcclusion()
+    {
         return this.familyModel.useAmbientOcclusion();
     }
 
     @Override
-    public boolean hasDepth() {
+    public boolean hasDepth()
+    {
         return this.familyModel.hasDepth();
     }
 
     @Override
-    public boolean isSideLit() {
+    public boolean isSideLit()
+    {
         return this.familyModel.isSideLit();
     }
 
     @Override
-    public boolean isBuiltin() {
+    public boolean isBuiltin()
+    {
         return this.familyModel.isBuiltin();
     }
 
     @Nonnull
     @Override
     @Deprecated
-    public Sprite getSprite() {
+    public Sprite getSprite()
+    {
         return this.familyModel.getSprite();
     }
 
     @Nonnull
     @Override
     @Deprecated
-    public ModelTransformation getTransformation() {
+    public ModelTransformation getTransformation()
+    {
         return this.familyModel.getTransformation();
     }
 
     @Nonnull
     @Override
-    public ModelOverrideList getOverrides() {
+    public ModelOverrideList getOverrides()
+    {
         return this.m_overrides;
     }
 
-    private static class TurtleModelCombination {
+    private static class TurtleModelCombination
+    {
         final boolean m_colour;
         final ITurtleUpgrade m_leftUpgrade;
         final ITurtleUpgrade m_rightUpgrade;
@@ -162,8 +175,9 @@ public class TurtleSmartItemModel implements BakedModel {
         final boolean m_christmas;
         final boolean m_flip;
 
-        TurtleModelCombination(boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, Identifier overlay, boolean christmas,
+        TurtleModelCombination( boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, Identifier overlay, boolean christmas,
-                               boolean flip) {
+                                boolean flip )
+        {
             this.m_colour = colour;
             this.m_leftUpgrade = leftUpgrade;
             this.m_rightUpgrade = rightUpgrade;
@@ -173,7 +187,8 @@ public class TurtleSmartItemModel implements BakedModel {
         }
 
         @Override
-        public int hashCode() {
+        public int hashCode()
+        {
             final int prime = 31;
             int result = 0;
             result = prime * result + (this.m_colour ? 1 : 0);
@@ -186,17 +201,20 @@ public class TurtleSmartItemModel implements BakedModel {
         }
 
         @Override
-        public boolean equals(Object other) {
+        public boolean equals( Object other )
-            if (other == this) {
+        {
+            if( other == this )
+            {
                 return true;
             }
-            if (!(other instanceof TurtleModelCombination)) {
+            if( !(other instanceof TurtleModelCombination) )
+            {
                 return false;
             }
 
             TurtleModelCombination otherCombo = (TurtleModelCombination) other;
             return otherCombo.m_colour == this.m_colour && otherCombo.m_leftUpgrade == this.m_leftUpgrade && otherCombo.m_rightUpgrade == this.m_rightUpgrade && Objects.equal(
-                otherCombo.m_overlay, this.m_overlay) && otherCombo.m_christmas == this.m_christmas && otherCombo.m_flip == this.m_flip;
+                otherCombo.m_overlay, this.m_overlay ) && otherCombo.m_christmas == this.m_christmas && otherCombo.m_flip == this.m_flip;
         }
     }
 

src/main/java/dan200/computercraft/core/apis/ApiFactories.java

@@ -6,27 +6,31 @@
 
 package dan200.computercraft.core.apis;
 
+import dan200.computercraft.api.lua.ILuaAPIFactory;
+
+import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
+public final class ApiFactories
-
+{
-import dan200.computercraft.api.lua.ILuaAPIFactory;
-
-public final class ApiFactories {
     private static final Collection<ILuaAPIFactory> factories = new LinkedHashSet<>();
-    private static final Collection<ILuaAPIFactory> factoriesView = Collections.unmodifiableCollection(factories);
+    private static final Collection<ILuaAPIFactory> factoriesView = Collections.unmodifiableCollection( factories );
-    private ApiFactories() {
+
+    private ApiFactories()
+    {
     }
 
-    public static synchronized void register(@Nonnull ILuaAPIFactory factory) {
+    public static synchronized void register( @Nonnull ILuaAPIFactory factory )
-        Objects.requireNonNull(factory, "provider cannot be null");
+    {
-        factories.add(factory);
+        Objects.requireNonNull( factory, "provider cannot be null" );
+        factories.add( factory );
     }
 
-    public static Iterable<ILuaAPIFactory> getAll() {
+    public static Iterable<ILuaAPIFactory> getAll()
+    {
         return factoriesView;
     }
 }

src/main/java/dan200/computercraft/core/apis/ComputerAccess.java

@@ -6,12 +6,6 @@
 
 package dan200.computercraft.core.apis;
 
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
 import dan200.computercraft.api.peripheral.IComputerAccess;
@@ -19,121 +13,157 @@ import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.filesystem.FileSystemException;
 
-public abstract class ComputerAccess implements IComputerAccess {
+import javax.annotation.Nonnull;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+public abstract class ComputerAccess implements IComputerAccess
+{
     private final IAPIEnvironment m_environment;
     private final Set<String> m_mounts = new HashSet<>();
 
-    protected ComputerAccess(IAPIEnvironment environment) {
+    protected ComputerAccess( IAPIEnvironment environment )
+    {
         this.m_environment = environment;
     }
 
-    public void unmountAll() {
+    public void unmountAll()
+    {
         FileSystem fileSystem = this.m_environment.getFileSystem();
-        for (String mount : this.m_mounts) {
+        for( String mount : this.m_mounts )
-            fileSystem.unmount(mount);
+        {
+            fileSystem.unmount( mount );
         }
         this.m_mounts.clear();
     }
 
     @Override
-    public synchronized String mount(@Nonnull String desiredLoc, @Nonnull IMount mount, @Nonnull String driveName) {
+    public synchronized String mount( @Nonnull String desiredLoc, @Nonnull IMount mount, @Nonnull String driveName )
-        Objects.requireNonNull(desiredLoc, "desiredLocation cannot be null");
+    {
-        Objects.requireNonNull(mount, "mount cannot be null");
+        Objects.requireNonNull( desiredLoc, "desiredLocation cannot be null" );
-        Objects.requireNonNull(driveName, "driveName cannot be null");
+        Objects.requireNonNull( mount, "mount cannot be null" );
+        Objects.requireNonNull( driveName, "driveName cannot be null" );
 
         // Mount the location
         String location;
         FileSystem fileSystem = this.m_environment.getFileSystem();
-        if (fileSystem == null) {
+        if( fileSystem == null )
-            throw new IllegalStateException("File system has not been created");
+        {
+            throw new IllegalStateException( "File system has not been created" );
         }
 
-        synchronized (fileSystem) {
+        synchronized( fileSystem )
-            location = this.findFreeLocation(desiredLoc);
+        {
-            if (location != null) {
+            location = this.findFreeLocation( desiredLoc );
-                try {
+            if( location != null )
-                    fileSystem.mount(driveName, location, mount);
+            {
-                } catch (FileSystemException ignored) {
+                try
+                {
+                    fileSystem.mount( driveName, location, mount );
+                }
+                catch( FileSystemException ignored )
+                {
                 }
             }
         }
 
-        if (location != null) {
+        if( location != null )
-            this.m_mounts.add(location);
+        {
+            this.m_mounts.add( location );
         }
         return location;
     }
 
     @Override
-    public synchronized String mountWritable(@Nonnull String desiredLoc, @Nonnull IWritableMount mount, @Nonnull String driveName) {
+    public synchronized String mountWritable( @Nonnull String desiredLoc, @Nonnull IWritableMount mount, @Nonnull String driveName )
-        Objects.requireNonNull(desiredLoc, "desiredLocation cannot be null");
+    {
-        Objects.requireNonNull(mount, "mount cannot be null");
+        Objects.requireNonNull( desiredLoc, "desiredLocation cannot be null" );
-        Objects.requireNonNull(driveName, "driveName cannot be null");
+        Objects.requireNonNull( mount, "mount cannot be null" );
+        Objects.requireNonNull( driveName, "driveName cannot be null" );
 
         // Mount the location
         String location;
         FileSystem fileSystem = this.m_environment.getFileSystem();
-        if (fileSystem == null) {
+        if( fileSystem == null )
-            throw new IllegalStateException("File system has not been created");
+        {
+            throw new IllegalStateException( "File system has not been created" );
         }
 
-        synchronized (fileSystem) {
+        synchronized( fileSystem )
-            location = this.findFreeLocation(desiredLoc);
+        {
-            if (location != null) {
+            location = this.findFreeLocation( desiredLoc );
-                try {
+            if( location != null )
-                    fileSystem.mountWritable(driveName, location, mount);
+            {
-                } catch (FileSystemException ignored) {
+                try
+                {
+                    fileSystem.mountWritable( driveName, location, mount );
+                }
+                catch( FileSystemException ignored )
+                {
                 }
             }
         }
 
-        if (location != null) {
+        if( location != null )
-            this.m_mounts.add(location);
+        {
+            this.m_mounts.add( location );
         }
         return location;
     }
 
     @Override
-    public void unmount(String location) {
+    public void unmount( String location )
-        if (location == null) {
+    {
+        if( location == null )
+        {
             return;
         }
-        if (!this.m_mounts.contains(location)) {
+        if( !this.m_mounts.contains( location ) )
-            throw new IllegalStateException("You didn't mount this location");
+        {
+            throw new IllegalStateException( "You didn't mount this location" );
         }
 
         this.m_environment.getFileSystem()
-                          .unmount(location);
+            .unmount( location );
-        this.m_mounts.remove(location);
+        this.m_mounts.remove( location );
     }
 
     @Override
-    public int getID() {
+    public int getID()
+    {
         return this.m_environment.getComputerID();
     }
 
     @Override
-    public void queueEvent(@Nonnull String event, Object... arguments) {
+    public void queueEvent( @Nonnull String event, Object... arguments )
-        Objects.requireNonNull(event, "event cannot be null");
+    {
-        this.m_environment.queueEvent(event, arguments);
+        Objects.requireNonNull( event, "event cannot be null" );
+        this.m_environment.queueEvent( event, arguments );
     }
 
     @Nonnull
     @Override
-    public IWorkMonitor getMainThreadMonitor() {
+    public IWorkMonitor getMainThreadMonitor()
+    {
         return this.m_environment.getMainThreadMonitor();
     }
 
-    private String findFreeLocation(String desiredLoc) {
+    private String findFreeLocation( String desiredLoc )
-        try {
+    {
+        try
+        {
             FileSystem fileSystem = this.m_environment.getFileSystem();
-            if (!fileSystem.exists(desiredLoc)) {
+            if( !fileSystem.exists( desiredLoc ) )
+            {
                 return desiredLoc;
             }
 
             // We used to check foo2, foo3, foo4, etc here but the disk drive does this itself now
             return null;
-        } catch (FileSystemException e) {
+        }
+        catch( FileSystemException e )
+        {
             return null;
         }
     }

src/main/java/dan200/computercraft/core/apis/FSAPI.java

@@ -6,18 +6,6 @@
 
 package dan200.computercraft.core.apis;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.nio.channels.ReadableByteChannel;
-import java.nio.channels.WritableByteChannel;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.OptionalLong;
-import java.util.function.Function;
-
-
 import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.LuaException;
@@ -31,31 +19,47 @@ import dan200.computercraft.core.filesystem.FileSystemException;
 import dan200.computercraft.core.filesystem.FileSystemWrapper;
 import dan200.computercraft.core.tracking.TrackingField;
 
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.OptionalLong;
+import java.util.function.Function;
+
 /**
  * The FS API allows you to manipulate files and the filesystem.
  *
  * @cc.module fs
  */
-public class FSAPI implements ILuaAPI {
+public class FSAPI implements ILuaAPI
+{
     private final IAPIEnvironment environment;
     private FileSystem fileSystem = null;
 
-    public FSAPI(IAPIEnvironment env) {
+    public FSAPI( IAPIEnvironment env )
+    {
         this.environment = env;
     }
 
     @Override
-    public String[] getNames() {
+    public String[] getNames()
-        return new String[] {"fs"};
+    {
+        return new String[] { "fs" };
     }
 
     @Override
-    public void startup() {
+    public void startup()
+    {
         this.fileSystem = this.environment.getFileSystem();
     }
 
     @Override
-    public void shutdown() {
+    public void shutdown()
+    {
         this.fileSystem = null;
     }
 
@@ -67,12 +71,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the path doesn't exist.
      */
     @LuaFunction
-    public final String[] list(String path) throws LuaException {
+    public final String[] list( String path ) throws LuaException
-        this.environment.addTrackingChange(TrackingField.FS_OPS);
+    {
-        try {
+        this.environment.addTrackingChange( TrackingField.FS_OPS );
-            return this.fileSystem.list(path);
+        try
-        } catch (FileSystemException e) {
+        {
-            throw new LuaException(e.getMessage());
+            return this.fileSystem.list( path );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -82,22 +90,24 @@ public class FSAPI implements ILuaAPI {
      *
      * @param arguments The paths to combine.
      * @return The new path, with separators added between parts as needed.
+     * @throws LuaException On argument errors.
      * @cc.tparam string path The first part of the path. For example, a parent directory path.
      * @cc.tparam string ... Additional parts of the path to combine.
-     * @throws LuaException On argument errors.
      */
     @LuaFunction
-    public final String combine( IArguments arguments ) throws LuaException {
+    public final String combine( IArguments arguments ) throws LuaException
+    {
         StringBuilder result = new StringBuilder();
-        result.append(FileSystem.sanitizePath(arguments.getString(0), true));
+        result.append( FileSystem.sanitizePath( arguments.getString( 0 ), true ) );
 
-        for (int i = 1, n = arguments.count(); i < n; i++) {
+        for( int i = 1, n = arguments.count(); i < n; i++ )
-            String part = FileSystem.sanitizePath(arguments.getString(i), true);
+        {
-            if (result.length() != 0 && !part.isEmpty()) result.append('/');
+            String part = FileSystem.sanitizePath( arguments.getString( i ), true );
-            result.append(part);
+            if( result.length() != 0 && !part.isEmpty() ) result.append( '/' );
+            result.append( part );
         }
 
-        return FileSystem.sanitizePath(result.toString(), true);
+        return FileSystem.sanitizePath( result.toString(), true );
     }
 
     /**
@@ -107,8 +117,9 @@ public class FSAPI implements ILuaAPI {
      * @return The final part of the path (the file name).
      */
     @LuaFunction
-    public final String getName(String path) {
+    public final String getName( String path )
-        return FileSystem.getName(path);
+    {
+        return FileSystem.getName( path );
     }
 
     /**
@@ -118,8 +129,9 @@ public class FSAPI implements ILuaAPI {
      * @return The path with the final part removed (the parent directory).
      */
     @LuaFunction
-    public final String getDir(String path) {
+    public final String getDir( String path )
-        return FileSystem.getDirectory(path);
+    {
+        return FileSystem.getDirectory( path );
     }
 
     /**
@@ -130,11 +142,15 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the path doesn't exist.
      */
     @LuaFunction
-    public final long getSize(String path) throws LuaException {
+    public final long getSize( String path ) throws LuaException
-        try {
+    {
-            return this.fileSystem.getSize(path);
+        try
-        } catch (FileSystemException e) {
+        {
-            throw new LuaException(e.getMessage());
+            return this.fileSystem.getSize( path );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -145,10 +161,14 @@ public class FSAPI implements ILuaAPI {
      * @return Whether the path exists.
      */
     @LuaFunction
-    public final boolean exists(String path) {
+    public final boolean exists( String path )
-        try {
+    {
-            return this.fileSystem.exists(path);
+        try
-        } catch (FileSystemException e) {
+        {
+            return this.fileSystem.exists( path );
+        }
+        catch( FileSystemException e )
+        {
             return false;
         }
     }
@@ -160,10 +180,14 @@ public class FSAPI implements ILuaAPI {
      * @return Whether the path is a directory.
      */
     @LuaFunction
-    public final boolean isDir(String path) {
+    public final boolean isDir( String path )
-        try {
+    {
-            return this.fileSystem.isDir(path);
+        try
-        } catch (FileSystemException e) {
+        {
+            return this.fileSystem.isDir( path );
+        }
+        catch( FileSystemException e )
+        {
             return false;
         }
     }
@@ -175,10 +199,14 @@ public class FSAPI implements ILuaAPI {
      * @return Whether the path cannot be written to.
      */
     @LuaFunction
-    public final boolean isReadOnly(String path) {
+    public final boolean isReadOnly( String path )
-        try {
+    {
-            return this.fileSystem.isReadOnly(path);
+        try
-        } catch (FileSystemException e) {
+        {
+            return this.fileSystem.isReadOnly( path );
+        }
+        catch( FileSystemException e )
+        {
             return false;
         }
     }
@@ -190,12 +218,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the directory couldn't be created.
      */
     @LuaFunction
-    public final void makeDir(String path) throws LuaException {
+    public final void makeDir( String path ) throws LuaException
-        try {
+    {
-            this.environment.addTrackingChange(TrackingField.FS_OPS);
+        try
-            this.fileSystem.makeDir(path);
+        {
-        } catch (FileSystemException e) {
+            this.environment.addTrackingChange( TrackingField.FS_OPS );
-            throw new LuaException(e.getMessage());
+            this.fileSystem.makeDir( path );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -209,12 +241,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the file or directory couldn't be moved.
      */
     @LuaFunction
-    public final void move(String path, String dest) throws LuaException {
+    public final void move( String path, String dest ) throws LuaException
-        try {
+    {
-            this.environment.addTrackingChange(TrackingField.FS_OPS);
+        try
-            this.fileSystem.move(path, dest);
+        {
-        } catch (FileSystemException e) {
+            this.environment.addTrackingChange( TrackingField.FS_OPS );
-            throw new LuaException(e.getMessage());
+            this.fileSystem.move( path, dest );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -228,12 +264,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the file or directory couldn't be copied.
      */
     @LuaFunction
-    public final void copy(String path, String dest) throws LuaException {
+    public final void copy( String path, String dest ) throws LuaException
-        try {
+    {
-            this.environment.addTrackingChange(TrackingField.FS_OPS);
+        try
-            this.fileSystem.copy(path, dest);
+        {
-        } catch (FileSystemException e) {
+            this.environment.addTrackingChange( TrackingField.FS_OPS );
-            throw new LuaException(e.getMessage());
+            this.fileSystem.copy( path, dest );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -246,12 +286,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the file or directory couldn't be deleted.
      */
     @LuaFunction
-    public final void delete(String path) throws LuaException {
+    public final void delete( String path ) throws LuaException
-        try {
+    {
-            this.environment.addTrackingChange(TrackingField.FS_OPS);
+        try
-            this.fileSystem.delete(path);
+        {
-        } catch (FileSystemException e) {
+            this.environment.addTrackingChange( TrackingField.FS_OPS );
-            throw new LuaException(e.getMessage());
+            this.fileSystem.delete( path );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -272,44 +316,55 @@ public class FSAPI implements ILuaAPI {
      * @cc.treturn string|nil A message explaining why the file cannot be opened.
      */
     @LuaFunction
-    public final Object[] open(String path, String mode) throws LuaException {
+    public final Object[] open( String path, String mode ) throws LuaException
-        this.environment.addTrackingChange(TrackingField.FS_OPS);
+    {
-        try {
+        this.environment.addTrackingChange( TrackingField.FS_OPS );
-            switch (mode) {
+        try
-            case "r": {
+        {
-                // Open the file for reading, then create a wrapper around the reader
+            switch( mode )
-                FileSystemWrapper<BufferedReader> reader = this.fileSystem.openForRead(path, EncodedReadableHandle::openUtf8);
+            {
-                return new Object[] {new EncodedReadableHandle(reader.get(), reader)};
+                case "r":
+                {
+                    // Open the file for reading, then create a wrapper around the reader
+                    FileSystemWrapper<BufferedReader> reader = this.fileSystem.openForRead( path, EncodedReadableHandle::openUtf8 );
+                    return new Object[] { new EncodedReadableHandle( reader.get(), reader ) };
+                }
+                case "w":
+                {
+                    // Open the file for writing, then create a wrapper around the writer
+                    FileSystemWrapper<BufferedWriter> writer = this.fileSystem.openForWrite( path, false, EncodedWritableHandle::openUtf8 );
+                    return new Object[] { new EncodedWritableHandle( writer.get(), writer ) };
+                }
+                case "a":
+                {
+                    // Open the file for appending, then create a wrapper around the writer
+                    FileSystemWrapper<BufferedWriter> writer = this.fileSystem.openForWrite( path, true, EncodedWritableHandle::openUtf8 );
+                    return new Object[] { new EncodedWritableHandle( writer.get(), writer ) };
+                }
+                case "rb":
+                {
+                    // Open the file for binary reading, then create a wrapper around the reader
+                    FileSystemWrapper<ReadableByteChannel> reader = this.fileSystem.openForRead( path, Function.identity() );
+                    return new Object[] { BinaryReadableHandle.of( reader.get(), reader ) };
+                }
+                case "wb":
+                {
+                    // Open the file for binary writing, then create a wrapper around the writer
+                    FileSystemWrapper<WritableByteChannel> writer = this.fileSystem.openForWrite( path, false, Function.identity() );
+                    return new Object[] { BinaryWritableHandle.of( writer.get(), writer ) };
+                }
+                case "ab":
+                {
+                    // Open the file for binary appending, then create a wrapper around the reader
+                    FileSystemWrapper<WritableByteChannel> writer = this.fileSystem.openForWrite( path, true, Function.identity() );
+                    return new Object[] { BinaryWritableHandle.of( writer.get(), writer ) };
+                }
+                default:
+                    throw new LuaException( "Unsupported mode" );
             }
-            case "w": {
+        }
-                // Open the file for writing, then create a wrapper around the writer
+        catch( FileSystemException e )
-                FileSystemWrapper<BufferedWriter> writer = this.fileSystem.openForWrite(path, false, EncodedWritableHandle::openUtf8);
+        {
-                return new Object[] {new EncodedWritableHandle(writer.get(), writer)};
-            }
-            case "a": {
-                // Open the file for appending, then create a wrapper around the writer
-                FileSystemWrapper<BufferedWriter> writer = this.fileSystem.openForWrite(path, true, EncodedWritableHandle::openUtf8);
-                return new Object[] {new EncodedWritableHandle(writer.get(), writer)};
-            }
-            case "rb": {
-                // Open the file for binary reading, then create a wrapper around the reader
-                FileSystemWrapper<ReadableByteChannel> reader = this.fileSystem.openForRead(path, Function.identity());
-                return new Object[] {BinaryReadableHandle.of(reader.get(), reader)};
-            }
-            case "wb": {
-                // Open the file for binary writing, then create a wrapper around the writer
-                FileSystemWrapper<WritableByteChannel> writer = this.fileSystem.openForWrite(path, false, Function.identity());
-                return new Object[] {BinaryWritableHandle.of(writer.get(), writer)};
-            }
-            case "ab": {
-                // Open the file for binary appending, then create a wrapper around the reader
-                FileSystemWrapper<WritableByteChannel> writer = this.fileSystem.openForWrite(path, true, Function.identity());
-                return new Object[] {BinaryWritableHandle.of(writer.get(), writer)};
-            }
-            default:
-                throw new LuaException("Unsupported mode");
-            }
-        } catch (FileSystemException e) {
             return new Object[] {
                 null,
                 e.getMessage()
@@ -326,11 +381,15 @@ public class FSAPI implements ILuaAPI {
      * @cc.treturn string The name of the drive that the file is on; e.g. {@code hdd} for local files, or {@code rom} for ROM files.
      */
     @LuaFunction
-    public final Object[] getDrive(String path) throws LuaException {
+    public final Object[] getDrive( String path ) throws LuaException
-        try {
+    {
-            return this.fileSystem.exists(path) ? new Object[] {this.fileSystem.getMountLabel(path)} : null;
+        try
-        } catch (FileSystemException e) {
+        {
-            throw new LuaException(e.getMessage());
+            return this.fileSystem.exists( path ) ? new Object[] { this.fileSystem.getMountLabel( path ) } : null;
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -343,12 +402,16 @@ public class FSAPI implements ILuaAPI {
      * @cc.treturn number|"unlimited" The amount of free space available, in bytes, or "unlimited".
      */
     @LuaFunction
-    public final Object getFreeSpace(String path) throws LuaException {
+    public final Object getFreeSpace( String path ) throws LuaException
-        try {
+    {
-            long freeSpace = this.fileSystem.getFreeSpace(path);
+        try
+        {
+            long freeSpace = this.fileSystem.getFreeSpace( path );
             return freeSpace >= 0 ? freeSpace : "unlimited";
-        } catch (FileSystemException e) {
+        }
-            throw new LuaException(e.getMessage());
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -363,12 +426,16 @@ public class FSAPI implements ILuaAPI {
      * @throws LuaException If the path doesn't exist.
      */
     @LuaFunction
-    public final String[] find(String path) throws LuaException {
+    public final String[] find( String path ) throws LuaException
-        try {
+    {
-            this.environment.addTrackingChange(TrackingField.FS_OPS);
+        try
-            return this.fileSystem.find(path);
+        {
-        } catch (FileSystemException e) {
+            this.environment.addTrackingChange( TrackingField.FS_OPS );
-            throw new LuaException(e.getMessage());
+            return this.fileSystem.find( path );
+        }
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -384,12 +451,16 @@ public class FSAPI implements ILuaAPI {
      * @cc.treturn number|nil This drive's capacity. This will be nil for "read-only" drives, such as the ROM or treasure disks.
      */
     @LuaFunction
-    public final Object getCapacity(String path) throws LuaException {
+    public final Object getCapacity( String path ) throws LuaException
-        try {
+    {
-            OptionalLong capacity = this.fileSystem.getCapacity(path);
+        try
+        {
+            OptionalLong capacity = this.fileSystem.getCapacity( path );
             return capacity.isPresent() ? capacity.getAsLong() : null;
-        } catch (FileSystemException e) {
+        }
-            throw new LuaException(e.getMessage());
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
@@ -410,9 +481,11 @@ public class FSAPI implements ILuaAPI {
      * @see #isDir If you only care whether a path is a directory or not.
      */
     @LuaFunction
-    public final Map<String, Object> attributes(String path) throws LuaException {
+    public final Map<String, Object> attributes( String path ) throws LuaException
-        try {
+    {
-            BasicFileAttributes attributes = this.fileSystem.getAttributes(path);
+        try
+        {
+            BasicFileAttributes attributes = this.fileSystem.getAttributes( path );
             Map<String, Object> result = new HashMap<>();
             result.put( "modification", getFileTime( attributes.lastModifiedTime() ) );
             result.put( "modified", getFileTime( attributes.lastModifiedTime() ) );
@@ -421,12 +494,15 @@ public class FSAPI implements ILuaAPI {
             result.put( "isDir", attributes.isDirectory() );
             result.put( "isReadOnly", fileSystem.isReadOnly( path ) );
             return result;
-        } catch (FileSystemException e) {
+        }
-            throw new LuaException(e.getMessage());
+        catch( FileSystemException e )
+        {
+            throw new LuaException( e.getMessage() );
         }
     }
 
-    private static long getFileTime(FileTime time) {
+    private static long getFileTime( FileTime time )
+    {
         return time == null ? 0 : time.toMillis();
     }
 }

src/main/java/dan200/computercraft/core/apis/FastLuaException.java

@@ -5,26 +5,30 @@
  */
 package dan200.computercraft.core.apis;
 
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.lua.LuaException;
 
+import javax.annotation.Nullable;
+
 /**
  * A Lua exception which does not contain its stack trace.
  */
-public class FastLuaException extends LuaException {
+public class FastLuaException extends LuaException
+{
     private static final long serialVersionUID = 5957864899303561143L;
 
-    public FastLuaException(@Nullable String message) {
+    public FastLuaException( @Nullable String message )
-        super(message);
+    {
+        super( message );
     }
 
-    public FastLuaException(@Nullable String message, int level) {
+    public FastLuaException( @Nullable String message, int level )
-        super(message, level);
+    {
+        super( message, level );
     }
 
     @Override
-    public synchronized Throwable fillInStackTrace() {
+    public synchronized Throwable fillInStackTrace()
+    {
         return this;
     }
 }

src/main/java/dan200/computercraft/core/apis/HTTPAPI.java

@@ -156,7 +156,7 @@ public class HTTPAPI implements ILuaAPI
     @LuaFunction
     public final Object[] websocket( String address, Optional<Map<?, ?>> headerTbl ) throws LuaException
     {
-        if( !ComputerCraft.httpWebsocketEnabled)
+        if( !ComputerCraft.httpWebsocketEnabled )
         {
             throw new LuaException( "Websocket connections are disabled" );
         }
@@ -205,4 +205,4 @@ public class HTTPAPI implements ILuaAPI
         }
         return headers;
     }
-}
+}

src/main/java/dan200/computercraft/core/apis/IAPIEnvironment.java

@@ -6,9 +6,6 @@
 
 package dan200.computercraft.core.apis;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IWorkMonitor;
 import dan200.computercraft.core.computer.ComputerSide;
@@ -17,7 +14,11 @@ import dan200.computercraft.core.filesystem.FileSystem;
 import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.tracking.TrackingField;
 
-public interface IAPIEnvironment {
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public interface IAPIEnvironment
+{
     String TIMER_EVENT = "timer";
 
     int getComputerID();
@@ -37,41 +38,43 @@ public interface IAPIEnvironment {
 
     void reboot();
 
-    void queueEvent(String event, Object... args);
+    void queueEvent( String event, Object... args );
 
-    void setOutput(ComputerSide side, int output);
+    void setOutput( ComputerSide side, int output );
 
-    int getOutput(ComputerSide side);
+    int getOutput( ComputerSide side );
 
-    int getInput(ComputerSide side);
+    int getInput( ComputerSide side );
 
-    void setBundledOutput(ComputerSide side, int output);
+    void setBundledOutput( ComputerSide side, int output );
 
-    int getBundledOutput(ComputerSide side);
+    int getBundledOutput( ComputerSide side );
 
-    int getBundledInput(ComputerSide side);
+    int getBundledInput( ComputerSide side );
 
-    void setPeripheralChangeListener(@Nullable IPeripheralChangeListener listener);
+    void setPeripheralChangeListener( @Nullable IPeripheralChangeListener listener );
 
     @Nullable
-    IPeripheral getPeripheral(ComputerSide side);
+    IPeripheral getPeripheral( ComputerSide side );
 
     String getLabel();
 
-    void setLabel(@Nullable String label);
+    void setLabel( @Nullable String label );
 
-    int startTimer(long ticks);
+    int startTimer( long ticks );
 
-    void cancelTimer(int id);
+    void cancelTimer( int id );
 
-    default void addTrackingChange(@Nonnull TrackingField field) {
+    default void addTrackingChange( @Nonnull TrackingField field )
-        this.addTrackingChange(field, 1);
+    {
+        this.addTrackingChange( field, 1 );
     }
 
-    void addTrackingChange(@Nonnull TrackingField field, long change);
+    void addTrackingChange( @Nonnull TrackingField field, long change );
 
     @FunctionalInterface
-    interface IPeripheralChangeListener {
+    interface IPeripheralChangeListener
-        void onPeripheralChanged(ComputerSide side, @Nullable IPeripheral newPeripheral);
+    {
+        void onPeripheralChanged( ComputerSide side, @Nullable IPeripheral newPeripheral );
     }
 }

src/main/java/dan200/computercraft/core/apis/LuaDateTime.java

@@ -6,276 +6,297 @@
 
 package dan200.computercraft.core.apis;
 
+import dan200.computercraft.api.lua.LuaException;
+
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.format.TextStyle;
-import java.time.temporal.ChronoField;
+import java.time.temporal.*;
-import java.time.temporal.IsoFields;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalField;
-import java.time.temporal.TemporalUnit;
-import java.time.temporal.ValueRange;
-import java.time.temporal.WeekFields;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.LongUnaryOperator;
 
-import dan200.computercraft.api.lua.LuaException;
+final class LuaDateTime
+{
+    private static final TemporalField CENTURY = map( ChronoField.YEAR, ValueRange.of( 0, 6 ), x -> (x / 100) % 100 );
+    private static final TemporalField ZERO_WEEK = map( WeekFields.SUNDAY_START.dayOfWeek(), ValueRange.of( 0, 6 ), x -> x - 1 );
 
-final class LuaDateTime {
+    private LuaDateTime()
-    private static final TemporalField CENTURY = map(ChronoField.YEAR, ValueRange.of(0, 6), x -> (x / 100) % 100);
+    {
-    private static final TemporalField ZERO_WEEK = map(WeekFields.SUNDAY_START.dayOfWeek(), ValueRange.of(0, 6), x -> x - 1);
-
-    private LuaDateTime() {
     }
 
-    static void format(DateTimeFormatterBuilder formatter, String format, ZoneOffset offset) throws LuaException {
+    static void format( DateTimeFormatterBuilder formatter, String format, ZoneOffset offset ) throws LuaException
-        for (int i = 0; i < format.length(); ) {
+    {
+        for( int i = 0; i < format.length(); )
+        {
             char c;
-            switch (c = format.charAt(i++)) {
+            switch( c = format.charAt( i++ ) )
-            case '\n':
+            {
-                formatter.appendLiteral('\n');
+                case '\n':
-                break;
+                    formatter.appendLiteral( '\n' );
-            default:
-                formatter.appendLiteral(c);
-                break;
-            case '%':
-                if (i >= format.length()) {
                     break;
-                }
-                switch (c = format.charAt(i++)) {
                 default:
-                    throw new LuaException("bad argument #1: invalid conversion specifier '%" + c + "'");
+                    formatter.appendLiteral( c );
-
+                    break;
                 case '%':
-                    formatter.appendLiteral('%');
+                    if( i >= format.length() )
-                    break;
+                    {
-                case 'a':
+                        break;
-                    formatter.appendText(ChronoField.DAY_OF_WEEK, TextStyle.SHORT);
+                    }
-                    break;
+                    switch( c = format.charAt( i++ ) )
-                case 'A':
+                    {
-                    formatter.appendText(ChronoField.DAY_OF_WEEK, TextStyle.FULL);
+                        default:
-                    break;
+                            throw new LuaException( "bad argument #1: invalid conversion specifier '%" + c + "'" );
-                case 'b':
+
-                case 'h':
+                        case '%':
-                    formatter.appendText(ChronoField.MONTH_OF_YEAR, TextStyle.SHORT);
+                            formatter.appendLiteral( '%' );
-                    break;
+                            break;
-                case 'B':
+                        case 'a':
-                    formatter.appendText(ChronoField.MONTH_OF_YEAR, TextStyle.FULL);
+                            formatter.appendText( ChronoField.DAY_OF_WEEK, TextStyle.SHORT );
-                    break;
+                            break;
-                case 'c':
+                        case 'A':
-                    format(formatter, "%a %b %e %H:%M:%S %Y", offset);
+                            formatter.appendText( ChronoField.DAY_OF_WEEK, TextStyle.FULL );
-                    break;
+                            break;
-                case 'C':
+                        case 'b':
-                    formatter.appendValueReduced(CENTURY, 2, 2, 0);
+                        case 'h':
-                    break;
+                            formatter.appendText( ChronoField.MONTH_OF_YEAR, TextStyle.SHORT );
-                case 'd':
+                            break;
-                    formatter.appendValue(ChronoField.DAY_OF_MONTH, 2);
+                        case 'B':
-                    break;
+                            formatter.appendText( ChronoField.MONTH_OF_YEAR, TextStyle.FULL );
-                case 'D':
+                            break;
-                case 'x':
+                        case 'c':
-                    format(formatter, "%m/%d/%y", offset);
+                            format( formatter, "%a %b %e %H:%M:%S %Y", offset );
-                    break;
+                            break;
-                case 'e':
+                        case 'C':
-                    formatter.padNext(2)
+                            formatter.appendValueReduced( CENTURY, 2, 2, 0 );
-                             .appendValue(ChronoField.DAY_OF_MONTH);
+                            break;
-                    break;
+                        case 'd':
-                case 'F':
+                            formatter.appendValue( ChronoField.DAY_OF_MONTH, 2 );
-                    format(formatter, "%Y-%m-%d", offset);
+                            break;
-                    break;
+                        case 'D':
-                case 'g':
+                        case 'x':
-                    formatter.appendValueReduced(IsoFields.WEEK_BASED_YEAR, 2, 2, 0);
+                            format( formatter, "%m/%d/%y", offset );
-                    break;
+                            break;
-                case 'G':
+                        case 'e':
-                    formatter.appendValue(IsoFields.WEEK_BASED_YEAR);
+                            formatter.padNext( 2 )
-                    break;
+                                .appendValue( ChronoField.DAY_OF_MONTH );
-                case 'H':
+                            break;
-                    formatter.appendValue(ChronoField.HOUR_OF_DAY, 2);
+                        case 'F':
-                    break;
+                            format( formatter, "%Y-%m-%d", offset );
-                case 'I':
+                            break;
-                    formatter.appendValue(ChronoField.HOUR_OF_AMPM);
+                        case 'g':
-                    break;
+                            formatter.appendValueReduced( IsoFields.WEEK_BASED_YEAR, 2, 2, 0 );
-                case 'j':
+                            break;
-                    formatter.appendValue(ChronoField.DAY_OF_YEAR, 3);
+                        case 'G':
-                    break;
+                            formatter.appendValue( IsoFields.WEEK_BASED_YEAR );
-                case 'm':
+                            break;
-                    formatter.appendValue(ChronoField.MONTH_OF_YEAR, 2);
+                        case 'H':
-                    break;
+                            formatter.appendValue( ChronoField.HOUR_OF_DAY, 2 );
-                case 'M':
+                            break;
-                    formatter.appendValue(ChronoField.MINUTE_OF_HOUR, 2);
+                        case 'I':
-                    break;
+                            formatter.appendValue( ChronoField.HOUR_OF_AMPM );
-                case 'n':
+                            break;
-                    formatter.appendLiteral('\n');
+                        case 'j':
-                    break;
+                            formatter.appendValue( ChronoField.DAY_OF_YEAR, 3 );
-                case 'p':
+                            break;
-                    formatter.appendText(ChronoField.AMPM_OF_DAY);
+                        case 'm':
-                    break;
+                            formatter.appendValue( ChronoField.MONTH_OF_YEAR, 2 );
-                case 'r':
+                            break;
-                    format(formatter, "%I:%M:%S %p", offset);
+                        case 'M':
-                    break;
+                            formatter.appendValue( ChronoField.MINUTE_OF_HOUR, 2 );
-                case 'R':
+                            break;
-                    format(formatter, "%H:%M", offset);
+                        case 'n':
-                    break;
+                            formatter.appendLiteral( '\n' );
-                case 'S':
+                            break;
-                    formatter.appendValue(ChronoField.SECOND_OF_MINUTE, 2);
+                        case 'p':
-                    break;
+                            formatter.appendText( ChronoField.AMPM_OF_DAY );
-                case 't':
+                            break;
-                    formatter.appendLiteral('\t');
+                        case 'r':
-                    break;
+                            format( formatter, "%I:%M:%S %p", offset );
-                case 'T':
+                            break;
-                case 'X':
+                        case 'R':
-                    format(formatter, "%H:%M:%S", offset);
+                            format( formatter, "%H:%M", offset );
-                    break;
+                            break;
-                case 'u':
+                        case 'S':
-                    formatter.appendValue(ChronoField.DAY_OF_WEEK);
+                            formatter.appendValue( ChronoField.SECOND_OF_MINUTE, 2 );
-                    break;
+                            break;
-                case 'U':
+                        case 't':
-                    formatter.appendValue(ChronoField.ALIGNED_WEEK_OF_YEAR, 2);
+                            formatter.appendLiteral( '\t' );
-                    break;
+                            break;
-                case 'V':
+                        case 'T':
-                    formatter.appendValue(IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2);
+                        case 'X':
-                    break;
+                            format( formatter, "%H:%M:%S", offset );
-                case 'w':
+                            break;
-                    formatter.appendValue(ZERO_WEEK);
+                        case 'u':
-                    break;
+                            formatter.appendValue( ChronoField.DAY_OF_WEEK );
-                case 'W':
+                            break;
-                    formatter.appendValue(WeekFields.ISO.weekOfYear(), 2);
+                        case 'U':
-                    break;
+                            formatter.appendValue( ChronoField.ALIGNED_WEEK_OF_YEAR, 2 );
-                case 'y':
+                            break;
-                    formatter.appendValueReduced(ChronoField.YEAR, 2, 2, 0);
+                        case 'V':
-                    break;
+                            formatter.appendValue( IsoFields.WEEK_OF_WEEK_BASED_YEAR, 2 );
-                case 'Y':
+                            break;
-                    formatter.appendValue(ChronoField.YEAR);
+                        case 'w':
-                    break;
+                            formatter.appendValue( ZERO_WEEK );
-                case 'z':
+                            break;
-                    formatter.appendOffset("+HHMM", "+0000");
+                        case 'W':
-                    break;
+                            formatter.appendValue( WeekFields.ISO.weekOfYear(), 2 );
-                case 'Z':
+                            break;
-                    formatter.appendChronologyId();
+                        case 'y':
-                    break;
+                            formatter.appendValueReduced( ChronoField.YEAR, 2, 2, 0 );
-                }
+                            break;
+                        case 'Y':
+                            formatter.appendValue( ChronoField.YEAR );
+                            break;
+                        case 'z':
+                            formatter.appendOffset( "+HHMM", "+0000" );
+                            break;
+                        case 'Z':
+                            formatter.appendChronologyId();
+                            break;
+                    }
             }
         }
     }
 
-    static long fromTable(Map<?, ?> table) throws LuaException {
+    static long fromTable( Map<?, ?> table ) throws LuaException
-        int year = getField(table, "year", -1);
+    {
-        int month = getField(table, "month", -1);
+        int year = getField( table, "year", -1 );
-        int day = getField(table, "day", -1);
+        int month = getField( table, "month", -1 );
-        int hour = getField(table, "hour", 12);
+        int day = getField( table, "day", -1 );
-        int minute = getField(table, "min", 12);
+        int hour = getField( table, "hour", 12 );
-        int second = getField(table, "sec", 12);
+        int minute = getField( table, "min", 12 );
-        LocalDateTime time = LocalDateTime.of(year, month, day, hour, minute, second);
+        int second = getField( table, "sec", 12 );
+        LocalDateTime time = LocalDateTime.of( year, month, day, hour, minute, second );
 
-        Boolean isDst = getBoolField(table, "isdst");
+        Boolean isDst = getBoolField( table, "isdst" );
-        if (isDst != null) {
+        if( isDst != null )
+        {
             boolean requireDst = isDst;
-            for (ZoneOffset possibleOffset : ZoneOffset.systemDefault()
+            for( ZoneOffset possibleOffset : ZoneOffset.systemDefault()
-                                                       .getRules()
+                .getRules()
-                                                       .getValidOffsets(time)) {
+                .getValidOffsets( time ) )
-                Instant instant = time.toInstant(possibleOffset);
+            {
-                if (possibleOffset.getRules()
+                Instant instant = time.toInstant( possibleOffset );
-                                  .getDaylightSavings(instant)
+                if( possibleOffset.getRules()
-                                  .isZero() == requireDst) {
+                    .getDaylightSavings( instant )
+                    .isZero() == requireDst )
+                {
                     return instant.getEpochSecond();
                 }
             }
         }
 
         ZoneOffset offset = ZoneOffset.systemDefault()
-                                      .getRules()
+            .getRules()
-                                      .getOffset(time);
+            .getOffset( time );
-        return time.toInstant(offset)
+        return time.toInstant( offset )
-                   .getEpochSecond();
+            .getEpochSecond();
     }
 
-    private static int getField(Map<?, ?> table, String field, int def) throws LuaException {
+    private static int getField( Map<?, ?> table, String field, int def ) throws LuaException
-        Object value = table.get(field);
+    {
-        if (value instanceof Number) {
+        Object value = table.get( field );
+        if( value instanceof Number )
+        {
             return ((Number) value).intValue();
         }
-        if (def < 0) {
+        if( def < 0 )
-            throw new LuaException("field \"" + field + "\" missing in date table");
+        {
+            throw new LuaException( "field \"" + field + "\" missing in date table" );
         }
         return def;
     }
 
-    private static Boolean getBoolField(Map<?, ?> table, String field) throws LuaException {
+    private static Boolean getBoolField( Map<?, ?> table, String field ) throws LuaException
-        Object value = table.get(field);
+    {
-        if (value instanceof Boolean || value == null) {
+        Object value = table.get( field );
+        if( value instanceof Boolean || value == null )
+        {
             return (Boolean) value;
         }
-        throw new LuaException("field \"" + field + "\" missing in date table");
+        throw new LuaException( "field \"" + field + "\" missing in date table" );
     }
 
-    static Map<String, ?> toTable(TemporalAccessor date, ZoneId offset, Instant instant) {
+    static Map<String, ?> toTable( TemporalAccessor date, ZoneId offset, Instant instant )
-        HashMap<String, Object> table = new HashMap<>(9);
+    {
-        table.put("year", date.getLong(ChronoField.YEAR));
+        HashMap<String, Object> table = new HashMap<>( 9 );
-        table.put("month", date.getLong(ChronoField.MONTH_OF_YEAR));
+        table.put( "year", date.getLong( ChronoField.YEAR ) );
-        table.put("day", date.getLong(ChronoField.DAY_OF_MONTH));
+        table.put( "month", date.getLong( ChronoField.MONTH_OF_YEAR ) );
-        table.put("hour", date.getLong(ChronoField.HOUR_OF_DAY));
+        table.put( "day", date.getLong( ChronoField.DAY_OF_MONTH ) );
-        table.put("min", date.getLong(ChronoField.MINUTE_OF_HOUR));
+        table.put( "hour", date.getLong( ChronoField.HOUR_OF_DAY ) );
-        table.put("sec", date.getLong(ChronoField.SECOND_OF_MINUTE));
+        table.put( "min", date.getLong( ChronoField.MINUTE_OF_HOUR ) );
-        table.put("wday", date.getLong(WeekFields.SUNDAY_START.dayOfWeek()));
+        table.put( "sec", date.getLong( ChronoField.SECOND_OF_MINUTE ) );
-        table.put("yday", date.getLong(ChronoField.DAY_OF_YEAR));
+        table.put( "wday", date.getLong( WeekFields.SUNDAY_START.dayOfWeek() ) );
-        table.put("isdst",
+        table.put( "yday", date.getLong( ChronoField.DAY_OF_YEAR ) );
-                  offset.getRules()
+        table.put( "isdst",
-                        .isDaylightSavings(instant));
+            offset.getRules()
+                .isDaylightSavings( instant ) );
         return table;
     }
 
-    private static TemporalField map(TemporalField field, ValueRange range, LongUnaryOperator convert) {
+    private static TemporalField map( TemporalField field, ValueRange range, LongUnaryOperator convert )
-        return new TemporalField() {
+    {
-            private final ValueRange range = ValueRange.of(0, 99);
+        return new TemporalField()
+        {
+            private final ValueRange range = ValueRange.of( 0, 99 );
 
             @Override
-            public TemporalUnit getBaseUnit() {
+            public TemporalUnit getBaseUnit()
+            {
                 return field.getBaseUnit();
             }
 
             @Override
-            public TemporalUnit getRangeUnit() {
+            public TemporalUnit getRangeUnit()
+            {
                 return field.getRangeUnit();
             }
 
             @Override
-            public ValueRange range() {
+            public ValueRange range()
+            {
                 return this.range;
             }
 
             @Override
-            public boolean isDateBased() {
+            public boolean isDateBased()
+            {
                 return field.isDateBased();
             }
 
             @Override
-            public boolean isTimeBased() {
+            public boolean isTimeBased()
+            {
                 return field.isTimeBased();
             }
 
             @Override
-            public boolean isSupportedBy(TemporalAccessor temporal) {
+            public boolean isSupportedBy( TemporalAccessor temporal )
-                return field.isSupportedBy(temporal);
+            {
+                return field.isSupportedBy( temporal );
             }
 
             @Override
-            public ValueRange rangeRefinedBy(TemporalAccessor temporal) {
+            public ValueRange rangeRefinedBy( TemporalAccessor temporal )
+            {
                 return this.range;
             }
 
             @Override
-            public long getFrom(TemporalAccessor temporal) {
+            public long getFrom( TemporalAccessor temporal )
-                return convert.applyAsLong(temporal.getLong(field));
+            {
+                return convert.applyAsLong( temporal.getLong( field ) );
             }
 
             @Override
-            @SuppressWarnings ("unchecked")
+            @SuppressWarnings( "unchecked" )
-            public <R extends Temporal> R adjustInto(R temporal, long newValue) {
+            public <R extends Temporal> R adjustInto( R temporal, long newValue )
-                return (R) temporal.with(field, newValue);
+            {
+                return (R) temporal.with( field, newValue );
             }
         };
     }

src/main/java/dan200/computercraft/core/apis/OSAPI.java

@@ -6,23 +6,6 @@
 
 package dan200.computercraft.core.apis;
 
-import static dan200.computercraft.api.lua.LuaValues.checkFinite;
-
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatterBuilder;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Optional;
-import java.util.TimeZone;
-
-import javax.annotation.Nonnull;
-
 import dan200.computercraft.api.lua.IArguments;
 import dan200.computercraft.api.lua.ILuaAPI;
 import dan200.computercraft.api.lua.LuaException;
@@ -31,12 +14,23 @@ import dan200.computercraft.shared.util.StringUtil;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 
+import javax.annotation.Nonnull;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatterBuilder;
+import java.util.*;
+
+import static dan200.computercraft.api.lua.LuaValues.checkFinite;
+
 /**
  * The {@link OSAPI} API allows interacting with the current computer.
  *
  * @cc.module os
  */
-public class OSAPI implements ILuaAPI {
+public class OSAPI implements ILuaAPI
+{
     private final IAPIEnvironment apiEnvironment;
 
     private final Int2ObjectMap<Alarm> m_alarms = new Int2ObjectOpenHashMap<>();
@@ -46,51 +40,60 @@ public class OSAPI implements ILuaAPI {
 
     private int m_nextAlarmToken = 0;
 
-    public OSAPI(IAPIEnvironment environment) {
+    public OSAPI( IAPIEnvironment environment )
+    {
         this.apiEnvironment = environment;
     }
 
     @Override
-    public String[] getNames() {
+    public String[] getNames()
-        return new String[] {"os"};
+    {
+        return new String[] { "os" };
     }
 
     @Override
-    public void startup() {
+    public void startup()
+    {
         this.m_time = this.apiEnvironment.getComputerEnvironment()
-                                         .getTimeOfDay();
+            .getTimeOfDay();
         this.m_day = this.apiEnvironment.getComputerEnvironment()
-                                        .getDay();
+            .getDay();
         this.m_clock = 0;
 
-        synchronized (this.m_alarms) {
+        synchronized( this.m_alarms )
+        {
             this.m_alarms.clear();
         }
     }
 
     @Override
-    public void update() {
+    public void update()
+    {
         this.m_clock++;
 
         // Wait for all of our alarms
-        synchronized (this.m_alarms) {
+        synchronized( this.m_alarms )
+        {
             double previousTime = this.m_time;
             int previousDay = this.m_day;
             double time = this.apiEnvironment.getComputerEnvironment()
-                                             .getTimeOfDay();
+                .getTimeOfDay();
             int day = this.apiEnvironment.getComputerEnvironment()
-                                         .getDay();
+                .getDay();
 
-            if (time > previousTime || day > previousDay) {
+            if( time > previousTime || day > previousDay )
+            {
                 double now = this.m_day * 24.0 + this.m_time;
                 Iterator<Int2ObjectMap.Entry<Alarm>> it = this.m_alarms.int2ObjectEntrySet()
-                                                                       .iterator();
+                    .iterator();
-                while (it.hasNext()) {
+                while( it.hasNext() )
+                {
                     Int2ObjectMap.Entry<Alarm> entry = it.next();
                     Alarm alarm = entry.getValue();
                     double t = alarm.m_day * 24.0 + alarm.m_time;
-                    if (now >= t) {
+                    if( now >= t )
-                        this.apiEnvironment.queueEvent("alarm", entry.getIntKey());
+                    {
+                        this.apiEnvironment.queueEvent( "alarm", entry.getIntKey() );
                         it.remove();
                     }
                 }
@@ -102,8 +105,10 @@ public class OSAPI implements ILuaAPI {
     }
 
     @Override
-    public void shutdown() {
+    public void shutdown()
-        synchronized (this.m_alarms) {
+    {
+        synchronized( this.m_alarms )
+        {
             this.m_alarms.clear();
         }
     }
@@ -118,10 +123,11 @@ public class OSAPI implements ILuaAPI {
      * @cc.see os.pullEvent To pull the event queued
      */
     @LuaFunction
-    public final void queueEvent(String name, IArguments args) {
+    public final void queueEvent( String name, IArguments args )
-        this.apiEnvironment.queueEvent(name,
+    {
-                                       args.drop(1)
+        this.apiEnvironment.queueEvent( name,
-                                      .getAll());
+            args.drop( 1 )
+                .getAll() );
     }
 
     /**
@@ -133,8 +139,9 @@ public class OSAPI implements ILuaAPI {
      * @throws LuaException If the time is below zero.
      */
     @LuaFunction
-    public final int startTimer(double timer) throws LuaException {
+    public final int startTimer( double timer ) throws LuaException
-        return this.apiEnvironment.startTimer(Math.round(checkFinite(0, timer) / 0.05));
+    {
+        return this.apiEnvironment.startTimer( Math.round( checkFinite( 0, timer ) / 0.05 ) );
     }
 
     /**
@@ -144,8 +151,9 @@ public class OSAPI implements ILuaAPI {
      * @see #startTimer To start a timer.
      */
     @LuaFunction
-    public final void cancelTimer(int token) {
+    public final void cancelTimer( int token )
-        this.apiEnvironment.cancelTimer(token);
+    {
+        this.apiEnvironment.cancelTimer( token );
     }
 
     /**
@@ -156,14 +164,17 @@ public class OSAPI implements ILuaAPI {
      * @throws LuaException If the time is out of range.
      */
     @LuaFunction
-    public final int setAlarm(double time) throws LuaException {
+    public final int setAlarm( double time ) throws LuaException
-        checkFinite(0, time);
+    {
-        if (time < 0.0 || time >= 24.0) {
+        checkFinite( 0, time );
-            throw new LuaException("Number out of range");
+        if( time < 0.0 || time >= 24.0 )
+        {
+            throw new LuaException( "Number out of range" );
         }
-        synchronized (this.m_alarms) {
+        synchronized( this.m_alarms )
+        {
             int day = time > this.m_time ? this.m_day : this.m_day + 1;
-            this.m_alarms.put(this.m_nextAlarmToken, new Alarm(time, day));
+            this.m_alarms.put( this.m_nextAlarmToken, new Alarm( time, day ) );
             return this.m_nextAlarmToken++;
         }
     }
@@ -175,25 +186,29 @@ public class OSAPI implements ILuaAPI {
      * @see #setAlarm To set an alarm.
      */
     @LuaFunction
-    public final void cancelAlarm(int token) {
+    public final void cancelAlarm( int token )
-        synchronized (this.m_alarms) {
+    {
-            this.m_alarms.remove(token);
+        synchronized( this.m_alarms )
+        {
+            this.m_alarms.remove( token );
         }
     }
 
     /**
      * Shuts down the computer immediately.
      */
-    @LuaFunction ("shutdown")
+    @LuaFunction( "shutdown" )
-    public final void doShutdown() {
+    public final void doShutdown()
+    {
         this.apiEnvironment.shutdown();
     }
 
     /**
      * Reboots the computer immediately.
      */
-    @LuaFunction ("reboot")
+    @LuaFunction( "reboot" )
-    public final void doReboot() {
+    public final void doReboot()
+    {
         this.apiEnvironment.reboot();
     }
 
@@ -202,11 +217,12 @@ public class OSAPI implements ILuaAPI {
      *
      * @return The ID of the computer.
      */
-    @LuaFunction ({
+    @LuaFunction( {
         "getComputerID",
         "computerID"
-    })
+    } )
-    public final int getComputerID() {
+    public final int getComputerID()
+    {
         return this.apiEnvironment.getComputerID();
     }
 
@@ -216,13 +232,14 @@ public class OSAPI implements ILuaAPI {
      * @return The label of the computer.
      * @cc.treturn string The label of the computer.
      */
-    @LuaFunction ({
+    @LuaFunction( {
         "getComputerLabel",
         "computerLabel"
-    })
+    } )
-    public final Object[] getComputerLabel() {
+    public final Object[] getComputerLabel()
+    {
         String label = this.apiEnvironment.getLabel();
-        return label == null ? null : new Object[] {label};
+        return label == null ? null : new Object[] { label };
     }
 
     /**
@@ -231,8 +248,9 @@ public class OSAPI implements ILuaAPI {
      * @param label The new label. May be {@code nil} in order to clear it.
      */
     @LuaFunction
-    public final void setComputerLabel(Optional<String> label) {
+    public final void setComputerLabel( Optional<String> label )
-        this.apiEnvironment.setLabel(StringUtil.normaliseLabel(label.orElse(null)));
+    {
+        this.apiEnvironment.setLabel( StringUtil.normaliseLabel( label.orElse( null ) ) );
     }
 
     /**
@@ -241,7 +259,8 @@ public class OSAPI implements ILuaAPI {
      * @return The computer's uptime.
      */
     @LuaFunction
-    public final double clock() {
+    public final double clock()
+    {
         return this.m_clock * 0.05;
     }
 
@@ -258,33 +277,37 @@ public class OSAPI implements ILuaAPI {
      * @return The hour of the selected locale, or a UNIX timestamp from the table, depending on the argument passed in.
      * @throws LuaException If an invalid locale is passed.
      * @cc.tparam [opt] string|table locale The locale of the time, or a table filled by {@code os.date("*t")} to decode. Defaults to {@code ingame}
-     *     locale if not specified.
+     * locale if not specified.
      * @see #date To get a date table that can be converted with this function.
      */
     @LuaFunction
-    public final Object time(IArguments args) throws LuaException {
+    public final Object time( IArguments args ) throws LuaException
-        Object value = args.get(0);
+    {
-        if (value instanceof Map) {
+        Object value = args.get( 0 );
-            return LuaDateTime.fromTable((Map<?, ?>) value);
+        if( value instanceof Map )
+        {
+            return LuaDateTime.fromTable( (Map<?, ?>) value );
         }
 
-        String param = args.optString(0, "ingame");
+        String param = args.optString( 0, "ingame" );
-        switch (param.toLowerCase(Locale.ROOT)) {
+        switch( param.toLowerCase( Locale.ROOT ) )
-        case "utc": // Get Hour of day (UTC)
+        {
-            return getTimeForCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+            case "utc": // Get Hour of day (UTC)
-        case "local": // Get Hour of day (local time)
+                return getTimeForCalendar( Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) ) );
-            return getTimeForCalendar(Calendar.getInstance());
+            case "local": // Get Hour of day (local time)
-        case "ingame": // Get in-game hour
+                return getTimeForCalendar( Calendar.getInstance() );
-            return this.m_time;
+            case "ingame": // Get in-game hour
-        default:
+                return this.m_time;
-            throw new LuaException("Unsupported operation");
+            default:
+                throw new LuaException( "Unsupported operation" );
         }
     }
 
-    private static float getTimeForCalendar(Calendar c) {
+    private static float getTimeForCalendar( Calendar c )
-        float time = c.get(Calendar.HOUR_OF_DAY);
+    {
-        time += c.get(Calendar.MINUTE) / 60.0f;
+        float time = c.get( Calendar.HOUR_OF_DAY );
-        time += c.get(Calendar.SECOND) / (60.0f * 60.0f);
+        time += c.get( Calendar.MINUTE ) / 60.0f;
+        time += c.get( Calendar.SECOND ) / (60.0f * 60.0f);
         return time;
     }
 
@@ -300,28 +323,32 @@ public class OSAPI implements ILuaAPI {
      * @throws LuaException If an invalid locale is passed.
      */
     @LuaFunction
-    public final int day(Optional<String> args) throws LuaException {
+    public final int day( Optional<String> args ) throws LuaException
-        switch (args.orElse("ingame")
+    {
-                    .toLowerCase(Locale.ROOT)) {
+        switch( args.orElse( "ingame" )
-        case "utc":     // Get numbers of days since 1970-01-01 (utc)
+            .toLowerCase( Locale.ROOT ) )
-            return getDayForCalendar(Calendar.getInstance(TimeZone.getTimeZone("UTC")));
+        {
-        case "local": // Get numbers of days since 1970-01-01 (local time)
+            case "utc":     // Get numbers of days since 1970-01-01 (utc)
-            return getDayForCalendar(Calendar.getInstance());
+                return getDayForCalendar( Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) ) );
-        case "ingame":// Get game day
+            case "local": // Get numbers of days since 1970-01-01 (local time)
-            return this.m_day;
+                return getDayForCalendar( Calendar.getInstance() );
-        default:
+            case "ingame":// Get game day
-            throw new LuaException("Unsupported operation");
+                return this.m_day;
+            default:
+                throw new LuaException( "Unsupported operation" );
         }
     }
 
-    private static int getDayForCalendar(Calendar c) {
+    private static int getDayForCalendar( Calendar c )
+    {
         GregorianCalendar g = c instanceof GregorianCalendar ? (GregorianCalendar) c : new GregorianCalendar();
-        int year = c.get(Calendar.YEAR);
+        int year = c.get( Calendar.YEAR );
         int day = 0;
-        for (int y = 1970; y < year; y++) {
+        for( int y = 1970; y < year; y++ )
-            day += g.isLeapYear(y) ? 366 : 365;
+        {
+            day += g.isLeapYear( y ) ? 366 : 365;
         }
-        day += c.get(Calendar.DAY_OF_YEAR);
+        day += c.get( Calendar.DAY_OF_YEAR );
         return day;
     }
 
@@ -337,32 +364,38 @@ public class OSAPI implements ILuaAPI {
      * @throws LuaException If an invalid locale is passed.
      */
     @LuaFunction
-    public final long epoch(Optional<String> args) throws LuaException {
+    public final long epoch( Optional<String> args ) throws LuaException
-        switch (args.orElse("ingame")
+    {
-                    .toLowerCase(Locale.ROOT)) {
+        switch( args.orElse( "ingame" )
-        case "utc": {
+            .toLowerCase( Locale.ROOT ) )
-            // Get utc epoch
+        {
-            Calendar c = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
+            case "utc":
-            return getEpochForCalendar(c);
+            {
-        }
+                // Get utc epoch
-        case "local": {
+                Calendar c = Calendar.getInstance( TimeZone.getTimeZone( "UTC" ) );
-            // Get local epoch
+                return getEpochForCalendar( c );
-            Calendar c = Calendar.getInstance();
-            return getEpochForCalendar(c);
-        }
-        case "ingame":
-            // Get in-game epoch
-            synchronized (this.m_alarms) {
-                return this.m_day * 86400000L + (long) (this.m_time * 3600000.0);
             }
-        default:
+            case "local":
-            throw new LuaException("Unsupported operation");
+            {
+                // Get local epoch
+                Calendar c = Calendar.getInstance();
+                return getEpochForCalendar( c );
+            }
+            case "ingame":
+                // Get in-game epoch
+                synchronized( this.m_alarms )
+                {
+                    return this.m_day * 86400000L + (long) (this.m_time * 3600000.0);
+                }
+            default:
+                throw new LuaException( "Unsupported operation" );
         }
     }
 
-    private static long getEpochForCalendar(Calendar c) {
+    private static long getEpochForCalendar( Calendar c )
+    {
         return c.getTime()
-                .getTime();
+            .getTime();
     }
 
     /**
@@ -376,54 +409,62 @@ public class OSAPI implements ILuaAPI {
      * UNIX timestamp (days since 1 January 1970) with {@link #date}.
      *
      * @param formatA The format of the string to return. This defaults to {@code %c}, which expands to a string similar to "Sat Dec 24 16:58:00 2011".
-     * @param timeA The time to convert to a string. This defaults to the current time.
+     * @param timeA   The time to convert to a string. This defaults to the current time.
      * @return The resulting format string.
      * @throws LuaException If an invalid format is passed.
      */
     @LuaFunction
-    public final Object date(Optional<String> formatA, Optional<Long> timeA) throws LuaException {
+    public final Object date( Optional<String> formatA, Optional<Long> timeA ) throws LuaException
-        String format = formatA.orElse("%c");
+    {
-        long time = timeA.orElseGet(() -> Instant.now()
+        String format = formatA.orElse( "%c" );
-                                                 .getEpochSecond());
+        long time = timeA.orElseGet( () -> Instant.now()
+            .getEpochSecond() );
 
-        Instant instant = Instant.ofEpochSecond(time);
+        Instant instant = Instant.ofEpochSecond( time );
         ZonedDateTime date;
         ZoneOffset offset;
-        if (format.startsWith("!")) {
+        if( format.startsWith( "!" ) )
+        {
             offset = ZoneOffset.UTC;
-            date = ZonedDateTime.ofInstant(instant, offset);
+            date = ZonedDateTime.ofInstant( instant, offset );
-            format = format.substring(1);
+            format = format.substring( 1 );
-        } else {
+        }
+        else
+        {
             ZoneId id = ZoneId.systemDefault();
             offset = id.getRules()
-                       .getOffset(instant);
+                .getOffset( instant );
-            date = ZonedDateTime.ofInstant(instant, id);
+            date = ZonedDateTime.ofInstant( instant, id );
         }
 
-        if (format.equals("*t")) {
+        if( format.equals( "*t" ) )
-            return LuaDateTime.toTable(date, offset, instant);
+        {
+            return LuaDateTime.toTable( date, offset, instant );
         }
 
         DateTimeFormatterBuilder formatter = new DateTimeFormatterBuilder();
-        LuaDateTime.format(formatter, format, offset);
+        LuaDateTime.format( formatter, format, offset );
-        return formatter.toFormatter(Locale.ROOT)
+        return formatter.toFormatter( Locale.ROOT )
-                        .format(date);
+            .format( date );
     }
 
-    private static class Alarm implements Comparable<Alarm> {
+    private static class Alarm implements Comparable<Alarm>
+    {
         final double m_time;
         final int m_day;
 
-        Alarm(double time, int day) {
+        Alarm( double time, int day )
+        {
             this.m_time = time;
             this.m_day = day;
         }
 
         @Override
-        public int compareTo(@Nonnull Alarm o) {
+        public int compareTo( @Nonnull Alarm o )
+        {
             double t = this.m_day * 24.0 + this.m_time;
             double ot = this.m_day * 24.0 + this.m_time;
-            return Double.compare(t, ot);
+            return Double.compare( t, ot );
         }
     }