Change gitpod button, move banner to the top

Linter fix and removing unnecessary this's

.editorconfig

@@ -10,6 +10,3 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
-
-[*.properties]
-insert_final_newline = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -12,4 +12,5 @@ labels: bug
 ## Useful information to include:
  - Minecraft version
  - CC: Restitched version
+ - Logs: These will be located in the `logs/` directory of your Minecraft instance. Please upload them as a gist or directly into this editor.
  - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.

.github/matchers/checkstyle.json

@@ -0,0 +1,17 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "checkstyle",
+            "pattern": [
+                {
+                    "regexp": "^([a-z]+) ([\\w./-]+):(\\d+):(\\d+): (.*)$",
+                    "severity": 1,
+                    "file": 2,
+                    "line": 3,
+                    "column": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

.github/matchers/illuaminate.json

@@ -0,0 +1,18 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "illuaminate",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^([\\w./-]+):\\[(\\d+):(\\d+)\\-(?:\\d+):(?:\\d+)\\]: (.*) \\[([a-z:-]+)\\]$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "message": 4,
+                    "code": 5
+                }
+            ]
+        }
+    ]
+}

.github/matchers/junit.json

@@ -0,0 +1,15 @@
+{
+    "problemMatcher": [
+        {
+            "owner": "junit",
+            "pattern": [
+                {
+                    "regexp": "^## ([\\w./-]+):(\\d+): (.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "message": 3
+                }
+            ]
+        }
+    ]
+}

.github/workflows/main-ci.yml

@@ -12,6 +12,7 @@ jobs:
     - name: Checkout submodules
       run: git submodule update --init --recursive
 
+
     - name: Set up Java 8
       uses: actions/setup-java@v1
       with:
@@ -25,11 +26,35 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
 
+    - name: Disable Gradle daemon
+      run: |
+        mkdir -p ~/.gradle
+        echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
+
     - name: Build with Gradle
-              run: ./gradlew build --no-daemon || ./gradlew build --no-daemon
+      run: |
+        ./gradlew assemble || ./gradlew assemble
+        ./gradlew build
 
     - name: Upload Jar
-              uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v2
       with:
-                  name: cc-restiched
+        name: cc-restitched
         path: build/libs
+
+    - name: Parse test reports
+      run: ./tools/parse-reports.py
+      if: ${{ failure() }}
+
+    - name: Cache pre-commit
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache/pre-commit
+        key: ${{ runner.os }}-pre-commit-${{ hashFiles('config/pre-commit/config.yml') }}
+        restore-keys: |
+          ${{ runner.os }}-pre-commit-
+
+    - name: Run linters
+      run: |
+        pip install pre-commit
+        pre-commit run --config config/pre-commit/config.yml --show-diff-on-failure --all --color=always

.gitpod.Dockerfile

@@ -0,0 +1,19 @@
+FROM gitpod/workspace-base
+
+USER gitpod
+
+# Install custom tools, runtime, etc. using apt-get
+# For example, the command below would install "bastet" - a command line tetris clone:
+#
+# RUN sudo apt-get -q update && \
+#     sudo apt-get install -yq bastet && \
+#     sudo rm -rf /var/lib/apt/lists/*
+#
+# More information: https://www.gitpod.io/docs/config-docker/
+
+# Install Java 8 and 16
+RUN sudo apt-get -q update && \
+    sudo apt install -yq openjdk-8-jdk openjdk-16-jdk
+
+# This is so that you can use java 8 until such a time as you switch to java 16
+RUN sudo update-java-alternatives --set java-1.8.0-openjdk-amd64

.gitpod.yml

@@ -0,0 +1,18 @@
+image:
+  file: .gitpod.Dockerfile
+
+ports:
+  - port: 25565
+    onOpen: notify
+
+vscode:
+  extensions:
+    - ms-azuretools.vscode-docker
+    - redhat.java
+    - richardwillis.vscode-gradle
+    - vscjava.vscode-java-debug
+    - vscode.github
+
+
+tasks:
+  - init: ./gradlew

.vscode/settings.json

@@ -1,3 +1,15 @@
 {
+	"files.exclude": {
+		// Default Java Dev
+        "**/.classpath": true,
+        "**/.project": true,
+        "**/.settings": true,
+        "**/.factorypath": true,
+
+		// Custom Hidden Files
+		"**/.bin": true,
+		"**/.editorconfig": true,
+    },
+
 	"java.configuration.updateBuildConfiguration": "automatic"
 }

README.md

@@ -1,14 +1,13 @@
-# CC:Restitched Patchwork
-# CC:R Version VS CC:T Version
-CC:R Strives to maintaim perfect pairity with CC:R, however in some cases this is not possible, or atleast, not yet, so just because you might be on CC:R 1.96.6, doesnt mean you are on CC:T 1.96.6. 
-
 <img src="logo.png" alt="CC: Restitched" width="100%"/>
 
