Basic network visualiser

.editorconfig

@@ -11,8 +11,5 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false
 
-[*.sexp]
-indent_size = 2
-
 [*.properties]
 insert_final_newline = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,15 +1,16 @@
 ---
 name: Bug report
 about: Report some misbehaviour in the mod
-labels: bug
+
 ---
 
 <!--
 ## Before reporting
- - Search for the bug on the issue tracker. Make sure to look at closed issues too!
+ - Search for the bug both here and [on the ComputerCraft issues page](https://github.com/dan200/ComputerCraft/issues?utf8=%E2%9C%93&q=is%3Aissue+)
+ - If possible, try to reproduce on vanilla ComputerCraft. If it still occurs, [report on the ComputerCraft repo](https://github.com/dan200/ComputerCraft/issues/new) instead.
 -->
 
 ## Useful information to include:
  - Minecraft version
  - CC: Tweaked version
- - 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.
+ - Detailed reproduction steps!** Sometimes I can spot a bug pretty easily, but often it's much more obscure. Anything you can give which will help reproduce it means it'll get fixed quicker.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,14 +1,15 @@
 ---
 name: Feature request
 about: Suggest an idea or improvement
-labels: enhancement
+
 ---
 
 <!--
 ## Before reporting
- - Search for the suggestion here. It's possible someone's suggested it before!
+ - Search for the suggestion both here and [on the ComputerCraft issues page](https://github.com/dan200/ComputerCraft/issues?utf8=%E2%9C%93&q=is%3Aissue+). It's possible someone's suggested it before!
+ - Unless something is specific to CC:Tweaked, try to [suggest them on the ComputerCraft repo](https://github.com/dan200/ComputerCraft/issues/new). There's a lot more people watching it, so it allows the wider community to contribute.
 -->
 
 ## Useful information to include:
- - Explanation of how the feature/change should work.
- - Some rationale/use case for a feature. My general approach to designing new features is to ask yourself "what issue are we trying to solve" and _then_ "is this the best way to solve this issue?".
+ - Explanation of how the feature/change chould work.
+ - Some rationale/use case for a feature. I'd like to keep CC:T as minimal

.github/pull_request_template.md

@@ -1,3 +1,9 @@
-## A quick checklist
- - If there's a existing issue, please link to it. If not, provide fill out the same information you would in a normal issue - reproduction steps for bugs, rationale for use-case.
- - If you're working on CraftOS, try to write a few test cases so we can ensure everything continues to work in the future. Tests live in `src/test/resources/test-rom/spec` and can be run with `./gradlew check`.
+<!--
+Unless this feature is specific to CC:Tweaked, try to [target the original ComputerCraft repo](https://github.com/dan200/ComputerCraft/) instead. There's a lot more people watching it, so it allows the wider community to contribute.
+-->
+
+## Useful information to include:
+ - Brief explanation of the changes you've made.
+ - Rationale of why this change has been made/reasoning behind it.
+
+The more information you can provide, the easier it is to review something now _and_ to see why a change was made, when the code needs updating in the future.

.github/workflows/main-ci.yml

@@ -1,39 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-
-    - name: Build with Gradle
-      run: ./gradlew build --no-daemon
-
-    - name: Upload Jar
-      uses: actions/upload-artifact@v1
-      with:
-        name: CC-Tweaked
-        path: build/libs
-
-  lint-lua:
-    name: Lint Lua
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: Lint Lua code
-      run: |
-        test -d bin || mkdir bin
-        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/bin/illuaminate
-        chmod +x bin/illuaminate
-        bin/illuaminate lint

.gitignore

@@ -15,9 +15,3 @@
 .idea
 .gradle
 *.DS_Store
-
-.classpath
-.project
-.settings/
-bin/
-*.launch

.luacheckrc

@@ -0,0 +1,34 @@
+std = "max"
+
+ignore = {
+    -- Allow access to undefined globals or their fields. In the future we'll
+    -- define all of CC's globals within this file
+    '113', '143',
+
+    -- FIXME: Ignore unused arguments and loop variables
+    '212', '213',
+
+    -- Disable line is too long for now. It would be possible to clean
+    -- this up in the future.
+    '631',
+}
+
+-- Only run the linter on ROM and bios for now, as the treasure disks
+-- are largely unsupported.
+include_files = {
+    'src/main/resources/assets/computercraft/lua/rom',
+    'src/main/resources/assets/computercraft/lua/bios.lua'
+}
+
+files['src/main/resources/assets/computercraft/lua/bios.lua'] = {
+    -- Allow declaring and mutating globals
+    allow_defined_top = true,
+    ignore = { '112', '121', '122', '131', '142' },
+}
+
+files['src/main/resources/assets/computercraft/lua/rom/apis'] = {
+    -- APIs may define globals on the top level. We'll ignore unused globals,
+    -- as obviously they may be used outside that API.
+    allow_defined_top = true,
+    ignore = { '131' },
+}

.travis.yml

@@ -0,0 +1,14 @@
+language: java
+
+script: ./gradlew build --no-daemon
+
+before_cache:
+  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
+  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
+cache:
+  directories:
+    - $HOME/.gradle/caches/
+    - $HOME/.gradle/wrapper/s
+
+jdk:
+    - oraclejdk8

LICENSE-luaj

@@ -0,0 +1,19 @@
+Copyright (c) 2007 LuaJ. All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,35 +1,35 @@
 # ![CC: Tweaked](logo.png)
-[![Current build status](https://github.com/SquidDev-CC/CC-Tweaked/workflows/Build/badge.svg)](https://github.com/SquidDev-CC/CC-Tweaked/actions "Current build status") [![Download CC: Tweaked on CurseForge](http://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
+[![Build Status](https://travis-ci.org/SquidDev-CC/CC-Tweaked.svg?branch=master)](https://travis-ci.org/SquidDev-CC/CC-Tweaked)
 
-CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
-turtles and more to Minecraft.
+CC: Tweaked is a fork of ComputerCraft which aims to provide earlier access to the more experimental and in-development
+features of the mod. For a more stable experience, I recommend checking out the
+[original mod](https://github.com/dan200/ComputerCraft).
 
 ## What?
-ComputerCraft has always held a fond place in my heart: it's the mod which really got me into Minecraft, and it's the
-mod which has kept me playing it for many years. However, development of the original mod has slowed, as the original
-developers have had less time to work on the mod, and moved onto other projects and commitments.
+CC: Tweaked (or CC:T for short) does not aim to create a competing fork of ComputerCraft, nor am I planning to take it
+in in a vastly different direction to the original mod. In fact, CC:T aims to be a nurturing ground for various
+features, with a pull request against the original mod being the end goal.
 
-CC: Tweaked (or CC:T for short) is an attempt to continue ComputerCraft's legacy. It's not intended to be a competitor
-to CC, nor do I want to take it in a vastly different direction to the original mod. Instead, CC:T focuses on making the
-ComputerCraft experience as _solid_ as possible, ironing out any wrinkles that may have developed over time.
+CC:T also includes many pull requests from the community which have not yet been merged, offering a large number
+of additional bug fixes and features over the original mod.
 
 ## Features
-CC: Tweaked contains all the features of the latest version of ComputerCraft, as well as numerous fixes, performance
-improvements and several nifty additions. I'd recommend checking out [the releases page](https://github.com/SquidDev-CC/CC-Tweaked/releases)
-to see the full set of changes, but here's a couple of the more interesting additions:
+CC: Tweaked contains all the features of the latest alpha, as well as numerous fixes, performance improvements and
+several additional features. I'd recommend checking out [the releases page](https://github.com/SquidDev-CC/CC-Tweaked/releases)
+to see the full changes, but here's a couple of the more interesting changes:
 
- - Improvements to the `http` library, including websockets, support for other HTTP methods (`PUT`, `DELETE`, etc...)
-   and configurable limits on HTTP usage.
- - Full-block wired modems, allowing one to wrap non-solid peripherals (such as turtles, or chests if Plethora is
-   installed).
- - Pocket computers can be held like maps, allowing you to view the screen without entering a GUI.
- - Printed pages and books can be placed in item frames and held like maps.
- - Several profiling and administration tools for server owners, via the `/computercraft` command. This allows operators
-   to track which computers are hogging resources, turn on and shutdown multiple computers at once and interact with
+ - Replace LuaJ with Cobalt.
+ - Allow running multiple computers at the same time.
+ - Websocket support in the HTTP library.
+ - Wired modems and cables act more like multiparts.
+ - Add map-like rendering for pocket computers and printed pages/books.
+ - Adds the `/computercraft` command, offering various diagnostic tools for server owners. This allows operators to
+   track which computers are hogging resources, turn on and shutdown multiple computers at once and interact with
    computers remotely.
- - Closer emulation of standard Lua, adding the `debug` and `io` libraries. This also enables seeking within binary
-   files, meaning you don't need to read large files into memory.
- - Allow running multiple computers on multiple threads, reducing latency on worlds with many computers.
+ - Add full-block wired modems, allowing one to wrap non-solid peripherals (such as turtles, or chests if Plethora is
+   installed).
+ - Extended binary file handles. They support file seeking, and reading new lines, allowing full (and accurate)
+   emulation of the standard Lua `io` library.
 
 ## Relation to CCTweaks?
 This mod has nothing to do with CCTweaks, though there is no denying the name is a throwback to it. That being said,
@@ -37,39 +37,13 @@ several features have been included, such as full block modems, the Cobalt runti
 computers.
 
 ## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping
-develop CC:T, you'll need to follow these steps:
+Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you do wish to contribute
+code, do consider submitting it to the ComputerCraft repository first.
+
+That being said, in order to start helping develop CC:T, you'll need to follow these steps:
 
  - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
  - **Setup Forge:** `./gradlew setupDecompWorkspace`
  - **Test your changes:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
 
 If you want to run CC:T in a normal Minecraft instance, run `./gradlew build` and copy the `.jar` from `build/libs`.
-
-## Community
-If you need help getting started with CC: Tweaked, want to show off your latest project, or just want to chat about
-ComputerCraft we have a [forum](https://forums.computercraft.cc/) and [Discord guild](https://discord.gg/H2UyJXe)!
-There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=#computercraft), if
-that's more your cup of tea.
-
-I'd generally recommend you don't contact me directly (email, DM, etc...) unless absolutely necessary (i.e. in order to
-report exploits). You'll get a far quicker response if you ask the whole community!
-
-## Using
-If you want to depend on CC: Tweaked, we have a maven repo. However, you should be wary that some functionality is only
-exposed by CC:T's API and not vanilla ComputerCraft. If you wish to support all variations of ComputerCraft, I recommend
-using [cc.crzd.me's maven](https://cc.crzd.me/maven/) instead.
-
-```groovy
-dependencies {
-  maven { url 'https://squiddev.cc/maven/' }
-}
-
-dependencies {
-  implementation "org.squiddev:cc-tweaked-${mc_version}:${cct_version}"
-}
-```
-
-You should also be careful to only use classes within the `dan200.computercraft.api` package. Non-API classes are
-subject to change at any point. If you depend on functionality outside the API, file an issue, and we can look into
-exposing more features.

build.gradle

@@ -5,22 +5,17 @@ buildscript {
         jcenter()
         maven {
             name = "forge"
-            url = "https://files.minecraftforge.net/maven"
+            url = "http://files.minecraftforge.net/maven"
         }
     }
     dependencies {
-        classpath 'com.google.code.gson:gson:2.8.1'
         classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta1'
         classpath 'org.ajoberstar.grgit:grgit-gradle:3.0.0'
     }
 }
 
 plugins {
-    id "checkstyle"
-    id "com.github.hierynomus.license" version "0.15.0"
-    id "com.matthewprenger.cursegradle" version "1.3.0"
-    id "com.github.breadmoirai.github-release" version "2.2.4"
+    id 'com.matthewprenger.cursegradle' version '1.0.10'
 }
 
 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -28,41 +23,35 @@ apply plugin: 'org.ajoberstar.grgit'
 apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
-version = mod_version
-
+version = "1.80pr1.14"
 group = "org.squiddev"
-archivesBaseName = "cc-tweaked-${mc_version}"
+archivesBaseName = "cc-tweaked"
 
 minecraft {
-    version = "${mc_version}-${forge_version}"
+    version = "1.12.2-14.23.4.2749"
     runDir = "run"
-    replace '${version}', mod_version
+    replace '${version}', project.version
 
-    mappings = mappings_version
-    makeObfSourceJar = false
+    // the mappings can be changed at any time, and must be in the following format.
+    // snapshot_YYYYMMDD   snapshot are built nightly.
+    // stable_#            stables are built at the discretion of the MCP team.
+    // Use non-default mappings at your own risk. they may not allways work.
+    // simply re-run your setup task after changing the mappings to update your workspace.
+    mappings = "snapshot_20180724"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
 repositories {
     maven {
-        name "JEI"
-        url "https://dvs1.progwml6.com/files/maven"
+        name = "JEI"
+        url  = "http://dvs1.progwml6.com/files/maven"
     }
     maven {
-        name "SquidDev"
-        url "https://squiddev.cc/maven"
-    }
-    ivy {
-        name "Charset"
-        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
-    }
-    maven {
-        name "Amadornes"
-        url "https://maven.amadornes.com/"
-    }
-    maven {
-        name "CraftTweaker"
-        url "https://maven.blamejared.com/"
+        name = "squiddev"
+        url = "https://squiddev.cc/maven"
     }
+
+    ivy { artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]" }
 }
 
 configurations {
@@ -72,25 +61,18 @@ configurations {
 }
 
 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
-
-    deobfProvided "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
-    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
-    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
+    deobfProvided "mezz.jei:jei_1.12.2:4.8.5.159:api"
     deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
 
-    runtime "mezz.jei:jei_1.12.2:4.15.0.269"
+    runtime "mezz.jei:jei_1.12.2:4.8.5.159"
 
     shade 'org.squiddev:Cobalt:0.5.0-SNAPSHOT'
 
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
+    testCompile 'junit:junit:4.11'
 
     deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
 }
 
-// Compile tasks
-
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
@@ -102,76 +84,20 @@ jar {
         attributes('FMLAT': 'computercraft_at.cfg')
     }
 
-    from (sourceSets.main.allSource) {
+    into("docs", { from (javadoc.destinationDir) })
+
+    into("api", { from (sourceSets.main.allSource) {
         include "dan200/computercraft/api/**/*.java"
-    }
+    }})
 
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
-[compileJava, compileTestJava].forEach {
-    it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
-    }
-}
-
-
-
-import java.nio.charset.StandardCharsets
-import java.nio.file.*
-import java.util.zip.*
-
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonElement
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
 import org.ajoberstar.grgit.Grgit
-import proguard.gradle.ProGuardTask
-
-task proguard(type: ProGuardTask, dependsOn: jar) {
-    description "Removes unused shadowed classes from the jar"
-    group "compact"
-
-    injars jar.archivePath
-    outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
-
-    // Add the main runtime jar and all non-shadowed dependencies
-    libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
-    libraryjars "${System.getProperty('java.home')}/lib/jce.jar"
-    doFirst {
-        sourceSets.main.compileClasspath
-            .filter { !it.name.contains("Cobalt") }
-            .each { libraryjars it }
-    }
-
-    // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
-    dontobfuscate; dontoptimize; keepattributes; keepparameternames
-
-    // Proguard will remove directories by default, but that breaks JarMount.
-    keepdirectories 'assets/computercraft/lua**'
-
-    // Preserve ComputerCraft classes - we only want to strip shadowed files.
-    keep 'class dan200.computercraft.** { *; }'
-}
-
-task proguardMove(dependsOn: proguard) {
-    description "Replace the original jar with the minified version"
-    group "compact"
-
-    doLast {
-        Files.move(
-            file("${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar").toPath(),
-            file(jar.archivePath).toPath(),
-            StandardCopyOption.REPLACE_EXISTING
-        )
-    }
-}
-
-reobfJar.dependsOn proguardMove
 
 processResources {
-    inputs.property "version", mod_version
-    inputs.property "mcversion", mc_version
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
 
     def hash = 'none'
     Set<String> contributors = []
@@ -192,9 +118,9 @@ processResources {
         include 'mcmod.info'
         include 'assets/computercraft/lua/rom/help/credits.txt'
 
-        expand 'version': mod_version,
-               'mcversion': mc_version,
-               'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
+        expand 'version':project.version,
+               'mcversion':project.minecraft.version,
+               'gitcontributors':contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
     }
 
     from(sourceSets.main.resources.srcDirs) {
@@ -203,149 +129,13 @@ processResources {
     }
 }
 
-task compressJson(dependsOn: extractAnnotationsJar) {
-    group "compact"
-    description "Minifies all JSON files, stripping whitespace"
-
-    def jarPath = file(jar.archivePath)
-
-    def tempPath = File.createTempFile("input", ".jar", temporaryDir)
-    tempPath.deleteOnExit()
-
-    def gson = new GsonBuilder().create()
-
-    doLast {
-        // Copy over all files in the current jar to the new one, running json files from GSON. As pretty printing
-        // is turned off, they should be minified.
-        new ZipFile(jarPath).withCloseable { inJar ->
-            tempPath.getParentFile().mkdirs()
-            new ZipOutputStream(new BufferedOutputStream(new FileOutputStream(tempPath))).withCloseable { outJar ->
-                inJar.entries().each { entry ->
-                    if(entry.directory) {
-                        outJar.putNextEntry(entry)
-                    } else if(!entry.name.endsWith(".json")) {
-                        outJar.putNextEntry(entry)
-                        inJar.getInputStream(entry).withCloseable { outJar << it }
-                    } else {
-                        ZipEntry newEntry = new ZipEntry(entry.name)
-                        newEntry.setTime(entry.time)
-                        outJar.putNextEntry(newEntry)
-
-                        def element = inJar.getInputStream(entry).withCloseable { gson.fromJson(it.newReader("UTF8"), JsonElement.class) }
-                        outJar.write(gson.toJson(element).getBytes(StandardCharsets.UTF_8))
-                    }
-                }
-
-            }
-        }
-
-        // And replace the original jar again
-        Files.move(tempPath.toPath(), jarPath.toPath(), StandardCopyOption.REPLACE_EXISTING)
-    }
-}
-
-assemble.dependsOn compressJson
-
-// Check tasks
-
-test {
-    useJUnitPlatform()
-    testLogging {
-        events "skipped", "failed"
-    }
-}
-
-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 rootProject.file('config/license/main.txt')
-    }
-}
-
-[licenseTest, licenseFormatTest].forEach {
-    it.configure {
-        include("**/*.java")
-        header rootProject.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 rootProject.file('config/license/api.txt')
-    }
-}
-
-// Upload tasks
-
-task checkRelease {
-    group "upload"
-    description "Verifies that everything is ready for a release"
-
-    inputs.property "version", mod_version
-    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt")
-    inputs.file("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
-
-    doLast {
-        def ok = true
-
-        // Check we're targetting the current version
-        def whatsnew = new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt").readLines()
-        if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
-            ok = false
-            project.logger.error("Expected `whatsnew.txt' to target $mod_version.")
-        }
-
-        // Check "read more" exists and trim it
-        def idx = whatsnew.findIndexOf { it == 'Type "help changelog" to see the full version history.' }
-        if (idx == -1) {
-            ok = false
-            project.logger.error("Must mention the changelog in whatsnew.txt")
-        } else {
-            whatsnew = whatsnew.getAt(0 ..< idx)
-        }
-
-        // Check whatsnew and changelog match.
-        def versionChangelog = "# " + whatsnew.join("\n")
-        def changelog = new File("src/main/resources/assets/computercraft/lua/rom/help/changelog.txt").getText()
-        if (!changelog.startsWith(versionChangelog)) {
-            ok = false
-            project.logger.error("whatsnew and changelog are not in sync")
-        }
-
-        if (!ok) throw new IllegalStateException("Could not check release")
-    }
-}
-check.dependsOn checkRelease
 
 curseforge {
     apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
     project {
         id = '282001'
-        releaseType = 'release'
-        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${mc_version}-${mod_version})."
-
-        relations {
-            incompatible "computercraft"
-        }
+        releaseType = 'beta'
+        changelog = "Release notes can be found on the GitHub repository (https://github.com/SquidDev-CC/CC-Tweaked/releases/tag/v${project.version})."
     }
 }
 
@@ -373,22 +163,22 @@ uploadArchives {
                 pom.project {
                     name 'CC: Tweaked'
                     packaging 'jar'
-                    description 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
+                    description 'A fork of ComputerCraft which aims to provide earlier access to the more experimental and in-development features of the mod.'
                     url 'https://github.com/SquidDev-CC/CC-Tweaked'
 
                     scm {
-                        url 'https://github.com/SquidDev-CC/CC-Tweaked.git'
+                        url 'https://github.com/dan200/ComputerCraft.git'
                     }
 
                     issueManagement {
                         system 'github'
-                        url 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
+                        url 'https://github.com/dan200/ComputerCraft/issues'
                     }
 
                     licenses {
                         license {
                             name 'ComputerCraft Public License, Version 1.0'
-                            url 'https://github.com/SquidDev-CC/CC-Tweaked/blob/master/LICENSE'
+                            url 'https://github.com/dan200/ComputerCraft/blob/master/LICENSE'
                             distribution 'repo'
                         }
                     }
@@ -402,31 +192,10 @@ uploadArchives {
     }
 }
 
-githubRelease {
-    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
-    owner 'SquidDev-CC'
-    repo 'CC-Tweaked'
-    try {
-        targetCommitish = Grgit.open(dir: '.').branch.current().name
-    } catch(Exception ignored) { }
-
-    tagName "v${mc_version}-${mod_version}"
-    releaseName "[${mc_version}] ${mod_version}"
-    body {
-        "## " + new File("src/main/resources/assets/computercraft/lua/rom/help/whatsnew.txt")
-            .readLines()
-            .takeWhile { it != 'Type "help changelog" to see the full version history.' }
-            .join("\n").trim()
+gradle.projectsEvaluated {
+    tasks.withType(JavaCompile) {
+        options.compilerArgs << "-Xlint"
     }
-    prerelease false
-}
-
-def uploadTasks = ["uploadArchives", "curseforge", "githubRelease"]
-uploadTasks.forEach { tasks.getByName(it).dependsOn checkRelease }
-
-task uploadAll(dependsOn: uploadTasks) {
-    group "upload"
-    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }
 
 runClient.outputs.upToDateWhen { false }

config/checkstyle/checkstyle.xml

@@ -1,169 +0,0 @@
-<?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/checkstyle/suppressions.xml" />
-    </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" />
-        <!-- Allow an optional m_ on private members -->
-        <module name="MemberName">
-            <property name="applyToPrivate" value="false" />
-            <property name="applyToPackage" value="false" />
-        </module>
-        <module name="MemberName">
-            <property name="format" value="^(m_)?[a-z][a-zA-Z0-9]*$" />
-            <property name="applyToPrivate" value="true" />
-            <property name="applyToPackage" value="true" />
-        </module>
-        <module name="MethodName" />
-        <module name="MethodTypeParameterName" />
-        <module name="PackageName">
-            <property name="format" value="^dan200\.computercraf(\.[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,DO_WHILE,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

@@ -1,12 +0,0 @@
-<?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" />
-
-    <!-- Do not check for missing package Javadoc. -->
-    <suppress checks="JavadocStyle" files=".*[\\/]package-info.java" />
-</suppressions>

config/license/api.txt

@@ -1,3 +0,0 @@
-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

@@ -1,3 +0,0 @@
-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

gradle.properties

@@ -1,7 +0,0 @@
-# Mod properties
-mod_version=1.86.1
-
-# Minecraft properties
-mc_version=1.12.2
-forge_version=14.23.4.2749
-mappings_version=snapshot_20180724

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip

illuaminate.sexp

@@ -1,28 +0,0 @@
-; -*- mode: Lisp;-*-
-
-(sources
-  /src/main/resources/assets/computercraft/lua/bios.lua
-  /src/main/resources/assets/computercraft/lua/rom/
-  /src/test/resources/test-rom)
-
-(at /
-  (linters
-    ;; It'd be nice to avoid this, but right now there's a lot of instances of
-    ;; it.
-    -var:set-loop
-
-    ;; It's useful to name arguments for documentation, so we allow this. It'd
-    ;; be good to find a compromise in the future, but this works for now.
-    -var:unused-arg))
-
-;; We disable the unused global linter in bios.lua and the APIs. In the future
-;; hopefully we'll get illuaminate to handle this.
-(at
-  (/src/main/resources/assets/computercraft/lua/bios.lua
-   /src/main/resources/assets/computercraft/lua/rom/apis/)
-  (linters -var:unused-global)
-  (lint
-    (allow-toplevel-global true)))
-
-;; These warnings are broken right now
-(at (bios.lua worm.lua) (linters -control:unreachable))

settings.gradle

@@ -1 +1 @@
-rootProject.name = "cc-tweaked-${mc_version}"
+rootProject.name = 'cc-tweaked'

src/main/java/dan200/computercraft/CCTweaked.java

@@ -1,29 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft;
-
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.network.NetworkCheckHandler;
-import net.minecraftforge.fml.relauncher.Side;
-
-import java.util.Map;
-
-/**
- * A stub mod for CC: Tweaked. This doesn't have any functionality (everything of note is done in
- * {@link ComputerCraft}), but people may depend on this if they require CC: Tweaked functionality.
- */
-@Mod(
-    modid = "cctweaked", name = ComputerCraft.NAME, version = ComputerCraft.VERSION,
-    acceptableRemoteVersions = "*"
-)
-public class CCTweaked
-{
-    @NetworkCheckHandler
-    public boolean onNetworkConnect( Map<String, String> mods, Side side )
-    {
-        return true;
-    }
-}

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft;
 
 import dan200.computercraft.api.filesystem.IMount;
@@ -23,15 +24,18 @@ import dan200.computercraft.api.turtle.event.TurtleAction;
 import dan200.computercraft.core.apis.AddressPredicate;
 import dan200.computercraft.core.apis.ApiFactories;
 import dan200.computercraft.core.apis.http.websocket.Websocket;
-import dan200.computercraft.core.computer.MainThread;
 import dan200.computercraft.core.filesystem.ComboMount;
 import dan200.computercraft.core.filesystem.FileMount;
 import dan200.computercraft.core.filesystem.JarMount;
+import dan200.computercraft.core.terminal.Terminal;
 import dan200.computercraft.core.tracking.Tracking;
 import dan200.computercraft.shared.*;
 import dan200.computercraft.shared.computer.blocks.BlockCommandComputer;
 import dan200.computercraft.shared.computer.blocks.BlockComputer;
+import dan200.computercraft.shared.computer.blocks.TileComputer;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
+import dan200.computercraft.shared.computer.core.ComputerFamily;
+import dan200.computercraft.shared.computer.core.ServerComputer;
 import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
 import dan200.computercraft.shared.computer.items.ItemCommandComputer;
 import dan200.computercraft.shared.computer.items.ItemComputer;
@@ -39,19 +43,24 @@ import dan200.computercraft.shared.media.items.ItemDiskExpanded;
 import dan200.computercraft.shared.media.items.ItemDiskLegacy;
 import dan200.computercraft.shared.media.items.ItemPrintout;
 import dan200.computercraft.shared.media.items.ItemTreasureDisk;
+import dan200.computercraft.shared.network.NetworkHandler;
 import dan200.computercraft.shared.peripheral.common.BlockPeripheral;
 import dan200.computercraft.shared.peripheral.common.ItemPeripheral;
+import dan200.computercraft.shared.peripheral.diskdrive.TileDiskDrive;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockCable;
 import dan200.computercraft.shared.peripheral.modem.wired.BlockWiredModemFull;
 import dan200.computercraft.shared.peripheral.modem.wired.ItemCable;
 import dan200.computercraft.shared.peripheral.modem.wireless.BlockAdvancedModem;
 import dan200.computercraft.shared.peripheral.modem.wireless.ItemAdvancedModem;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
+import dan200.computercraft.shared.peripheral.printer.TilePrinter;
 import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.pocket.peripherals.PocketModem;
 import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
-import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
+import dan200.computercraft.shared.proxy.ICCTurtleProxy;
+import dan200.computercraft.shared.proxy.IComputerCraftProxy;
 import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
+import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import dan200.computercraft.shared.turtle.items.ItemTurtleAdvanced;
 import dan200.computercraft.shared.turtle.items.ItemTurtleLegacy;
 import dan200.computercraft.shared.turtle.items.ItemTurtleNormal;
@@ -67,11 +76,14 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.fml.common.*;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.SidedProxy;
 import net.minecraftforge.fml.common.event.*;
 import net.minecraftforge.fml.relauncher.Side;
 import org.apache.logging.log4j.Logger;
@@ -80,21 +92,30 @@ import java.io.*;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 @Mod(
-    modid = ComputerCraft.MOD_ID, name = ComputerCraft.NAME, version = ComputerCraft.VERSION,
+    modid = ComputerCraft.MOD_ID, name = "CC: Tweaked", version = "${version}",
     guiFactory = "dan200.computercraft.client.gui.GuiConfigCC$Factory",
     dependencies = "required:forge@[14.23.4.2746,)"
 )
 public class ComputerCraft
 {
     public static final String MOD_ID = "computercraft";
-    static final String VERSION = "${version}";
-    static final String NAME = "CC: Tweaked";
+
+    // GUI IDs
+    public static final int diskDriveGUIID = 100;
+    public static final int computerGUIID = 101;
+    public static final int printerGUIID = 102;
+    public static final int turtleGUIID = 103;
+    // ComputerCraftEdu uses ID 104
+    public static final int printoutGUIID = 105;
+    public static final int pocketComputerGUIID = 106;
+    public static final int viewComputerGUIID = 110;
 
     // Configuration options
     public static final String[] DEFAULT_HTTP_WHITELIST = new String[] { "*" };
@@ -112,11 +133,8 @@ public class ComputerCraft
     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 long maxMainGlobalTime = TimeUnit.MILLISECONDS.toNanos( 10 );
-    public static long maxMainComputerTime = TimeUnit.MILLISECONDS.toNanos( 5 );
+    public static boolean logPeripheralErrors = false;
 
     public static boolean http_enable = true;
     public static boolean http_websocket_enable = true;
@@ -154,7 +172,7 @@ public class ComputerCraft
     public static final int terminalHeight_pocketComputer = 20;
 
     // Blocks and Items
-    public static final class Blocks
+    public static class Blocks
     {
         public static BlockComputer computer;
         public static BlockCommandComputer commandComputer;
@@ -169,7 +187,7 @@ public class ComputerCraft
         public static BlockWiredModemFull wiredModemFull;
     }
 
-    public static final class Items
+    public static class Items
     {
         public static ItemComputer computer;
         public static ItemCommandComputer commandComputer;
@@ -192,7 +210,7 @@ public class ComputerCraft
         public static ItemBlock wiredModemFull;
     }
 
-    public static final class TurtleUpgrades
+    public static class TurtleUpgrades
     {
         public static TurtleModem wirelessModem;
         public static TurtleModem advancedModem;
@@ -206,7 +224,7 @@ public class ComputerCraft
         public static TurtleHoe diamondHoe;
     }
 
-    public static final class PocketUpgrades
+    public static class PocketUpgrades
     {
         public static PocketModem wirelessModem;
         public static PocketModem advancedModem;
@@ -217,7 +235,7 @@ public class ComputerCraft
     }
 
     @Deprecated
-    public static final class Upgrades
+    public static class Upgrades
     {
         public static TurtleModem advancedModem;
     }
@@ -236,14 +254,20 @@ public class ComputerCraft
     public static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
 
     // Implementation
-    @Mod.Instance( ComputerCraft.MOD_ID )
+    @Mod.Instance( value = ComputerCraft.MOD_ID )
     public static ComputerCraft instance;
 
     @SidedProxy(
         clientSide = "dan200.computercraft.client.proxy.ComputerCraftProxyClient",
         serverSide = "dan200.computercraft.shared.proxy.ComputerCraftProxyCommon"
     )
-    private static ComputerCraftProxyCommon proxy;
+    private static IComputerCraftProxy proxy;
+
+    @SidedProxy(
+        clientSide = "dan200.computercraft.client.proxy.CCTurtleProxyClient",
+        serverSide = "dan200.computercraft.shared.proxy.CCTurtleProxyCommon"
+    )
+    private static ICCTurtleProxy turtleProxy;
 
     @Mod.EventHandler
     public void preInit( FMLPreInitializationEvent event )
@@ -253,19 +277,24 @@ public class ComputerCraft
         // Load config
         Config.load( event.getSuggestedConfigurationFile() );
 
+        // Setup network
+        NetworkHandler.setup();
+
         proxy.preInit();
+        turtleProxy.preInit();
     }
 
     @Mod.EventHandler
     public void init( FMLInitializationEvent event )
     {
         proxy.init();
+        turtleProxy.init();
     }
 
     @Mod.EventHandler
     public void onServerStarting( FMLServerStartingEvent event )
     {
-        ComputerCraftProxyCommon.initServer( event.getServer() );
+        proxy.initServer( event.getServer() );
     }
 
     @Mod.EventHandler
@@ -275,7 +304,6 @@ public class ComputerCraft
         {
             ComputerCraft.serverComputerRegistry.reset();
             WirelessNetwork.resetNetworks();
-            MainThread.reset();
             Tracking.reset();
         }
     }
@@ -287,14 +315,65 @@ public class ComputerCraft
         {
             ComputerCraft.serverComputerRegistry.reset();
             WirelessNetwork.resetNetworks();
-            MainThread.reset();
             Tracking.reset();
         }
     }
 
     public static String getVersion()
     {
-        return VERSION;
+        return "${version}";
+    }
+
+    public static void openDiskDriveGUI( EntityPlayer player, TileDiskDrive drive )
+    {
+        BlockPos pos = drive.getPos();
+        player.openGui( ComputerCraft.instance, ComputerCraft.diskDriveGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
+    }
+
+    public static void openComputerGUI( EntityPlayer player, TileComputer computer )
+    {
+        BlockPos pos = computer.getPos();
+        player.openGui( ComputerCraft.instance, ComputerCraft.computerGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
+    }
+
+    public static void openPrinterGUI( EntityPlayer player, TilePrinter printer )
+    {
+        BlockPos pos = printer.getPos();
+        player.openGui( ComputerCraft.instance, ComputerCraft.printerGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
+    }
+
+    public static void openTurtleGUI( EntityPlayer player, TileTurtle turtle )
+    {
+        BlockPos pos = turtle.getPos();
+        player.openGui( instance, ComputerCraft.turtleGUIID, player.getEntityWorld(), pos.getX(), pos.getY(), pos.getZ() );
+    }
+
+    public static void openPrintoutGUI( EntityPlayer player, EnumHand hand )
+    {
+        player.openGui( ComputerCraft.instance, ComputerCraft.printoutGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 );
+    }
+
+    public static void openPocketComputerGUI( EntityPlayer player, EnumHand hand )
+    {
+        player.openGui( ComputerCraft.instance, ComputerCraft.pocketComputerGUIID, player.getEntityWorld(), hand.ordinal(), 0, 0 );
+    }
+
+    public static void openComputerGUI( EntityPlayer player, ServerComputer computer )
+    {
+        ComputerFamily family = computer.getFamily();
+        int width = 0, height = 0;
+        Terminal terminal = computer.getTerminal();
+        if( terminal != null )
+        {
+            width = terminal.getWidth();
+            height = terminal.getHeight();
+        }
+
+        // Pack useful terminal information into the various coordinate bits.
+        // These are extracted in ComputerCraftProxyCommon.getClientGuiElement
+        player.openGui( ComputerCraft.instance, ComputerCraft.viewComputerGUIID, player.getEntityWorld(),
+            computer.getInstanceID(), family.ordinal(), (width & 0xFFFF) << 16 | (height & 0xFFFF)
+        );
     }
 
     private static File getBaseDir()
@@ -307,6 +386,16 @@ public class ComputerCraft
         return new File( getBaseDir(), "resourcepacks" );
     }
 
+    public static boolean canPlayerUseCommands( EntityPlayer player )
+    {
+        MinecraftServer server = player.getServer();
+        if( server != null )
+        {
+            return server.getPlayerList().canSendCommands( player.getGameProfile() );
+        }
+        return false;
+    }
+
     @Deprecated
     public static void registerPermissionProvider( ITurtlePermissionProvider provider )
     {
@@ -389,27 +478,6 @@ public class ComputerCraft
         }
     }
 
-    private static void loadFromFile( List<IMount> mounts, File file, String path, boolean allowMissing )
-    {
-        try
-        {
-            if( file.isFile() )
-            {
-                mounts.add( new JarMount( file, path ) );
-            }
-            else
-            {
-                File subResource = new File( file, path );
-                if( subResource.exists() ) mounts.add( new FileMount( subResource, 0 ) );
-            }
-        }
-        catch( IOException | RuntimeException e )
-        {
-            if( allowMissing && e instanceof FileNotFoundException ) return;
-            ComputerCraft.log.error( "Could not load mount '" + path + " 'from '" + file.getName() + "'", e );
-        }
-    }
-
     @Deprecated
     public static IMount createResourceMount( Class<?> modClass, String domain, String subPath )
     {
@@ -429,26 +497,18 @@ public class ComputerCraft
             }
         }
 
-        // Mount from mod jars, preferring the specified one.
+        // Mount from mod jar
         File modJar = getContainingJar( modClass );
-        Set<File> otherMods = new HashSet<>();
-        for( ModContainer container : Loader.instance().getActiveModList() )
-        {
-            File modFile = container.getSource();
-            if( modFile != null && !modFile.equals( modJar ) && modFile.exists() )
-            {
-                otherMods.add( container.getSource() );
-            }
-        }
-
-        for( File file : otherMods )
-        {
-            loadFromFile( mounts, file, subPath, true );
-        }
-
         if( modJar != null )
         {
-            loadFromFile( mounts, modJar, subPath, false );
+            try
+            {
+                mounts.add( new JarMount( modJar, subPath ) );
+            }
+            catch( IOException | RuntimeException e )
+            {
+                ComputerCraft.log.error( "Could not load mount from mod jar", e );
+            }
         }
 
         // Mount from resource packs
@@ -458,8 +518,25 @@ public class ComputerCraft
             String[] resourcePacks = resourcePackDir.list();
             for( String resourcePackName : resourcePacks )
             {
-                File resourcePack = new File( resourcePackDir, resourcePackName );
-                loadFromFile( mounts, resourcePack, subPath, true );
+                try
+                {
+                    File resourcePack = new File( resourcePackDir, resourcePackName );
+                    if( !resourcePack.isDirectory() )
+                    {
+                        // Mount a resource pack from a jar
+                        mounts.add( new JarMount( resourcePack, subPath ) );
+                    }
+                    else
+                    {
+                        // Mount a resource pack from a folder
+                        File subResource = new File( resourcePack, subPath );
+                        if( subResource.exists() ) mounts.add( new FileMount( subResource, 0 ) );
+                    }
+                }
+                catch( IOException | RuntimeException e )
+                {
+                    ComputerCraft.log.error( "Could not load resource pack '" + resourcePackName + "'", e );
+                }
             }
         }
 
@@ -565,7 +642,7 @@ public class ComputerCraft
     private static File getContainingJar( Class<?> modClass )
     {
         String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-        int bangIndex = path.indexOf( '!' );
+        int bangIndex = path.indexOf( "!" );
         if( bangIndex >= 0 )
         {
             path = path.substring( 0, bangIndex );
@@ -596,7 +673,7 @@ public class ComputerCraft
     private static File getDebugCodeDir( Class<?> modClass )
     {
         String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
-        int bangIndex = path.indexOf( '!' );
+        int bangIndex = path.indexOf( "!" );
         return bangIndex >= 0 ? null : new File( new File( path ).getParentFile(), "../.." );
     }
 
@@ -653,12 +730,5 @@ public class ComputerCraft
     {
         return Peripherals.getPeripheral( world, pos, side );
     }
-
-    @Deprecated
-    public static boolean canPlayerUseCommands( EntityPlayer player )
-    {
-        MinecraftServer server = player.getServer();
-        return server != null && server.getPlayerList().canSendCommands( player.getGameProfile() );
-    }
     //endregion
 }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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;
 
 import dan200.computercraft.api.filesystem.IMount;
@@ -31,9 +32,8 @@ import java.lang.reflect.Method;
 
 /**
  * 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.
+ * 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
 {
@@ -173,8 +173,8 @@ public final class ComputerCraftAPI
      * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
      *
      * @param provider The peripheral provider to register.
-     * @see IPeripheral
-     * @see IPeripheralProvider
+     * @see dan200.computercraft.api.peripheral.IPeripheral
+     * @see dan200.computercraft.api.peripheral.IPeripheralProvider
      */
     public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
     {
@@ -198,7 +198,7 @@ public final class ComputerCraftAPI
      * this during the load() method of your mod.
      *
      * @param upgrade The turtle upgrade to register.
-     * @see ITurtleUpgrade
+     * @see dan200.computercraft.api.turtle.ITurtleUpgrade
      */
     public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {
@@ -223,7 +223,7 @@ public final class ComputerCraftAPI
      * Registers a bundled redstone provider to provide bundled redstone output for blocks.
      *
      * @param provider The bundled redstone provider to register.
-     * @see IBundledRedstoneProvider
+     * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider
      */
     public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
     {
@@ -249,7 +249,7 @@ public final class ComputerCraftAPI
      * @param side  The side to extract the bundled redstone output from.
      * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned.
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
-     * @see IBundledRedstoneProvider
+     * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider
      */
     public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
     {
@@ -269,10 +269,10 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * Registers a media provider to provide {@link IMedia} implementations for Items.
+     * Registers a media provider to provide {@link IMedia} implementations for Items
      *
      * @param provider The media provider to register.
-     * @see IMediaProvider
+     * @see dan200.computercraft.api.media.IMediaProvider
      */
     public static void registerMediaProvider( @Nonnull IMediaProvider provider )
     {
@@ -294,7 +294,7 @@ public final class ComputerCraftAPI
      * Registers a permission provider to restrict where turtles can move or build.
      *
      * @param provider The turtle permission provider to register.
-     * @see ITurtlePermissionProvider
+     * @see dan200.computercraft.api.permissions.ITurtlePermissionProvider
      * @deprecated Prefer using {@link dan200.computercraft.api.turtle.event.TurtleBlockEvent} or the standard Forge events.
      */
     @Deprecated
@@ -370,7 +370,7 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * Construct a new wired node for a given wired element.
+     * Construct a new wired node for a given wired element
      *
      * @param element The element to construct it for
      * @return The element's node
@@ -398,7 +398,7 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * Get the wired network element for a block in world.
+     * Get the wired network element for a block in world
      *
      * @param world The world the block exists in
      * @param pos   The position the block exists in
@@ -438,50 +438,50 @@ public final class ComputerCraftAPI
                 computerCraft_getVersion = findCCMethod( "getVersion", new Class<?>[] {
                 } );
                 computerCraft_createUniqueNumberedSaveDir = findCCMethod( "createUniqueNumberedSaveDir", new Class<?>[] {
-                    World.class, String.class,
+                    World.class, String.class
                 } );
                 computerCraft_createSaveDirMount = findCCMethod( "createSaveDirMount", new Class<?>[] {
-                    World.class, String.class, Long.TYPE,
+                    World.class, String.class, Long.TYPE
                 } );
                 computerCraft_createResourceMount = findCCMethod( "createResourceMount", new Class<?>[] {
-                    Class.class, String.class, String.class,
+                    Class.class, String.class, String.class
                 } );
                 computerCraft_registerPeripheralProvider = findCCMethod( "registerPeripheralProvider", new Class<?>[] {
-                    IPeripheralProvider.class,
+                    IPeripheralProvider.class
                 } );
                 computerCraft_registerTurtleUpgrade = findCCMethod( "registerTurtleUpgrade", new Class<?>[] {
-                    ITurtleUpgrade.class,
+                    ITurtleUpgrade.class
                 } );
                 computerCraft_registerBundledRedstoneProvider = findCCMethod( "registerBundledRedstoneProvider", new Class<?>[] {
-                    IBundledRedstoneProvider.class,
+                    IBundledRedstoneProvider.class
                 } );
                 computerCraft_getDefaultBundledRedstoneOutput = findCCMethod( "getDefaultBundledRedstoneOutput", new Class<?>[] {
-                    World.class, BlockPos.class, EnumFacing.class,
+                    World.class, BlockPos.class, EnumFacing.class
                 } );
                 computerCraft_registerMediaProvider = findCCMethod( "registerMediaProvider", new Class<?>[] {
-                    IMediaProvider.class,
+                    IMediaProvider.class
                 } );
                 computerCraft_registerPermissionProvider = findCCMethod( "registerPermissionProvider", new Class<?>[] {
-                    ITurtlePermissionProvider.class,
+                    ITurtlePermissionProvider.class
                 } );
                 computerCraft_registerPocketUpgrade = findCCMethod( "registerPocketUpgrade", new Class<?>[] {
-                    IPocketUpgrade.class,
+                    IPocketUpgrade.class
                 } );
                 computerCraft_getWirelessNetwork = findCCMethod( "getWirelessNetwork", new Class<?>[] {
                 } );
                 computerCraft_registerAPIFactory = findCCMethod( "registerAPIFactory", new Class<?>[] {
-                    ILuaAPIFactory.class,
+                    ILuaAPIFactory.class
                 } );
                 computerCraft_createWiredNodeForElement = findCCMethod( "createWiredNodeForElement", new Class<?>[] {
-                    IWiredElement.class,
+                    IWiredElement.class
                 } );
                 computerCraft_getWiredElementAt = findCCMethod( "getWiredElementAt", new Class<?>[] {
-                    IBlockAccess.class, BlockPos.class, EnumFacing.class,
+                    IBlockAccess.class, BlockPos.class, EnumFacing.class
                 } );
             }
             catch( Exception e )
             {
-                System.err.println( "ComputerCraftAPI: ComputerCraft not found." );
+                System.out.println( "ComputerCraftAPI: ComputerCraft not found." );
             }
             finally
             {
@@ -498,7 +498,7 @@ public final class ComputerCraftAPI
         }
         catch( NoSuchMethodException e )
         {
-            System.err.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." );
+            System.out.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." );
             return null;
         }
     }

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

@@ -1,41 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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.filesystem;
-
-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
-{
-    private static final long serialVersionUID = -8809108200853029849L;
-
-    private final String filename;
-
-    public FileOperationException( @Nullable String filename, @Nonnull String message )
-    {
-        super( Objects.requireNonNull( message, "message cannot be null" ) );
-        this.filename = filename;
-    }
-
-    public FileOperationException( String message )
-    {
-        super( Objects.requireNonNull( message, "message cannot be null" ) );
-        this.filename = null;
-    }
-
-    @Nullable
-    public String getFilename()
-    {
-        return filename;
-    }
-}

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.filesystem;
 
 import java.io.IOException;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.filesystem;
 
 import dan200.computercraft.api.ComputerCraftAPI;
@@ -18,7 +19,7 @@ import java.util.List;
 
 /**
  * Represents a read only part of a virtual filesystem that can be mounted onto a computer using
- * {@link IComputerAccess#mount(String, IMount)}.
+ * {@link IComputerAccess#mount(String, IMount)}
  *
  * Ready made implementations of this interface can be created using
  * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or
@@ -59,7 +60,7 @@ public interface IMount
     void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException;
 
     /**
-     * Returns the size of a file with a given path, in bytes.
+     * Returns the size of a file with a given path, in bytes
      *
      * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
      * @return The size of the file, in bytes.
@@ -89,6 +90,7 @@ public interface IMount
      * @throws IOException If the file does not exist, or could not be opened.
      */
     @Nonnull
+    @SuppressWarnings( "deprecation" )
     default ReadableByteChannel openChannelForRead( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForRead( path ) );

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.filesystem;
 
 import dan200.computercraft.api.ComputerCraftAPI;
@@ -66,6 +67,7 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
+    @SuppressWarnings( "deprecation" )
     default WritableByteChannel openChannelForWrite( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForWrite( path ) );
@@ -92,6 +94,7 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
+    @SuppressWarnings( "deprecation" )
     default WritableByteChannel openChannelForAppend( @Nonnull String path ) throws IOException
     {
         return Channels.newChannel( openForAppend( path ) );

src/main/java/dan200/computercraft/api/filesystem/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|FileSystem", apiVersion = "${version}" )
 package dan200.computercraft.api.filesystem;
 

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

@@ -1,334 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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 dan200.computercraft.api.peripheral.IComputerAccess;
-import dan200.computercraft.api.peripheral.IPeripheral;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Map;
-
-/**
- * Provides methods for extracting values and validating Lua arguments, such as those provided to
- * {@link ILuaObject#callMethod(ILuaContext, int, Object[])} or
- * {@link IPeripheral#callMethod(IComputerAccess, ILuaContext, int, Object[])}.
- *
- * This provides two sets of functions: the {@code get*} methods, which require an argument to be valid, and
- * {@code opt*}, which accept a default value and return that if the argument was not present or was {@code null}.
- * If the argument is of the wrong type, a suitable error message will be thrown, with a similar format to Lua's own
- * error messages.
- *
- * <h2>Example usage:</h2>
- * <pre>
- * {@code
- * int slot = getInt( args, 0 );
- * int amount = optInt( args, 1, 64 );
- * }
- * </pre>
- */
-public final class ArgumentHelper
-{
-    private ArgumentHelper()
-    {
-    }
-
-    /**
-     * Get a string representation of the given value's type.
-     *
-     * @param value The value whose type we are trying to compute.
-     * @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 ) return "nil";
-        if( value instanceof String ) return "string";
-        if( value instanceof Boolean ) return "boolean";
-        if( value instanceof Number ) return "number";
-        if( value instanceof Map ) return "table";
-        return "userdata";
-    }
-
-    /**
-     * Construct a "bad argument" exception, from an expected type and the actual value provided.
-     *
-     * @param index    The argument number, starting from 0.
-     * @param expected The expected type for this argument.
-     * @param actual   The actual value provided for this argument.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badArgumentOf( int index, @Nonnull String expected, @Nullable Object actual )
-    {
-        return badArgument( index, expected, getType( actual ) );
-    }
-
-    /**
-     * Construct a "bad argument" exception, from an expected and actual type.
-     *
-     * @param index    The argument number, starting from 0.
-     * @param expected The expected type for this argument.
-     * @param actual   The provided type for this argument.
-     * @return The constructed exception, which should be thrown immediately.
-     */
-    @Nonnull
-    public static LuaException badArgument( int index, @Nonnull String expected, @Nonnull String actual )
-    {
-        return new LuaException( "bad argument #" + (index + 1) + " (" + expected + " expected, got " + actual + ")" );
-    }
-
-    /**
-     * Get an argument as a double.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a number.
-     * @see #getFiniteDouble(Object[], int) if you require this to be finite (i.e. not infinite or NaN).
-     */
-    public static double getDouble( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        if( index >= args.length ) throw badArgument( index, "number", "nil" );
-        Object value = args[index];
-        if( !(value instanceof Number) ) throw badArgumentOf( index, "number", value );
-        return ((Number) value).doubleValue();
-    }
-
-    /**
-     * Get an argument as an integer.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not an integer.
-     */
-    public static int getInt( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        return (int) getLong( args, index );
-    }
-
-    /**
-     * Get an argument as a long.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a long.
-     */
-    public static long getLong( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        if( index >= args.length ) throw badArgument( index, "number", "nil" );
-        Object value = args[index];
-        if( !(value instanceof Number) ) throw badArgumentOf( index, "number", value );
-        return checkFinite( index, (Number) value ).longValue();
-    }
-
-    /**
-     * Get an argument as a finite number (not infinite or NaN).
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not finite.
-     */
-    public static double getFiniteDouble( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        return checkFinite( index, getDouble( args, index ) );
-    }
-
-    /**
-     * Get an argument as a boolean.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a boolean.
-     */
-    public static boolean getBoolean( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        if( index >= args.length ) throw badArgument( index, "boolean", "nil" );
-        Object value = args[index];
-        if( !(value instanceof Boolean) ) throw badArgumentOf( index, "boolean", value );
-        return (Boolean) value;
-    }
-
-    /**
-     * Get an argument as a string.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a string.
-     */
-    @Nonnull
-    public static String getString( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        if( index >= args.length ) throw badArgument( index, "string", "nil" );
-        Object value = args[index];
-        if( !(value instanceof String) ) throw badArgumentOf( index, "string", value );
-        return (String) value;
-    }
-
-    /**
-     * Get an argument as a table.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @return The argument's value.
-     * @throws LuaException If the value is not a table.
-     */
-    @Nonnull
-    public static Map<?, ?> getTable( @Nonnull Object[] args, int index ) throws LuaException
-    {
-        if( index >= args.length ) throw badArgument( index, "table", "nil" );
-        Object value = args[index];
-        if( !(value instanceof Map) ) throw badArgumentOf( index, "table", value );
-        return (Map<?, ?>) value;
-    }
-
-    /**
-     * Get an argument as a double.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    public static double optDouble( @Nonnull Object[] args, int index, double def ) throws LuaException
-    {
-        Object value = index < args.length ? args[index] : null;
-        if( value == null ) return def;
-        if( !(value instanceof Number) ) throw badArgumentOf( index, "number", value );
-        return ((Number) value).doubleValue();
-    }
-
-    /**
-     * Get an argument as an int.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    public static int optInt( @Nonnull Object[] args, int index, int def ) throws LuaException
-    {
-        return (int) optLong( args, index, def );
-    }
-
-    /**
-     * Get an argument as a long.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a number.
-     */
-    public static long optLong( @Nonnull Object[] args, int index, long def ) throws LuaException
-    {
-        Object value = index < args.length ? args[index] : null;
-        if( value == null ) return def;
-        if( !(value instanceof Number) ) throw badArgumentOf( index, "number", value );
-        return checkFinite( index, (Number) value ).longValue();
-    }
-
-    /**
-     * Get an argument as a finite number (not infinite or NaN).
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not finite.
-     */
-    public static double optFiniteDouble( @Nonnull Object[] args, int index, double def ) throws LuaException
-    {
-        return checkFinite( index, optDouble( args, index, def ) );
-    }
-
-    /**
-     * Get an argument as a boolean.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a boolean.
-     */
-    public static boolean optBoolean( @Nonnull Object[] args, int index, boolean def ) throws LuaException
-    {
-        Object value = index < args.length ? args[index] : null;
-        if( value == null ) return def;
-        if( !(value instanceof Boolean) ) throw badArgumentOf( index, "boolean", value );
-        return (Boolean) value;
-    }
-
-    /**
-     * Get an argument as a string.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a string.
-     */
-    public static String optString( @Nonnull Object[] args, int index, String def ) throws LuaException
-    {
-        Object value = index < args.length ? args[index] : null;
-        if( value == null ) return def;
-        if( !(value instanceof String) ) throw badArgumentOf( index, "string", value );
-        return (String) value;
-    }
-
-    /**
-     * Get an argument as a table.
-     *
-     * @param args  The arguments to extract from.
-     * @param index The index into the argument array to read from.
-     * @param def   The default value, if this argument is not given.
-     * @return The argument's value, or {@code def} if none was provided.
-     * @throws LuaException If the value is not a table.
-     */
-    public static Map<?, ?> optTable( @Nonnull Object[] args, int index, Map<Object, Object> def ) throws LuaException
-    {
-        Object value = index < args.length ? args[index] : null;
-        if( value == null ) return def;
-        if( !(value instanceof Map) ) throw badArgumentOf( index, "table", value );
-        return (Map<?, ?>) value;
-    }
-
-    private static Number checkFinite( int index, Number value ) throws LuaException
-    {
-        checkFinite( index, value.doubleValue() );
-        return value;
-    }
-
-    private static double checkFinite( int index, double value ) throws LuaException
-    {
-        if( !Double.isFinite( value ) ) throw badArgument( index, "number", getNumericType( value ) );
-        return value;
-    }
-
-    /**
-     * Returns a more detailed representation of this number's type. If this is finite, it will just return "number",
-     * otherwise it returns whether it is infinite or NaN.
-     *
-     * @param value The value to extract the type for.
-     * @return This value's numeric type.
-     */
-    @Nonnull
-    public static String getNumericType( double value )
-    {
-        if( Double.isNaN( value ) ) return "nan";
-        if( value == Double.POSITIVE_INFINITY ) return "inf";
-        if( value == Double.NEGATIVE_INFINITY ) return "-inf";
-        return "number";
-    }
-}

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.filesystem.IFileSystem;
@@ -25,7 +26,7 @@ public interface IComputerSystem extends IComputerAccess
     IFileSystem getFileSystem();
 
     /**
-     * Get the label for this computer.
+     * Get the label for this computer
      *
      * @return This computer's label, or {@code null} if it is not set.
      */

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.ComputerCraftAPI;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.ComputerCraftAPI;
@@ -16,7 +17,6 @@ import javax.annotation.Nullable;
  * @see ILuaAPI
  * @see ComputerCraftAPI#registerAPIFactory(ILuaAPIFactory)
  */
-@FunctionalInterface
 public interface ILuaAPIFactory
 {
     /**

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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;
@@ -31,12 +32,7 @@ public interface ILuaContext
      *                              intercepted, or the computer will leak memory and end up in a broken state.
      */
     @Nonnull
-    default Object[] pullEvent( @Nullable String filter ) throws LuaException, InterruptedException
-    {
-        Object[] results = pullEventRaw( filter );
-        if( results.length >= 1 && results[0].equals( "terminate" ) ) throw new LuaException( "Terminated", 0 );
-        return results;
-    }
+    Object[] pullEvent( @Nullable String filter ) throws LuaException, InterruptedException;
 
     /**
      * The same as {@link #pullEvent(String)}, except "terminated" events are ignored. Only use this if you want to
@@ -51,10 +47,7 @@ public interface ILuaContext
      * @see #pullEvent(String)
      */
     @Nonnull
-    default Object[] pullEventRaw( @Nullable String filter ) throws InterruptedException
-    {
-        return yield( new Object[] { filter } );
-    }
+    Object[] pullEventRaw( @Nullable String filter ) throws InterruptedException;
 
     /**
      * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.peripheral.IComputerAccess;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.Nullable;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.Nullable;

src/main/java/dan200/computercraft/api/lua/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Lua", apiVersion = "${version}" )
 package dan200.computercraft.api.lua;
 

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

@@ -1,12 +1,12 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.media;
 
 import dan200.computercraft.api.filesystem.IMount;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.SoundEvent;
 import net.minecraft.world.World;
@@ -16,9 +16,7 @@ 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}.
+ * Implement this interface on your Item class to allow it to be used in the drive.
  */
 public interface IMedia
 {
@@ -45,7 +43,7 @@ public interface IMedia
 
     /**
      * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie:
-     * "Jonathan Coulton - Still Alive"
+     * "Jonathon Coulton - Still Alive"
      *
      * @param stack The {@link ItemStack} to modify.
      * @return The name, or null if this item does not represent an item with audio.
@@ -76,7 +74,7 @@ public interface IMedia
      * @param world The world in which the item and disk drive reside.
      * @return The mount, or null if this item does not represent an item with data. If the mount returned also
      * implements {@link dan200.computercraft.api.filesystem.IWritableMount}, it will mounted using mountWritable()
-     * @see IMount
+     * @see dan200.computercraft.api.filesystem.IMount
      * @see dan200.computercraft.api.filesystem.IWritableMount
      * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long)
      * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String)

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.media;
 
 import net.minecraft.item.ItemStack;
@@ -22,7 +23,7 @@ public interface IMediaProvider
      * Produce an IMedia implementation from an ItemStack.
      *
      * @param stack The stack from which to extract the media information.
-     * @return An {@link IMedia} implementation, or {@code null} if the item is not something you wish to handle
+     * @return An IMedia implementation, or null if the item is not something you wish to handle
      * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider)
      */
     @Nullable

src/main/java/dan200/computercraft/api/media/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Media", apiVersion = "${version}" )
 package dan200.computercraft.api.media;
 

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network;

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network;

src/main/java/dan200/computercraft/api/network/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network", apiVersion = "${version}" )
 package dan200.computercraft.api.network;
 

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network.wired;
 
 import dan200.computercraft.api.ComputerCraftAPI;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network.wired;
 
 import dan200.computercraft.api.peripheral.IPeripheral;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network.wired;
 
 import dan200.computercraft.api.peripheral.IPeripheral;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network.wired;
 
 import dan200.computercraft.api.network.IPacketNetwork;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.network.wired;
 
 import dan200.computercraft.api.network.IPacketSender;

src/main/java/dan200/computercraft/api/network/wired/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network|Wired", apiVersion = "${version}" )
 package dan200.computercraft.api.network.wired;
 

src/main/java/dan200/computercraft/api/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API", apiVersion = "${version}" )
 package dan200.computercraft.api;
 

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

@@ -1,15 +1,14 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.lua.ILuaTask;
 import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
@@ -147,7 +146,7 @@ public interface IComputerAccess
      *
      *                  You may supply {@code null} to indicate that no arguments are to be supplied.
      * @throws RuntimeException If the peripheral has been detached.
-     * @see IPeripheral#callMethod
+     * @see dan200.computercraft.api.peripheral.IPeripheral#callMethod
      */
     void queueEvent( @Nonnull String event, @Nullable Object[] arguments );
 
@@ -180,8 +179,8 @@ public interface IComputerAccess
     }
 
     /**
-     * Get a reachable peripheral with the given attachment name. This is a equivalent to
-     * {@link #getAvailablePeripherals()}{@code .get(name)}, though may be more efficient.
+     * Get a reachable peripheral with the given attachement name. This is a equivalent to
+     * {@link #getAvailablePeripherals()}{@code .get(name)}, though may be more performant.
      *
      * @param name The peripheral's attached name
      * @return The reachable peripheral, or {@code null} if none can be found.
@@ -192,23 +191,4 @@ public interface IComputerAccess
     {
         return null;
     }
-
-    /**
-     * Get a {@link IWorkMonitor} for tasks your peripheral might execute on the main (server) thread.
-     *
-     * This should be used to ensure your peripheral integrates with ComputerCraft's monitoring and limiting of how much
-     * server time each computer consumes. You should not need to use this if you use
-     * {@link ILuaContext#issueMainThreadTask(ILuaTask)} - this is intended for mods with their own system for running
-     * work on the main thread.
-     *
-     * Please note that the returned implementation is <em>not</em> thread-safe, and should only be used from the main
-     * thread.
-     *
-     * @return The work monitor for the main thread, or {@code null} if this computer does not have one.
-     */
-    @Nullable
-    default IWorkMonitor getMainThreadMonitor()
-    {
-        return null;
-    }
 }

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

@@ -1,11 +1,11 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.lua.ArgumentHelper;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;
 
@@ -41,8 +41,8 @@ public interface IPeripheral
      * This is called when a lua program on an attached computer calls {@code peripheral.call()} with
      * one of the methods exposed by {@link #getMethodNames()}.
      *
-     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe when interacting
-     * with Minecraft objects.
+     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * when interacting with Minecraft objects.
      *
      * @param computer  The interface to the computer that is making the call. Remember that multiple
      *                  computers can be attached to a peripheral at once.
@@ -58,11 +58,9 @@ public interface IPeripheral
      *                  Lua values of type "table" will be represented by Object type Map.<br>
      *                  Lua values of any other type will be represented by a null object.<br>
      *                  This array will be empty if no arguments are passed.
-     *
-     *                  It is recommended you use {@link ArgumentHelper} in order to validate and process arguments.
      * @return An array of objects, representing values you wish to return to the lua program. Integers, Doubles, Floats,
-     * Strings, Booleans, Maps, ILuaObject and null be converted to their corresponding lua type. All other types will
-     * be converted to nil.
+     * Strings, Booleans, Maps and ILuaObject and null be converted to their corresponding lua type. All other types
+     * will be converted to nil.
      *
      * You may return null to indicate no values should be returned.
      * @throws LuaException         If you throw any exception from this function, a lua error will be raised with the
@@ -72,27 +70,25 @@ public interface IPeripheral
      *                              InterruptedException will be thrown. This exception must not be caught or
      *                              intercepted, or the computer will leak memory and end up in a broken state.
      * @see #getMethodNames
-     * @see ArgumentHelper
      */
     @Nullable
     Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException;
 
     /**
-     * Is called when when a computer is attaching to the peripheral.
+     * Is called when canAttachToSide has returned true, and a computer is attaching to the peripheral.
      *
      * This will occur when a peripheral is placed next to an active computer, when a computer is turned on next to a
-     * peripheral, when a turtle travels into a square next to a peripheral, or when a wired modem adjacent to this
-     * peripheral is does any of the above.
+     * peripheral, or when a turtle travels into a square next to a peripheral.
      *
-     * Between calls to attach and {@link #detach}, the attached computer can make method calls on the peripheral using
+     * Between calls to attach() and detach(), the attached computer can make method calls on the peripheral using
      * {@code peripheral.call()}. This method can be used to keep track of which computers are attached to the
      * peripheral, or to take action when attachment occurs.
      *
-     * Be aware that will be called from both the server thread and ComputerCraft Lua thread, and so must be thread-safe
-     * and reentrant.
+     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * when interacting with Minecraft objects.
      *
-     * @param computer The interface to the computer that is being attached. Remember that multiple computers can be
-     *                 attached to a peripheral at once.
+     * @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 )
@@ -100,21 +96,19 @@ public interface IPeripheral
     }
 
     /**
-     * Called when a computer is detaching from the peripheral.
+     * Is called when a computer is detaching from the peripheral.
      *
-     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers, when a
-     * turtle moves away from a block attached to a peripheral, or when a wired modem adjacent to this peripheral is
-     * detached.
+     * This will occur when a computer shuts down, when the peripheral is removed while attached to computers,
+     * or when a turtle moves away from a square attached to a peripheral. This method can be used to keep track of
+     * which computers are attached to the peripheral, or to take action when detachment
+     * occurs.
      *
-     * This method can be used to keep track of which computers are attached to the peripheral, or to take action when
-     * detachment occurs.
+     * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe
+     * when interacting with Minecraft objects.
      *
-     * Be aware that this will be called from both the server and ComputerCraft Lua thread, and must be thread-safe
-     * and reentrant.
-     *
-     * @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
+     * @param computer The interface to the computer that is being detached. Remember that multiple
+     *                 computers can be attached to a peripheral at once.
+     * @see #detach
      */
     default void detach( @Nonnull IComputerAccess computer )
     {

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

@@ -1,11 +1,11 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -16,8 +16,6 @@ import javax.annotation.Nullable;
 /**
  * This interface is used to create peripheral implementations for blocks.
  *
- * If you have a {@link TileEntity} which acts as a peripheral, you may alternatively implement {@link IPeripheralTile}.
- *
  * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider)
  */
 @FunctionalInterface

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

@@ -1,32 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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 net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-/**
- * A {@link net.minecraft.tileentity.TileEntity} 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
-{
-    /**
-     * Get the peripheral on the given {@code side}.
-     *
-     * @param side The side to get the peripheral from.
-     * @return A peripheral, or {@code null} if there is not a peripheral here.
-     * @see IPeripheralProvider#getPeripheral(World, BlockPos, EnumFacing)
-     */
-    @Nullable
-    IPeripheral getPeripheral( @Nonnull EnumFacing side );
-}

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

@@ -1,77 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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 java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 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.
- *
- * This is primarily intended for work done by peripherals on the main thread (such as on a tile entity's tick), but
- * could be used for other purposes (such as complex computations done on another thread).
- *
- * Before running a task, one should call {@link #canWork()} to determine if the computer is currently allowed to
- * execute work. If that returns true, you should execute the task and use {@link #trackWork(long, TimeUnit)} to inform
- * the monitor how long that task took.
- *
- * Alternatively, use {@link #runWork(Runnable)} to run and keep track of work.
- *
- * @see IComputerAccess#getMainThreadMonitor()
- */
-public interface IWorkMonitor
-{
-    /**
-     * If the owning computer is currently allowed to execute work.
-     *
-     * @return If we can execute work right now.
-     */
-    boolean canWork();
-
-    /**
-     * If the owning computer is currently allowed to execute work, and has ample time to do so.
-     *
-     * This is effectively a more restrictive form of {@link #canWork()}. One should use that in order to determine if
-     * you may do an initial piece of work, and shouldWork to determine if any additional task may be performed.
-     *
-     * @return If we should execute work right now.
-     */
-    boolean shouldWork();
-
-    /**
-     * Inform the monitor how long some piece of work took to execute.
-     *
-     * @param time The time some task took to run
-     * @param unit The unit that {@code time} was measured in.
-     */
-    void trackWork( long time, @Nonnull TimeUnit unit );
-
-    /**
-     * Run a task if possible, and inform the monitor of how long it took.
-     *
-     * @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 )
-    {
-        Objects.requireNonNull( runnable, "runnable should not be null" );
-        if( !canWork() ) return false;
-
-        long start = System.nanoTime();
-        try
-        {
-            runnable.run();
-        }
-        finally
-        {
-            trackWork( System.nanoTime() - start, TimeUnit.NANOSECONDS );
-        }
-
-        return true;
-    }
-}

src/main/java/dan200/computercraft/api/peripheral/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Peripheral", apiVersion = "${version}" )
 package dan200.computercraft.api.peripheral;
 

src/main/java/dan200/computercraft/api/permissions/ITurtlePermissionProvider.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.permissions;
 
 import net.minecraft.util.math.BlockPos;

src/main/java/dan200/computercraft/api/permissions/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Permissions", apiVersion = "${version}" )
 package dan200.computercraft.api.permissions;
 

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.pocket;
 
 import dan200.computercraft.api.peripheral.IPeripheral;
@@ -15,7 +16,7 @@ import javax.annotation.Nullable;
 import java.util.Map;
 
 /**
- * Wrapper class for pocket computers.
+ * Wrapper class for pocket computers
  */
 public interface IPocketAccess
 {
@@ -23,22 +24,10 @@ public interface IPocketAccess
      * Gets the entity holding this item.
      *
      * @return The holding entity. This may be {@code null}.
-     * @deprecated Use {@link #getValidEntity()} where possible.
      */
     @Nullable
-    @Deprecated
     Entity getEntity();
 
-    /**
-     * Gets the entity holding this item with additional safety checks.
-     *
-     * This must be called on the server thread.
-     *
-     * @return The holding entity, or {@code null} if none exists.
-     */
-    @Nullable
-    Entity getValidEntity();
-
     /**
      * Get the colour of this pocket computer as a RGB number.
      *

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.pocket;
 
 import dan200.computercraft.api.ComputerCraftAPI;
@@ -18,7 +19,7 @@ import javax.annotation.Nullable;
 /**
  * Additional peripherals for pocket computers.
  *
- * This is similar to {@link ITurtleUpgrade}.
+ * This is similar to {@link dan200.computercraft.api.turtle.ITurtleUpgrade}.
  */
 public interface IPocketUpgrade
 {
@@ -53,9 +54,6 @@ public interface IPocketUpgrade
      * pocket computer which holds this upgrade. This item stack is also used to determine the upgrade given by
      * {@code pocket.equip()}/{@code pocket.unequip()}.
      *
-     * Ideally this should be constant over a session. It is recommended that you cache
-     * the item too, in order to prevent constructing it every time the method is called.
-     *
      * @return The item stack used for crafting. This can be {@link ItemStack#EMPTY} if crafting is disabled.
      */
     @Nonnull

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.redstone;
 
 import net.minecraft.util.EnumFacing;

src/main/java/dan200/computercraft/api/redstone/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Redstone", apiVersion = "${version}" )
 package dan200.computercraft.api.redstone;
 

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 com.mojang.authlib.GameProfile;
@@ -144,9 +145,7 @@ public interface ITurtleAccess
     GameProfile getOwningPlayer();
 
     /**
-     * Get the inventory of this turtle.
-     *
-     * Note: this inventory should only be accessed and modified on the server thread.
+     * Get the inventory of this turtle
      *
      * @return This turtle's inventory
      * @see #getItemHandler()
@@ -157,8 +156,6 @@ public interface ITurtleAccess
     /**
      * Get the inventory of this turtle as an {@link IItemHandlerModifiable}.
      *
-     * Note: this inventory should only be accessed and modified on the server thread.
-     *
      * @return This turtle's inventory
      * @see #getInventory()
      * @see IItemHandlerModifiable

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.lua.ILuaContext;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 dan200.computercraft.api.ComputerCraftAPI;
@@ -78,9 +79,6 @@ public interface ITurtleUpgrade
      * with to create a turtle which holds this upgrade. This item stack is also used
      * to determine the upgrade given by {@code turtle.equip()}
      *
-     * Ideally this should be constant over a session. It is recommended that you cache
-     * the item too, in order to prevent constructing it every time the method is called.
-     *
      * @return The item stack to craft with, or {@link ItemStack#EMPTY} if it cannot be crafted.
      */
     @Nonnull
@@ -108,8 +106,8 @@ public interface ITurtleUpgrade
      * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called
      * by the turtle, and the tool is required to do some work.
      *
-     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig} for
-     * digging, {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
+     * Conforming implementations should fire {@link BlockEvent.BreakEvent} and {@link TurtleBlockEvent.Dig}for digging,
+     * {@link AttackEntityEvent} and {@link TurtleAttackEvent} for attacking.
      *
      * @param turtle    Access to the turtle that the tool resides on.
      * @param side      Which side of the turtle (left or right) the tool resides on.

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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;
 
 /**

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 net.minecraft.util.EnumFacing;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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;
 
 /**
@@ -11,12 +12,12 @@ package dan200.computercraft.api.turtle;
 public enum TurtleSide
 {
     /**
-     * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
+     * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle)
      */
     Left,
 
     /**
-     * The turtle's right side (where the modem usually is on a Wireless Mining Turtle).
+     * The turtle's right side (where the modem usually is on a Wireless Mining Turtle)
      */
     Right,
 }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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;
 
 /**

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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 net.minecraft.util.EnumFacing;
@@ -17,12 +18,12 @@ import net.minecraft.util.EnumFacing;
 public enum TurtleVerb
 {
     /**
-     * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}.
+     * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}
      */
     Dig,
 
     /**
-     * The turtle called {@code turtle.attack()}, {@code turtle.attackUp()} or {@code turtle.attackDown()}.
+     * The turtle called {@code turtle.attack()}, {@code turtle.attackUp()} or {@code turtle.attackDown()}
      */
     Attack,
 }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 /**
@@ -70,7 +71,7 @@ public enum TurtleAction
     EQUIP,
 
     /**
-     * Inspect a block in world.
+     * Inspect a block in world
      *
      * @see TurtleBlockEvent.Inspect
      */

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.lua.ILuaContext;
@@ -18,6 +19,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.fml.common.eventhandler.Cancelable;
 
 import javax.annotation.Nonnull;
 import java.util.Map;
@@ -35,6 +37,7 @@ import java.util.Objects;
  * Be aware that some events (such as {@link TurtleInventoryEvent}) do not necessarily interact
  * with a block, simply objects within that block space.
  */
+@Cancelable
 public abstract class TurtleBlockEvent extends TurtlePlayerEvent
 {
     private final World world;
@@ -81,6 +84,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#DIG
      */
+    @Cancelable
     public static class Dig extends TurtleBlockEvent
     {
         private final IBlockState block;
@@ -111,7 +115,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
         }
 
         /**
-         * Get the upgrade doing the digging.
+         * Get the upgrade doing the digging
          *
          * @return The upgrade doing the digging.
          */
@@ -138,6 +142,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#MOVE
      */
+    @Cancelable
     public static class Move extends TurtleBlockEvent
     {
         public Move( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos )
@@ -151,6 +156,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#PLACE
      */
+    @Cancelable
     public static class Place extends TurtleBlockEvent
     {
         private final ItemStack stack;
@@ -182,6 +188,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
      *
      * @see TurtleAction#INSPECT
      */
+    @Cancelable
     public static class Inspect extends TurtleBlockEvent
     {
         private final IBlockState state;
@@ -222,7 +229,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
         /**
          * Add new information to the inspection result. Note this will override fields with the same name.
          *
-         * @param newData The data to add. Note all values should be convertible to Lua (see
+         * @param newData The data to add. Note all values should be convertable to Lua (see
          *                {@link dan200.computercraft.api.peripheral.IPeripheral#callMethod(IComputerAccess, ILuaContext, int, Object[])}).
          */
         public void addData( @Nonnull Map<String, ?> newData )

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;

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

@@ -1,73 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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.event;
-
-import dan200.computercraft.api.lua.ILuaContext;
-import dan200.computercraft.api.peripheral.IComputerAccess;
-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.
- *
- * You may prevent items being inspected, or add additional information to the result. Be aware that this is fired on
- * the computer thread, and so any operations on it must be thread safe.
- *
- * @see TurtleAction#INSPECT_ITEM
- */
-public class TurtleInspectItemEvent extends TurtleActionEvent
-{
-    private final ItemStack stack;
-    private final Map<String, Object> data;
-
-    public TurtleInspectItemEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, @Nonnull Map<String, Object> data )
-    {
-        super( turtle, TurtleAction.INSPECT_ITEM );
-
-        Objects.requireNonNull( stack, "stack cannot be null" );
-        Objects.requireNonNull( data, "data cannot be null" );
-        this.stack = stack;
-        this.data = data;
-    }
-
-    /**
-     * The item which is currently being inspected.
-     *
-     * @return The item stack which is being inspected. This should <b>not</b> be modified.
-     */
-    @Nonnull
-    public ItemStack getStack()
-    {
-        return stack;
-    }
-
-    /**
-     * Get the "inspection data" from this item, which will be returned to the user.
-     *
-     * @return This items's inspection data.
-     */
-    @Nonnull
-    public Map<String, Object> getData()
-    {
-        return data;
-    }
-
-    /**
-     * Add new information to the inspection result. Note this will override fields with the same name.
-     *
-     * @param newData The data to add. Note all values should be convertible to Lua (see
-     *                {@link dan200.computercraft.api.peripheral.IPeripheral#callMethod(IComputerAccess, ILuaContext, int, Object[])}).
-     */
-    public void addData( @Nonnull Map<String, ?> newData )
-    {
-        Objects.requireNonNull( newData, "newData cannot be null" );
-        data.putAll( newData );
-    }
-}

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;
@@ -10,6 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.items.IItemHandler;
 
 import javax.annotation.Nonnull;
@@ -19,6 +21,7 @@ import java.util.Objects;
 /**
  * Fired when a turtle attempts to interact with an inventory.
  */
+@Cancelable
 public abstract class TurtleInventoryEvent extends TurtleBlockEvent
 {
     private final IItemHandler handler;
@@ -30,7 +33,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
     }
 
     /**
-     * Get the inventory being interacted with.
+     * Get the inventory being interacted with
      *
      * @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
      */
@@ -45,6 +48,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#SUCK
      */
+    @Cancelable
     public static class Suck extends TurtleInventoryEvent
     {
         public Suck( @Nonnull ITurtleAccess turtle, @Nonnull FakePlayer player, @Nonnull World world, @Nonnull BlockPos pos, @Nullable IItemHandler handler )
@@ -58,6 +62,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
      *
      * @see TurtleAction#DROP
      */
+    @Cancelable
     public static class Drop extends TurtleInventoryEvent
     {
         private final ItemStack stack;
@@ -73,12 +78,13 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
         /**
          * The item which will be inserted into the inventory/dropped on the ground.
          *
-         * @return The item stack which will be dropped. This should <b>not</b> be modified.
+         * Note that this is a copy of the original stack, and so should not be modified, as that will have no effect.
+         *
+         * @return The item stack which will be dropped.
          */
-        @Nonnull
         public ItemStack getStack()
         {
-            return stack;
+            return stack.copy();
         }
     }
 }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.event;
 
 import dan200.computercraft.api.turtle.ITurtleAccess;

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

@@ -1,90 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. 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.event;
-
-import dan200.computercraft.api.turtle.ITurtleAccess;
-import net.minecraft.item.ItemStack;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.Objects;
-
-/**
- * Fired when a turtle attempts to refuel from an item.
- *
- * 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
-{
-    private final ItemStack stack;
-    private Handler handler;
-
-    public TurtleRefuelEvent( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack )
-    {
-        super( turtle, TurtleAction.REFUEL );
-
-        Objects.requireNonNull( turtle, "turtle cannot be null" );
-        this.stack = stack;
-    }
-
-    /**
-     * Get the stack we are attempting to refuel from.
-     *
-     * Do not modify the returned stack - all modifications should be done within the {@link Handler}.
-     *
-     * @return The stack to refuel from.
-     */
-    public ItemStack getStack()
-    {
-        return stack;
-    }
-
-    /**
-     * Get the refuel handler for this stack.
-     *
-     * @return The refuel handler, or {@code null} if none has currently been set.
-     * @see #setHandler(Handler)
-     */
-    @Nullable
-    public Handler getHandler()
-    {
-        return handler;
-    }
-
-    /**
-     * Set the refuel handler for this stack.
-     *
-     * You should call this if you can actually refuel from this item, and ideally only if there are no existing
-     * handlers.
-     *
-     * @param handler The new refuel handler.
-     * @see #getHandler()
-     */
-    public void setHandler( @Nullable Handler handler )
-    {
-        this.handler = handler;
-    }
-
-    /**
-     * Handles refuelling a turtle from a specific item.
-     */
-    @FunctionalInterface
-    public interface Handler
-    {
-        /**
-         * Refuel a turtle using an item.
-         *
-         * @param turtle The turtle to refuel.
-         * @param stack  The stack to refuel with.
-         * @param slot   The slot the stack resides within. This may be used to modify the inventory afterwards.
-         * @param limit  The maximum number of refuel operations to perform. This will often correspond to the number of
-         *               items to consume.
-         * @return The amount of fuel gained.
-         */
-        int refuel( @Nonnull ITurtleAccess turtle, @Nonnull ItemStack stack, int slot, int limit );
-    }
-}

src/main/java/dan200/computercraft/api/turtle/event/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle|Event", apiVersion = "${version}" )
 package dan200.computercraft.api.turtle.event;
 

src/main/java/dan200/computercraft/api/turtle/package-info.java

@@ -1,8 +1,9 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2019. 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.
  */
+
 @API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle", apiVersion = "${version}" )
 package dan200.computercraft.api.turtle;
 

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

@@ -1,14 +1,14 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.TurtleModelLoader;
 import dan200.computercraft.shared.media.items.ItemDiskLegacy;
-import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 import dan200.computercraft.shared.turtle.items.ItemTurtleBase;
 import dan200.computercraft.shared.util.Colour;
 import net.minecraft.client.Minecraft;
@@ -38,9 +38,9 @@ import javax.annotation.Nonnull;
  * Registers textures and models for items.
  */
 @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
-public final class ClientRegistry
+public class ClientRegistry
 {
-    private static final String[] EXTRA_MODELS = new String[] {
+    private static final String[] EXTRA_MODELS = {
         "turtle_modem_off_left",
         "turtle_modem_on_left",
         "turtle_modem_off_right",
@@ -58,8 +58,6 @@ public final class ClientRegistry
         "turtle_elf_overlay",
     };
 
-    private ClientRegistry() {}
-
     @SubscribeEvent
     public static void registerModels( ModelRegistryEvent event )
     {
@@ -119,7 +117,7 @@ public final class ClientRegistry
     public static void onItemColours( ColorHandlerEvent.Item event )
     {
         event.getItemColors().registerItemColorHandler(
-            ( stack, layer ) -> layer == 1 ? ((ItemDiskLegacy) stack.getItem()).getColour( stack ) : 0xFFFFFF,
+            ( stack, layer ) -> layer == 0 ? 0xFFFFFF : ((ItemDiskLegacy) stack.getItem()).getColour( stack ),
             ComputerCraft.Items.disk, ComputerCraft.Items.diskExpanded
         );
 
@@ -129,21 +127,32 @@ public final class ClientRegistry
                 case 0:
                 default:
                     return 0xFFFFFF;
-                case 1: // Frame colour
-                    return ComputerCraft.Items.pocketComputer.getColour( stack );
-                case 2: // Light colour
+                case 1:
                 {
-                    int light = ItemPocketComputer.getLightState( stack );
-                    return light == -1 ? Colour.Black.getHex() : light;
+                    // Frame colour
+                    int colour = ComputerCraft.Items.pocketComputer.getColour( stack );
+                    return colour == -1 ? 0xFFFFFF : colour;
+                }
+                case 2:
+                {
+                    // Light colour
+                    int colour = ComputerCraft.Items.pocketComputer.getLightState( stack );
+                    return colour == -1 ? Colour.Black.getHex() : colour;
                 }
             }
         }, ComputerCraft.Items.pocketComputer );
 
         // Setup turtle colours
-        event.getItemColors().registerItemColorHandler(
-            ( stack, tintIndex ) -> tintIndex == 0 ? ((ItemTurtleBase) stack.getItem()).getColour( stack ) : 0xFFFFFF,
-            ComputerCraft.Blocks.turtle, ComputerCraft.Blocks.turtleExpanded, ComputerCraft.Blocks.turtleAdvanced
-        );
+        event.getItemColors().registerItemColorHandler( ( stack, tintIndex ) -> {
+            if( tintIndex == 0 )
+            {
+                ItemTurtleBase turtle = (ItemTurtleBase) stack.getItem();
+                int colour = turtle.getColour( stack );
+                if( colour != -1 ) return colour;
+            }
+
+            return 0xFFFFFF;
+        }, ComputerCraft.Blocks.turtle, ComputerCraft.Blocks.turtleExpanded, ComputerCraft.Blocks.turtleAdvanced );
     }
 
     private static void registerItemModel( Item item, int damage, String name )

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
 import dan200.computercraft.shared.command.text.ChatHelpers;
@@ -12,14 +13,12 @@ import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiNewChat;
-import net.minecraft.client.gui.GuiUtilRenderComponents;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextFormatting;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.annotation.Nullable;
-import java.util.List;
 
 public class ClientTableFormatter implements TableFormatter
 {
@@ -27,7 +26,7 @@ public class ClientTableFormatter implements TableFormatter
 
     private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
 
-    private static FontRenderer renderer()
+    private FontRenderer renderer()
     {
         return Minecraft.getMinecraft().fontRenderer;
     }
@@ -63,13 +62,7 @@ public class ClientTableFormatter implements TableFormatter
     @Override
     public void writeLine( int id, ITextComponent component )
     {
-        Minecraft mc = Minecraft.getMinecraft();
-        GuiNewChat chat = mc.ingameGUI.getChatGUI();
-
-        // Trim the text if it goes over the allowed length
-        int maxWidth = MathHelper.floor( chat.getChatWidth() / chat.getChatScale() );
-        List<ITextComponent> list = GuiUtilRenderComponents.splitText( component, maxWidth, mc.fontRenderer, false, false );
-        if( !list.isEmpty() ) chat.printChatMessageWithOptionalDeletion( list.get( 0 ), id );
+        Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion( component, id );
     }
 
     @Override

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client;
 
 import dan200.computercraft.ComputerCraft;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.core.terminal.TextBuffer;
@@ -18,7 +19,7 @@ import org.lwjgl.opengl.GL11;
 
 import java.util.Arrays;
 
-public final class FixedWidthFontRenderer
+public class FixedWidthFontRenderer
 {
     private static final ResourceLocation FONT = new ResourceLocation( "computercraft", "textures/gui/term_font.png" );
     public static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/term_background.png" );
@@ -92,7 +93,7 @@ public final class FixedWidthFontRenderer
 
     private boolean isGreyScale( int colour )
     {
-        return colour == 0 || colour == 15 || colour == 7 || colour == 8;
+        return (colour == 0 || colour == 15 || colour == 7 || colour == 8);
     }
 
     public void drawStringBackgroundPart( int x, int y, TextBuffer backgroundColour, double leftMarginSize, double rightMarginSize, boolean greyScale, Palette p )

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.ComputerCraft;
@@ -23,10 +24,9 @@ import java.io.IOException;
 
 public class GuiComputer extends GuiContainer
 {
-    public static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners.png" );
-    public static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_advanced.png" );
-    public static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_command.png" );
-    public static final ResourceLocation BACKGROUND_COLOUR = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/corners_colour.png" );
+    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/corners.png" );
+    private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/corners_advanced.png" );
+    private static final ResourceLocation BACKGROUND_COMMAND = new ResourceLocation( "computercraft", "textures/gui/corners_command.png" );
 
     private final ComputerFamily m_family;
     private final ClientComputer m_computer;
@@ -80,6 +80,12 @@ public class GuiComputer extends GuiContainer
         Keyboard.enableRepeatEvents( false );
     }
 
+    @Override
+    public boolean doesGuiPauseGame()
+    {
+        return false;
+    }
+
     @Override
     public void updateScreen()
     {
@@ -138,7 +144,7 @@ public class GuiComputer extends GuiContainer
     }
 
     @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    public void drawScreen( int mouseX, int mouseY, float f )
     {
         // Work out where to draw
         int startX = (width - m_terminal.getWidth()) / 2;
@@ -150,7 +156,7 @@ public class GuiComputer extends GuiContainer
         drawDefaultBackground();
 
         // Draw terminal
-        m_terminal.draw( mc, startX, startY, mouseX, mouseY );
+        m_terminal.draw( this.mc, startX, startY, mouseX, mouseY );
 
         // Draw a border around the terminal
         GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
@@ -158,23 +164,29 @@ public class GuiComputer extends GuiContainer
         {
             case Normal:
             default:
-                mc.getTextureManager().bindTexture( BACKGROUND_NORMAL );
+            {
+                this.mc.getTextureManager().bindTexture( BACKGROUND );
                 break;
+            }
             case Advanced:
-                mc.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
+            {
+                this.mc.getTextureManager().bindTexture( BACKGROUND_ADVANCED );
                 break;
+            }
             case Command:
-                mc.getTextureManager().bindTexture( BACKGROUND_COMMAND );
+            {
+                this.mc.getTextureManager().bindTexture( BACKGROUND_COMMAND );
                 break;
+            }
         }
 
         drawTexturedModalRect( startX - 12, startY - 12, 12, 28, 12, 12 );
-        drawTexturedModalRect( startX - 12, endY, 12, 40, 12, 12 );
+        drawTexturedModalRect( startX - 12, endY, 12, 40, 12, 16 );
         drawTexturedModalRect( endX, startY - 12, 24, 28, 12, 12 );
-        drawTexturedModalRect( endX, endY, 24, 40, 12, 12 );
+        drawTexturedModalRect( endX, endY, 24, 40, 12, 16 );
 
         drawTexturedModalRect( startX, startY - 12, 0, 0, endX - startX, 12 );
-        drawTexturedModalRect( startX, endY, 0, 12, endX - startX, 12 );
+        drawTexturedModalRect( startX, endY, 0, 12, endX - startX, 16 );
 
         drawTexturedModalRect( startX - 12, startY, 0, 28, 12, endY - startY );
         drawTexturedModalRect( endX, startY, 36, 28, 12, endY - startY );

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.ComputerCraft;
@@ -21,8 +22,10 @@ public class GuiConfigCC extends GuiConfig
         super( parentScreen, Config.getConfigElements(), ComputerCraft.MOD_ID, false, false, "CC: Tweaked" );
     }
 
-    public static class Factory implements IModGuiFactory
+    public static class Factory
+        implements IModGuiFactory
     {
+
         @Override
         public void initialize( Minecraft minecraft )
         {

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
@@ -24,19 +25,21 @@ public class GuiDiskDrive extends GuiContainer
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
+    protected void drawGuiContainerForegroundLayer( int par1, int par2 )
     {
         String title = m_container.getDiskDrive().getDisplayName().getUnformattedText();
         fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
-        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, (ySize - 96) + 2, 0x404040 );
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerBackgroundLayer( float f, int i, int j )
     {
         GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( BACKGROUND );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        this.mc.getTextureManager().bindTexture( BACKGROUND );
+        int l = (width - xSize) / 2;
+        int i1 = (height - ySize) / 2;
+        drawTexturedModalRect( l, i1, 0, 0, xSize, ySize );
     }
 
     @Override

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

@@ -1,13 +1,13 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.shared.media.inventory.ContainerHeldItem;
-import dan200.computercraft.shared.pocket.items.ItemPocketComputer;
 
 public class GuiPocketComputer extends GuiComputer
 {
@@ -16,7 +16,7 @@ public class GuiPocketComputer extends GuiComputer
         super(
             container,
             ComputerCraft.Items.pocketComputer.getFamily( container.getStack() ),
-            ItemPocketComputer.createClientComputer( container.getStack() ),
+            ComputerCraft.Items.pocketComputer.createClientComputer( container.getStack() ),
             ComputerCraft.terminalWidth_pocketComputer,
             ComputerCraft.terminalHeight_pocketComputer
         );

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
@@ -15,30 +16,36 @@ public class GuiPrinter extends GuiContainer
 {
     private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/printer.png" );
 
-    private final ContainerPrinter container;
+    private final ContainerPrinter m_container;
 
     public GuiPrinter( ContainerPrinter container )
     {
         super( container );
-        this.container = container;
+        m_container = container;
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer( int mouseX, int mouseY )
+    protected void drawGuiContainerForegroundLayer( int par1, int par2 )
     {
-        String title = container.getPrinter().getDisplayName().getUnformattedText();
+        String title = m_container.getPrinter().getDisplayName().getUnformattedText();
         fontRenderer.drawString( title, (xSize - fontRenderer.getStringWidth( title )) / 2, 6, 0x404040 );
-        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, ySize - 96 + 2, 0x404040 );
+        fontRenderer.drawString( I18n.format( "container.inventory" ), 8, (ySize - 96) + 2, 0x404040 );
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerBackgroundLayer( float f, int i, int j )
     {
         GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( BACKGROUND );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        this.mc.getTextureManager().bindTexture( BACKGROUND );
+        int startX = (width - xSize) / 2;
+        int startY = (height - ySize) / 2;
+        drawTexturedModalRect( startX, startY, 0, 0, xSize, ySize );
 
-        if( container.isPrinting() ) drawTexturedModalRect( guiLeft + 34, guiTop + 21, 176, 0, 25, 45 );
+        boolean printing = m_container.isPrinting();
+        if( printing )
+        {
+            drawTexturedModalRect( startX + 34, startY + 21, 176, 0, 25, 45 );
+        }
     }
 
     @Override

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.core.terminal.TextBuffer;
@@ -28,8 +29,6 @@ public class GuiPrintout extends GuiContainer
     {
         super( container );
 
-        ySize = Y_SIZE;
-
         String[] text = ItemPrintout.getText( container.getStack() );
         m_text = new TextBuffer[text.length];
         for( int i = 0; i < m_text.length; i++ ) m_text[i] = new TextBuffer( text[i] );
@@ -43,6 +42,12 @@ public class GuiPrintout extends GuiContainer
         m_book = ItemPrintout.getType( container.getStack() ) == ItemPrintout.Type.Book;
     }
 
+    @Override
+    public boolean doesGuiPauseGame()
+    {
+        return false;
+    }
+
     @Override
     protected void keyTyped( char c, int k ) throws IOException
     {
@@ -68,35 +73,41 @@ public class GuiPrintout extends GuiContainer
         int mouseWheelChange = Mouse.getEventDWheel();
         if( mouseWheelChange < 0 )
         {
-            // Scroll up goes to the next page
+            // Up
             if( m_page < m_pages - 1 ) m_page++;
         }
         else if( mouseWheelChange > 0 )
         {
-            // Scroll down goes to the previous page
+            // Down
             if( m_page > 0 ) m_page--;
         }
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerForegroundLayer( int par1, int par2 )
     {
-        // Draw the printout
-        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
-
-        drawBorder( guiLeft, guiTop, zLevel, m_page, m_pages, m_book );
-        drawText( guiLeft + X_TEXT_MARGIN, guiTop + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
     }
 
     @Override
-    public void drawScreen( int mouseX, int mouseY, float partialTicks )
+    protected void drawGuiContainerBackgroundLayer( float var1, int var2, int var3 )
     {
-        // We must take the background further back in order to not overlap with our printed pages.
-        zLevel--;
-        drawDefaultBackground();
-        zLevel++;
+    }
 
-        super.drawScreen( mouseX, mouseY, partialTicks );
-        renderHoveredToolTip( mouseX, mouseY );
+    @Override
+    public void drawScreen( int mouseX, int mouseY, float f )
+    {
+        // Draw background
+        zLevel = zLevel - 1;
+        drawDefaultBackground();
+        zLevel = zLevel + 1;
+
+        // Draw the printout
+        GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
+
+        int startY = (height - Y_SIZE) / 2;
+        int startX = (width - X_SIZE) / 2;
+
+        drawBorder( startX, startY, zLevel, m_page, m_pages, m_book );
+        drawText( startX + X_TEXT_MARGIN, startY + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
     }
 }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui;
 
 import dan200.computercraft.ComputerCraft;
@@ -22,7 +23,7 @@ import java.io.IOException;
 
 public class GuiTurtle extends GuiContainer
 {
-    private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
+    private static final ResourceLocation BACKGROUND = new ResourceLocation( "computercraft", "textures/gui/turtle.png" );
     private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
 
     private ContainerTurtle m_container;
@@ -49,8 +50,8 @@ public class GuiTurtle extends GuiContainer
         super.initGui();
         Keyboard.enableRepeatEvents( true );
         m_terminalGui = new WidgetTerminal(
-            guiLeft + 8,
-            guiTop + 8,
+            (width - xSize) / 2 + 8,
+            (height - ySize) / 2 + 8,
             ComputerCraft.terminalWidth_turtle,
             ComputerCraft.terminalHeight_turtle,
             () -> m_computer,
@@ -97,8 +98,8 @@ public class GuiTurtle extends GuiContainer
     public void handleMouseInput() throws IOException
     {
         super.handleMouseInput();
-        int x = Mouse.getEventX() * width / mc.displayWidth;
-        int y = height - Mouse.getEventY() * height / mc.displayHeight - 1;
+        int x = Mouse.getEventX() * this.width / mc.displayWidth;
+        int y = this.height - Mouse.getEventY() * this.height / mc.displayHeight - 1;
         m_terminalGui.handleMouseInput( x, y );
     }
 
@@ -111,29 +112,34 @@ public class GuiTurtle extends GuiContainer
 
     protected void drawSelectionSlot( boolean advanced )
     {
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+
         // Draw selection slot
         int slot = m_container.getSelectedSlot();
         if( slot >= 0 )
         {
             GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-            int slotX = slot % 4;
-            int slotY = slot / 4;
-            mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-            drawTexturedModalRect( guiLeft + m_container.turtleInvStartX - 2 + slotX * 18, guiTop + m_container.playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
+            int slotX = (slot % 4);
+            int slotY = (slot / 4);
+            this.mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND );
+            drawTexturedModalRect( x + m_container.m_turtleInvStartX - 2 + slotX * 18, y + m_container.m_playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
         }
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer( float partialTicks, int mouseX, int mouseY )
+    protected void drawGuiContainerBackgroundLayer( float f, int mouseX, int mouseY )
     {
         // Draw term
-        boolean advanced = m_family == ComputerFamily.Advanced;
+        boolean advanced = (m_family == ComputerFamily.Advanced);
         m_terminalGui.draw( Minecraft.getMinecraft(), 0, 0, mouseX, mouseY );
 
         // Draw border/inventory
         GlStateManager.color( 1.0F, 1.0F, 1.0F, 1.0F );
-        mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
-        drawTexturedModalRect( guiLeft, guiTop, 0, 0, xSize, ySize );
+        this.mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND );
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect( x, y, 0, 0, xSize, ySize );
 
         drawSelectionSlot( advanced );
     }

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui.widgets;
 
 import net.minecraft.client.Minecraft;

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.gui.widgets;
 
 import dan200.computercraft.client.FrameInfo;
@@ -30,23 +31,23 @@ public class WidgetTerminal extends Widget
 
     private final IComputerContainer m_computer;
 
-    private float m_terminateTimer = 0.0f;
-    private float m_rebootTimer = 0.0f;
-    private float m_shutdownTimer = 0.0f;
+    private float m_terminateTimer;
+    private float m_rebootTimer;
+    private float m_shutdownTimer;
 
-    private int m_lastClickButton = -1;
-    private int m_lastClickX = -1;
-    private int m_lastClickY = -1;
+    private int m_lastClickButton;
+    private int m_lastClickX;
+    private int m_lastClickY;
 
-    private boolean m_focus = false;
-    private boolean m_allowFocusLoss = true;
+    private boolean m_focus;
+    private boolean m_allowFocusLoss;
 
     private int m_leftMargin;
     private int m_rightMargin;
     private int m_topMargin;
     private int m_bottomMargin;
 
-    private final ArrayList<Integer> m_keysDown = new ArrayList<>();
+    private ArrayList<Integer> m_keysDown;
 
     public WidgetTerminal( int x, int y, int termWidth, int termHeight, IComputerContainer computer, int leftMargin, int rightMargin, int topMargin, int bottomMargin )
     {
@@ -57,11 +58,23 @@ public class WidgetTerminal extends Widget
         );
 
         m_computer = computer;
+        m_terminateTimer = 0.0f;
+        m_rebootTimer = 0.0f;
+        m_shutdownTimer = 0.0f;
+
+        m_lastClickButton = -1;
+        m_lastClickX = -1;
+        m_lastClickY = -1;
+
+        m_focus = false;
+        m_allowFocusLoss = true;
 
         m_leftMargin = leftMargin;
         m_rightMargin = rightMargin;
         m_topMargin = topMargin;
         m_bottomMargin = bottomMargin;
+
+        m_keysDown = new ArrayList<>();
     }
 
     public void setAllowFocusLoss( boolean allowFocusLoss )
@@ -81,9 +94,9 @@ public class WidgetTerminal extends Widget
                 String clipboard = GuiScreen.getClipboardString();
                 if( clipboard != null )
                 {
-                    // Clip to the first occurrence of \r or \n
-                    int newLineIndex1 = clipboard.indexOf( '\r' );
-                    int newLineIndex2 = clipboard.indexOf( '\n' );
+                    // Clip to the first occurance of \r or \n
+                    int newLineIndex1 = clipboard.indexOf( "\r" );
+                    int newLineIndex2 = clipboard.indexOf( "\n" );
                     if( newLineIndex1 >= 0 && newLineIndex2 >= 0 )
                     {
                         clipboard = clipboard.substring( 0, Math.min( newLineIndex1, newLineIndex2 ) );
@@ -109,7 +122,9 @@ public class WidgetTerminal extends Widget
                         }
 
                         // Queue the "paste" event
-                        queueEvent( "paste", new Object[] { clipboard } );
+                        queueEvent( "paste", new Object[] {
+                            clipboard
+                        } );
                     }
                 }
                 return true;
@@ -128,15 +143,18 @@ public class WidgetTerminal extends Widget
                     }
 
                     // Queue the "key" event
-                    IComputer computer = m_computer.getComputer();
-                    if( computer != null ) computer.keyDown( key, repeat );
+                    queueEvent( "key", new Object[] {
+                        key, repeat
+                    } );
                     handled = true;
                 }
 
                 if( (ch >= 32 && ch <= 126) || (ch >= 160 && ch <= 255) ) // printable chars in byte range
                 {
                     // Queue the "char" event
-                    queueEvent( "char", new Object[] { Character.toString( ch ) } );
+                    queueEvent( "char", new Object[] {
+                        Character.toString( ch )
+                    } );
                     handled = true;
                 }
 
@@ -171,7 +189,9 @@ public class WidgetTerminal extends Widget
                         charX = Math.min( Math.max( charX, 0 ), term.getWidth() - 1 );
                         charY = Math.min( Math.max( charY, 0 ), term.getHeight() - 1 );
 
-                        computer.mouseClick( button + 1, charX + 1, charY + 1 );
+                        computer.queueEvent( "mouse_click", new Object[] {
+                            button + 1, charX + 1, charY + 1
+                        } );
 
                         m_lastClickButton = button;
                         m_lastClickX = charX;
@@ -202,8 +222,9 @@ public class WidgetTerminal extends Widget
                 if( m_focus )
                 {
                     // Queue the "key_up" event
-                    IComputer computer = m_computer.getComputer();
-                    if( computer != null ) computer.keyUp( key );
+                    queueEvent( "key_up", new Object[] {
+                        key
+                    } );
                     handled = true;
                 }
             }
@@ -230,7 +251,12 @@ public class WidgetTerminal extends Widget
 
                 if( m_lastClickButton >= 0 && !Mouse.isButtonDown( m_lastClickButton ) )
                 {
-                    if( m_focus ) computer.mouseUp( m_lastClickButton + 1, charX + 1, charY + 1 );
+                    if( m_focus )
+                    {
+                        computer.queueEvent( "mouse_up", new Object[] {
+                            m_lastClickButton + 1, charX + 1, charY + 1
+                        } );
+                    }
                     m_lastClickButton = -1;
                 }
 
@@ -244,16 +270,22 @@ public class WidgetTerminal extends Widget
                 {
                     if( wheelChange < 0 )
                     {
-                        computer.mouseScroll( 1, charX + 1, charY + 1 );
+                        computer.queueEvent( "mouse_scroll", new Object[] {
+                            1, charX + 1, charY + 1
+                        } );
                     }
                     else if( wheelChange > 0 )
                     {
-                        computer.mouseScroll( -1, charX + 1, charY + 1 );
+                        computer.queueEvent( "mouse_scroll", new Object[] {
+                            -1, charX + 1, charY + 1
+                        } );
                     }
 
                     if( m_lastClickButton >= 0 && (charX != m_lastClickX || charY != m_lastClickY) )
                     {
-                        computer.mouseDrag( m_lastClickButton + 1, charX + 1, charY + 1 );
+                        computer.queueEvent( "mouse_drag", new Object[] {
+                            m_lastClickButton + 1, charX + 1, charY + 1
+                        } );
                         m_lastClickX = charX;
                         m_lastClickY = charY;
                     }
@@ -273,8 +305,11 @@ public class WidgetTerminal extends Widget
             {
                 if( m_terminateTimer < TERMINATE_TIME )
                 {
-                    m_terminateTimer += 0.05f;
-                    if( m_terminateTimer >= TERMINATE_TIME ) queueEvent( "terminate" );
+                    m_terminateTimer = m_terminateTimer + 0.05f;
+                    if( m_terminateTimer >= TERMINATE_TIME )
+                    {
+                        queueEvent( "terminate" );
+                    }
                 }
             }
             else
@@ -287,11 +322,14 @@ public class WidgetTerminal extends Widget
             {
                 if( m_rebootTimer < TERMINATE_TIME )
                 {
-                    m_rebootTimer += 0.05f;
+                    m_rebootTimer = m_rebootTimer + 0.05f;
                     if( m_rebootTimer >= TERMINATE_TIME )
                     {
                         IComputer computer = m_computer.getComputer();
-                        if( computer != null ) computer.reboot();
+                        if( computer != null )
+                        {
+                            computer.reboot();
+                        }
                     }
                 }
             }
@@ -305,11 +343,14 @@ public class WidgetTerminal extends Widget
             {
                 if( m_shutdownTimer < TERMINATE_TIME )
                 {
-                    m_shutdownTimer += 0.05f;
+                    m_shutdownTimer = m_shutdownTimer + 0.05f;
                     if( m_shutdownTimer >= TERMINATE_TIME )
                     {
                         IComputer computer = m_computer.getComputer();
-                        if( computer != null ) computer.shutdown();
+                        if( computer != null )
+                        {
+                            computer.shutdown();
+                        }
                     }
                 }
             }
@@ -336,7 +377,7 @@ public class WidgetTerminal extends Widget
         {
             // Draw the screen contents
             IComputer computer = m_computer.getComputer();
-            Terminal terminal = computer != null ? computer.getTerminal() : null;
+            Terminal terminal = (computer != null) ? computer.getTerminal() : null;
             if( terminal != null )
             {
                 // Draw the terminal
@@ -414,12 +455,18 @@ public class WidgetTerminal extends Widget
     private void queueEvent( String event )
     {
         IComputer computer = m_computer.getComputer();
-        if( computer != null ) computer.queueEvent( event );
+        if( computer != null )
+        {
+            computer.queueEvent( event );
+        }
     }
 
     private void queueEvent( String event, Object[] args )
     {
         IComputer computer = m_computer.getComputer();
-        if( computer != null ) computer.queueEvent( event, args );
+        if( computer != null )
+        {
+            computer.queueEvent( event, args );
+        }
     }
 }

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

@@ -0,0 +1,24 @@
+/*
+ * This file is part of ComputerCraft - http://www.computercraft.info
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Send enquiries to dratcliffe@gmail.com
+ */
+
+package dan200.computercraft.client.proxy;
+
+import dan200.computercraft.client.render.TileEntityTurtleRenderer;
+import dan200.computercraft.shared.proxy.CCTurtleProxyCommon;
+import dan200.computercraft.shared.turtle.blocks.TileTurtle;
+import net.minecraftforge.fml.client.registry.ClientRegistry;
+
+public class CCTurtleProxyClient extends CCTurtleProxyCommon
+{
+    @Override
+    public void init()
+    {
+        super.init();
+
+        // Setup renderers
+        ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
+    }
+}

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

@@ -1,20 +1,19 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.proxy;
 
 import dan200.computercraft.ComputerCraft;
 import dan200.computercraft.client.render.TileEntityCableRenderer;
 import dan200.computercraft.client.render.TileEntityMonitorRenderer;
-import dan200.computercraft.client.render.TileEntityTurtleRenderer;
 import dan200.computercraft.shared.command.CommandCopy;
 import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
 import dan200.computercraft.shared.peripheral.monitor.ClientMonitor;
 import dan200.computercraft.shared.peripheral.monitor.TileMonitor;
 import dan200.computercraft.shared.proxy.ComputerCraftProxyCommon;
-import dan200.computercraft.shared.turtle.blocks.TileTurtle;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -41,11 +40,10 @@ public class ComputerCraftProxyClient extends ComputerCraftProxyCommon
         // Setup renderers
         ClientRegistry.bindTileEntitySpecialRenderer( TileMonitor.class, new TileEntityMonitorRenderer() );
         ClientRegistry.bindTileEntitySpecialRenderer( TileCable.class, new TileEntityCableRenderer() );
-        ClientRegistry.bindTileEntitySpecialRenderer( TileTurtle.class, new TileEntityTurtleRenderer() );
     }
 
     @Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
-    public static final class ForgeHandlers
+    public static class ForgeHandlers
     {
         @SubscribeEvent
         public static void onWorldUnload( WorldEvent.Unload event )

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

@@ -1,8 +1,9 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
+
 package dan200.computercraft.client.render;
 
 import net.minecraft.client.Minecraft;
@@ -17,7 +18,7 @@ import net.minecraft.util.math.MathHelper;
 public abstract class ItemMapLikeRenderer
 {
     /**
-     * The main rendering method for the item.
+     * The main rendering method for the item
      *
      * @param stack The stack to render
      * @see ItemRenderer#renderMapFirstPerson(ItemStack)
@@ -86,7 +87,7 @@ public abstract class ItemMapLikeRenderer
     }
 
     /**
-     * Render an item in the middle of the screen.
+     * Render an item in the middle of the screen
      *
      * @param pitch         The pitch of the player
      * @param equipProgress The equip progress of this item