-*it works and runs-ish*
+[![Current build status](https://github.com/Merith-TK/cc-restitched/workflows/Build/badge.svg)](https://github.com/Merith-TK/cc-restitched/actions "Current build status")
+[![Download CC: Restitched  on CurseForge](http://cf.way2muchnoise.eu/title/cc-restitched.svg)](https://www.curseforge.com/minecraft/mc-mods/cc-restitched-updated "Download CC: Restitched on CurseForge")
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/Merith-TK/cc-restitched)
 
-[![Current build status](https://github.com/Merith-TK/cc-restitched/workflows/Build/badge.svg)](https://github.com/Merith-TK/cc-restitched/actions "Current build status") [![Download CC: Restitched  on CurseForge](http://cf.way2muchnoise.eu/title/cc-restitched.svg)](https://www.curseforge.com/minecraft/mc-mods/cc-restitched-updated "Download CC: Restitched on CurseForge")
+# CC:R Version VS CC:T Version
+CC:R Strives to maintain perfect pairity with CC:T, however in some cases this is not possible, so CC:R might have a "newer" version than what CC:T has, these newer versions will be primarily bugfixes and the like because fabric is "weird" when porting a forge mod
 
-## What?
+## What is CC: Restiched
 This is an fork of [Zundrel/cc-tweaked-fabric](https://github.com/Zundrel/cc-tweaked-fabric) who's goal was to port [SquidDev-CC/CC-Tweaked](https://github.com/SquidDev-CC/CC-Tweaked) to the [Fabric](https://fabricmc.net/) modloader. I picked up maintaining the mod because the team working on Zundrel's fork, admitted they had gotten lethargic so I picked it up to make it equal with CC:T
 
 ## Resource Packs
@@ -17,13 +16,17 @@ This mod includes textures that are more in-line with the style of Mojang's new
 <img src="https://raw.githubusercontent.com/3prm3/cc-pack/main/pack.png" alt="CC: Restitched" width="16"  height="16"/> [3prm3/cc-pack](https://github.com/3prm3/cc-pack/)
 We also have a second resourcepack made by [3prm3](https://github.com/3prm3), it features a complete overhaul and can be enabled by enabling the `overhaul` resource pack, go check out his resource pack over here!
 
-## Major Tasks Planned
-* Rewrite the config system
-    * **Planned for 1.96.0 release**
-	* it currently sets the values that would normally be read from `config/computercraft.json` to the default values, because it does not read the file at all
-* Fixing `/computercraft` commands,
-    * No clue why they broken, they just are
-	
+# Conflicts
+Currently Iris and Canvas Shaders are Incompatible with this mod,
+ - Iris has transparent monitors, and when a computer displays something on the monitor, the face becomes black
+ - Canvas... uhm
+	- Computer Terminals are 100% unusable and scuffed
+		- <img src="https://user-images.githubusercontent.com/16393543/120464345-ab619b00-c351-11eb-9dfb-e68ddc93de5e.png">
+	- Monitors break with either rendering option
+		- TBO
+			- Just crashes on world load
+		- VBO
+			- <img src="https://user-images.githubusercontent.com/16393543/120475933-d999a780-c35e-11eb-9d94-ef4e5988ad5f.png">
 ## Contributing
 Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC:R there are a few rules
 1) Any updates that port commits from CC:T, ***MUST*** follow the format defined in [patchwork.md](patchwork.md) otherwise they will not be accepted,

build.gradle

@@ -1,6 +1,8 @@
 plugins {
-    id 'fabric-loom' version '0.6-SNAPSHOT'
+    id 'fabric-loom' version '0.7-SNAPSHOT'
     id 'maven-publish'
+    id "checkstyle"
+    id "com.github.hierynomus.license" version "0.15.0"
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -13,7 +15,8 @@ archivesBaseName = "cc-restiched"
 
 repositories {
     mavenCentral()
-    jcenter()
+    maven { url 'https://jitpack.io' }
+    maven { url "https://maven.shedaniel.me/" }
     maven {
         name "SquidDev"
         url "https://squiddev.cc/maven"
@@ -21,47 +24,35 @@ repositories {
 }
 
 configurations {
-    compile.extendsFrom shade
+    implementation.extendsFrom shade
 }
 
 dependencies {
+    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
+
     minecraft "com.mojang:minecraft:${mc_version}"
     mappings "net.fabricmc:yarn:${mc_version}+build.${mappings_version}:v2"
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
     modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
 
-    compile 'com.electronwill.night-config:json:3.6.0'
-
-    modImplementation "me.shedaniel.cloth:config-2:${cloth_config_version}"
+    modApi("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }
     modImplementation "io.github.prospector:modmenu:${modmenu_version}"
+    modImplementation "me.shedaniel.cloth.api:cloth-utils-v1:${cloth_api_version}"
 
-    modApi "me.shedaniel.cloth.api:cloth-utils-v1:${project.cloth_api_version}"
-    include "me.shedaniel.cloth.api:cloth-utils-v1:${project.cloth_api_version}"
-
-    implementation "blue.endless:jankson:${jankson_version}"
+    implementation 'com.electronwill.night-config:toml:3.6.3'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
 
-    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
-    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
-
-    include "me.shedaniel.cloth:config-2:${cloth_config_version}"
-    include "blue.endless:jankson:${jankson_version}"
-    include 'javax.vecmath:vecmath:1.5.2'
-
-    compile 'javax.vecmath:vecmath:1.5.2'
-
     shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
 
-    modRuntime "me.shedaniel:RoughlyEnoughItems-api:5.8.9"
-    modRuntime "me.shedaniel:RoughlyEnoughItems:5.8.9"
-}
+    include "me.shedaniel.cloth.api:cloth-utils-v1:${cloth_api_version}"
+    include 'com.electronwill.night-config:core:3.6.3'
+    include 'com.electronwill.night-config:toml:3.6.3'
+    include "me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}"
 
-sourceSets {
-    main {
-        java {
-            exclude 'dan200/computercraft/shared/integration'
-        }
-    }
+    modRuntime "me.shedaniel:RoughlyEnoughItems-api:5.12.248"
+    modRuntime "me.shedaniel:RoughlyEnoughItems:5.12.248"
 }
 
 processResources {
@@ -98,6 +89,49 @@ jar {
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
+
+import com.hierynomus.gradle.license.tasks.LicenseCheck
+import com.hierynomus.gradle.license.tasks.LicenseFormat
+
+license {
+    mapping("java", "SLASHSTAR_STYLE")
+    strictCheck true
+
+    ext.year = Calendar.getInstance().get(Calendar.YEAR)
+}
+
+[licenseMain, licenseFormatMain].forEach {
+    it.configure {
+        include("**/*.java")
+        exclude("dan200/computercraft/api/**")
+        header file('config/license/main.txt')
+    }
+}
+
+[licenseTest, licenseFormatTest].forEach {
+    it.configure {
+        include("**/*.java")
+        header file('config/license/main.txt')
+    }
+}
+
+gradle.projectsEvaluated {
+    tasks.withType(LicenseFormat) {
+        outputs.upToDateWhen { false }
+    }
+}
+
+
+task licenseAPI(type: LicenseCheck);
+task licenseFormatAPI(type: LicenseFormat);
+[licenseAPI, licenseFormatAPI].forEach {
+    it.configure {
+        source = sourceSets.main.java
+        include("dan200/computercraft/api/**")
+        header file('config/license/api.txt')
+    }
+}
+
 // configure the maven publication
 publishing {
     publications {

config/checkstyle/checkstyle.xml

@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
+<module name="Checker">
+    <property name="tabWidth" value="4"/>
+    <property name="charset" value="UTF-8" />
+
+    <module name="SuppressionFilter">
+	<property name="file" value="${config_loc}/suppressions.xml" />
+    </module>
+
+    <module name="BeforeExecutionExclusionFileFilter">
+        <property name="fileNamePattern" value="render_old"/>
+    </module>
+
+    <module name="TreeWalker">
+        <!-- Annotations -->
+        <module name="AnnotationLocation" />
+        <module name="AnnotationUseStyle" />
+        <module name="MissingDeprecated" />
+        <module name="MissingOverride" />
+
+        <!-- Blocks -->
+        <module name="EmptyBlock" />
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="ignored" />
+        </module>
+        <module name="LeftCurly">
+            <property name="option" value="nl" />
+            <!-- The defaults, minus lambdas. -->
+            <property name="tokens" value="ANNOTATION_DEF,CLASS_DEF,CTOR_DEF,ENUM_CONSTANT_DEF,ENUM_DEF,INTERFACE_DEF,LITERAL_CASE,LITERAL_CATCH,LITERAL_DEFAULT,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,METHOD_DEF,OBJBLOCK,STATIC_INIT" />
+        </module>
+        <module name="NeedBraces">
+            <property name="allowSingleLineStatement" value="true"/>
+        </module>
+        <module name="RightCurly">
+            <property name="option" value="alone" />
+        </module>
+
+        <!-- Class design. As if we've ever followed good practice here. -->
+        <module name="FinalClass" />
+        <module name="InterfaceIsType" />
+        <module name="MutableException" />
+        <module name="OneTopLevelClass" />
+
+        <!-- Coding -->
+        <module name="ArrayTrailingComma" />
+        <module name="EqualsHashCode" />
+        <!-- FallThrough does not handle unreachable code well -->
+        <module name="IllegalInstantiation" />
+        <module name="IllegalThrows" />
+        <module name="ModifiedControlVariable" />
+        <module name="NoClone" />
+        <module name="NoFinalizer" />
+        <module name="OneStatementPerLine" />
+        <module name="PackageDeclaration" />
+        <module name="SimplifyBooleanExpression" />
+        <module name="SimplifyBooleanReturn" />
+        <module name="StringLiteralEquality" />
+        <module name="UnnecessaryParentheses" />
+        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
+        <module name="UnnecessarySemicolonInTryWithResources" />
+        <module name="UnnecessarySemicolonInEnumeration" />
+
+        <!-- Imports -->
+        <module name="CustomImportOrder" />
+        <module name="IllegalImport" />
+        <module name="RedundantImport" />
+        <module name="UnusedImports" />
+
+        <!-- Javadoc -->
+        <!-- TODO: Missing* checks for the dan200.computercraft.api package? -->
+        <module name="AtclauseOrder" />
+        <module name="InvalidJavadocPosition" />
+        <module name="JavadocBlockTagLocation" />
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocStyle" />
+        <module name="NonEmptyAtclauseDescription" />
+        <module name="SingleLineJavadoc" />
+        <module name="SummaryJavadocCheck"/>
+
+        <!-- Misc -->
+        <module name="ArrayTypeStyle" />
+        <module name="CommentsIndentation" />
+        <module name="Indentation" />
+        <module name="OuterTypeFilename" />
+
+        <!-- Modifiers -->
+        <module name="ModifierOrder" />
+        <module name="RedundantModifier" />
+
+        <!-- Naming -->
+        <module name="ClassTypeParameterName" />
+        <module name="InterfaceTypeParameterName" />
+        <module name="LambdaParameterName" />
+        <module name="LocalFinalVariableName" />
+        <module name="LocalVariableName" />
+        <module name="MemberName" />
+        <module name="MethodName" />
+        <module name="MethodTypeParameterName" />
+        <module name="PackageName">
+            <property name="format" value="^dan200\.computercraft(\.[a-z][a-z0-9]*)*" />
+        </module>
+        <module name="ParameterName" />
+        <module name="StaticVariableName">
+            <property name="format" value="^[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
+            <property name="applyToPrivate" value="false" />
+        </module>
+        <module name="StaticVariableName">
+            <property name="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z_]+)?$" />
+            <property name="applyToPrivate" value="true" />
+        </module>
+        <module name="TypeName" />
+
+        <!-- Whitespace -->
+        <module name="EmptyForInitializerPad"/>
+        <module name="EmptyForIteratorPad">
+            <property name="option" value="space"/>
+        </module>
+        <module name="GenericWhitespace" />
+        <module name="MethodParamPad" />
+        <module name="NoLineWrap" />
+        <module name="NoWhitespaceAfter">
+            <property name="tokens" value="AT,INC,DEC,UNARY_MINUS,UNARY_PLUS,BNOT,LNOT,DOT,ARRAY_DECLARATOR,INDEX_OP" />
+        </module>
+        <module name="NoWhitespaceBefore" />
+        <!-- TODO: Decide on an OperatorWrap style. -->
+        <module name="ParenPad">
+            <property name="option" value="space" />
+            <property name="tokens" value="ANNOTATION,ANNOTATION_FIELD_DEF,CTOR_CALL,CTOR_DEF,ENUM_CONSTANT_DEF,LITERAL_CATCH,LITERAL_DO,LITERAL_FOR,LITERAL_IF,LITERAL_NEW,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_WHILE,METHOD_CALL,METHOD_DEF,RESOURCE_SPECIFICATION,SUPER_CTOR_CALL,LAMBDA" />
+        </module>
+        <module name="ParenPad">
+            <property name="option" value="nospace" />
+            <property name="tokens" value="DOT,EXPR,QUESTION" />
+        </module>
+        <module name="SeparatorWrap">
+            <property name="option" value="eol" />
+            <property name="tokens" value="COMMA,SEMI,ELLIPSIS,ARRAY_DECLARATOR,RBRACK,METHOD_REF" />
+        </module>
+        <module name="SeparatorWrap">
+            <property name="option" value="nl" />
+            <property name="tokens" value="DOT,AT" />
+        </module>
+        <module name="SingleSpaceSeparator" />
+        <module name="TypecastParenPad" />
+        <module name="WhitespaceAfter">
+            <property name="tokens" value="COMMA" />
+        </module>
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true" />
+            <property name="ignoreEnhancedForColon" value="false" />
+            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
+        </module>
+    </module>
+
+    <module name="FileTabCharacter" />
+    <module name="NewlineAtEndOfFile" />
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Trailing whitespace"/>
+    </module>
+</module>

config/checkstyle/suppressions.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <!-- All the config options and method fields. -->
+    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
+    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
+
+    <!-- The commands API is documented in Lua. -->
+    <suppress checks="SummaryJavadocCheck" files=".*[\\/]CommandAPI.java" />
+</suppressions>

config/idea/codeStyleSettings.xml

@@ -0,0 +1,61 @@
+<code_scheme name="Project" version="173">
+  <JSON>
+    <option name="OBJECT_WRAPPING" value="1" />
+    <option name="ARRAY_WRAPPING" value="1" />
+  </JSON>
+  <JavaCodeStyleSettings>
+    <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+      <value />
+    </option>
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+    <option name="JD_PRESERVE_LINE_FEEDS" value="true" />
+  </JavaCodeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_FIRST_COLUMN_COMMENT" value="false" />
+    <option name="BRACE_STYLE" value="2" />
+    <option name="CLASS_BRACE_STYLE" value="2" />
+    <option name="METHOD_BRACE_STYLE" value="2" />
+    <option name="LAMBDA_BRACE_STYLE" value="5" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="SPACE_WITHIN_METHOD_CALL_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_METHOD_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_IF_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_WHILE_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_FOR_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_TRY_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_CATCH_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_SWITCH_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_SYNCHRONIZED_PARENTHESES" value="true" />
+    <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+    <option name="SPACE_BEFORE_IF_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_WHILE_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_FOR_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_TRY_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_CATCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SWITCH_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_SYNCHRONIZED_PARENTHESES" value="false" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
+    <option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
+    <option name="IF_BRACE_FORCE" value="1" />
+    <option name="DOWHILE_BRACE_FORCE" value="1" />
+    <option name="WHILE_BRACE_FORCE" value="1" />
+    <option name="FOR_BRACE_FORCE" value="1" />
+    <option name="SPACE_WITHIN_ANNOTATION_PARENTHESES" value="true" />
+    <indentOptions>
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+  <codeStyleSettings language="JSON">
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+    <option name="SPACE_WITHIN_BRACKETS" value="true" />
+    <option name="SPACE_WITHIN_BRACES" value="true" />
+    <indentOptions>
+      <option name="INDENT_SIZE" value="4" />
+      <option name="CONTINUATION_INDENT_SIZE" value="4" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>

config/license/api.txt

@@ -0,0 +1,3 @@
+This file is part of the public ComputerCraft API - http://www.computercraft.info
+Copyright Daniel Ratcliffe, 2011-${year}. This API may be redistributed unmodified and in full only.
+For help using the API, and posting your mods, visit the forums at computercraft.info.

config/license/main.txt

@@ -0,0 +1,3 @@
+This file is part of ComputerCraft - http://www.computercraft.info
+Copyright Daniel Ratcliffe, 2011-${year}. Do not distribute without permission.
+Send enquiries to dratcliffe@gmail.com

config/pre-commit/config.yml

@@ -0,0 +1,49 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v3.2.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-merge-conflict
+
+  # Quick syntax checkers
+  - id: check-xml
+  - id: check-yaml
+  - id: check-toml
+  - id: check-json
+    exclude: "tsconfig\\.json$"
+
+- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
+  rev: 2.3.5
+  hooks:
+  - id: editorconfig-checker
+    args: ['-disable-indentation']
+    exclude: "^(.*\\.(bat)|LICENSE)$"
+
+- repo: local
+  hooks:
+  - id: checkstyle
+    name: Check Java codestyle
+    files: ".*\\.java$"
+    language: system
+    entry: ./gradlew checkstyleMain checkstyleTest
+    pass_filenames: false
+    require_serial: true
+  - id: license
+    name: Check Java license headers
+    files: ".*\\.java$"
+    language: system
+    entry: ./gradlew licenseFormat
+    pass_filenames: false
+    require_serial: true
+
+exclude: |
+  (?x)^(
+    src/generated|
+    src/test/resources/test-rom/data/json-parsing/|
+    src/test/server-files/|
+    config/idea/|
+    .vscode/
+  )

config/pre-commit/illuaminate-lint.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env sh
+set -e
+
+test -d bin || mkdir bin
+test -f bin/illuaminate || curl -s -obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
+chmod +x bin/illuaminate
+
+if [ -n ${GITHUB_ACTIONS+x} ]; then
+    # Register a problem matcher (see https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md)
+    # for illuaminate.
+    echo "::add-matcher::.github/matchers/illuaminate.json"
+    trap 'echo "::remove-matcher owner=illuaminate::"' EXIT
+fi
+
+./gradlew luaJavadoc
+bin/illuaminate lint

gradle.properties

@@ -2,16 +2,16 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Mod properties
-mod_version=1.96.0
+mod_version=1.96.1-rc1
 
 # Minecraft properties
 mc_version=1.16.5
 mappings_version=9
 
 # Dependencies
-cloth_config_version=4.8.1
+cloth_config_version=4.11.26
 fabric_loader_version=0.11.3
 fabric_api_version=0.32.0+1.16
 jankson_version=1.2.0
-modmenu_version=1.14.6+
+modmenu_version=1.16.9
 cloth_api_version=1.4.5

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Jul 07 13:15:43 EDT 2020
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

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

@@ -6,21 +6,9 @@
 
 package dan200.computercraft;
 
-import static dan200.computercraft.shared.ComputerCraftRegistry.ModBlocks;
-import static dan200.computercraft.shared.ComputerCraftRegistry.init;
-
-import java.nio.file.Paths;
-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;
-import dan200.computercraft.core.apis.http.websocket.Websocket;
 import dan200.computercraft.shared.common.ColourableRecipe;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
 import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
@@ -35,85 +23,96 @@ 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.Config;
 import dan200.computercraft.shared.util.ImpostorRecipe;
 import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
-import org.apache.logging.log4j.LogManager;
-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 options
-    public static final int terminalWidth_computer = 51;
-    public static final int terminalHeight_computer = 19;
-    public static final int terminalWidth_turtle = 39;
-    public static final int terminalHeight_turtle = 13;
-    public static final int terminalWidth_pocketComputer = 26;
-    public static final int terminalHeight_pocketComputer = 20;
-    // Registries
-    public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
-    public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
-    // Logging
-    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 boolean commandRequireCreative = false;
-    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
+
+    // Configuration fields
     public static int computerSpaceLimit = 1000 * 1000;
     public static int floppySpaceLimit = 125 * 1000;
     public static int maximumFilesOpen = 128;
-    public static boolean disable_lua51_features = false;
-    public static String default_computer_settings = "";
-    public static boolean debug_enable = true;
-    public static boolean logPeripheralErrors = false;
-    public static int computer_threads = 1;
+    public static boolean disableLua51Features = false;
+    public static String defaultComputerSettings = "";
+    public static boolean debugEnable = true;
+    public static boolean logComputerErrors = true;
+    public static boolean commandRequireCreative = true;
+
+    public static int computerThreads = 1;
     public static long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
     public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
-    public static boolean http_enable = true;
-    public static boolean http_websocket_enable = true;
-    public static int httpTimeout = 30000;
+
+    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( "*", null, Action.ALLOW.toPartial() )
+    ) );
     public static int httpMaxRequests = 16;
-    public static long httpMaxDownload = 16 * 1024 * 1024;
-    public static long httpMaxUpload = 4 * 1024 * 1024;
     public static int httpMaxWebsockets = 4;
-    public static int httpMaxWebsocketMessage = Websocket.MAX_MESSAGE_SIZE;
+
     public static boolean enableCommandBlock = false;
-    public static int modem_range = 64;
-    public static int modem_highAltitudeRange = 384;
-    public static int modem_rangeDuringStorm = 64;
-    public static int modem_highAltitudeRangeDuringStorm = 384;
+    public static int modemRange = 64;
+    public static int modemHighAltitudeRange = 384;
+    public static int modemRangeDuringStorm = 64;
+    public static int modemHighAltitudeRangeDuringStorm = 384;
     public static int maxNotesPerTick = 8;
+    public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
+    public static double monitorDistanceSq = 4096;
+    public static long monitorBandwidth = 1_000_000;
+
     public static boolean turtlesNeedFuel = true;
     public static int turtleFuelLimit = 20000;
     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 int computerTermWidth = 51;
+    public static int computerTermHeight = 19;
+
+    public static final int turtleTermWidth = 39;
+    public static final int turtleTermHeight = 13;
+
+    public static int pocketTermWidth = 26;
+    public static int pocketTermHeight = 20;
     public static int monitorWidth = 8;
     public static int monitorHeight = 6;
-    public static double monitorDistanceSq = 4096;
 
-    public static List<AddressRule> httpRules = Collections.unmodifiableList( Arrays.asList(
-        AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
-        AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
-    ) );
+    // Registries
+    public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
+    public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
+
+    // Logging
+    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 ) );
 
     @Override
-    public void onInitialize() {
-        Config.load(Paths.get(FabricLoader.getInstance()
-                                          .getConfigDir()
-                                          .toFile()
-                                          .getPath(), MOD_ID + ".json5"));
+    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, "computer_upgrade" ), ComputerUpgradeRecipe.SERIALIZER );
@@ -135,5 +134,4 @@ public final class ComputerCraft implements ModInitializer {
             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.MediaProviders;
-import dan200.computercraft.shared.Peripherals;
-import dan200.computercraft.shared.PocketUpgrades;
-import dan200.computercraft.shared.TurtleUpgrades;
+import dan200.computercraft.shared.*;
 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 {
+            try
+            {
                 return manager.getResource( new Identifier( domain, subPath ) )
                     .getInputStream();
-            } catch (IOException ignored) {
+            }
+            catch( IOException ignored )
+            {
                 return null;
             }
         }
@@ -78,11 +78,13 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
 
     @Nonnull
     @Override
-    public String getInstalledVersion() {
-        if (this.version != null) {
-            return this.version;
+    public String getInstalledVersion()
+    {
+        if( version != null )
+        {
+            return version;
         }
-        return this.version = FabricLoader.getInstance()
+        return version = FabricLoader.getInstance()
             .getModContainer( ComputerCraft.MOD_ID )
             .map( x -> x.getMetadata()
                 .getVersion()
@@ -91,23 +93,30 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
     }
 
     @Override
-    public int createUniqueNumberedSaveDir(@Nonnull World world, @Nonnull String parentSubPath) {
+    public int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
+    {
         return IDAssigner.getNextId( parentSubPath );
     }
 
     @Override
-    public IWritableMount createSaveDirMount(@Nonnull World world, @Nonnull String subPath, long capacity) {
-        try {
+    public IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
+    {
+        try
+        {
             return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
-        } catch (Exception e) {
+        }
+        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 );
             return mount.exists( "" ) ? mount : null;
@@ -116,32 +125,38 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI {
     }
 
     @Override
-    public void registerPeripheralProvider(@Nonnull IPeripheralProvider provider) {
+    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
+    {
         Peripherals.register( provider );
     }
 
     @Override
-    public void registerTurtleUpgrade(@Nonnull ITurtleUpgrade upgrade) {
+    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
+    {
         TurtleUpgrades.register( upgrade );
     }
 
     @Override
-    public void registerBundledRedstoneProvider(@Nonnull IBundledRedstoneProvider provider) {
+    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider 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 );
     }
 
     @Override
-    public void registerMediaProvider(@Nonnull IMediaProvider provider) {
+    public void registerMediaProvider( @Nonnull IMediaProvider provider )
+    {
         MediaProviders.register( provider );
     }
 
     @Override
-    public void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
         PocketUpgrades.register( upgrade );
     }
 
@@ -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 );
     }
 
     @Nonnull
     @Override
-    public IWiredNode createWiredNodeForElement(@Nonnull IWiredElement element) {
+    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement 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) {
+        if( tile instanceof TileCable )
+        {
             return ((TileCable) tile).getElement( side );
-        } else if (tile instanceof TileWiredModemFull) {
+        }
+        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,42 +21,52 @@ 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() {
-        if (instance != null) {
+    private static IComputerCraftAPI getInstance()
+    {
+        if( instance != null )
+        {
             return instance;
         }
 
-        try {
+        try
+        {
             return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
                 .getField( "INSTANCE" )
                 .get( null );
-        } catch (ReflectiveOperationException e) {
+        }
+        catch( ReflectiveOperationException e )
+        {
             throw new IllegalStateException( "Cannot find ComputerCraft API", e );
         }
     }
@@ -76,7 +83,8 @@ public final class ComputerCraftAPI {
      * 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 );
     }
 
@@ -99,7 +107,8 @@ 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 );
     }
 
@@ -122,7 +131,8 @@ 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 );
     }
 
@@ -133,7 +143,8 @@ 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 );
     }
 
@@ -155,7 +166,8 @@ 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 );
     }
 
@@ -165,7 +177,8 @@ 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 );
     }
 
@@ -179,7 +192,8 @@ public final class ComputerCraftAPI {
      * 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 );
     }
 
@@ -189,11 +203,13 @@ 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 );
     }
 
-    public static void registerPocketUpgrade(@Nonnull IPocketUpgrade upgrade) {
+    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
         getInstance().registerPocketUpgrade( upgrade );
     }
 
@@ -202,11 +218,13 @@ 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 );
     }
 
@@ -218,7 +236,8 @@ 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 );
     }
 
@@ -232,11 +251,13 @@ public final class ComputerCraftAPI {
      * @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 );
     }
 
-    public interface IComputerCraftAPI {
+    public interface IComputerCraftAPI
+    {
         @Nonnull
         String getInstalledVersion();
 

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,34 +17,39 @@ 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 net.fabricmc.api.Environment;
+import javax.annotation.Nonnull;
+import java.util.Objects;
 
 /**
  * A model to render, combined with a transformation matrix to apply.
  */
 @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 );
     }
 
-    public TransformedModel(@Nonnull BakedModel model) {
+    public TransformedModel( @Nonnull BakedModel model )
+    {
         this.model = Objects.requireNonNull( model );
-        this.matrix = AffineTransformation.identity();
+        matrix = AffineTransformation.identity();
     }
 
-    public static TransformedModel of(@Nonnull ModelIdentifier location) {
+    public static TransformedModel of( @Nonnull ModelIdentifier location )
+    {
         BakedModelManager modelManager = MinecraftClient.getInstance()
             .getBakedModelManager();
         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()
             .getModels()
@@ -56,28 +58,37 @@ public final class TransformedModel {
     }
 
     @Nonnull
-    public BakedModel getModel() {
-        return this.model;
+    public BakedModel getModel()
+    {
+        return model;
     }
 
     @Nonnull
-    public AffineTransformation getMatrix() {
-        return this.matrix;
+    public AffineTransformation getMatrix()
+    {
+        return matrix;
     }
 
-    public void push(MatrixStack matrixStack) {
+    public void push( MatrixStack matrixStack )
+    {
         matrixStack.push();
 
-        AffineTransformationAccess access = (AffineTransformationAccess) (Object) this.matrix;
+        AffineTransformationAccess access = (AffineTransformationAccess) (Object) matrix;
         if( access.getTranslation() != null )
+        {
             matrixStack.translate( access.getTranslation().getX(), access.getTranslation().getY(), access.getTranslation().getZ() );
+        }
 
-        matrixStack.multiply(this.matrix.getRotation2());
+        matrixStack.multiply( matrix.getRotation2() );
 
         if( access.getScale() != null )
+        {
             matrixStack.scale( access.getScale().getX(), access.getScale().getY(), access.getScale().getZ() );
+        }
 
         if( access.getRotation1() != null )
+        {
             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 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() {
-        return !this.isDirectory;
+    public boolean isRegularFile()
+    {
+        return !isDirectory;
     }
 
     @Override
-    public boolean isDirectory() {
-        return this.isDirectory;
+    public boolean isDirectory()
+    {
+        return isDirectory;
     }
 
     @Override
-    public boolean isSymbolicLink() {
+    public boolean isSymbolicLink()
+    {
         return false;
     }
 
     @Override
-    public boolean isOther() {
+    public boolean isOther()
+    {
         return false;
     }
 
     @Override
-    public long size() {
-        return this.size;
+    public long size()
+    {
+        return 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" ) );
         this.filename = filename;
     }
 
-    public FileOperationException(@Nonnull String message) {
+    public FileOperationException( @Nonnull String message )
+    {
         super( Objects.requireNonNull( message, "message cannot be null" ) );
-        this.filename = null;
+        filename = null;
     }
 
     @Nullable
-    public String getFilename() {
-        return this.filename;
+    public String getFilename()
+    {
+        return filename;
     }
 }

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

@@ -13,7 +13,8 @@ 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.
      *

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,7 +27,8 @@ 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.
      *
@@ -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 {
-        if (!this.exists(path)) {
+    default BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException
+    {
+        if( !exists( path ) )
+        {
             throw new FileOperationException( path, "No such file" );
         }
-        return new FileAttributes(this.isDirectory(path), this.getSize(path));
+        return new FileAttributes( isDirectory( path ), getSize( path ) );
     }
 
     /**

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,7 +28,8 @@ 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.
      *
@@ -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 javax.annotation.Nullable;
+import static dan200.computercraft.api.lua.LuaValues.checkFinite;
 
 /**
  * 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.
@@ -28,10 +28,12 @@ public interface IArguments {
      */
     IArguments drop( int count );
 
-    default Object[] getAll() {
-        Object[] result = new Object[this.count()];
-        for (int i = 0; i < result.length; i++) {
-            result[i] = this.get(i);
+    default Object[] getAll()
+    {
+        Object[] result = new Object[count()];
+        for( int i = 0; i < result.length; i++ )
+        {
+            result[i] = get( i );
         }
         return result;
     }
@@ -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 {
-        return (int) this.getLong(index);
+    default int getInt( int index ) throws LuaException
+    {
+        return (int) getLong( index );
     }
 
     /**
@@ -78,9 +81,11 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not a long.
      */
-    default long getLong(int index) throws LuaException {
-        Object value = this.get(index);
-        if (!(value instanceof Number)) {
+    default long getLong( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( !(value instanceof Number) )
+        {
             throw LuaValues.badArgumentOf( index, "number", value );
         }
         return LuaValues.checkFiniteNum( index, (Number) value )
@@ -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 {
-        return checkFinite(index, this.getDouble(index));
+    default double getFiniteDouble( int index ) throws LuaException
+    {
+        return checkFinite( index, getDouble( index ) );
     }
 
     /**
@@ -106,9 +112,11 @@ 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 {
-        Object value = this.get(index);
-        if (!(value instanceof Number)) {
+    default double getDouble( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( !(value instanceof Number) )
+        {
             throw LuaValues.badArgumentOf( index, "number", value );
         }
         return ((Number) value).doubleValue();
@@ -121,9 +129,11 @@ public interface IArguments {
      * @return The argument's value.
      * @throws LuaException If the value is not a boolean.
      */
-    default boolean getBoolean(int index) throws LuaException {
-        Object value = this.get(index);
-        if (!(value instanceof Boolean)) {
+    default boolean getBoolean( int index ) throws LuaException
+    {
+        Object value = get( index );
+        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 {
-        return LuaValues.encode(this.getString(index));
+    default ByteBuffer getBytes( int index ) throws LuaException
+    {
+        return LuaValues.encode( getString( index ) );
     }
 
     /**
@@ -149,9 +160,11 @@ public interface IArguments {
      * @throws LuaException If the value is not a string.
      */
     @Nonnull
-    default String getString(int index) throws LuaException {
-        Object value = this.get(index);
-        if (!(value instanceof String)) {
+    default String getString( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( !(value instanceof String) )
+        {
             throw LuaValues.badArgumentOf( index, "string", value );
         }
         return (String) value;
@@ -167,8 +180,9 @@ public interface IArguments {
      * @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 {
-        return LuaValues.checkEnum(index, klass, this.getString(index));
+    default <T extends Enum<T>> T getEnum( int index, Class<T> klass ) throws LuaException
+    {
+        return LuaValues.checkEnum( index, klass, getString( index ) );
     }
 
     /**
@@ -179,9 +193,11 @@ public interface IArguments {
      * @throws LuaException If the value is not a table.
      */
     @Nonnull
-    default Map<?, ?> getTable(int index) throws LuaException {
-        Object value = this.get(index);
-        if (!(value instanceof Map)) {
+    default Map<?, ?> getTable( int index ) throws LuaException
+    {
+        Object value = get( index );
+        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 {
-        return this.optString(index).map(LuaValues::encode);
+    default Optional<ByteBuffer> optBytes( int index ) throws LuaException
+    {
+        return optString( index ).map( LuaValues::encode );
     }
 
     /**
@@ -205,12 +222,15 @@ 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 {
-        Object value = this.get(index);
-        if (value == null) {
+    default Optional<String> optString( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof String)) {
+        if( !(value instanceof String) )
+        {
             throw LuaValues.badArgumentOf( index, "string", value );
         }
         return Optional.of( (String) value );
@@ -226,8 +246,9 @@ public interface IArguments {
      * @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 {
-        Optional<String> str = this.optString(index);
+    default <T extends Enum<T>> Optional<T> optEnum( int index, Class<T> klass ) throws LuaException
+    {
+        Optional<String> str = optString( index );
         return str.isPresent() ? Optional.of( LuaValues.checkEnum( index, klass, str.get() ) ) : Optional.empty();
     }
 
@@ -239,8 +260,9 @@ public interface IArguments {
      * @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 {
-        return this.optDouble(index).orElse(def);
+    default double optDouble( int index, double def ) throws LuaException
+    {
+        return optDouble( index ).orElse( def );
     }
 
     /**
@@ -251,12 +273,15 @@ public interface IArguments {
      * @throws LuaException If the value is not a number.
      */
     @Nonnull
-    default Optional<Double> optDouble(int index) throws LuaException {
-        Object value = this.get(index);
-        if (value == null) {
+    default Optional<Double> optDouble( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Number)) {
+        if( !(value instanceof Number) )
+        {
             throw LuaValues.badArgumentOf( index, "number", value );
         }
         return Optional.of( ((Number) value).doubleValue() );
@@ -270,8 +295,9 @@ public interface IArguments {
      * @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 {
-        return this.optInt(index).orElse(def);
+    default int optInt( int index, int def ) throws LuaException
+    {
+        return 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 {
-        return this.optLong(index).map(Long::intValue);
+    default Optional<Integer> optInt( int index ) throws LuaException
+    {
+        return optLong( index ).map( Long::intValue );
     }
 
     /**
@@ -293,12 +320,15 @@ 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 {
-        Object value = this.get(index);
-        if (value == null) {
+    default Optional<Long> optLong( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Number)) {
+        if( !(value instanceof Number) )
+        {
             throw LuaValues.badArgumentOf( index, "number", value );
         }
         return Optional.of( LuaValues.checkFiniteNum( index, (Number) value )
@@ -313,8 +343,9 @@ public interface IArguments {
      * @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 {
-        return this.optLong(index).orElse(def);
+    default long optLong( int index, long def ) throws LuaException
+    {
+        return optLong( index ).orElse( def );
     }
 
     /**
@@ -325,8 +356,9 @@ public interface IArguments {
      * @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 {
-        return this.optFiniteDouble(index).orElse(def);
+    default double optFiniteDouble( int index, double def ) throws LuaException
+    {
+        return optFiniteDouble( index ).orElse( def );
     }
 
     /**
@@ -336,9 +368,11 @@ 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 {
-        Optional<Double> value = this.optDouble(index);
-        if (value.isPresent()) {
+    default Optional<Double> optFiniteDouble( int index ) throws LuaException
+    {
+        Optional<Double> value = optDouble( index );
+        if( value.isPresent() )
+        {
             LuaValues.checkFiniteNum( index, value.get() );
         }
         return value;
@@ -352,8 +386,9 @@ public interface IArguments {
      * @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 {
-        return this.optBoolean(index).orElse(def);
+    default boolean optBoolean( int index, boolean def ) throws LuaException
+    {
+        return optBoolean( index ).orElse( def );
     }
 
     /**
@@ -363,12 +398,15 @@ 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 {
-        Object value = this.get(index);
-        if (value == null) {
+    default Optional<Boolean> optBoolean( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Boolean)) {
+        if( !(value instanceof Boolean) )
+        {
             throw LuaValues.badArgumentOf( index, "boolean", value );
         }
         return Optional.of( (Boolean) value );
@@ -382,8 +420,9 @@ public interface IArguments {
      * @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 {
-        return this.optString(index).orElse(def);
+    default String optString( int index, String def ) throws LuaException
+    {
+        return optString( index ).orElse( def );
     }
 
     /**
@@ -394,8 +433,9 @@ public interface IArguments {
      * @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 {
-        return this.optTable(index).orElse(def);
+    default Map<?, ?> optTable( int index, Map<Object, Object> def ) throws LuaException
+    {
+        return optTable( index ).orElse( def );
     }
 
     /**
@@ -405,12 +445,15 @@ 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 {
-        Object value = this.get(index);
-        if (value == null) {
+    default Optional<Map<?, ?>> optTable( int index ) throws LuaException
+    {
+        Object value = get( index );
+        if( value == null )
+        {
             return Optional.empty();
         }
-        if (!(value instanceof Map)) {
+        if( !(value instanceof Map) )
+        {
             throw LuaValues.badArgumentOf( index, "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.
      *

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.
      *

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.
      *

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.

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.

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

@@ -1,15 +1,15 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-
 package dan200.computercraft.api.lua;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public interface ILuaObject {
+public interface ILuaObject
+{
     @Nonnull
     String[] getMethodNames();
 

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

@@ -15,7 +15,8 @@ import javax.annotation.Nullable;
  * @see ILuaContext#issueMainThreadTask(ILuaTask)
  */
 @FunctionalInterface
-public interface ILuaTask {
+public interface ILuaTask
+{
     /**
      * Execute this task.
      *

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

@@ -11,20 +11,23 @@ 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 );
-        this.hasLevel = false;
-        this.level = 1;
+        hasLevel = false;
+        level = 1;
     }
 
-    public LuaException(@Nullable String message, int level) {
+    public LuaException( @Nullable String message, int level )
+    {
         super( message );
-        this.hasLevel = true;
+        hasLevel = true;
         this.level = level;
     }
 
@@ -33,8 +36,9 @@ public class LuaException extends Exception {
      *
      * @return Whether this has an explicit level.
      */
-    public boolean hasLevel() {
-        return this.hasLevel;
+    public boolean hasLevel()
+    {
+        return hasLevel;
     }
 
     /**
@@ -42,7 +46,8 @@ public class LuaException extends Exception {
      *
      * @return The level to raise the error at.
      */
-    public int getLevel() {
-        return this.level;
+    public int getLevel()
+    {
+        return 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.
  *
@@ -43,7 +39,8 @@ import dan200.computercraft.api.peripheral.IPeripheral;
 @Documented
 @Retention( RetentionPolicy.RUNTIME )
 @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 {
-    private LuaValues() {
+public final class LuaValues
+{
+    private LuaValues()
+    {
     }
 
     /**
@@ -28,9 +29,11 @@ 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 );
             chars[i] = c < 256 ? (byte) c : 63;
         }
@@ -48,7 +51,8 @@ public final class LuaValues {
      * @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 ) );
     }
 
@@ -61,7 +65,8 @@ public final class LuaValues {
      * @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 + ")" );
     }
 
@@ -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) {
-        if (value == null) {
+    public static String getType( @Nullable Object value )
+    {
+        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,7 +110,8 @@ 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() );
         return value;
     }
@@ -112,8 +124,10 @@ 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 {
-        if (!Double.isFinite(value)) {
+    public static double checkFinite( int index, double value ) throws LuaException
+    {
+        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) {
-        if (Double.isNaN(value)) {
+    public static String getNumericType( double 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";
@@ -150,10 +168,13 @@ public final class LuaValues {
      * @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 {
-        for (T possibility : klass.getEnumConstants()) {
+    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()
-                           .equalsIgnoreCase(value)) {
+                .equalsIgnoreCase( value ) )
+            {
                 return possibility;
             }
         }

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

@@ -6,37 +6,39 @@
 
 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 final Object[] result;
     private final ILuaCallback callback;
     private final int adjust;
 
-    private MethodResult(Object[] arguments, ILuaCallback callback) {
-        this.result = arguments;
+    private MethodResult( Object[] arguments, ILuaCallback callback )
+    {
+        result = arguments;
         this.callback = callback;
-        this.adjust = 0;
+        adjust = 0;
     }
 
-    private MethodResult(Object[] arguments, ILuaCallback callback, int adjust) {
-        this.result = arguments;
+    private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
+    {
+        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,7 +67,8 @@ 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 );
     }
 
@@ -75,7 +79,8 @@ 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 );
     }
 
@@ -89,10 +94,12 @@ public final class MethodResult {
      * @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 -> {
-            if (results.length >= 1 && results[0].equals("terminate")) {
+            if( results.length >= 1 && results[0].equals( "terminate" ) )
+            {
                 throw new LuaException( "Terminated", 0 );
             }
             return callback.resume( results );
@@ -109,7 +116,8 @@ public final class MethodResult {
      * @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 );
     }
@@ -124,23 +132,27 @@ public final class MethodResult {
      * @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 );
     }
 
     @Nullable
-    public Object[] getResult() {
-        return this.result;
+    public Object[] getResult()
+    {
+        return result;
     }
 
     @Nullable
-    public ILuaCallback getCallback() {
-        return this.callback;
+    public ILuaCallback getCallback()
+    {
+        return callback;
     }
 
-    public int getErrorAdjust() {
-        return this.adjust;
+    public int getErrorAdjust()
+    {
+        return 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) {
-        if (adjust < 0) {
+    public MethodResult adjustError( int adjust )
+    {
+        if( adjust < 0 )
+        {
             throw new IllegalArgumentException( "cannot adjust by a negative amount" );
         }
-        if (adjust == 0 || this.callback == null) {
+        if( adjust == 0 || callback == null )
+        {
             return this;
         }
-        return new MethodResult(this.result, this.callback, this.adjust + adjust);
+        return new MethodResult( result, 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" )
-    public ObjectArguments(IArguments arguments) {
+    public ObjectArguments( IArguments arguments )
+    {
         throw new IllegalStateException();
     }
 
-    public ObjectArguments(Object... args) {
+    public ObjectArguments( Object... args )
+    {
         this.args = Arrays.asList( args );
     }
 
-    public ObjectArguments(List<Object> args) {
+    public ObjectArguments( List<Object> args )
+    {
         this.args = Objects.requireNonNull( args );
     }
 
     @Override
-    public IArguments drop(int count) {
-        if (count < 0) {
+    public IArguments drop( int count )
+    {
+        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 >= args.size() )
+        {
             return EMPTY;
         }
 
-        return new ObjectArguments(this.args.subList(count, this.args.size()));
+        return new ObjectArguments( args.subList( count, args.size() ) );
     }
 
     @Override
-    public Object[] getAll() {
-        return this.args.toArray();
+    public Object[] getAll()
+    {
+        return args.toArray();
     }
 
     @Override
-    public int count() {
-        return this.args.size();
+    public int count()
+    {
+        return args.size();
     }
 
     @Nullable
     @Override
-    public Object get(int index) {
-        return index >= this.args.size() ? null : this.args.get(index);
+    public Object get( int index )
+    {
+        return index >= args.size() ? null : 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.
      *
@@ -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;
     }
 
@@ -78,7 +81,8 @@ public interface IMedia {
      * @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.
      *

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

@@ -14,7 +14,8 @@ import javax.annotation.Nonnull;
  * @see Packet
  * @see IPacketReceiver
  */
-public interface IPacketNetwork {
+public interface IPacketNetwork
+{
     /**
      * Add a receiver to the network.
      *

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.
      *

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;
@@ -36,7 +36,8 @@ public class Packet {
      *                     call.
      * @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" );
 
         this.channel = channel;
@@ -50,8 +51,9 @@ public class Packet {
      *
      * @return This packet's channel.
      */
-    public int getChannel() {
-        return this.channel;
+    public int getChannel()
+    {
+        return channel;
     }
 
     /**
@@ -59,8 +61,9 @@ public class Packet {
      *
      * @return This channel to reply on.
      */
-    public int getReplyChannel() {
-        return this.replyChannel;
+    public int getReplyChannel()
+    {
+        return replyChannel;
     }
 
     /**
@@ -69,8 +72,9 @@ public class Packet {
      * @return The packet's payload
      */
     @Nullable
-    public Object getPayload() {
-        return this.payload;
+    public Object getPayload()
+    {
+        return payload;
     }
 
     /**
@@ -79,40 +83,48 @@ public class Packet {
      * @return The sending object.
      */
     @Nonnull
-    public IPacketSender getSender() {
-        return this.sender;
+    public IPacketSender getSender()
+    {
+        return sender;
     }
 
     @Override
-    public int hashCode() {
+    public int hashCode()
+    {
         int result;
-        result = this.channel;
-        result = 31 * result + this.replyChannel;
-        result = 31 * result + (this.payload != null ? this.payload.hashCode() : 0);
-        result = 31 * result + this.sender.hashCode();
+        result = channel;
+        result = 31 * result + replyChannel;
+        result = 31 * result + (payload != null ? payload.hashCode() : 0);
+        result = 31 * result + sender.hashCode();
         return result;
     }
 
     @Override
-    public boolean equals(Object o) {
-        if (this == o) {
+    public boolean equals( Object o )
+    {
+        if( this == o )
+        {
             return true;
         }
-        if (o == null || this.getClass() != o.getClass()) {
+        if( o == null || getClass() != o.getClass() )
+        {
             return false;
         }
 
         Packet packet = (Packet) o;
 
-        if (this.channel != packet.channel) {
+        if( channel != packet.channel )
+        {
             return false;
         }
-        if (this.replyChannel != packet.replyChannel) {
+        if( replyChannel != packet.replyChannel )
+        {
             return false;
         }
-        if (!Objects.equals(this.payload, packet.payload)) {
+        if( !Objects.equals( payload, packet.payload ) )
+        {
             return false;
         }
-        return this.sender.equals(packet.sender);
+        return 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 dan200.computercraft.api.peripheral.IPeripheral;
+import java.util.Map;
 
 /**
  * A wired network is composed of one of more {@link IWiredNode}s, a set of connections between them, and a series of peripherals.
@@ -24,7 +23,8 @@ import dan200.computercraft.api.peripheral.IPeripheral;
  *
  * @see IWiredNode#getNetwork()
  */
-public interface IWiredNetwork {
+public interface IWiredNetwork
+{
     /**
      * Create a connection between two nodes.
      *

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 dan200.computercraft.api.peripheral.IPeripheral;
+import java.util.Map;
 
 /**
  * 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) {
-        return this.getNetwork().connect(this, node);
+    default boolean connectTo( @Nonnull IWiredNode node )
+    {
+        return 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) {
-        return this.getNetwork().disconnect(this, node);
+    default boolean disconnectFrom( @Nonnull IWiredNode node )
+    {
+        return 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() {
-        return this.getNetwork().remove(this);
+    default boolean remove()
+    {
+        return 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) {
-        this.getNetwork().updatePeripherals(this, peripherals);
+    default void updatePeripherals( @Nonnull Map<String, IPeripheral> peripherals )
+    {
+        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,14 +13,18 @@ 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.
      *
@@ -42,8 +41,9 @@ public interface IComputerAccess {
      * @see IMount
      */
     @Nullable
-    default String mount(@Nonnull String desiredLocation, @Nonnull IMount mount) {
-        return this.mount(desiredLocation, mount, this.getAttachmentName());
+    default String mount( @Nonnull String desiredLocation, @Nonnull IMount mount )
+    {
+        return mount( desiredLocation, mount, getAttachmentName() );
     }
 
     /**
@@ -91,8 +91,9 @@ public interface IComputerAccess {
      * @see IMount
      */
     @Nullable
-    default String mountWritable(@Nonnull String desiredLocation, @Nonnull IWritableMount mount) {
-        return this.mountWritable(desiredLocation, mount, this.getAttachmentName());
+    default String mountWritable( @Nonnull String desiredLocation, @Nonnull IWritableMount mount )
+    {
+        return mountWritable( desiredLocation, mount, getAttachmentName() );
     }
 
     /**

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 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;
+import javax.annotation.Nonnull;
 
 /**
  * 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.

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

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,7 +22,8 @@ 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.
      *

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

@@ -1,24 +1,24 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
  * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-
 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}.
      *

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()) {
+        if( !canWork() )
+        {
             return false;
         }
 
         long start = System.nanoTime();
-        try {
+        try
+        {
             runnable.run();
-        } finally {
-            this.trackWork(System.nanoTime() - start, TimeUnit.NANOSECONDS);
+        }
+        finally
+        {
+            trackWork( System.nanoTime() - start, TimeUnit.NANOSECONDS );
         }
 
         return true;

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" );
     }
 
-    public NotAttachedException(String s) {
+    public NotAttachedException( String 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 );
     }
 
-    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);
+        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() {
-        return this.id;
+    public final Identifier getUpgradeID()
+    {
+        return id;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective() {
-        return this.adjective;
+    public final String getUnlocalisedAdjective()
+    {
+        return adjective;
     }
 
     @Nonnull
     @Override
-    public final ItemStack getCraftingItem() {
-        return this.stack;
+    public final ItemStack getCraftingItem()
+    {
+        return 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.
      *

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.
  *
@@ -42,7 +41,8 @@ public interface IPocketUpgrade extends IUpgradeBase
      * @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 )
+    {
     }
 
     /**
@@ -55,7 +55,8 @@ public interface IPocketUpgrade extends IUpgradeBase
      * 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,19 +6,20 @@
 
 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.
      *

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 ) );
     }
 
-    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 ) );
     }
 
-    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 );
     }
 
 
     @Nonnull
     @Override
-    public final Identifier getUpgradeID() {
-        return this.id;
+    public final Identifier getUpgradeID()
+    {
+        return id;
     }
 
     @Nonnull
     @Override
-    public final String getUnlocalisedAdjective() {
-        return this.adjective;
+    public final String getUnlocalisedAdjective()
+    {
+        return adjective;
     }
 
     @Nonnull
     @Override
-    public final TurtleUpgradeType getType() {
-        return this.type;
+    public final TurtleUpgradeType getType()
+    {
+        return type;
     }
 
     @Nonnull
     @Override
-    public final ItemStack getCraftingItem() {
-        return this.stack;
+    public final ItemStack getCraftingItem()
+    {
+        return stack;
     }
 }

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

@@ -1,23 +1,14 @@
 /*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
+ * This file is part of the public ComputerCraft API - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
  */
-
 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;
@@ -27,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.MessageType;
-import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
-import net.minecraft.network.Packet;
+import net.minecraft.network.*;
 import net.minecraft.network.packet.c2s.play.RequestCommandCompletionsC2SPacket;
 import net.minecraft.network.packet.c2s.play.VehicleMoveC2SPacket;
 import net.minecraft.recipe.Recipe;
@@ -51,217 +38,319 @@ 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 FakePlayer(ServerWorld world, GameProfile gameProfile) {
+public class FakePlayer extends ServerPlayerEntity
+{
+    public FakePlayer( ServerWorld world, GameProfile gameProfile )
+    {
         super( world.getServer(), world, gameProfile, new ServerPlayerInteractionManager( world ) );
-        this.networkHandler = new FakeNetHandler(this);
+        networkHandler = new FakeNetHandler( this );
     }
 
     // region Direct networkHandler access
     @Override
-    public void enterCombat() { }
+    public void enterCombat()
+    {
+    }
 
     @Override
-    public void endCombat() { }
+    public void endCombat()
+    {
+    }
 
     @Override
-    public void tick() { }
+    public void tick()
+    {
+    }
 
     @Override
-    public void playerTick() { }
+    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;
     }
 
     @Override
-    public void stopRiding() { }
+    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() { }
+    public void closeHandledScreen()
+    {
+    }
 
     @Override
-    public void updateCursorStack() { }
+    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() { }
+    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 {
-        FakeNetHandler(ServerPlayerEntity player) {
+    private static class FakeNetHandler extends ServerPlayNetworkHandler
+    {
+        FakeNetHandler( ServerPlayerEntity player )
+        {
             super( player.server, new FakeConnection(), player );
         }
 
         @Override
-        public void disconnect(Text message) { }
-
-        @Override
-        public void onVehicleMove(VehicleMoveC2SPacket move) { }
-
-        @Override
-        public void onRequestCommandCompletions(RequestCommandCompletionsC2SPacket packet) { }
-
-        @Override
-        public void sendPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener) { }
+        public void disconnect( Text message )
+        {
         }
 
-    private static class FakeConnection extends ClientConnection {
-        FakeConnection() {
+        @Override
+        public void onVehicleMove( VehicleMoveC2SPacket move )
+        {
+        }
+
+        @Override
+        public void onRequestCommandCompletions( RequestCommandCompletionsC2SPacket packet )
+        {
+        }
+
+        @Override
+        public void sendPacket( Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> listener )
+        {
+        }
+    }
+
+    private static class FakeConnection extends ClientConnection
+    {
+        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 );
         }
 
         @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.
      *
@@ -265,8 +265,9 @@ public interface ITurtleAccess {
      */
     void updateUpgradeNBTData( @Nonnull TurtleSide side );
 
-    default ItemStorage getItemHandler() {
-        return ItemStorage.wrap(this.getInventory());
+    default ItemStorage getItemHandler()
+    {
+        return ItemStorage.wrap( 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.
      *

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.
@@ -46,7 +44,8 @@ public interface ITurtleUpgrade extends IUpgradeBase
      * @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;
     }
 
@@ -63,7 +62,8 @@ public interface ITurtleUpgrade extends IUpgradeBase
      * 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();
     }
 
@@ -84,6 +84,7 @@ public interface ITurtleUpgrade extends IUpgradeBase
      * @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.
      */
-    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 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,8 +48,10 @@ public final class TurtleCommandResult {
      * @return A successful command result with the given values.
      */
     @Nonnull
-    public static TurtleCommandResult success(@Nullable Object[] results) {
-        if (results == null || results.length == 0) {
+    public static TurtleCommandResult success( @Nullable Object[] results )
+    {
+        if( results == null || results.length == 0 )
+        {
             return EMPTY_SUCCESS;
         }
         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,8 +75,10 @@ public final class TurtleCommandResult {
      * @return A failed command result with a message.
      */
     @Nonnull
-    public static TurtleCommandResult failure(@Nullable String errorMessage) {
-        if (errorMessage == null) {
+    public static TurtleCommandResult failure( @Nullable String errorMessage )
+    {
+        if( errorMessage == null )
+        {
             return EMPTY_FAILURE;
         }
         return new TurtleCommandResult( false, errorMessage, null );
@@ -81,8 +89,9 @@ public final class TurtleCommandResult {
      *
      * @return If the command was successful.
      */
-    public boolean isSuccess() {
-        return this.success;
+    public boolean isSuccess()
+    {
+        return success;
     }
 
     /**
@@ -91,8 +100,9 @@ public final class TurtleCommandResult {
      * @return The command's error message, or {@code null} if it was a success.
      */
     @Nullable
-    public String getErrorMessage() {
-        return this.errorMessage;
+    public String getErrorMessage()
+    {
+        return 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() {
-        return this.results;
+    public Object[] getResults()
+    {
+        return 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,31 +6,33 @@
 
 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 dan200.computercraft.api.turtle.ITurtleAccess;
-import dan200.computercraft.api.turtle.TurtleCommandResult;
+import java.util.Objects;
 
 /**
  * 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 );
 
         Objects.requireNonNull( action, "action cannot be null" );
         this.action = action;
     }
 
-    public TurtleAction getAction() {
-        return this.action;
+    public TurtleAction getAction()
+    {
+        return action;
     }
 
     /**
@@ -43,8 +45,9 @@ public class TurtleActionEvent extends TurtleEvent {
      * @deprecated Use {@link #setCanceled(boolean, String)} instead.
      */
     @Deprecated
-    public void setCanceled(boolean cancel) {
-        this.setCanceled(cancel, null);
+    public void setCanceled( boolean cancel )
+    {
+        setCanceled( cancel, null );
     }
 
     /**
@@ -56,8 +59,9 @@ public class TurtleActionEvent extends TurtleEvent {
      * @param failureMessage The message to return to the user explaining the failure.
      * @see TurtleCommandResult#failure(String)
      */
-    public void setCanceled(boolean cancel, @Nullable String failureMessage) {
-        this.cancelled = true;
+    public void setCanceled( boolean cancel, @Nullable String failureMessage )
+    {
+        cancelled = true;
         this.failureMessage = cancel ? failureMessage : null;
     }
 
@@ -69,11 +73,13 @@ public class TurtleActionEvent extends TurtleEvent {
      * @see #setCanceled(boolean, String)
      */
     @Nullable
-    public String getFailureMessage() {
-        return this.failureMessage;
+    public String getFailureMessage()
+    {
+        return failureMessage;
     }
 
-    public boolean isCancelled() {
-        return this.cancelled;
+    public boolean isCancelled()
+    {
+        return cancelled;
     }
 }

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

@@ -6,29 +6,29 @@
 
 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,
-                             @Nonnull TurtleSide side) {
+                              @Nonnull TurtleSide side )
+    {
         super( turtle, TurtleAction.ATTACK, player );
         Objects.requireNonNull( target, "target cannot be null" );
         Objects.requireNonNull( upgrade, "upgrade cannot be null" );
@@ -44,8 +44,9 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The entity being attacked.
      */
     @Nonnull
-    public Entity getTarget() {
-        return this.target;
+    public Entity getTarget()
+    {
+        return target;
     }
 
     /**
@@ -54,8 +55,9 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The upgrade responsible for attacking.
      */
     @Nonnull
-    public ITurtleUpgrade getUpgrade() {
-        return this.upgrade;
+    public ITurtleUpgrade getUpgrade()
+    {
+        return upgrade;
     }
 
     /**
@@ -64,7 +66,8 @@ public class TurtleAttackEvent extends TurtlePlayerEvent {
      * @return The upgrade's side.
      */
     @Nonnull
-    public TurtleSide getSide() {
-        return this.side;
+    public TurtleSide getSide()
+    {
+        return 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,12 +29,14 @@ 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,
-                               @Nonnull BlockPos pos) {
+                                @Nonnull BlockPos pos )
+    {
         super( turtle, action, player );
 
         Objects.requireNonNull( world, "world cannot be null" );
@@ -50,8 +50,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @return The world the turtle is interacting in.
      */
-    public World getWorld() {
-        return this.world;
+    public World getWorld()
+    {
+        return world;
     }
 
     /**
@@ -59,8 +60,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @return The position the turtle is interacting with.
      */
-    public BlockPos getPos() {
-        return this.pos;
+    public BlockPos getPos()
+    {
+        return pos;
     }
 
     /**
@@ -68,13 +70,15 @@ 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,
-                   @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side) {
+                    @Nonnull ITurtleUpgrade upgrade, @Nonnull TurtleSide side )
+        {
             super( turtle, TurtleAction.DIG, player, world, pos );
 
             Objects.requireNonNull( block, "block cannot be null" );
@@ -91,8 +95,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The block which is going to be broken.
          */
         @Nonnull
-        public BlockState getBlock() {
-            return this.block;
+        public BlockState getBlock()
+        {
+            return block;
         }
 
         /**
@@ -101,8 +106,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The upgrade doing the digging.
          */
         @Nonnull
-        public ITurtleUpgrade getUpgrade() {
-            return this.upgrade;
+        public ITurtleUpgrade getUpgrade()
+        {
+            return upgrade;
         }
 
         /**
@@ -111,8 +117,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The upgrade's side.
          */
         @Nonnull
-        public TurtleSide getSide() {
-            return this.side;
+        public TurtleSide getSide()
+        {
+            return side;
         }
     }
 
@@ -121,8 +128,10 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
      *
      * @see TurtleAction#MOVE
      */
-    public static class Move extends TurtleBlockEvent {
-        public Move(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos) {
+    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 );
         }
     }
@@ -132,10 +141,12 @@ 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 );
 
             Objects.requireNonNull( stack, "stack cannot be null" );
@@ -148,8 +159,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The item stack to be placed.
          */
         @Nonnull
-        public ItemStack getStack() {
-            return this.stack;
+        public ItemStack getStack()
+        {
+            return stack;
         }
     }
 
@@ -160,12 +172,14 @@ 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,
-                       @Nonnull Map<String, Object> data) {
+                        @Nonnull Map<String, Object> data )
+        {
             super( turtle, TurtleAction.INSPECT, player, world, pos );
 
             Objects.requireNonNull( state, "state cannot be null" );
@@ -180,8 +194,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return The inspected block state.
          */
         @Nonnull
-        public BlockState getState() {
-            return this.state;
+        public BlockState getState()
+        {
+            return state;
         }
 
         /**
@@ -190,8 +205,9 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent {
          * @return This block's inspection data.
          */
         @Nonnull
-        public Map<String, Object> getData() {
-            return this.data;
+        public Map<String, Object> getData()
+        {
+            return 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);
+            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,17 +20,20 @@ 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" );
         this.turtle = turtle;
     }
 
-    public static boolean post(TurtleActionEvent event) {
+    public static boolean post( TurtleActionEvent event )
+    {
         EVENT_BUS.post( event );
         return event.isCancelled();
     }
@@ -42,8 +44,9 @@ public abstract class TurtleEvent {
      * @return The access for this turtle.
      */
     @Nonnull
-    public ITurtleAccess getTurtle() {
-        return this.turtle;
+    public ITurtleAccess getTurtle()
+    {
+        return 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,17 +22,20 @@ 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 );
     }
 
-    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 );
 
         Objects.requireNonNull( stack, "stack cannot be null" );
@@ -50,8 +51,9 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      * @return The item stack which is being inspected. This should <b>not</b> be modified.
      */
     @Nonnull
-    public ItemStack getStack() {
-        return this.stack;
+    public ItemStack getStack()
+    {
+        return stack;
     }
 
     /**
@@ -60,8 +62,9 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      * @return This items's inspection data.
      */
     @Nonnull
-    public Map<String, Object> getData() {
-        return this.data;
+    public Map<String, Object> getData()
+    {
+        return data;
     }
 
     /**
@@ -69,8 +72,9 @@ public class TurtleInspectItemEvent extends TurtleActionEvent {
      *
      * @return If this is run on the main thread.
      */
-    public boolean onMainThread() {
-        return this.mainThread;
+    public boolean onMainThread()
+    {
+        return 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);
+        data.putAll( newData );
     }
 }

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

@@ -6,27 +6,27 @@
 
 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,
-                                   @Nonnull BlockPos pos, @Nullable Inventory handler) {
+                                    @Nonnull BlockPos pos, @Nullable Inventory handler )
+    {
         super( turtle, action, player, world, pos );
         this.handler = handler;
     }
@@ -37,8 +37,9 @@ 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() {
-        return this.handler;
+    public Inventory getItemHandler()
+    {
+        return handler;
     }
 
     /**
@@ -46,8 +47,10 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent {
      *
      * @see TurtleAction#SUCK
      */
-    public static class Suck extends TurtleInventoryEvent {
-        public Suck(@Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable Inventory handler) {
+    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 );
         }
     }
@@ -57,11 +60,13 @@ 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,
-                    @Nonnull ItemStack stack) {
+                     @Nonnull ItemStack stack )
+        {
             super( turtle, TurtleAction.DROP, player, world, pos, handler );
 
             Objects.requireNonNull( stack, "stack cannot be null" );
@@ -74,8 +79,9 @@ 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() {
-            return this.stack;
+        public ItemStack getStack()
+        {
+            return stack;
         }
     }
 }

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

@@ -6,22 +6,23 @@
 
 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 );
 
         Objects.requireNonNull( player, "player cannot be null" );
@@ -36,7 +37,8 @@ public abstract class TurtlePlayerEvent extends TurtleActionEvent {
      * @return A {@link FakePlayer} representing this turtle.
      */
     @Nonnull
-    public FakePlayer getPlayer() {
-        return this.player;
+    public FakePlayer getPlayer()
+    {
+        return 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 dan200.computercraft.api.turtle.ITurtleAccess;
-
-import net.minecraft.item.ItemStack;
+import java.util.Objects;
 
 /**
  * Fired when a turtle attempts to refuel from an item.
@@ -21,11 +19,13 @@ 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 );
 
         Objects.requireNonNull( turtle, "turtle cannot be null" );
@@ -39,8 +39,9 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      *
      * @return The stack to refuel from.
      */
-    public ItemStack getStack() {
-        return this.stack;
+    public ItemStack getStack()
+    {
+        return stack;
     }
 
     /**
@@ -50,8 +51,9 @@ public class TurtleRefuelEvent extends TurtleActionEvent {
      * @see #setHandler(Handler)
      */
     @Nullable
-    public Handler getHandler() {
-        return this.handler;
+    public Handler getHandler()
+    {
+        return 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,7 +73,8 @@ 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.
          *

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,8 +25,8 @@ 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 net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
+import java.util.HashSet;
+import java.util.function.Consumer;
 
 /**
  * Registers textures and models for items.
@@ -37,7 +35,8 @@ import net.fabricmc.fabric.api.event.client.ClientSpriteRegistryCallback;
     "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",
@@ -69,20 +68,25 @@ public final class ClientRegistry {
 
     private ClientRegistry() {}
 
-    public static void onTextureStitchEvent(SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry) {
-        for (String extra : EXTRA_TEXTURES) {
+    public static void onTextureStitchEvent( SpriteAtlasTexture atlasTexture, ClientSpriteRegistryCallback.Registry registry )
+    {
+        for( String extra : EXTRA_TEXTURES )
+        {
             registry.register( new Identifier( ComputerCraft.MOD_ID, extra ) );
         }
     }
 
     @SuppressWarnings( "NewExpressionSideOnly" )
-    public static void onModelBakeEvent(ResourceManager manager, Consumer<ModelIdentifier> out) {
-        for (String model : EXTRA_MODELS) {
+    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" ) );
         }
     }
 
-    public static void onItemColours() {
+    public static void onItemColours()
+    {
         ColorProviderRegistry.ITEM.register( ( stack, layer ) -> {
             return layer == 1 ? ((ItemDisk) stack.getItem()).getColour( stack ) : 0xFFFFFF;
         }, ComputerCraftRegistry.ModItems.DISK );
@@ -91,18 +95,17 @@ public final class ClientRegistry {
             ComputerCraftRegistry.ModItems.TREASURE_DISK );
 
         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 );
                     return light == -1 ? Colour.BLACK.getHex() : light;
             }
-            }
         }, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_NORMAL, ComputerCraftRegistry.ModItems.POCKET_COMPUTER_ADVANCED );
 
         // Setup turtle colours
@@ -111,7 +114,8 @@ public final class ClientRegistry {
             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,
             spriteIdentifier -> MinecraftClient.getInstance()

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

@@ -6,36 +6,38 @@
 
 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;
+
+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) {
-        int extraWidth = width - this.getWidth(component);
-        if (extraWidth <= 0) {
+    public Text getPadding( Text component, int width )
+    {
+        int extraWidth = width - getWidth( component );
+        if( extraWidth <= 0 )
+        {
             return null;
         }
 
@@ -48,22 +50,26 @@ public class ClientTableFormatter implements TableFormatter {
         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 );
     }
 
     @Override
-    public void writeLine(int id, Text component) {
+    public void writeLine( int id, Text component )
+    {
         MinecraftClient mc = MinecraftClient.getInstance();
         ChatHud chat = mc.inGameHud.getChatHud();
 
@@ -75,7 +81,8 @@ public class ClientTableFormatter implements TableFormatter {
     }
 
     @Override
-    public int display(TableBuilder table) {
+    public int display( TableBuilder table )
+    {
         ChatHud chat = MinecraftClient.getInstance().inGameHud.getChatHud();
 
         int lastHeight = lastHeights.get( table.getId() );
@@ -83,7 +90,8 @@ public class ClientTableFormatter implements TableFormatter {
         int height = TableFormatter.super.display( table );
         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() );
         }
         return height;

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

@@ -8,38 +8,41 @@ 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 {
-
+    private FrameInfo()
+    {
     }
 
-    private FrameInfo() {
-    }
-
-    public static void init() {
+    public static void init()
+    {
         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,29 +6,24 @@
 
 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.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.render.*;
 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;
@@ -40,11 +35,13 @@ public final class FixedWidthFontRenderer {
     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,
-                                  @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize) {
+                                   @Nonnull Palette palette, boolean greyscale, float leftMarginSize, float rightMarginSize )
+    {
         bindFont();
 
         VertexConsumerProvider.Immediate renderer = MinecraftClient.getInstance()
@@ -64,7 +61,8 @@ public final class FixedWidthFontRenderer {
         renderer.draw();
     }
 
-    private static void bindFont() {
+    private static void bindFont()
+    {
         MinecraftClient.getInstance()
             .getTextureManager()
             .bindTexture( FONT );
@@ -73,17 +71,23 @@ public final class FixedWidthFontRenderer {
 
     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,
-                                  float leftMarginSize, float rightMarginSize) {
-        if (backgroundColour != null) {
+                                   float leftMarginSize, float rightMarginSize )
+    {
+        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 ) );
             float r, g, b;
-            if (greyscale) {
+            if( greyscale )
+            {
                 r = g = b = toGreyscale( colour );
-            } else {
+            }
+            else
+            {
                 r = (float) colour[0];
                 g = (float) colour[1];
                 b = (float) colour[2];
@@ -91,7 +95,8 @@ public final class FixedWidthFontRenderer {
 
             // Draw char
             int index = text.charAt( i );
-            if (index > 255) {
+            if( index > 255 )
+            {
                 index = '?';
             }
             drawChar( transform, renderer, x + i * FONT_WIDTH, y, index, r, g, b );
@@ -101,12 +106,15 @@ public final class FixedWidthFontRenderer {
 
     private static void drawBackground( @Nonnull Matrix4f transform, @Nonnull VertexConsumer renderer, float x, float y,
                                         @Nonnull TextBuffer backgroundColour, @Nonnull Palette palette, boolean greyscale, float leftMarginSize,
-                                       float rightMarginSize, float height) {
-        if (leftMarginSize > 0) {
+                                        float rightMarginSize, float height )
+    {
+        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,
                 x + backgroundColour.length() * FONT_WIDTH,
@@ -121,13 +129,16 @@ public final class FixedWidthFontRenderer {
         // 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) {
+            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 );
             }
 
@@ -135,7 +146,8 @@ public final class FixedWidthFontRenderer {
             blockStart = i;
         }
 
-        if (blockColour != '\0') {
+        if( blockColour != '\0' )
+        {
             drawQuad( transform,
                 renderer,
                 x + blockStart * FONT_WIDTH,
@@ -148,17 +160,21 @@ public final class FixedWidthFontRenderer {
         }
     }
 
-    public static int getColour(char c, Colour def) {
+    public static int getColour( char c, Colour 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;
         }
 
@@ -195,12 +211,16 @@ public final class FixedWidthFontRenderer {
     }
 
     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 ) );
         float r, g, b;
-        if (greyscale) {
+        if( greyscale )
+        {
             r = g = b = toGreyscale( colour );
-        } else {
+        }
+        else
+        {
             r = (float) colour[0];
             g = (float) colour[1];
             b = (float) colour[2];
@@ -209,7 +229,8 @@ public final class FixedWidthFontRenderer {
         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 )
             .texture( BACKGROUND_START, BACKGROUND_START )
@@ -238,7 +259,8 @@ public final class FixedWidthFontRenderer {
 
     public static void drawTerminalWithoutCursor( @Nonnull Matrix4f transform, @Nonnull VertexConsumer buffer, float x, float y,
                                                   @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();
 
@@ -266,7 +288,8 @@ public final class FixedWidthFontRenderer {
             bottomMarginSize );
 
         // The main text
-        for (int i = 0; i < height; i++) {
+        for( int i = 0; i < height; i++ )
+        {
             drawString( transform,
                 buffer,
                 x,
@@ -282,19 +305,24 @@ public final class FixedWidthFontRenderer {
     }
 
     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() );
             float r, g, b;
-            if (greyscale) {
+            if( greyscale )
+            {
                 r = g = b = toGreyscale( colour );
-            } else {
+            }
+            else
+            {
                 r = (float) colour[0];
                 g = (float) colour[1];
                 b = (float) colour[2];
@@ -305,13 +333,15 @@ public final class FixedWidthFontRenderer {
     }
 
     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 );
     }
 
     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()
@@ -323,15 +353,18 @@ public final class FixedWidthFontRenderer {
     }
 
     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 );
     }
 
-    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 );
     }
 
-    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()
@@ -342,17 +375,20 @@ public final class FixedWidthFontRenderer {
     }
 
     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() );
     }
 
-    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() );
     }
 
-    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;
@@ -373,11 +409,12 @@ public final class FixedWidthFontRenderer {
                     false,
                     false ) ) // blur, minimap
                 .alpha( ONE_TENTH_ALPHA )
-                                                                                          .writeMaskState(DEPTH_MASK)
+                .writeMaskState( ALL_MASK )
                 .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 );
         }
     }

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,23 +17,29 @@ 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> {
-    private final ComputerFamily family;
-    private final ClientComputer computer;
+import javax.annotation.Nonnull;
+
+import static dan200.computercraft.client.render.ComputerBorderRenderer.BORDER;
+import static dan200.computercraft.client.render.ComputerBorderRenderer.MARGIN;
+
+public class GuiComputer<T extends ContainerComputerBase> extends HandledScreen<T>
+{
+    protected final ComputerFamily family;
+    protected final ClientComputer computer;
     private final int termWidth;
     private final int termHeight;
 
-    private WidgetTerminal terminal;
-    private WidgetWrapper terminalWrapper;
+    protected WidgetTerminal terminal;
+    protected WidgetWrapper terminalWrapper;
 
-    private GuiComputer(T container, PlayerInventory player, Text title, int termWidth, int termHeight) {
+    protected GuiComputer( T container, PlayerInventory player, Text title, int termWidth, int termHeight )
+    {
         super( container, player, title );
         this.family = container.getFamily();
         this.computer = (ClientComputer) container.getComputer();
@@ -47,93 +48,111 @@ public final class GuiComputer<T extends ContainerComputerBase> extends HandledS
         this.terminal = null;
     }
 
-    public static GuiComputer<ContainerComputer> create(ContainerComputer container, PlayerInventory inventory, Text component) {
-        return new GuiComputer<>(container, inventory, component, ComputerCraft.terminalWidth_computer, ComputerCraft.terminalHeight_computer);
+    public static GuiComputer<ContainerComputer> create( ContainerComputer container, PlayerInventory inventory, Text component )
+    {
+        return new GuiComputer<>( container, inventory, component, ComputerCraft.computerTermWidth, ComputerCraft.computerTermHeight );
     }
 
-    public static GuiComputer<ContainerPocketComputer> createPocket(ContainerPocketComputer container, PlayerInventory inventory, Text component) {
-        return new GuiComputer<>(container, inventory, component, ComputerCraft.terminalWidth_pocketComputer, ComputerCraft.terminalHeight_pocketComputer);
+    public static GuiComputer<ContainerPocketComputer> createPocket( ContainerPocketComputer container, PlayerInventory inventory, Text component )
+    {
+        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() );
     }
 
+    protected void initTerminal( int border, int widthExtra, int heightExtra )
+    {
+        client.keyboard.setRepeatEvents( true );
 
-    @Override
-    protected void init() {
-        this.client.keyboard.setRepeatEvents(true);
+        int termPxWidth = termWidth * FixedWidthFontRenderer.FONT_WIDTH;
+        int termPxHeight = termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
 
-        int termPxWidth = this.termWidth * FixedWidthFontRenderer.FONT_WIDTH;
-        int termPxHeight = this.termHeight * FixedWidthFontRenderer.FONT_HEIGHT;
-
-        this.backgroundWidth = termPxWidth + MARGIN * 2 + BORDER * 2;
-        this.backgroundHeight = termPxHeight + MARGIN * 2 + BORDER * 2;
+        backgroundWidth = termPxWidth + MARGIN * 2 + border * 2 + widthExtra;
+        backgroundHeight = termPxHeight + MARGIN * 2 + border * 2 + heightExtra;
 
         super.init();
 
-        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);
+        terminal = new WidgetTerminal( client, () -> computer, termWidth, termHeight, MARGIN, MARGIN, MARGIN, MARGIN );
+        terminalWrapper = new WidgetWrapper( terminal, MARGIN + border + x, MARGIN + border + y, termPxWidth, termPxHeight );
 
-        this.children.add(this.terminalWrapper);
-        this.setFocused(this.terminalWrapper);
+        children.add( terminalWrapper );
+        setFocused( terminalWrapper );
     }
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
+    protected void init()
+    {
+        initTerminal( BORDER, 0, 0 );
+    }
+
+    @Override
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    {
+        this.renderBackground( stack );
         super.render( stack, mouseX, mouseY, partialTicks );
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
+        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());
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
 
         // Draw a border around the terminal
         RenderSystem.color4f( 1, 1, 1, 1 );
-        this.client.getTextureManager()
-                   .bindTexture(ComputerBorderRenderer.getTexture(this.family));
-        ComputerBorderRenderer.render(this.terminalWrapper.getX() - MARGIN, this.terminalWrapper.getY() - MARGIN,
-                                      this.getZOffset(), this.terminalWrapper.getWidth() + MARGIN * 2, this.terminalWrapper.getHeight() + MARGIN * 2);
+        client.getTextureManager()
+            .bindTexture( ComputerBorderRenderer.getTexture( family ) );
+        ComputerBorderRenderer.render( terminalWrapper.getX() - MARGIN, terminalWrapper.getY() - MARGIN,
+            getZOffset(), terminalWrapper.getWidth() + MARGIN * 2, terminalWrapper.getHeight() + MARGIN * 2 );
     }
 
     @Override
-    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);
+    public boolean mouseDragged( double x, double y, int button, double deltaX, double deltaY )
+    {
+        return (getFocused() != null && getFocused().mouseDragged( x, y, button, deltaX, deltaY )) || super.mouseDragged( x, y, button, deltaX, deltaY );
     }
 
     @Override
-	public boolean mouseReleased(double mouseX, double mouseY, int button) {
-		return (this.getFocused() != null && this.getFocused().mouseReleased(mouseX, mouseY, button)) || super.mouseReleased(x, y, button);
+    public boolean mouseReleased( double mouseX, double mouseY, int button )
+    {
+        return (getFocused() != null && 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) {
-            return this.getFocused().keyPressed(key, scancode, modifiers);
+        if( key == GLFW.GLFW_KEY_TAB && getFocused() != null && getFocused() == terminalWrapper )
+        {
+            return getFocused().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.terminal = null;
-        this.client.keyboard.setRepeatEvents(false);
+        children.remove( terminal );
+        terminal = null;
+        client.keyboard.setRepeatEvents( false );
     }
 
     @Override
-    public void tick() {
+    public void tick()
+    {
         super.tick();
-        this.terminal.update();
+        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;
+
+public class GuiDiskDrive extends HandledScreen<ContainerDiskDrive>
+{
     private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/disk_drive.png" );
 
-    public GuiDiskDrive(ContainerDiskDrive container, PlayerInventory player, Text title) {
+    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) {
-        this.renderBackground(transform);
+    public void render( @Nonnull MatrixStack transform, int mouseX, int mouseY, float partialTicks )
+    {
+        renderBackground( transform );
         super.render( transform, mouseX, mouseY, partialTicks );
-        this.drawMouseoverTooltip(transform, mouseX, mouseY);
+        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 );
-        this.client.getTextureManager()
+        client.getTextureManager()
             .bindTexture( BACKGROUND );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
     }
 }

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

@@ -6,21 +6,22 @@
 
 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;
+
+public class GuiPrinter extends HandledScreen<ContainerPrinter>
+{
     private static final Identifier BACKGROUND = new Identifier( "computercraft", "textures/gui/printer.png" );
 
-    public GuiPrinter(ContainerPrinter container, PlayerInventory player, Text title) {
+    public GuiPrinter( ContainerPrinter container, PlayerInventory player, Text title )
+    {
         super( container, player, title );
     }
 
@@ -33,21 +34,24 @@ public class GuiPrinter extends HandledScreen<ContainerPrinter> {
     }*/
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
-        this.renderBackground(stack);
+    public void render( @Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks )
+    {
+        renderBackground( stack );
         super.render( stack, mouseX, mouseY, partialTicks );
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
+        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 );
-        this.client.getTextureManager()
+        client.getTextureManager()
             .bindTexture( BACKGROUND );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
 
-        if (this.getScreenHandler().isPrinting()) {
-            this.drawTexture(transform, this.x + 34, this.y + 21, 176, 0, 25, 45);
+        if( getScreenHandler().isPrinting() )
+        {
+            drawTexture( transform, x + 34, 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,54 +17,69 @@ 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> {
-    private final boolean m_book;
-    private final int m_pages;
-    private final TextBuffer[] m_text;
-    private final TextBuffer[] m_colours;
-    private int m_page;
+import javax.annotation.Nonnull;
 
-    public GuiPrintout(ContainerHeldItem container, PlayerInventory player, Text title) {
+import static dan200.computercraft.client.render.PrintoutRenderer.*;
+
+public class GuiPrintout extends HandledScreen<ContainerHeldItem>
+{
+    private final boolean book;
+    private final int pages;
+    private final TextBuffer[] text;
+    private final TextBuffer[] colours;
+    private int page;
+
+    public GuiPrintout( ContainerHeldItem container, PlayerInventory player, Text title )
+    {
         super( container, player, title );
 
-        this.backgroundHeight = Y_SIZE;
+        backgroundHeight = Y_SIZE;
 
         String[] text = ItemPrintout.getText( container.getStack() );
-        this.m_text = new TextBuffer[text.length];
-        for (int i = 0; i < this.m_text.length; i++) {
-            this.m_text[i] = new TextBuffer(text[i]);
+        this.text = new TextBuffer[text.length];
+        for( int i = 0; i < this.text.length; i++ )
+        {
+            this.text[i] = new TextBuffer( text[i] );
         }
 
         String[] colours = ItemPrintout.getColours( container.getStack() );
-        this.m_colours = new TextBuffer[colours.length];
-        for (int i = 0; i < this.m_colours.length; i++) {
-            this.m_colours[i] = new TextBuffer(colours[i]);
+        this.colours = new TextBuffer[colours.length];
+        for( int i = 0; i < this.colours.length; i++ )
+        {
+            this.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_book = ((ItemPrintout) container.getStack()
+        page = 0;
+        pages = Math.max( this.text.length / ItemPrintout.LINES_PER_PAGE, 1 );
+        book = ((ItemPrintout) container.getStack()
             .getItem()).getType() == ItemPrintout.Type.BOOK;
     }
 
     @Override
-    public boolean mouseScrolled(double x, double y, double delta) {
-        if (super.mouseScrolled(x, y, delta)) {
+    public boolean mouseScrolled( double x, double y, double 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) {
-                this.m_page++;
+            if( page < pages - 1 )
+            {
+                page++;
             }
             return true;
         }
 
-        if (delta > 0) {
+        if( delta > 0 )
+        {
             // Scroll down goes to the previous page
-            if (this.m_page > 0) {
-                this.m_page--;
+            if( page > 0 )
+            {
+                page--;
             }
             return true;
         }
@@ -83,22 +88,25 @@ 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.renderBackground(stack);
-        this.setZOffset(this.getZOffset() + 1);
+        setZOffset( getZOffset() - 1 );
+        renderBackground( stack );
+        setZOffset( getZOffset() + 1 );
 
         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.enableDepthTest();
@@ -108,27 +116,33 @@ public class GuiPrintout extends HandledScreen<ContainerHeldItem> {
             .getEntityVertexConsumers();
         Matrix4f matrix = transform.peek()
             .getModel();
-        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);
+        drawBorder( matrix, renderer, x, y, getZOffset(), page, pages, book );
+        drawText( matrix, renderer, x + X_TEXT_MARGIN, y + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
         renderer.draw();
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
-        if (super.keyPressed(key, scancode, modifiers)) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        if( super.keyPressed( key, scancode, modifiers ) )
+        {
             return true;
         }
 
-        if (key == GLFW.GLFW_KEY_RIGHT) {
-            if (this.m_page < this.m_pages - 1) {
-                this.m_page++;
+        if( key == GLFW.GLFW_KEY_RIGHT )
+        {
+            if( page < pages - 1 )
+            {
+                page++;
             }
             return true;
         }
 
-        if (key == GLFW.GLFW_KEY_LEFT) {
-            if (this.m_page > 0) {
-                this.m_page--;
+        if( key == GLFW.GLFW_KEY_LEFT )
+        {
+            if( page > 0 )
+            {
+                page--;
             }
             return true;
         }

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

@@ -6,121 +6,60 @@
 
 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;
-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;
 
-public class GuiTurtle extends HandledScreen<ContainerTurtle> {
+import javax.annotation.Nonnull;
+
+public class GuiTurtle extends GuiComputer<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;
+    private final ContainerTurtle container;
 
-    public GuiTurtle(ContainerTurtle container, PlayerInventory player, Text title) {
-        super(container, player, title);
+    public GuiTurtle( ContainerTurtle container, PlayerInventory player, Text title )
+    {
+        super( container, player, title, ComputerCraft.turtleTermWidth, ComputerCraft.turtleTermHeight );
 
-        this.m_container = container;
-        this.m_family = container.getFamily();
-        this.m_computer = (ClientComputer) container.getComputer();
-
-        this.backgroundWidth = 254;
-        this.backgroundHeight = 217;
+        this.container = container;
     }
 
     @Override
-    protected void init() {
-        super.init();
-        this.client.keyboard.setRepeatEvents(true);
-
-        int termPxWidth = ComputerCraft.terminalWidth_turtle * FixedWidthFontRenderer.FONT_WIDTH;
-        int termPxHeight = ComputerCraft.terminalHeight_turtle * FixedWidthFontRenderer.FONT_HEIGHT;
-
-        this.terminal = new WidgetTerminal(this.client, () -> this.m_computer, ComputerCraft.terminalWidth_turtle, ComputerCraft.terminalHeight_turtle, 2, 2, 2, 2);
-        this.terminalWrapper = new WidgetWrapper(this.terminal, 2 + 8 + this.x, 2 + 8 + this.y, termPxWidth, termPxHeight);
-
-        this.children.add(this.terminalWrapper);
-        this.setFocused(this.terminalWrapper);
+    protected void init()
+    {
+        initTerminal( 8, 0, 80 );
     }
 
     @Override
-    public void render(@Nonnull MatrixStack stack, int mouseX, int mouseY, float partialTicks) {
-        this.renderBackground(stack);
-        super.render(stack, mouseX, mouseY, partialTicks);
-        this.drawMouseoverTooltip(stack, mouseX, mouseY);
-    }
-
-    @Override
-    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) {
+    public 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());
+        Identifier texture = family == ComputerFamily.ADVANCED ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL;
+        terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
 
         // Draw border/inventory
         RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
-        this.client.getTextureManager()
+        client.getTextureManager()
             .bindTexture( texture );
-        this.drawTexture(transform, this.x, this.y, 0, 0, this.backgroundWidth, this.backgroundHeight);
+        drawTexture( transform, x, y, 0, 0, backgroundWidth, backgroundHeight );
 
         // Draw selection slot
-        int slot = this.m_container.getSelectedSlot();
-        if (slot >= 0) {
+        int slot = container.getSelectedSlot();
+        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,
+            drawTexture( transform, x + ContainerTurtle.TURTLE_START_X - 2 + slotX * 18, y + ContainerTurtle.PLAYER_START_Y - 2 + slotY * 18,
                 0,
                 217,
                 24,
                 24 );
         }
     }
-
-    @Override
-    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);
-    }
-
-    @Override
-    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) {
-            return this.getFocused().keyPressed(key, scancode, modifiers);
-        }
-
-        return super.keyPressed(key, scancode, modifiers);
-    }
-
-    @Override
-    public void removed() {
-        super.removed();
-        this.children.remove(this.terminal);
-        this.terminal = null;
-        this.client.keyboard.setRepeatEvents(false);
-    }
-
-    @Override
-    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;
@@ -43,7 +43,8 @@ public class WidgetTerminal implements Element {
     private int lastMouseY = -1;
 
     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,14 +56,17 @@ 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 );
@@ -70,58 +74,66 @@ public class WidgetTerminal implements Element {
 
             computer.mouseClick( button + 1, charX + 1, charY + 1 );
 
-            this.lastMouseButton = button;
-            this.lastMouseX = charX;
-            this.lastMouseY = charY;
+            lastMouseButton = button;
+            lastMouseX = charX;
+            lastMouseY = charY;
         }
 
         return true;
     }
 
     @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 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            if (this.lastMouseButton == button) {
-                computer.mouseUp(this.lastMouseButton + 1, charX + 1, charY + 1);
-                this.lastMouseButton = -1;
+            if( lastMouseButton == button )
+            {
+                computer.mouseUp( lastMouseButton + 1, charX + 1, charY + 1 );
+                lastMouseButton = -1;
             }
 
-            this.lastMouseX = charX;
-            this.lastMouseY = charY;
+            lastMouseX = charX;
+            lastMouseY = charY;
         }
 
         return false;
     }
 
     @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 );
             charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-            if (button == this.lastMouseButton && (charX != this.lastMouseX || charY != this.lastMouseY)) {
+            if( button == lastMouseButton && (charX != lastMouseX || charY != lastMouseY) )
+            {
                 computer.mouseDrag( button + 1, charX + 1, charY + 1 );
-                this.lastMouseX = charX;
-                this.lastMouseY = charY;
+                lastMouseX = charX;
+                lastMouseY = charY;
             }
         }
 
@@ -129,14 +141,17 @@ 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 );
@@ -144,59 +159,74 @@ public class WidgetTerminal implements Element {
 
             computer.mouseScroll( delta < 0 ? 1 : -1, charX + 1, charY + 1 );
 
-            this.lastMouseX = charX;
-            this.lastMouseY = charY;
+            lastMouseX = charX;
+            lastMouseY = charY;
         }
 
         return true;
     }
 
     @Override
-    public boolean keyPressed(int key, int scancode, int modifiers) {
-        if (key == GLFW.GLFW_KEY_ESCAPE) {
+    public boolean keyPressed( int key, int scancode, int modifiers )
+    {
+        if( key == GLFW.GLFW_KEY_ESCAPE )
+        {
             return false;
         }
-        if ((modifiers & GLFW.GLFW_MOD_CONTROL) != 0) {
-            switch (key) {
+        if( (modifiers & GLFW.GLFW_MOD_CONTROL) != 0 )
+        {
+            switch( key )
+            {
                 case GLFW.GLFW_KEY_T:
-                if (this.terminateTimer < 0) {
-                    this.terminateTimer = 0;
+                    if( terminateTimer < 0 )
+                    {
+                        terminateTimer = 0;
                     }
                     return true;
                 case GLFW.GLFW_KEY_S:
-                if (this.shutdownTimer < 0) {
-                    this.shutdownTimer = 0;
+                    if( shutdownTimer < 0 )
+                    {
+                        shutdownTimer = 0;
                     }
                     return true;
                 case GLFW.GLFW_KEY_R:
-                if (this.rebootTimer < 0) {
-                    this.rebootTimer = 0;
+                    if( rebootTimer < 0 )
+                    {
+                        rebootTimer = 0;
                     }
                     return true;
 
                 case GLFW.GLFW_KEY_V:
                     // Ctrl+V for paste
-                String clipboard = this.client.keyboard.getClipboard();
-                if (clipboard != null) {
+                    String clipboard = 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) {
+                        if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
+                        {
                             clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
-                    } else if (newLineIndex1 >= 0) {
+                        }
+                        else if( newLineIndex1 >= 0 )
+                        {
                             clipboard = clipboard.substring( 0, newLineIndex1 );
-                    } else if (newLineIndex2 >= 0) {
+                        }
+                        else if( newLineIndex2 >= 0 )
+                        {
                             clipboard = clipboard.substring( 0, newLineIndex2 );
                         }
 
                         // Filter the string
                         clipboard = SharedConstants.stripInvalidChars( clipboard );
-                    if (!clipboard.isEmpty()) {
+                        if( !clipboard.isEmpty() )
+                        {
                             // Clip to 512 characters and queue the event
-                        if (clipboard.length() > 512) {
+                            if( clipboard.length() > 512 )
+                            {
                                 clipboard = clipboard.substring( 0, 512 );
                             }
-                        this.queueEvent("paste", clipboard);
+                            queueEvent( "paste", clipboard );
                         }
 
                         return true;
@@ -204,12 +234,14 @@ public class WidgetTerminal implements Element {
             }
         }
 
-        if (key >= 0 && this.terminateTimer < 0 && this.rebootTimer < 0 && this.shutdownTimer < 0) {
+        if( key >= 0 && terminateTimer < 0 && rebootTimer < 0 && shutdownTimer < 0 )
+        {
             // Queue the "key" event and add to the down set
-            boolean repeat = this.keysDown.get(key);
-            this.keysDown.set(key);
+            boolean repeat = keysDown.get( key );
+            keysDown.set( key );
             IComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
+            {
                 computer.keyDown( key, repeat );
             }
         }
@@ -218,29 +250,33 @@ 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)) {
-            this.keysDown.set(key, false);
+        if( key >= 0 && keysDown.get( key ) )
+        {
+            keysDown.set( key, false );
             IComputer computer = this.computer.get();
-            if (computer != null) {
+            if( computer != null )
+            {
                 computer.keyUp( key );
             }
         }
 
-        switch (key) {
+        switch( key )
+        {
             case GLFW.GLFW_KEY_T:
-            this.terminateTimer = -1;
+                terminateTimer = -1;
                 break;
             case GLFW.GLFW_KEY_R:
-            this.rebootTimer = -1;
+                rebootTimer = -1;
                 break;
             case GLFW.GLFW_KEY_S:
-            this.shutdownTimer = -1;
+                shutdownTimer = -1;
                 break;
             case GLFW.GLFW_KEY_LEFT_CONTROL:
             case GLFW.GLFW_KEY_RIGHT_CONTROL:
-            this.terminateTimer = this.rebootTimer = this.shutdownTimer = -1;
+                terminateTimer = rebootTimer = shutdownTimer = -1;
                 break;
         }
 
@@ -248,93 +284,116 @@ public class WidgetTerminal implements Element {
     }
 
     @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
         {
             // Queue the "char" event
-            this.queueEvent("char", Character.toString(ch));
+            queueEvent( "char", Character.toString( ch ) );
         }
 
         return true;
     }
 
     @Override
-    public boolean changeFocus(boolean reversed) {
-        if (this.focused) {
+    public boolean changeFocus( boolean reversed )
+    {
+        if( focused )
+        {
             // When blurring, we should make all keys go up
-            for (int key = 0; key < this.keysDown.size(); key++) {
-                if (this.keysDown.get(key)) {
-                    this.queueEvent("key_up", key);
+            for( int key = 0; key < keysDown.size(); key++ )
+            {
+                if( keysDown.get( key ) )
+                {
+                    queueEvent( "key_up", key );
                 }
             }
-            this.keysDown.clear();
+            keysDown.clear();
 
             // When blurring, we should make the last mouse button go up
-            if (this.lastMouseButton > 0) {
+            if( lastMouseButton > 0 )
+            {
                 IComputer computer = this.computer.get();
-                if (computer != null) {
-                    computer.mouseUp(this.lastMouseButton + 1, this.lastMouseX + 1, this.lastMouseY + 1);
+                if( computer != null )
+                {
+                    computer.mouseUp( lastMouseButton + 1, lastMouseX + 1, lastMouseY + 1 );
                 }
-                this.lastMouseButton = -1;
+                lastMouseButton = -1;
             }
 
-            this.shutdownTimer = this.terminateTimer = this.rebootTimer = -1;
+            shutdownTimer = terminateTimer = rebootTimer = -1;
         }
-        this.focused = !this.focused;
+        focused = !focused;
         return true;
     }
 
     @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 );
         }
     }
 
-    public void update() {
-        if (this.terminateTimer >= 0 && this.terminateTimer < TERMINATE_TIME && (this.terminateTimer += 0.05f) > TERMINATE_TIME) {
-            this.queueEvent("terminate");
+    public void update()
+    {
+        if( terminateTimer >= 0 && terminateTimer < TERMINATE_TIME && (terminateTimer += 0.05f) > TERMINATE_TIME )
+        {
+            queueEvent( "terminate" );
         }
 
-        if (this.shutdownTimer >= 0 && this.shutdownTimer < TERMINATE_TIME && (this.shutdownTimer += 0.05f) > TERMINATE_TIME) {
+        if( shutdownTimer >= 0 && shutdownTimer < TERMINATE_TIME && (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( rebootTimer >= 0 && rebootTimer < TERMINATE_TIME && (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 );
         }
     }
 
-    public void draw(int originX, int originY) {
-        synchronized (this.computer) {
+    public void draw( int originX, int originY )
+    {
+        synchronized( computer )
+        {
             // Draw the screen contents
             ClientComputer computer = this.computer.get();
             Terminal terminal = computer != null ? computer.getTerminal() : null;
-            if (terminal != null) {
-                FixedWidthFontRenderer.drawTerminal(originX, originY, terminal, !computer.isColour(), this.topMargin, this.bottomMargin, this.leftMargin,
-                                                    this.rightMargin);
-            } else {
-                FixedWidthFontRenderer.drawEmptyTerminal(originX - this.leftMargin,
-                                                         originY - this.rightMargin, this.termWidth * FONT_WIDTH + this.leftMargin + this.rightMargin,
-                                                         this.termHeight * FONT_HEIGHT + this.topMargin + this.bottomMargin);
+            if( terminal != null )
+            {
+                FixedWidthFontRenderer.drawTerminal( originX, originY, terminal, !computer.isColour(), topMargin, bottomMargin, leftMargin,
+                    rightMargin );
+            }
+            else
+            {
+                FixedWidthFontRenderer.drawEmptyTerminal( originX - leftMargin,
+                    originY - rightMargin, termWidth * FONT_WIDTH + leftMargin + rightMargin,
+                    termHeight * FONT_HEIGHT + topMargin + bottomMargin );
             }
         }
     }