Don't run CI on 1.12

Our cable has a rather complex getCollisionBoundingBox implementation,
which (combined with computing the actual block state) ends up taking an
awful lot of time.

This shaves 9% off each frame. I don't miss 1.12 one bit.

.editorconfig

@@ -10,3 +10,13 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.sexp]
+indent_size = 2
+
+[*.yml]
+indent_size = 2
+
+
+[*.properties]
+insert_final_newline = false

.github/ISSUE_TEMPLATE/bug_report.md

@@ -11,6 +11,5 @@ labels: bug
 
 ## Useful information to include:
  - Minecraft version
- - CC: Restitched version
- - Logs: These will be located in the `logs/` directory of your Minecraft instance. Please upload them as a gist or directly into this editor.
+ - 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.

.github/ISSUE_TEMPLATE/peripheral_shoutout.md

@@ -1,12 +0,0 @@
----
-name: Peripheral Shoutout
-about: Made a Peripheral mod for CC:R? Let us know so we can give it a shoutout
-labels: peripheralShoutout
----
-
-## What to include?
- - Link to the mod's Icon
- - Link to the mod
- - Mod Name
- - Basic description of the mod
- - Link to CC:R Peripheral Documentation for the mod

.github/matchers/checkstyle.json

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

.github/matchers/illuaminate.json

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

.github/matchers/junit.json

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

.github/workflows/main-ci.yml

@@ -1,59 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true
-
-    - name: Set up Java 16
-      uses: actions/setup-java@v1
-      with:
-        java-version: 16
-
-    - name: Cache gradle dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
-        restore-keys: |
-          ${{ runner.os }}-gradle-
-
-    - name: Disable Gradle daemon
-      run: |
-        mkdir -p ~/.gradle
-        echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
-
-    - name: Build with Gradle
-      run: |
-        ./gradlew assemble || ./gradlew assemble
-        ./gradlew build
-
-    - name: Upload Jar
-      uses: actions/upload-artifact@v2
-      with:
-        name: cc-restitched
-        path: build/libs
-
-    - name: Parse test reports
-      run: ./tools/parse-reports.py
-      if: ${{ failure() }}
-
-    - name: Cache pre-commit
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pre-commit
-        key: ${{ runner.os }}-pre-commit-${{ hashFiles('config/pre-commit/config.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-pre-commit-
-
-    - name: Run linters
-      run: |
-        pip install pre-commit
-        pre-commit run --config config/pre-commit/config.yml --show-diff-on-failure --all --color=always

.gitignore

@@ -3,22 +3,23 @@
 /logs
 /build
 /out
+/doc/**/*.html
+/doc/index.json
 
 # Runtime directories
 /run
 /run-*
 /test-files
 
-# Autogenerated by IDE
-/bin
-/.settings
-.classpath
-
 *.ipr
 *.iws
 *.iml
 .idea
 .gradle
 *.DS_Store
+
+.classpath
 .project
+.settings/
+bin/
 *.launch

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/main/resources/resourcepacks/overhaul"]
-	path = src/main/resources/resourcepacks/overhaul
-	url = https://github.com/3prm3/cc-pack

.gitpod.yml

@@ -1,20 +0,0 @@
-image:
-  file: config/gitpod/Dockerfile
-
-ports:
-  - port: 25565
-    onOpen: notify
-
-vscode:
-  extensions:
-    - eamodio.gitlens
-    - github.vscode-pull-request-github
-    - ms-azuretools.vscode-docker
-    - redhat.java
-    - richardwillis.vscode-gradle
-    - vscjava.vscode-java-debug
-    - vscode.github
-
-tasks:
-  - name: Setup pre-commit hool
-    init: pre-commit install --config config/pre-commit/config.yml --allow-missing-config

.luacheckrc

@@ -1,34 +0,0 @@
-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' },
-}

.vscode/settings.json

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

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Contributing to CC: Tweaked
+As with many open source projects, CC: Tweaked thrives on contributions from other people! This document (hopefully)
+provides an introduction as to how to get started in helping out.
+
+If you've any other questions, [just ask the community][community] or [open an issue][new-issue].
+
+## Reporting issues
+If you have a bug, suggestion, or other feedback, the best thing to do is [file an issue][new-issue]. When doing so,
+do use the issue templates - they provide a useful hint on what information to provide.
+
+## Developing
+In order to develop CC: Tweaked, you'll need to download the source code and then run it. This is a pretty simple
+process.
+
+ - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
+ - **Setup Forge:** `./gradlew setupDecompWorkspace`
+ - **Run Minecraft:** `./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`.
+These commands may take a few minutes to run the first time, as the environment is set up, but should be much faster
+afterwards.
+
+### Code linters
+CC: Tweaked uses a couple of "linters" on its source code, to enforce a consistent style across the project. While these
+are run whenever you submit a PR, it's often useful to run this before committing.
+
+ - **[Checkstyle]:** Checks Java code to ensure it is consistently formatted. This can be run with `./gradlew build` or
+   `./gradle check`.
+ - **[illuaminate]:** Checks Lua code for semantic and styleistic issues. See [the usage section][illuaminate-usage] for
+   how to download and run it.
+
+[new-issue]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose "Create a new issue"
+[community]: README.md#Community "Get in touch with the community."
+[checkstyle]: https://checkstyle.org/
+[illuaminate]: https://github.com/SquidDev/illuaminate/
+[illuaminate-usage]: https://github.com/SquidDev/illuaminate/blob/master/README.md#usage

LICENSE

@@ -19,14 +19,14 @@ Mod: The mod code designated by the present license, in source form, binary
 form, as obtained standalone, as part of a wider distribution or resulting from
 the compilation of the original or modified sources.
 
-Dependency: Code required for the mod to work properly. This includes
+Dependency: Code required for the mod to work properly. This includes 
 dependencies required to compile the code as well as any file or modification
 that is explicitly or implicitly required for the mod to be working.
 
 1. Scope
 --------
 
-The present license is granted to any user of the mod. As a prerequisite,
+The present license is granted to any user of the mod. As a prerequisite, 
 a user must own a legally acquired copy of Minecraft
 
 2. Liability
@@ -41,13 +41,13 @@ or misuse of this mod fall on the user.
 3. Play rights
 --------------
 
-The user is allowed to install this mod on a Minecraft client or server and to play
+The user is allowed to install this mod on a Minecraft client or server and to play 
 without restriction.
 
 4. Modification rights
 ----------------------
 
-The user has the right to decompile the source code, look at either the
+The user has the right to decompile the source code, look at either the 
 decompiled version or the original source code, and to modify it.
 
 5. Distribution of original or modified copy rights
@@ -61,10 +61,10 @@ include:
    - patch to its source or binary files
    - any copy of a portion of its binary source files
 
-The user is allowed to redistribute this mod partially, in totality, or
+The user is allowed to redistribute this mod partially, in totality, or 
 included in a distribution.
 
-When distributing binary files, the user must provide means to obtain its
+When distributing binary files, the user must provide means to obtain its 
 entire set of sources or modified sources at no cost.
 
 All distributions of this mod must remain licensed under the CCPL.
@@ -92,7 +92,7 @@ must be made available at no cost and remain licensed under the CCPL.
 ---------------
 
 If you choose to contribute code or assets to be included in this mod, you
-agree that, if added to to the main repository at
+agree that, if added to to the main repository at 
 https://github.com/dan200/ComputerCraft, your contributions will be covered by
 this license, and that Daniel Ratcliffe will retain the right to re-license the
 mod, including your contributions, in part or in whole, under other licenses.

README.md

@@ -1,66 +1,69 @@
-<img src="logo.png" alt="CC: Restitched" width="100%"/>
+# ![CC: Tweaked](doc/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")
 
-[![Current build status](https://github.com/cc-tweaked/cc-restitched/workflows/Build/badge.svg)](https://github.com/cc-tweaked/cc-restitched/actions "Current build status")
-[![Download CC: Restitched  on CurseForge](https://camo.githubusercontent.com/07622e6662ef5ead080c4840ef6514a34e079d63015f7e51c977a55b1881dfb9/687474703a2f2f63662e776179326d7563686e6f6973652e65752f7469746c652f63632d726573746974636865642e737667)](https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC:  Restitched on CurseForge")
-[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/cc-tweaked/cc-restitched/tree/1.17.1)
+CC: Tweaked is a fork of [ComputerCraft](https://github.com/dan200/ComputerCraft), adding programmable computers,
+turtles and more to Minecraft.
 
-# What is CC: Restitched?
-This is a fabric port of [SquidDev-CC/CC-Tweaked](https://github.com/SquidDev-CC/CC-Tweaked). The work is a continuation of [Zundrel/cc-tweaked-fabric](https://github.com/Zundrel/cc-tweaked-fabric).
+## 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: Restitched vs. CC: Tweaked
-CC: R tries to maintain parity with CC: T, but may be behind or divergent in some areas. If you notice a disparity please open an issue. CC: R major and minor version numbers indicate parity with the major features of that version of CC: T. Patch version numbers will not align.
+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.
 
-## Resource Packs
-This mod includes textures by [Jummit](https://github.com/Jummit) that are more in line with the style of Mojang's new texture-artist, Jappa. If you prefer the original textures, enable the "Classic" resource pack.
+## 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:
 
-<img src="https://raw.githubusercontent.com/3prm3/cc-pack/main/pack.png" alt="CC: Restitched" width="16"  height="16"/> We also have a second resourcepack made by [3prm3](https://github.com/3prm3), it features a complete overhaul and can be enabled by enabling the `overhaul` resource pack, go check out his resource pack over [here](https://github.com/3prm3/cc-pack/)!
+ - 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
+   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.
+
+## 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,
+several features have been included, such as full block modems, the Cobalt runtime and map-like rendering for pocket
+computers.
 
 ## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC: R there are a few rules;
-1) Make sure your code follows the checkstyle rules. You can test this by running `./gradle build` or `./gradle check`.
-2)  Do not alter the lua code unless those changes are taken directly from CC: Tweaked. If you wish to contribute changes to the in game rom please contribute upstream at [CC-Tweaked](https://github.com/SquidDev-CC/CC-Tweaked).
-
-# Does this work Fabric's many rendering mods?
-* [ YES ] Sodium
-* [ YES ] Optifine
-	* Works with VBO Rendering (automatically set)
-	* No issues
-* [ EHH ] Iris Shaders
-	* "Works" with TBO Rendering (Default)
-	* Crashes with VBO Rendering
-	* <details>
-		<summary>Shaders are broken</summary>
-
-		* Shaders will cause varrying results ranging from monitors being invisible, to straight up crashing.
-		* Not using shaders will result in odd Z-Fighting of the monitor display and the transparent texture
-			- ![](https://user-images.githubusercontent.com/10422110/136869483-91824c5f-841f-4316-bfb1-2412477a29ee.png)
-			- ![](https://user-images.githubusercontent.com/10422110/136869535-a16581a3-5e0a-4632-923f-c8de8cc8a6ea.png)
-		</details>
-* [ YES ] Canvas
-	* Works with TBO Rendering (Default)
-	* Scuffed with VBO Rendering
-	* <details>
-		<summary>VBO is broken</summary>
-
-  		Monitors are just... scuffed beyond belief.
-		- ![](https://i.imgur.com/JVNZ2Pn.png)
-		- ![](https://i.imgur.com/SXXpr54.png)
-			* The content to the left is supposed to be on the monitors to the right, also the bottom one is supposed to `black/white` not colored.
-		* Turtle Texture for some reason?
-			- ![](https://i.imgur.com/OEmZXsx.png)
-		</details>
-
-## Contributing
-Any contribution is welcome, be that using the mod, reporting bugs or contributing code. In order to start helping develop CC: R there are a few rules;
-1) Follow the [Fabric](https://fabricmc.net/) programming guidelines as close as possible. This means you have to use [`loom`](https://fabricmc.net/wiki/tutorial:mappings) mappings, if you use anything else, your code will be rejected.
-2) You cannot intentionally implement bugs and security vulnerabilities.
-3) Unless the code is taken directly from CC: Tweaked, `lua` code is offlimits from alteration.
-
-## Bleeding Edge Builds
-Bleeding edge builds can be found [here](https://github.com/cc-tweaked/cc-restitched/actions) at Github Actions.
+Any contribution is welcome, be that using the mod, reporting bugs or contributing code. If you want to get started
+developing the mod, [check out the instructions here](CONTRIBUTING.md#developing).
 
 ## Community
-If you need help getting started with CC: Restitched, want to show off your latest project, or just want to chat about ComputerCraft, here is the [Forum](https://forums.computercraft.cc/) and the [Discord](https://discord.gg/H2UyJXe).
+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.computercraft.cc)!
+There's also a fairly populated, albeit quiet [IRC channel](http://webchat.esper.net/?channels=computercraft), if that's
+more your cup of tea.
 
-## Perpheral mods
-Unfortunately, CC: Restitched does not have as many peripherals mods available as CC: Tweaked. If you're an interested mod developer, please check out our `api` package. If you've already made a mod with CC: R peripheral support OR if you're a player who found a mod with ComputerCraft integration, please open an [issue here](https://github.com/cc-tweaked/cc-restitched/issues/new?assignees=&labels=peripheralShoutout&template=peripheral_shoutout.md) to let us know and we'll add it to the list!
+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

@@ -1,163 +1,98 @@
+
+// For those who want the bleeding edge
+buildscript {
+    repositories {
+        jcenter()
+        maven {
+            name = "forge"
+            url = "https://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 "jacoco"
-    id "maven-publish"
-    id "com.github.hierynomus.license" version "0.16.1"
-    id "org.jetbrains.kotlin.jvm" version "1.5.21"
-    id 'fabric-loom' version '0.10-SNAPSHOT'
+    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"
 }
 
-def javaVersion = JavaLanguageVersion.of(17)
-java {
-    toolchain {
-        languageVersion = javaVersion
-    }
-
-    withSourcesJar()
-    withJavadocJar()
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = javaVersion
-    }
-}
+apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'org.ajoberstar.grgit'
+apply plugin: 'maven-publish'
+apply plugin: 'maven'
 
 version = mod_version
 
-group = "dan200.computercraft"
-archivesBaseName = "cc-restitched"
+group = "org.squiddev"
+archivesBaseName = "cc-tweaked-${mc_version}"
 
-sourceSets {
-    main.resources {
-        srcDir 'src/generated/resources'
-    }
+minecraft {
+    version = "${mc_version}-${forge_version}"
+    runDir = "run"
+    replace '${version}', mod_version
 
-    testMod {}
-}
-
-loom {
-    accessWidenerPath = file("src/main/resources/cc.accesswidener")
+    mappings = mappings_version
+    makeObfSourceJar = false
 }
 
 repositories {
-    mavenCentral()
     maven {
         name "SquidDev"
         url "https://squiddev.cc/maven"
     }
-
-    // TODO: Limit these to a set of groups.
-    maven { url "https://maven.shedaniel.me/" }
-    maven { url "https://maven.terraformersmc.com/" }
+    ivy {
+        name "Charset"
+        artifactPattern "https://asie.pl/files/mods/Charset/LibOnly/[module]-[revision](-[classifier]).[ext]"
+    }
 }
 
 configurations {
     shade
-    implementation.extendsFrom shade
-    cctJavadoc
+    compile.extendsFrom shade
+    deployerJars
 }
 
 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.45"
+    checkstyle "com.puppycrawl.tools:checkstyle:8.25"
 
-    minecraft "com.mojang:minecraft:${mc_version}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
+    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 "pl.asie:Charset-Lib:0.5.4.6"
 
-    modApi("me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-    }
-    modImplementation "com.terraformersmc:modmenu:${modmenu_version}"
-    modImplementation "me.shedaniel.cloth.api:cloth-utils-v1:${cloth_api_version}"
+    runtime "mezz.jei:jei_1.12.2:4.15.0.269"
 
-    implementation 'com.electronwill.night-config:toml:3.6.3'
+    shade 'org.squiddev:Cobalt:0.5.5'
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.4.2'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.4.2'
 
-    shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
-
-    include "me.shedaniel.cloth.api:cloth-utils-v1:${cloth_api_version}"
-    include 'com.electronwill.night-config:core:3.6.3'
-    include 'com.electronwill.night-config:toml:3.6.3'
-    include "me.shedaniel.cloth:cloth-config-fabric:${cloth_config_version}"
-
-    //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-api-fabric:6.0.254-alpha"
-    //modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:6.0.254-alpha"
-
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    testImplementation 'org.junit.jupiter:junit-jupiter-params:5.7.0'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
-    testImplementation 'org.hamcrest:hamcrest:2.2'
-    testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.21'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1'
-
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.2'
+    deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
 }
 
-processResources {
-    inputs.property "version", project.version
-
-    def hash = 'none'
-    Set<String> contributors = []
-    try {
-        hash = ["git", "-C", projectDir, "rev-parse", "HEAD"].execute().text.trim()
-
-        def blacklist = ['GitHub', 'dan200', 'Daniel Ratcliffe']
-        ["git", "-C", projectDir, "log", "--format=tformat:%an%n%cn"].execute().text.split('\n').each {
-            if (!blacklist.contains(it)) contributors.add(it)
-        }
-    } catch (Exception e) {
-        e.printStackTrace()
-    }
-    inputs.property "commithash", hash
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
-    filesMatching(["fabric.mod.json", "data/computercraft/lua/rom/help/credits.txt"]) {
-        expand(
-            'version': mod_version,
-            'mcversion': mc_version,
-            'gitcontributors': contributors.sort(false, String.CASE_INSENSITIVE_ORDER).join('\n')
-        )
-    }
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
-}
+// Compile tasks
 
 javadoc {
     include "dan200/computercraft/api/**/*.java"
 }
 
-task luaJavadoc(type: Javadoc) {
-    description "Generates documentation for Java-side Lua functions."
-    group "documentation"
-
-    source = sourceSets.main.allJava
-    destinationDir = file("${project.docsDir}/luaJavadoc")
-    classpath = sourceSets.main.compileClasspath
-
-    options.docletpath = configurations.cctJavadoc.files as List
-    options.doclet = "cc.tweaked.javadoc.LuaDoclet"
-    options.noTimestamp = false
-
-    javadocTool = javaToolchains.javadocToolFor {
-        languageVersion = javaVersion
-    }
-}
-
 jar {
-    from "LICENSE"
+    dependsOn javadoc
+
     manifest {
-        attributes([
-            "Specification-Title"     : "computercraft",
-            "Specification-Version"   : "1",
-            "Implementation-Title"    : "CC: Restitched",
-            "Implementation-Version"  : "${mod_version}",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
+        attributes('FMLAT': 'computercraft_at.cfg')
+    }
+
+    from (sourceSets.main.allSource) {
+        include "dan200/computercraft/api/**/*.java"
     }
 
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
@@ -165,14 +100,144 @@ jar {
 
 [compileJava, compileTestJava].forEach {
     it.configure {
-        options.compilerArgs << "-Xlint" << "-Xlint:-processing"
+        options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
     }
 }
 
-sourcesJar {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+
+
+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
+
+    // Tell ProGuard to shut up
+    dontwarn 'org.checkerframework.**'
+
+    // 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
+
+    def hash = 'none'
+    Set<String> contributors = []
+    try {
+        def grgit = Grgit.open(dir: '.')
+        hash = grgit.head().id
+
+        def blacklist = ['GitHub', 'dan200', 'Daniel Ratcliffe']
+        grgit.log().each {
+            if (!blacklist.contains(it.author.name)) contributors.add(it.author.name)
+            if (!blacklist.contains(it.committer.name)) contributors.add(it.committer.name)
+        }
+    } catch(Exception ignored) { }
+
+    inputs.property "commithash", hash
+
+    from(sourceSets.main.resources.srcDirs) {
+        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')
+    }
+
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+        exclude 'assets/computercraft/lua/rom/help/credits.txt'
+    }
+}
+
+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 {
@@ -183,37 +248,33 @@ test {
 }
 
 jacocoTestReport {
-    dependsOn('test')
     reports {
-        xml.required = true
-        html.required = true
+        xml.enabled true
+        html.enabled true
     }
 }
 
 check.dependsOn jacocoTestReport
 
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
-
 license {
     mapping("java", "SLASHSTAR_STYLE")
     strictCheck true
 
-    ext.year = Calendar.getInstance().get(Calendar.YEAR)
+    ext.year = 2020
 }
 
 [licenseMain, licenseFormatMain].forEach {
     it.configure {
         include("**/*.java")
         exclude("dan200/computercraft/api/**")
-        header file('config/license/main.txt')
+        header rootProject.file('config/license/main.txt')
     }
 }
 
-[licenseTest, licenseFormatTest, licenseTestMod, licenseFormatTestMod].forEach {
+[licenseTest, licenseFormatTest].forEach {
     it.configure {
         include("**/*.java")
-        header file('config/license/main.txt')
+        header rootProject.file('config/license/main.txt')
     }
 }
 
@@ -223,27 +284,151 @@ gradle.projectsEvaluated {
     }
 }
 
-task licenseAPI(type: LicenseCheck)
-task licenseFormatAPI(type: LicenseFormat)
+
+task licenseAPI(type: LicenseCheck);
+task licenseFormatAPI(type: LicenseFormat);
 [licenseAPI, licenseFormatAPI].forEach {
     it.configure {
         source = sourceSets.main.java
         include("dan200/computercraft/api/**")
-        header file('config/license/api.txt')
+        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"
+        }
     }
 }
 
-// configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
             from components.java
+            artifact sourceJar
         }
     }
+}
 
-    // select the repositories you want to publish to
+uploadArchives {
     repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
+        if(project.hasProperty('mavenUploadUrl')) {
+            mavenDeployer {
+                configuration = configurations.deployerJars
+
+                repository(url: project.property('mavenUploadUrl')) {
+                    authentication(
+                        userName: project.property('mavenUploadUser'),
+                        privateKey: project.property('mavenUploadKey'))
+                }
+
+                pom.project {
+                    name 'CC: Tweaked'
+                    packaging 'jar'
+                    description 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
+                    url 'https://github.com/SquidDev-CC/CC-Tweaked'
+
+                    scm {
+                        url 'https://github.com/SquidDev-CC/CC-Tweaked.git'
+                    }
+
+                    issueManagement {
+                        system 'github'
+                        url 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
+                    }
+
+                    licenses {
+                        license {
+                            name 'ComputerCraft Public License, Version 1.0'
+                            url 'https://github.com/SquidDev-CC/CC-Tweaked/blob/master/LICENSE'
+                            distribution 'repo'
+                        }
+                    }
+                }
+
+                pom.whenConfigured { pom ->
+                    pom.dependencies.clear()
+                }
+            }
+        }
     }
 }
+
+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()
+    }
+    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 }
+runServer.outputs.upToDateWhen { false }

codeStyleSettings.xml

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

config/checkstyle/checkstyle.xml

@@ -7,11 +7,7 @@
     <property name="charset" value="UTF-8" />
 
     <module name="SuppressionFilter">
-	<property name="file" value="${config_loc}/suppressions.xml" />
-    </module>
-
-    <module name="BeforeExecutionExclusionFileFilter">
-        <property name="fileNamePattern" value="render_old"/>
+        <property name="file" value="config/checkstyle/suppressions.xml" />
     </module>
 
     <module name="TreeWalker">
@@ -58,20 +54,13 @@
         <module name="SimplifyBooleanExpression" />
         <module name="SimplifyBooleanReturn" />
         <module name="StringLiteralEquality" />
-        <module name="UnnecessaryParentheses">
-            <!-- Default minus LAND. -->
-            <property name="tokens" value="EXPR,IDENT,NUM_DOUBLE,NUM_FLOAT,NUM_INT,NUM_LONG,STRING_LITERAL,LITERAL_NULL,LITERAL_FALSE,LITERAL_TRUE,ASSIGN,BAND_ASSIGN,BOR_ASSIGN,BSR_ASSIGN,BXOR_ASSIGN,DIV_ASSIGN,MINUS_ASSIGN,MOD_ASSIGN,PLUS_ASSIGN,SL_ASSIGN,SR_ASSIGN,STAR_ASSIGN,LAMBDA,TEXT_BLOCK_LITERAL_BEGIN,LITERAL_INSTANCEOF,GT,LT,GE,LE,EQUAL,NOT_EQUAL,UNARY_MINUS,UNARY_PLUS,INC,DEC,LNOT,BNOT,POST_INC,POST_DEC" />
-        </module>
+        <module name="UnnecessaryParentheses" />
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
         <module name="UnnecessarySemicolonInTryWithResources" />
         <module name="UnnecessarySemicolonInEnumeration" />
 
         <!-- Imports -->
-        <module name="CustomImportOrder">
-            <property name="customImportOrderRules"
-                value="THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE###STATIC"
-            />
-        </module>
+        <module name="CustomImportOrder" />
         <module name="IllegalImport" />
         <module name="RedundantImport" />
         <module name="UnusedImports" />
@@ -104,19 +93,28 @@
         <module name="LambdaParameterName" />
         <module name="LocalFinalVariableName" />
         <module name="LocalVariableName" />
-        <module name="MemberName" />
+        <!-- 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\.computercraft(\.[a-z][a-z0-9]*)*" />
+            <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="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="format" value="^(s_)?[a-z][a-zA-Z0-9]*|CAPABILITY(_[A-Z]+)?$" />
             <property name="applyToPrivate" value="true" />
         </module>
         <module name="TypeName" />
@@ -156,14 +154,9 @@
             <property name="tokens" value="COMMA" />
         </module>
         <module name="WhitespaceAround">
-            <property name="ignoreEnhancedForColon" value="false" />
-            <!-- Allow empty functions -->
-            <property name="allowEmptyLambdas" value="true" />
-            <property name="allowEmptyMethods" value="true" />
             <property name="allowEmptyConstructors" value="true" />
-            <property name="allowEmptyTypes" value="true" />
-
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_RETURN,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND" />
+            <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>
 

config/checkstyle/suppressions.xml

@@ -7,9 +7,6 @@
     <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
     <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
 
-    <!-- Some shadowed fields in mixins can't be renamed -->
-    <suppress checks="StaticVariableName" files=".*[\\/]mixin[\\/].*" />
-
-    <!-- The commands API is documented in Lua. -->
-    <suppress checks="SummaryJavadocCheck" files=".*[\\/]CommandAPI.java" />
+    <!-- Do not check for missing package Javadoc. -->
+    <suppress checks="JavadocStyle" files=".*[\\/]package-info.java" />
 </suppressions>

config/gitpod/Dockerfile

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

config/idea/codeInspectionSettings.xml

@@ -2488,4 +2488,4 @@
       </option>
     </inspection_tool>
   </profile>
-</component>
+</component>

config/idea/codeStyleSettings.xml

@@ -58,4 +58,4 @@
       <option name="CONTINUATION_INDENT_SIZE" value="4" />
     </indentOptions>
   </codeStyleSettings>
-</code_scheme>
+</code_scheme>

config/pre-commit/config.yml

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

config/pre-commit/illuaminate-lint.sh

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

doc/events/alarm.md

@@ -1,21 +0,0 @@
----
-module: [kind=event] alarm
-see: os.setAlarm To start an alarm.
----
-
-The @{timer} event is fired when an alarm started with @{os.setAlarm} completes.
-
-## Return Values
-1. @{string}: The event name.
-2. @{number}: The ID of the alarm that finished.
-
-## Example
-Starts a timer and then prints its ID:
-```lua
-local alarmID = os.setAlarm(os.time() + 0.05)
-local event, id
-repeat
-    event, id = os.pullEvent("alarm")
-until id == alarmID
-print("Alarm with ID " .. id .. " was fired")
-```

doc/events/char.md

@@ -1,24 +0,0 @@
----
-module: [kind=event] char
-see: key To listen to any key press.
----
-
-The @{char} event is fired when a character is _typed_ on the keyboard.
-
-The @{char} event is different to a key press. Sometimes multiple key presses may result in one character being
-typed (for instance, on some European keyboards). Similarly, some keys (e.g. <kbd>Ctrl</kbd>) do not have any
-corresponding character. The @{key} should be used if you want to listen to key presses themselves.
-
-## Return values
-1. @{string}: The event name.
-2. @{string}: The string representing the character that was pressed.
-
-
-## Example
-Prints each character the user presses:
-```lua
-while true do
-  local event, character = os.pullEvent("char")
-  print(character .. " was pressed.")
-end
-```

doc/events/computer_command.md

@@ -1,18 +0,0 @@
----
-module: [kind=event] computer_command
----
-
-The @{computer_command} event is fired when the `/computercraft queue` command is run for the current computer.
-
-## Return Values
-1. @{string}: The event name.
-... @{string}: The arguments passed to the command.
-
-## Example
-Prints the contents of messages sent:
-```lua
-while true do
-  local event = {os.pullEvent("computer_command")}
-  print("Received message:", table.unpack(event, 2))
-end
-```

doc/events/disk.md

@@ -1,19 +0,0 @@
----
-module: [kind=event] disk
-see: disk_eject For the event sent when a disk is removed.
----
-
-The @{disk} event is fired when a disk is inserted into an adjacent or networked disk drive.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side of the disk drive that had a disk inserted.
-
-## Example
-Prints a message when a disk is inserted:
-```lua
-while true do
-  local event, side = os.pullEvent("disk")
-  print("Inserted a disk on side " .. side)
-end
-```

doc/events/disk_eject.md

@@ -1,19 +0,0 @@
----
-module: [kind=event] disk_eject
-see: disk For the event sent when a disk is inserted.
----
-
-The @{disk_eject} event is fired when a disk is removed from an adjacent or networked disk drive.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side of the disk drive that had a disk removed.
-
-## Example
-Prints a message when a disk is removed:
-```lua
-while true do
-  local event, side = os.pullEvent("disk_eject")
-  print("Removed a disk on side " .. side)
-end
-```

doc/events/http_check.md

@@ -1,14 +0,0 @@
----
-module: [kind=event] http_check
-see: http.checkURLAsync To check a URL asynchronously.
----
-
-The @{http_check} event is fired when a URL check finishes.
-
-This event is normally handled inside @{http.checkURL}, but it can still be seen when using @{http.checkURLAsync}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL requested to be checked.
-3. @{boolean}: Whether the check succeeded.
-4. @{string|nil}: If the check failed, a reason explaining why the check failed.

doc/events/http_failure.md

@@ -1,39 +0,0 @@
----
-module: [kind=event] http_failure
-see: http.request To send an HTTP request.
----
-
-The @{http_failure} event is fired when an HTTP request fails.
-
-This event is normally handled inside @{http.get} and @{http.post}, but it can still be seen when using @{http.request}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the site requested.
-3. @{string}: An error describing the failure.
-4. @{http.Response|nil}: A response handle if the connection succeeded, but the server's response indicated failure.
-
-## Example
-Prints an error why the website cannot be contacted:
-```lua
-local myURL = "https://does.not.exist.tweaked.cc"
-http.request(myURL)
-local event, url, err
-repeat
-    event, url, err = os.pullEvent("http_failure")
-until url == myURL
-print("The URL " .. url .. " could not be reached: " .. err)
-```
-
-Prints the contents of a webpage that does not exist:
-```lua
-local myURL = "https://tweaked.cc/this/does/not/exist"
-http.request(myURL)
-local event, url, err, handle
-repeat
-    event, url, err, handle = os.pullEvent("http_failure")
-until url == myURL
-print("The URL " .. url .. " could not be reached: " .. err)
-print(handle.getResponseCode())
-handle.close()
-```

doc/events/http_success.md

@@ -1,27 +0,0 @@
----
-module: [kind=event] http_success
-see: http.request To make an HTTP request.
----
-
-The @{http_success} event is fired when an HTTP request returns successfully.
-
-This event is normally handled inside @{http.get} and @{http.post}, but it can still be seen when using @{http.request}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the site requested.
-3. @{http.Response}: The handle for the response text.
-
-## Example
-Prints the content of a website (this may fail if the request fails):
-```lua
-local myURL = "https://tweaked.cc/"
-http.request(myURL)
-local event, url, handle
-repeat
-    event, url, handle = os.pullEvent("http_success")
-until url == myURL
-print("Contents of " .. url .. ":")
-print(handle.readAll())
-handle.close()
-```

doc/events/key.md

@@ -1,26 +0,0 @@
----
-module: [kind=event] key
----
-
-This event is fired when any key is pressed while the terminal is focused.
-
-This event returns a numerical "key code" (for instance, <kbd>F1</kbd> is 290). This value may vary between versions and
-so it is recommended to use the constants in the @{keys} API rather than hard coding numeric values.
-
-If the button pressed represented a printable character, then the @{key} event will be followed immediately by a @{char}
-event. If you are consuming text input, use a @{char} event instead!
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The numerical key value of the key pressed.
-3. @{boolean}: Whether the key event was generated while holding the key (@{true}), rather than pressing it the first time (@{false}).
-
-## Example
-Prints each key when the user presses it, and if the key is being held.
-
-```lua
-while true do
-  local event, key, is_held = os.pullEvent("key")
-  print(("%s held=%s"):format(keys.getName(key), is_held))
-end
-```

doc/events/key_up.md

@@ -1,24 +0,0 @@
----
-module: [kind=event] key_up
-see: keys For a lookup table of the given keys.
----
-
-Fired whenever a key is released (or the terminal is closed while a key was being pressed).
-
-This event returns a numerical "key code" (for instance, <kbd>F1</kbd> is 290). This value may vary between versions and
-so it is recommended to use the constants in the @{keys} API rather than hard coding numeric values.
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The numerical key value of the key pressed.
-
-## Example
-Prints each key released on the keyboard whenever a @{key_up} event is fired.
-
-```lua
-while true do
-  local event, key = os.pullEvent("key_up")
-  local name = keys.getName(key) or "unknown key"
-  print(name .. " was released.")
-end
-```

doc/events/modem_message.md

@@ -1,26 +0,0 @@
----
-module: [kind=event] modem_message
----
-
-The @{modem_message} event is fired when a message is received on an open channel on any @{modem}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side of the modem that received the message.
-3. @{number}: The channel that the message was sent on.
-4. @{number}: The reply channel set by the sender.
-5. @{any}: The message as sent by the sender.
-6. @{number}: The distance between the sender and the receiver, in blocks.
-
-## Example
-Wraps a @{modem} peripheral, opens channel 0 for listening, and prints all received messages.
-
-```lua
-local modem = peripheral.find("modem") or error("No modem attached", 0)
-modem.open(0)
-
-while true do
-  local event, side, channel, replyChannel, message, distance = os.pullEvent("modem_message")
-  print(("Message received on side %s on channel %d (reply to %d) from %f blocks away with message %s"):format(side, channel, replyChannel, distance, tostring(message)))
-end
-```

doc/events/monitor_resize.md

@@ -1,18 +0,0 @@
----
-module: [kind=event] monitor_resize
----
-
-The @{monitor_resize} event is fired when an adjacent or networked monitor's size is changed.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side or network ID of the monitor that resized.
-
-## Example
-Prints a message when a monitor is resized:
-```lua
-while true do
-  local event, side = os.pullEvent("monitor_resize")
-  print("The monitor on side " .. side .. " was resized.")
-end
-```

doc/events/monitor_touch.md

@@ -1,20 +0,0 @@
----
-module: [kind=event] monitor_touch
----
-
-The @{monitor_touch} event is fired when an adjacent or networked Advanced Monitor is right-clicked.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side or network ID of the monitor that was touched.
-3. @{number}: The X coordinate of the touch, in characters.
-4. @{number}: The Y coordinate of the touch, in characters.
-
-## Example
-Prints a message when a monitor is touched:
-```lua
-while true do
-  local event, side, x, y = os.pullEvent("monitor_touch")
-  print("The monitor on side " .. side .. " was touched at (" .. x .. ", " .. y .. ")")
-end
-```

doc/events/mouse_click.md

@@ -1,34 +0,0 @@
----
-module: [kind=event] mouse_click
----
-
-This event is fired when the terminal is clicked with a mouse. This event is only fired on advanced computers (including
-advanced turtles and pocket computers).
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The mouse button that was clicked.
-3. @{number}: The X-coordinate of the click.
-4. @{number}: The Y-coordinate of the click.
-
-## Mouse buttons
-Several mouse events (@{mouse_click}, @{mouse_up}, @{mouse_scroll}) contain a "mouse button" code. This takes a
-numerical value depending on which button on your mouse was last pressed when this event occurred.
-
-<table class="pretty-table">
-    <!-- Our markdown parser doesn't work on tables!? Guess I'll have to roll my own soonish :/. -->
-    <tr><th>Button code</th><th>Mouse button</th></tr>
-    <tr><td align="right">1</td><td>Left button</td></tr>
-    <tr><td align="right">2</td><td>Middle button</td></tr>
-    <tr><td align="right">3</td><td>Right button</td></tr>
-</table>
-
-## Example
-Print the button and the coordinates whenever the mouse is clicked.
-
-```lua
-while true do
-  local event, button, x, y = os.pullEvent("mouse_click")
-  print(("The mouse button %s was pressed at %d, %d"):format(button, x, y))
-end
-```

doc/events/mouse_drag.md

@@ -1,22 +0,0 @@
----
-module: [kind=event] mouse_drag
-see: mouse_click For when a mouse button is initially pressed.
----
-
-This event is fired every time the mouse is moved while a mouse button is being held.
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The [mouse button](mouse_click.html#Mouse_buttons) that is being pressed.
-3. @{number}: The X-coordinate of the mouse.
-4. @{number}: The Y-coordinate of the mouse.
-
-## Example
-Print the button and the coordinates whenever the mouse is dragged.
-
-```lua
-while true do
-  local event, button, x, y = os.pullEvent("mouse_drag")
-  print(("The mouse button %s was dragged at %d, %d"):format(button, x, y))
-end
-```

doc/events/mouse_scroll.md

@@ -1,21 +0,0 @@
----
-module: [kind=event] mouse_scroll
----
-
-This event is fired when a mouse wheel is scrolled in the terminal.
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The direction of the scroll. (-1 = up, 1 = down)
-3. @{number}: The X-coordinate of the mouse when scrolling.
-4. @{number}: The Y-coordinate of the mouse when scrolling.
-
-## Example
-Prints the direction of each scroll, and the position of the mouse at the time.
-
-```lua
-while true do
-  local event, dir, x, y = os.pullEvent("mouse_scroll")
-  print(("The mouse was scrolled in direction %s at %d, %d"):format(dir, x, y))
-end
-```

doc/events/mouse_up.md

@@ -1,21 +0,0 @@
----
-module: [kind=event] mouse_up
----
-
-This event is fired when a mouse button is released or a held mouse leaves the computer's terminal.
-
-## Return values
-1. @{string}: The event name.
-2. @{number}: The [mouse button](mouse_click.html#Mouse_buttons) that was released.
-3. @{number}: The X-coordinate of the mouse.
-4. @{number}: The Y-coordinate of the mouse.
-
-## Example
-Prints the coordinates and button number whenever the mouse is released.
-
-```lua
-while true do
-  local event, button, x, y = os.pullEvent("mouse_up")
-  print(("The mouse button %s was released at %d, %d"):format(button, x, y))
-end
-```

doc/events/paste.md

@@ -1,18 +0,0 @@
----
-module: [kind=event] paste
----
-
-The @{paste} event is fired when text is pasted into the computer through Ctrl-V (or ⌘V on Mac).
-
-## Return values
-1. @{string}: The event name.
-2. @{string} The text that was pasted.
-
-## Example
-Prints pasted text:
-```lua
-while true do
-  local event, text = os.pullEvent("paste")
-  print('"' .. text .. '" was pasted')
-end
-```

doc/events/peripheral.md

@@ -1,19 +0,0 @@
----
-module: [kind=event] peripheral
-see: peripheral_detach For the event fired when a peripheral is detached.
----
-
-The @{peripheral} event is fired when a peripheral is attached on a side or to a modem.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side the peripheral was attached to.
-
-## Example
-Prints a message when a peripheral is attached:
-```lua
-while true do
-  local event, side = os.pullEvent("peripheral")
-  print("A peripheral was attached on side " .. side)
-end
-```

doc/events/peripheral_detach.md

@@ -1,19 +0,0 @@
----
-module: [kind=event] peripheral_detach
-see: peripheral For the event fired when a peripheral is attached.
----
-
-The @{peripheral_detach} event is fired when a peripheral is detached from a side or from a modem.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The side the peripheral was detached from.
-
-## Example
-Prints a message when a peripheral is detached:
-```lua
-while true do
-  local event, side = os.pullEvent("peripheral_detach")
-  print("A peripheral was detached on side " .. side)
-end
-```

doc/events/rednet_message.md

@@ -1,30 +0,0 @@
----
-module: [kind=event] rednet_message
-see: modem_message For raw modem messages sent outside of Rednet.
-see: rednet.receive To wait for a Rednet message with an optional timeout and protocol filter.
----
-
-The @{rednet_message} event is fired when a message is sent over Rednet.
-
-This event is usually handled by @{rednet.receive}, but it can also be pulled manually.
-
-@{rednet_message} events are sent by @{rednet.run} in the top-level coroutine in response to @{modem_message} events. A @{rednet_message} event is always preceded by a @{modem_message} event. They are generated inside CraftOS rather than being sent by the ComputerCraft machine.
-
-## Return Values
-1. @{string}: The event name.
-2. @{number}: The ID of the sending computer.
-3. @{any}: The message sent.
-4. @{string|nil}: The protocol of the message, if provided.
-
-## Example
-Prints a message when one is sent:
-```lua
-while true do
-  local event, sender, message, protocol = os.pullEvent("rednet_message")
-  if protocol ~= nil then
-    print("Received message from " .. sender .. " with protocol " .. protocol .. " and message " .. tostring(message))
-  else
-    print("Received message from " .. sender .. " with message " .. tostring(message))
-  end
-end
-```

doc/events/redstone.md

@@ -1,14 +0,0 @@
----
-module: [kind=event] redstone
----
-
-The @{event!redstone} event is fired whenever any redstone inputs on the computer change.
-
-## Example
-Prints a message when a redstone input changes:
-```lua
-while true do
-  os.pullEvent("redstone")
-  print("A redstone input has changed!")
-end
-```

doc/events/speaker_audio_empty.md

@@ -1,27 +0,0 @@
----
-module: [kind=event] speaker_audio_empty
-see: speaker.playAudio To play audio using the speaker
----
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The name of the speaker which is available to play more audio.
-
-
-## Example
-This uses @{io.lines} to read audio data in blocks of 16KiB from "example_song.dfpwm", and then attempts to play it
-using @{speaker.playAudio}. If the speaker's buffer is full, it waits for an event and tries again.
-
-```lua {data-peripheral=speaker}
-local dfpwm = require("cc.audio.dfpwm")
-local speaker = peripheral.find("speaker")
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```

doc/events/task_complete.md

@@ -1,28 +0,0 @@
----
-module: [kind=event] task_complete
-see: commands.execAsync To run a command which fires a task_complete event.
----
-
-The @{task_complete} event is fired when an asynchronous task completes. This is usually handled inside the function call that queued the task; however, functions such as @{commands.execAsync} return immediately so the user can wait for completion.
-
-## Return Values
-1. @{string}: The event name.
-2. @{number}: The ID of the task that completed.
-3. @{boolean}: Whether the command succeeded.
-4. @{string}: If the command failed, an error message explaining the failure. (This is not present if the command succeeded.)
-...: Any parameters returned from the command.
-
-## Example
-Prints the results of an asynchronous command:
-```lua
-local taskID = commands.execAsync("say Hello")
-local event
-repeat
-    event = {os.pullEvent("task_complete")}
-until event[2] == taskID
-if event[3] == true then
-  print("Task " .. event[2] .. " succeeded:", table.unpack(event, 4))
-else
-  print("Task " .. event[2] .. " failed: " .. event[4])
-end
-```

doc/events/term_resize.md

@@ -1,20 +0,0 @@
----
-module: [kind=event] term_resize
----
-
-The @{term_resize} event is fired when the main terminal is resized. For instance:
- - When a the tab bar is shown or hidden in @{multishell}.
- - When the terminal is redirected to a monitor via the "monitor" program and the monitor is resized.
-
-When this event fires, some parts of the terminal may have been moved or deleted. Simple terminal programs (those
-not using @{term.setCursorPos}) can ignore this event, but more complex GUI programs should redraw the entire screen.
-
-## Example
-Prints :
-```lua
-while true do
-  os.pullEvent("term_resize")
-  local w, h = term.getSize()
-  print("The term was resized to (" .. w .. ", " .. h .. ")")
-end
-```

doc/events/terminate.md

@@ -1,25 +0,0 @@
----
-module: [kind=event] terminate
----
-
-The @{terminate} event is fired when <kbd>Ctrl-T</kbd> is held down.
-
-This event is normally handled by @{os.pullEvent}, and will not be returned. However, @{os.pullEventRaw} will return this event when fired.
-
-@{terminate} will be sent even when a filter is provided to @{os.pullEventRaw}. When using @{os.pullEventRaw} with a filter, make sure to check that the event is not @{terminate}.
-
-## Example
-Prints a message when Ctrl-T is held:
-```lua
-while true do
-  local event = os.pullEventRaw("terminate")
-  if event == "terminate" then print("Terminate requested!") end
-end
-```
-
-Exits when Ctrl-T is held:
-```lua
-while true do
-  os.pullEvent()
-end
-```

doc/events/timer.md

@@ -1,21 +0,0 @@
----
-module: [kind=event] timer
-see: os.startTimer To start a timer.
----
-
-The @{timer} event is fired when a timer started with @{os.startTimer} completes.
-
-## Return Values
-1. @{string}: The event name.
-2. @{number}: The ID of the timer that finished.
-
-## Example
-Starts a timer and then prints its ID:
-```lua
-local timerID = os.startTimer(2)
-local event, id
-repeat
-    event, id = os.pullEvent("timer")
-until id == timerID
-print("Timer with ID " .. id .. " was fired")
-```

doc/events/turtle_inventory.md

@@ -1,14 +0,0 @@
----
-module: [kind=event] turtle_inventory
----
-
-The @{turtle_inventory} event is fired when a turtle's inventory is changed.
-
-## Example
-Prints a message when the inventory is changed:
-```lua
-while true do
-  os.pullEvent("turtle_inventory")
-  print("The inventory was changed.")
-end
-```

doc/events/websocket_closed.md

@@ -1,21 +0,0 @@
----
-module: [kind=event] websocket_closed
----
-
-The @{websocket_closed} event is fired when an open WebSocket connection is closed.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the WebSocket that was closed.
-
-## Example
-Prints a message when a WebSocket is closed (this may take a minute):
-```lua
-local myURL = "wss://example.tweaked.cc/echo"
-local ws = http.websocket(myURL)
-local event, url
-repeat
-    event, url = os.pullEvent("websocket_closed")
-until url == myURL
-print("The WebSocket at " .. url .. " was closed.")
-```

doc/events/websocket_failure.md

@@ -1,25 +0,0 @@
----
-module: [kind=event] websocket_failure
-see: http.websocketAsync To send an HTTP request.
----
-
-The @{websocket_failure} event is fired when a WebSocket connection request fails.
-
-This event is normally handled inside @{http.websocket}, but it can still be seen when using @{http.websocketAsync}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the site requested.
-3. @{string}: An error describing the failure.
-
-## Example
-Prints an error why the website cannot be contacted:
-```lua
-local myURL = "wss://example.tweaked.cc/not-a-websocket"
-http.websocketAsync(myURL)
-local event, url, err
-repeat
-    event, url, err = os.pullEvent("websocket_failure")
-until url == myURL
-print("The URL " .. url .. " could not be reached: " .. err)
-```

doc/events/websocket_message.md

@@ -1,27 +0,0 @@
----
-module: [kind=event] websocket_message
----
-
-The @{websocket_message} event is fired when a message is received on an open WebSocket connection.
-
-This event is normally handled by @{http.Websocket.receive}, but it can also be pulled manually.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the WebSocket.
-3. @{string}: The contents of the message.
-4. @{boolean}: Whether this is a binary message.
-
-## Example
-Prints a message sent by a WebSocket:
-```lua
-local myURL = "wss://example.tweaked.cc/echo"
-local ws = http.websocket(myURL)
-ws.send("Hello!")
-local event, url, message
-repeat
-    event, url, message = os.pullEvent("websocket_message")
-until url == myURL
-print("Received message from " .. url .. " with contents " .. message)
-ws.close()
-```

doc/events/websocket_success.md

@@ -1,28 +0,0 @@
----
-module: [kind=event] websocket_success
-see: http.websocketAsync To open a WebSocket asynchronously.
----
-
-The @{websocket_success} event is fired when a WebSocket connection request returns successfully.
-
-This event is normally handled inside @{http.websocket}, but it can still be seen when using @{http.websocketAsync}.
-
-## Return Values
-1. @{string}: The event name.
-2. @{string}: The URL of the site.
-3. @{http.Websocket}: The handle for the WebSocket.
-
-## Example
-Prints the content of a website (this may fail if the request fails):
-```lua
-local myURL = "wss://example.tweaked.cc/echo"
-http.websocketAsync(myURL)
-local event, url, handle
-repeat
-    event, url, handle = os.pullEvent("websocket_success")
-until url == myURL
-print("Connected to " .. url)
-handle.send("Hello!")
-print(handle.receive())
-handle.close()
-```

doc/guides/speaker_audio.md

@@ -1,200 +0,0 @@
----
-module: [kind=guide] speaker_audio
-see: speaker.playAudio Play PCM audio using a speaker.
-see: cc.audio.dfpwm Provides utilities for encoding and decoding DFPWM files.
----
-
-# Playing audio with speakers
-CC: Tweaked's speaker peripheral provides a powerful way to play any audio you like with the @{speaker.playAudio}
-method. However, for people unfamiliar with digital audio, it's not the most intuitive thing to use. This guide provides
-an introduction to digital audio, demonstrates how to play music with CC: Tweaked's speakers, and then briefly discusses
-the more complex topic of audio processing.
-
-## A short introduction to digital audio
-When sound is recorded it is captured as an analogue signal, effectively the electrical version of a sound
-wave. However, this signal is continuous, and so can't be used directly by a computer. Instead, we measure (or *sample*)
-the amplitude of the wave many times a second and then *quantise* that amplitude, rounding it to the nearest
-representable value.
-
-This representation of sound - a long, uniformally sampled list of amplitudes is referred to as [Pulse-code
-Modulation][PCM] (PCM). PCM can be thought of as the "standard" audio format, as it's incredibly easy to work with. For
-instance, to mix two pieces of audio together, you can just samples from the two tracks together and take the average.
-
-CC: Tweaked's speakers also work with PCM audio. It plays back 48,000 samples a second, where each sample is an integer
-between -128 and 127. This is more commonly referred to as 48kHz and an 8-bit resolution.
-
-Let's now look at a quick example. We're going to generate a [Sine Wave] at 220Hz, which sounds like a low monotonous
-hum. First we wrap our speaker peripheral, and then we fill a table (also referred to as a *buffer*) with 128×1024
-samples - this is the maximum number of samples a speaker can accept in one go.
-
-In order to fill this buffer, we need to do a little maths. We want to play 220 sine waves each second, where each sine
-wave completes a full oscillation in 2π "units". This means one seconds worth of audio is 2×π×220 "units" long. We then
-need to split this into 48k samples, basically meaning for each sample we move 2×π×220/48k "along" the sine curve.
-
-```lua {data-peripheral=speaker}
-local speaker = peripheral.find("speaker")
-
-local buffer = {}
-local t, dt = 0, 2 * math.pi * 220 / 48000
-for i = 1, 128 * 1024 do
-    buffer[i] = math.floor(math.sin(t) * 127)
-    t = (t + dt) % (math.pi * 2)
-end
-
-speaker.playAudio(buffer)
-```
-
-## Streaming audio
-You might notice that the above snippet only generates a short bit of audio - 2.7s seconds to be precise. While we could
-try increasing the number of loop iterations, we'll get an error when we try to play it through the speaker: the sound
-buffer is too large for it to handle.
-
-Our 2.7 seconds of audio is stored in a table with over 130 _thousand_ elements. If we wanted to play a full minute of
-sine waves (and why wouldn't you?), you'd need a table with almost 3 _million_. Suddenly you find these numbers adding
-up very quickly, and these tables take up more and more memory.
-
-Instead of building our entire song (well, sine wave) in one go, we can produce it in small batches, each of which get
-passed off to @{speaker.playAudio} when the time is right. This allows us to build a _stream_ of audio, where we read
-chunks of audio one at a time (either from a file or a tone generator like above), do some optional processing to each
-one, and then play them.
-
-Let's adapt our example from above to do that instead.
-
-```lua {data-peripheral=speaker}
-local speaker = peripheral.find("speaker")
-
-local t, dt = 0, 2 * math.pi * 220 / 48000
-while true do
-    local buffer = {}
-    for i = 1, 16 * 1024 * 8 do
-        buffer[i] = math.floor(math.sin(t) * 127)
-        t = (t + dt) % (math.pi * 2)
-    end
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-It looks pretty similar to before, aside from we've wrapped the generation and playing code in a while loop, and added a
-rather odd loop with @{speaker.playAudio} and @{os.pullEvent}.
-
-Let's talk about this loop, why do we need to keep calling @{speaker.playAudio}? Remember that what we're trying to do
-here is avoid keeping too much audio in memory at once. However, if we're generating audio quicker than the speakers can
-play it, we're not helping at all - all this audio is still hanging around waiting to be played!
-
-In order to avoid this, the speaker rejects any new chunks of audio if its backlog is too large. When this happens,
-@{speaker.playAudio} returns false. Once enough audio has played, and the backlog has been reduced, a
-@{speaker_audio_empty} event is queued, and we can try to play our chunk once more.
-
-## Storing audio
-PCM is a fantastic way of representing audio when we want to manipulate it, but it's not very efficient when we want to
-store it to disk. Compare the size of a WAV file (which uses PCM) to an equivalent MP3, it's often 5 times the size.
-Instead, we store audio in special formats (or *codecs*) and then convert them to PCM when we need to do processing on
-them.
-
-Modern audio codecs use some incredibly impressive techniques to compress the audio as much as possible while preserving
-sound quality. However, due to CC: Tweaked's limited processing power, it's not really possible to use these from your
-computer. Instead, we need something much simpler.
-
-DFPWM (Dynamic Filter Pulse Width Modulation) is the de facto standard audio format of the ComputerCraft (and
-OpenComputers) world. Originally popularised by the addon mod [Computronics], CC:T now has built-in support for it with
-the @{cc.audio.dfpwm} module. This allows you to read DFPWM files from disk, decode them to PCM, and then play them
-using the speaker.
-
-Let's dive in with an example, and we'll explain things afterwards:
-
-```lua {data-peripheral=speaker}
-local dfpwm = require("cc.audio.dfpwm")
-local speaker = peripheral.find("speaker")
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-Once again, we see the @{speaker.playAudio}/@{speaker_audio_empty} loop. However, the rest of the program is a little
-different.
-
-First, we require the dfpwm module and call @{cc.audio.dfpwm.make_decoder} to construct a new decoder. This decoder
-accepts blocks of DFPWM data and converts it to a list of 8-bit amplitudes, which we can then play with our speaker.
-
-As mentioned to above, @{speaker.playAudio} accepts at most 128×1024 samples in one go. DFPMW uses a single bit for each
-sample, which means we want to process our audio in chunks of 16×1024 bytes (16KiB). In order to do this, we use
-@{io.lines}, which provides a nice way to loop over chunks of a file. You can of course just use @{fs.open} and
-@{fs.BinaryReadHandle.read} if you prefer.
-
-## Processing audio
-As mentioned near the beginning of this guide, PCM audio is pretty easy to work with as it's just a list of amplitudes.
-You can mix together samples from different streams by adding their amplitudes, change the rate of playback by removing
-samples, etc...
-
-Let's put together a small demonstration here. We're going to add a small delay effect to the song above, so that you
-hear a faint echo about a second later.
-
-In order to do this, we'll follow a format similar to the previous example, decoding the audio and then playing it.
-However, we'll also add some new logic between those two steps, which loops over every sample in our chunk of audio, and
-adds the sample from one second ago to it.
-
-For this, we'll need to keep track of the last 48k samples - exactly one seconds worth of audio. We can do this using a
-[Ring Buffer], which helps makes things a little more efficient.
-
-```lua {data-peripheral=speaker}
-local dfpwm = require("cc.audio.dfpwm")
-local speaker = peripheral.find("speaker")
-
--- Speakers play at 48kHz, so one second is 48k samples. We first fill our buffer
--- with 0s, as there's nothing to echo at the start of the track!
-local samples_i, samples_n = 1, 48000
-local samples = {}
-for i = 1, samples_n do samples[i] = 0 end
-
-local decoder = dfpwm.make_decoder()
-for chunk in io.lines("data/example.dfpwm", 16 * 1024) do
-    local buffer = decoder(chunk)
-
-    for i = 1, #buffer do
-        local original_value = buffer[i]
-
-        -- Replace this sample with its current amplitude plus the amplitude from one second ago.
-        -- We scale both to ensure the resulting value is still between -128 and 127.
-        buffer[i] = original_value * 0.6 + samples[samples_i] * 0.4
-
-        -- Now store the current sample, and move the "head" of our ring buffer forward one place.
-        samples[samples_i] = original_value
-        samples_i = samples_i + 1
-        if samples_i > samples_n then samples_i = 1 end
-    end
-
-    while not speaker.playAudio(buffer) do
-        os.pullEvent("speaker_audio_empty")
-    end
-end
-```
-
-:::note Confused?
-Don't worry if you don't understand this example. It's quite advanced, and does use some ideas that this guide doesn't
-cover. That said, don't be afraid to ask on [Discord] or [IRC] either!
-:::
-
-It's worth noting that the examples of audio processing we've mentioned here are about manipulating the _amplitude_ of
-the wave. If you wanted to modify the _frequency_ (for instance, shifting the pitch), things get rather more complex.
-For this, you'd need to use the [Fast Fourier transform][FFT] to convert the stream of amplitudes to frequencies,
-process those, and then convert them back to amplitudes.
-
-This is, I'm afraid, left as an exercise to the reader.
-
-[Computronics]: https://github.com/Vexatos/Computronics/ "Computronics on GitHub"
-[FFT]: https://en.wikipedia.org/wiki/Fast_Fourier_transform "Fast Fourier transform - Wikipedia"
-[PCM]: https://en.wikipedia.org/wiki/Pulse-code_modulation "Pulse-code Modulation - Wikipedia"
-[Ring Buffer]: https://en.wikipedia.org/wiki/Circular_buffer "Circular buffer - Wikipedia"
-[Sine Wave]: https://en.wikipedia.org/wiki/Sine_wave "Sine wave - Wikipedia"
-
-[Discord]: https://discord.computercraft.cc "The Minecraft Computer Mods Discord"
-[IRC]: http://webchat.esper.net/?channels=computercraft "IRC webchat on EsperNet"

doc/guides/using_require.md

@@ -1,83 +0,0 @@
----
-module: [kind=guide] using_require
----
-
-# Reusing code with require
-A library is a collection of useful functions and other definitions which is stored separately to your main program. You
-might want to create a library because you have some functions which are used in multiple programs, or just to split
-your program into multiple more modular files.
-
-Let's say we want to create a small library to make working with the @{term|terminal} a little easier. We'll provide two
-functions: `reset`, which clears the terminal and sets the cursor to (1, 1), and `write_center`, which prints some text
-in the middle of the screen.
-
-Start off by creating a file called `more_term.lua`:
-
-```lua {data-snippet=more_term}
-local function reset()
-  term.clear()
-  term.setCursorPos(1, 1)
-end
-
-local function write_center(text)
-  local x, y = term.getCursorPos()
-  local width, height = term.getSize()
-  term.setCursorPos(math.floor((width - #text) / 2) + 1, y)
-  term.write(text)
-end
-
-return { reset = reset, write_center = write_center }
-```
-
-Now, what's going on here? We define our two functions as one might expect, and then at the bottom return a table with
-the two functions. When we require this library, this table is what is returned. With that, we can then call the
-original functions. Now create a new file, with the following:
-
-```lua {data-mount=more_term:more_term.lua}
-local more_term = require("more_term")
-more_term.reset()
-more_term.write_center("Hello, world!")
-```
-
-When run, this'll clear the screen and print some text in the middle of the first line.
-
-## require in depth
-While the previous section is a good introduction to how @{require} operates, there are a couple of remaining points
-which are worth mentioning for more advanced usage.
-
-### Libraries can return anything
-In our above example, we return a table containing the functions we want to expose. However, it's worth pointing out
-that you can return ''anything'' from your library - a table, a function or even just a string! @{require} treats them
-all the same, and just returns whatever your library provides.
-
-### Module resolution and the package path
-In the above examples, we defined our library in a file, and @{require} read from it. While this is what you'll do most
-of the time, it is possible to make @{require} look elsewhere for your library, such as downloading from a website or
-loading from an in-memory library store.
-
-As a result, the *module name* you pass to @{require} doesn't correspond to a file path. One common mistake is to load
-code from a sub-directory using `require("folder/library")` or even `require("folder/library.lua")`, neither of which
-will do quite what you expect.
-
-When loading libraries (also referred to as *modules*) from files, @{require} searches along the *@{package.path|module
-path}*. By default, this looks something like:
-
-* `?.lua`
-* `?/init.lua`
-* `/rom/modules/main/?.lua`
-* etc...
-
-When you call `require("my_library")`, @{require} replaces the `?` in each element of the path with your module name, and
-checks if the file exists. In this case, we'd look for `my_library.lua`, `my_library/init.lua`,
-`/rom/modules/main/my_library.lua` and so on. Note that this works *relative to the current program*, so if your
-program is actually called `folder/program`, then we'll look for `folder/my_library.lua`, etc...
-
-One other caveat is loading libraries from sub-directories. For instance, say we have a file
-`my/fancy/library.lua`. This can be loaded by using `require("my.fancy.library")` - the '.'s are replaced with '/'
-before we start looking for the library.
-
-## External links
-There are several external resources which go into require in a little more detail:
-
- - The [Lua Module tutorial](http://lua-users.org/wiki/ModulesTutorial) on the Lua wiki.
- - [Lua's manual section on @{require}](https://www.lua.org/manual/5.1/manual.html#pdf-require).

doc/head.html

@@ -1 +0,0 @@
-<meta name="theme-color" content="#c8d87c">

doc/index.md

@@ -1,55 +1,11 @@
-# ![CC: Tweaked](logo.png)
-CC: Tweaked is a mod for Minecraft which adds programmable computers, turtles and more to the game. A fork of the
-much-beloved [ComputerCraft], it continues its legacy with better performance, stability, and a wealth of new features.
+# ![CC: Tweaked](logo.png) [![Download CC: Tweaked on CurseForge](https://cf.way2muchnoise.eu/title/cc-tweaked.svg)](https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked on CurseForge")
 
-CC: Tweaked can be installed from [CurseForge] or [Modrinth]. It requires the [Minecraft Forge][forge] mod loader, but
-[versions are available for Fabric][ccrestitched].
+CC: Tweaked is a fork of [ComputerCraft], adding programmable computers, turtles and more to Minecraft.
 
-## Features
-Controlled using the [Lua programming language][lua], CC: Tweaked's computers provides all the tools you need to start
-writing code and automating your Minecraft world.
+This website contains documentation for all Lua libraries and APIs from the latest version of CC: Tweaked. This
+documentation is still in development, so will most likely be incomplete. If you've found something you think is wrong,
+or would like to help out [please get in touch on GitHub][gh].
 
-![A ComputerCraft terminal open and ready to be programmed.](images/basic-terminal.png){.big-image}
-
-While computers are incredibly powerful, they're rather limited by their inability to move about. *Turtles* are the
-solution here. They can move about the world, placing and breaking blocks, swinging a sword to protect you from zombies,
-or whatever else you program them to!
-
-![A turtle tunneling in Minecraft.](images/turtle.png){.big-image}
-
-Not all problems can be solved with a pickaxe though, and so CC: Tweaked also provides a bunch of additional peripherals
-for your computers. You can play a tune with speakers, display text or images on a monitor, connect all your
-computers together with modems, and much more.
-
-Computers can now also interact with inventories such as chests, allowing you to build complex inventory and item
-management systems.
-
-![A chest's contents being read by a computer and displayed on a monitor.](images/peripherals.png){.big-image}
-
-## Getting Started
-While ComputerCraft is lovely for both experienced programmers and for people who have never coded before, it can be a
-little daunting getting started. Thankfully, there's several fantastic tutorials out there:
-
- - [Direwolf20's ComputerCraft tutorials](https://www.youtube.com/watch?v=wrUHUhfCY5A "ComputerCraft Tutorial Episode 1 - HELP! and Hello World")
- - [Sethbling's ComputerCraft series](https://www.youtube.com/watch?v=DSsx4VSe-Uk "Programming Tutorial with Minecraft Turtles -- Ep. 1: Intro to Turtles and If-Then-Else_End")
- - [Lyqyd's Computer Basics 1](http://www.computercraft.info/forums2/index.php?/topic/15033-computer-basics-i/ "Computer Basics I")
-
-Once you're a little more familiar with the mod, the sidebar and links below provide more detailed documentation on the
-various APIs and peripherals provided by the mod.
-
-If you get stuck, do pop in to the [Minecraft Computer Mod Discord guild][discord] or ComputerCraft's
-[IRC channel][irc].
-
-## Get Involved
-CC: Tweaked lives on [GitHub]. If you've got any ideas, feedback or bugs please do [create an issue][bug].
-
-[github]: https://github.com/cc-tweaked/CC-Tweaked/ "CC: Tweaked on GitHub"
-[bug]: https://github.com/cc-tweaked/CC-Tweaked/issues/new/choose
+[bug]: https://github.com/SquidDev-CC/CC-Tweaked/issues/new/choose
 [computercraft]: https://github.com/dan200/ComputerCraft "ComputerCraft on GitHub"
-[curseforge]: https://minecraft.curseforge.com/projects/cc-tweaked "Download CC: Tweaked from CurseForge"
-[modrinth]: https://modrinth.com/mod/gu7yAYhd "Download CC: Tweaked from Modrinth"
-[forge]: https://files.minecraftforge.net/ "Download Minecraft Forge."
-[ccrestitched]: https://www.curseforge.com/minecraft/mc-mods/cc-restitched "Download CC: Restitched from CurseForge"
-[lua]: https://www.lua.org/ "Lua's main website"
-[discord]: https://discord.computercraft.cc "The Minecraft Computer Mods Discord"
-[irc]: http://webchat.esper.net/?channels=computercraft "IRC webchat on EsperNet"
+[gh]: https://github.com/SquidDev-CC/CC-Tweaked "CC:Tweaked on GitHub"

doc/stub/commands.lua

@@ -0,0 +1,77 @@
+--- Execute a specific command.
+--
+-- @tparam string command The command to execute.
+-- @treturn boolean Whether the command executed successfully.
+-- @treturn { string... } The output of this command, as a list of lines.
+-- @treturn number|nil The number of "affected" objects, or `nil` if the command
+-- failed. The definition of this varies from command to command.
+-- @usage Set the block above the command computer to stone.
+--
+--     commands.exec("setblock ~ ~1 ~ minecraft:stone")
+function exec(command) end
+
+--- Asynchronously execute a command.
+--
+-- Unlike @{exec}, this will immediately return, instead of waiting for the
+-- command to execute. This allows you to run multiple commands at the same
+-- time.
+--
+-- When this command has finished executing, it will queue a `task_complete`
+-- event containing the result of executing this command (what @{exec} would
+-- return).
+--
+-- @tparam string command The command to execute.
+-- @treturn number The "task id". When this command has been executed, it will
+-- queue a `task_complete` event with a matching id.
+-- @usage Asynchronously sets the block above the computer to stone.
+--
+--     commands.execAsync("~ ~1 ~ minecraft:stone")
+-- @see parallel One may also use the parallel API to run multiple commands at
+-- once.
+function execAsync(commad) end
+
+--- List all available commands which the computer has permission to execute.
+--
+-- @treturn { string... } A list of all available commands
+function list() end
+
+--- Get the position of the current command computer.
+--
+-- @treturn number This computer's x position.
+-- @treturn number This computer's y position.
+-- @treturn number This computer's z position.
+-- @see gps.locate To get the position of a non-command computer.
+function getBlockPosition() end
+
+--- Get some basic information about a block.
+--
+-- The returned table contains the current name, metadata and block state (as
+-- with @{turtle.inspect}). If there is a tile entity for that block, its NBT
+-- will also be returned.
+--
+-- @tparam number x The x position of the block to query.
+-- @tparam number y The y position of the block to query.
+-- @tparam number z The z position of the block to query.
+-- @treturn table The given block's information.
+-- @throws If the coordinates are not within the world, or are not currently
+-- loaded.
+function getBlockInfo(x, y, z) end
+
+--- Get information about a range of blocks.
+--
+-- This returns the same information as @{getBlockInfo}, just for multiple
+-- blocks at once.
+--
+-- Blocks are traversed by ascending y level, followed by z and x - the returned
+-- table may be indexed using `x + z*width + y*depth*depth`.
+--
+-- @tparam number min_x The start x coordinate of the range to query.
+-- @tparam number min_y The start y coordinate of the range to query.
+-- @tparam number min_z The start z coordinate of the range to query.
+-- @tparam number max_x The end x coordinate of the range to query.
+-- @tparam number max_y The end y coordinate of the range to query.
+-- @tparam number max_z The end z coordinate of the range to query.
+-- @treturn { table... } A list of information about each block.
+-- @throws If the coordinates are not within the world.
+-- @throws If trying to get information about more than 4096 blocks.
+function getBlockInfos(min_x, min_y, min_z, max_x, max_y, max_z) end

doc/stub/fs.lua

@@ -2,6 +2,23 @@
 --
 -- @module fs
 
+function list(path) end
+function combine(base, child) end
+function getName(path) end
+function getSize(path) end
+function exists(path) end
+function isDir(path) end
+function isReadOnly(path) end
+function makeDir(path) end
+function move(from, to) end
+function copy(from, to) end
+function delete(path) end
+function open(path, mode) end
+function getDrive(path) end
+function getFreeSpace(path) end
+function find(pattern) end
+function getDir(path) end
+
 --- Returns true if a path is mounted to the parent filesystem.
 --
 -- The root filesystem "/" is considered a mount, along with disk folders and
@@ -12,25 +29,56 @@
 -- @treturn boolean If the path is mounted, rather than a normal file/folder.
 -- @throws If the path does not exist.
 -- @see getDrive
--- @since 1.87.0
 function isDriveRoot(path) end
 
---[[- Provides completion for a file or directory name, suitable for use with
-@{_G.read}.
+--- Get the capacity of the drive at the given path.
+--
+-- This may be used in conjunction with @{getFreeSpace} to determine what
+-- percentage of this drive has been used.
+--
+-- @tparam string path The path of the drive to get.
+-- @treturn number This drive's capacity. This will be 0 for "read-only" drives,
+-- such as the ROM or treasure disks.
+function getCapacity(path) end
 
-When a directory is a possible candidate for completion, two entries are
-included - one with a trailing slash (indicating that entries within this
-directory exist) and one without it (meaning this entry is an immediate
-completion candidate). `include_dirs` can be set to @{false} to only include
-those with a trailing slash.
+--- Get attributes about a specific file or folder.
+--
+-- The returned attributes table contains information about the size of the
+-- file, whether it is a directory, and when it was created and last modified.
+--
+-- The creation and modification times are given as the number of milliseconds
+-- since the UNIX epoch. This may be given to @{os.date} in order to convert it
+-- to more usable form.
+--
+-- @tparam string path The path to get attributes for.
+-- @treturn { size = number, isDir = boolean, created = number, modified = number }
+-- The resulting attributes.
+-- @throws If the path does not exist.
+-- @see getSize If you only care about the file's size.
+-- @see isDir If you only care whether a path is a directory or not.
+function attributes(path) end
 
-@tparam string path The path to complete.
-@tparam string location The location where paths are resolved from.
-@tparam[opt] boolean include_files When @{false}, only directories will be
-included in the returned list.
-@tparam[opt] boolean include_dirs When @{false}, "raw" directories will not be
-included in the returned list.
-@treturn { string... } A list of possible completion candidates.
-@since 1.74
-]]
-function complete(path, location, include_files, include_dirs) end
+-- Defined in bios.lua
+function complete(sPath, sLocation, bIncludeFiles, bIncludeDirs) end
+
+--- A file handle which can be read from.
+--
+-- @type ReadHandle
+-- @see fs.open
+local ReadHandle = {}
+function ReadHandle.read(count) end
+function ReadHandle.readAll() end
+function ReadHandle.readLine(with_trailing) end
+function ReadHandle.seek(whence, offset) end
+function ReadHandle.close() end
+
+--- A file handle which can be written to.
+--
+-- @type WriteHandle
+-- @see fs.open
+local WriteHandle = {}
+function WriteHandle.write(text) end
+function WriteHandle.writeLine(text) end
+function WriteHandle.flush(text) end
+function WriteHandle.seek(whence, offset) end
+function WriteHandle.close() end

doc/stub/global.lua

@@ -1,133 +0,0 @@
---[[-
-Functions in the global environment, defined in `bios.lua`. This does not
-include standard Lua functions.
-
-@module _G
-]]
-
---[[- Pauses execution for the specified number of seconds.
-
-As it waits for a fixed amount of world ticks, `time` will automatically be
-rounded up to the nearest multiple of 0.05 seconds. If you are using coroutines
-or the @{parallel|parallel API}, it will only pause execution of the current
-thread, not the whole program.
-
-:::tip
-Because sleep internally uses timers, it is a function that yields. This means
-that you can use it to prevent "Too long without yielding" errors, however, as
-the minimum sleep time is 0.05 seconds, it will slow your program down.
-:::
-
-:::caution
-Internally, this function queues and waits for a timer event (using
-@{os.startTimer}), however it does not listen for any other events. This means
-that any event that occurs while sleeping will be entirely discarded. If you
-need to receive events while sleeping, consider using @{os.startTimer|timers},
-or the @{parallel|parallel API}.
-:::
-
-@tparam number time The number of seconds to sleep for, rounded up to the
-nearest multiple of 0.05.
-
-@see os.startTimer
-@usage Sleep for three seconds.
-
-    print("Sleeping for three seconds")
-    sleep(3)
-    print("Done!")
-]]
-function sleep(time) end
-
---- Writes a line of text to the screen without a newline at the end, wrapping
--- text if necessary.
---
--- @tparam string text The text to write to the string
--- @treturn number The number of lines written
--- @see print A wrapper around write that adds a newline and accepts multiple arguments
--- @usage write("Hello, world")
-function write(text) end
-
---- Prints the specified values to the screen separated by spaces, wrapping if
--- necessary. After printing, the cursor is moved to the next line.
---
--- @param ... The values to print on the screen
--- @treturn number The number of lines written
--- @usage print("Hello, world!")
-function print(...) end
-
---- Prints the specified values to the screen in red, separated by spaces,
--- wrapping if necessary. After printing, the cursor is moved to the next line.
---
--- @param ... The values to print on the screen
--- @usage printError("Something went wrong!")
-function printError(...) end
-
---[[- Reads user input from the terminal, automatically handling arrow keys,
-pasting, character replacement, history scrollback, auto-completion, and
-default values.
-
-@tparam[opt] string replaceChar A character to replace each typed character with.
-This can be used for hiding passwords, for example.
-@tparam[opt] table history A table holding history items that can be scrolled
-back to with the up/down arrow keys. The oldest item is at index 1, while the
-newest item is at the highest index.
-@tparam[opt] function(partial: string):({ string... }|nil) completeFn A function
-to be used for completion. This function should take the partial text typed so
-far, and returns a list of possible completion options.
-@tparam[opt] string default Default text which should already be entered into
-the prompt.
-
-@treturn string The text typed in.
-
-@see cc.completion For functions to help with completion.
-@usage Read a string and echo it back to the user
-
-    write("> ")
-    local msg = read()
-    print(msg)
-
-@usage Prompt a user for a password.
-
-    while true do
-      write("Password> ")
-      local pwd = read("*")
-      if pwd == "let me in" then break end
-      print("Incorrect password, try again.")
-    end
-    print("Logged in!")
-
-@usage A complete example with completion, history and a default value.
-
-    local completion = require "cc.completion"
-    local history = { "potato", "orange", "apple" }
-    local choices = { "apple", "orange", "banana", "strawberry" }
-    write("> ")
-    local msg = read(nil, history, function(text) return completion.choice(text, choices) end, "app")
-    print(msg)
-
-@changed 1.74 Added `completeFn` parameter.
-@changed 1.80pr1 Added `default` parameter.
-]]
-function read(replaceChar, history, completeFn, default) end
-
---- The ComputerCraft and Minecraft version of the current computer environment.
---
--- For example, `ComputerCraft 1.93.0 (Minecraft 1.15.2)`.
--- @usage _HOST
--- @since 1.76
-_HOST = _HOST
-
---[[- The default computer settings as defined in the ComputerCraft
-configuration.
-
-This is a comma-separated list of settings pairs defined by the mod
-configuration or server owner. By default, it is empty.
-
-An example value to disable autocompletion:
-
-    shell.autocomplete=false,lua.autocomplete=false,edit.autocomplete=false
-
-@usage _CC_DEFAULT_SETTINGS
-@since 1.77
-]]
-_CC_DEFAULT_SETTINGS = _CC_DEFAULT_SETTINGS

doc/stub/http.lua

@@ -1,8 +1,9 @@
 --- The http library allows communicating with web servers, sending and
 -- receiving data from them.
 --
+-- #### `http_check` event
+--
 -- @module http
--- @since 1.1
 
 --- Asynchronously make a HTTP request to the given url.
 --
@@ -36,11 +37,6 @@
 --
 -- @see http.get  For a synchronous way to make GET requests.
 -- @see http.post For a synchronous way to make POST requests.
---
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
 function request(...) end
 
 --- Make a HTTP GET request to the given url.
@@ -64,16 +60,10 @@ function request(...) end
 -- @treturn string A message detailing why the request failed.
 -- @treturn Response|nil The failing http response, if available.
 --
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Response handles are now returned on error if available.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
---
--- @usage Make a request to [example.tweaked.cc](https://example.tweaked.cc),
+-- @usage Make a request to [example.computercraft.cc](https://example.computercraft.cc),
 -- and print the returned page.
 -- ```lua
--- local request = http.get("https://example.tweaked.cc")
+-- local request = http.get("https://example.computercraft.cc")
 -- print(request.readAll())
 -- -- => HTTP is working!
 -- request.close()
@@ -101,15 +91,49 @@ function get(...) end
 -- error or connection timeout.
 -- @treturn string A message detailing why the request failed.
 -- @treturn Response|nil The failing http response, if available.
---
--- @since 1.31
--- @changed 1.63 Added argument for headers.
--- @changed 1.80pr1 Response handles are now returned on error if available.
--- @changed 1.80pr1 Added argument for binary handles.
--- @changed 1.80pr1.6 Added support for table argument.
--- @changed 1.86.0 Added PATCH and TRACE methods.
 function post(...) end
 
+--- A http response. This acts very much like a @{fs.ReadHandle|file}, though
+-- provides some http specific methods.
+--
+-- #### `http_success` event
+-- #### `http_failure` event
+--
+-- @type Response
+-- @see http.request On how to make a http request.
+local Response = {}
+
+--- Returns the response code and response message returned by the server
+--
+-- @treturn number The response code (i.e. 200)
+-- @treturn string The response message (i.e. "OK")
+function Response.getResponseCode() end
+
+--- Get a table containing the response's headers, in a format similar to that
+-- required by @{http.request}. If multiple headers are sent with the same
+-- name, they will be combined with a comma.
+--
+-- @treturn { [string]=string } The response's headers.
+-- Make a request to [example.computercraft.cc](https://example.computercraft.cc),
+-- and print the returned headers.
+-- ```lua
+-- local request = http.get("https://example.computercraft.cc")
+-- print(textutils.serialize(request.getResponseHeaders()))
+-- -- => {
+-- --   [ "Content-Type" ] = "text/plain; charset=utf8",
+-- --   [ "content-length" ] = 17,
+-- --   ...
+-- -- }
+-- request.close()
+-- ```
+function Response.getResponseHeaders() end
+
+function Response.read(count) end
+function Response.readAll() end
+function Response.readLine(with_trailing) end
+function Response.seek(whence, offset) end
+function Response.close() end
+
 --- Asynchronously determine whether a URL can be requested.
 --
 -- If this returns `true`, one should also listen for [`http_check`
@@ -142,7 +166,7 @@ function checkURLAsync(url) end
 --
 -- @usage
 -- ```lua
--- print(http.checkURL("https://example.tweaked.cc/"))
+-- print(http.checkURL("https://example.computercraft.cc/"))
 -- -- => true
 -- print(http.checkURL("http://localhost/"))
 -- -- => false Domain not permitted
@@ -161,9 +185,6 @@ function checkURL(url) end
 -- @treturn Websocket The websocket connection.
 -- @treturn[2] false If the websocket connection failed.
 -- @treturn string An error message describing why the connection failed.
--- @since 1.80pr1.1
--- @changed 1.80pr1.3 No longer asynchronous.
--- @changed 1.95.3 Added User-Agent to default headers.
 function websocket(url, headers) end
 
 --- Asynchronously open a websocket.
@@ -176,6 +197,33 @@ function websocket(url, headers) end
 -- `ws://` or `wss://` protocol.
 -- @tparam[opt] { [string] = string } headers Additional headers to send as part
 -- of the initial websocket connection.
--- @since 1.80pr1.3
--- @changed 1.95.3 Added User-Agent to default headers.
 function websocketAsync(url, headers) end
+
+--- A websocket, which can be used to send an receive messages with a web
+-- server.
+--
+-- @type Websocket
+-- @see http.websocket On how to open a websocket.
+local Websocket = {}
+
+--- Send a websocket message to the connected server.
+--
+-- @tparam string message The message to send.
+-- @tparam[opt] boolean binary Whether this message should be treated as a
+-- binary string, rather than encoded text.
+-- @throws If the websocket has been closed.
+function Websocket.send(message, binary) end
+
+--- Wait for a message from the server.
+--
+-- @tparam[opt] number timeout The number of seconds to wait if no message is
+-- received.
+-- @treturn[1] string The received message.
+-- @treturn boolean If this was a binary message.
+-- @treturn[2] nil If the websocket was closed while waiting, or if we timed out.
+-- @throws If the websocket has been closed.
+function Websocket.receive(timeout) end
+
+--- Close this websocket. This will terminate the connection, meaning messages
+-- can no longer be sent or received along it.
+function Websocket.close() end

doc/stub/os.lua

@@ -1,128 +1,24 @@
+function queueEvent(event, ...) end
+function startTimer(delay) end
+function setAlarm(time) end
+function shutdown() end
+function reboot() end
+function getComputerID() end
+computerID = getComputerID
+function setComputerLabel(label) end
+function getComputerLabel() end
+computerLabel = getComputerLabel
+function clock() end
+function time(timezone) end
+function day(timezone) end
+function cancelTimer(id) end
+function cancelAlarm(id) end
+function epoch(timezone) end
+function date(format, time) end
+
 -- Defined in bios.lua
-
---[[- Loads the given API into the global environment.
-
-This function loads and executes the file at the given path, and all global
-variables and functions exported by it will by available through the use of
-`myAPI.<function name>`, where `myAPI` is the base name of the API file.
-
-@tparam string path The path of the API to load.
-@treturn boolean Whether or not the API was successfully loaded.
-@since 1.2
-
-@deprecated When possible it's best to avoid using this function. It pollutes
-the global table and can mask errors.
-
-@{require} should be used to load libraries instead.
-]]
 function loadAPI(path) end
-
---- Unloads an API which was loaded by @{os.loadAPI}.
---
--- This effectively removes the specified table from `_G`.
---
--- @tparam string name The name of the API to unload.
--- @since 1.2
--- @deprecated See @{os.loadAPI} for why.
-function unloadAPI(name) end
-
---[[- Pause execution of the current thread and waits for any events matching
-`filter`.
-
-This function @{coroutine.yield|yields} the current process and waits for it
-to be resumed with a vararg list where the first element matches `filter`.
-If no `filter` is supplied, this will match all events.
-
-Unlike @{os.pullEventRaw}, it will stop the application upon a "terminate"
-event, printing the error "Terminated".
-
-@tparam[opt] string filter Event to filter for.
-@treturn string event The name of the event that fired.
-@treturn any param... Optional additional parameters of the event.
-@usage Listen for `mouse_click` events.
-
-    while true do
-        local event, button, x, y = os.pullEvent("mouse_click")
-        print("Button", button, "was clicked at", x, ",", y)
-    end
-
-@usage Listen for multiple events.
-
-    while true do
-        local eventData = {os.pullEvent()}
-        local event = eventData[1]
-
-        if event == "mouse_click" then
-            print("Button", eventData[2], "was clicked at", eventData[3], ",", eventData[4])
-        elseif event == "key" then
-            print("Key code", eventData[2], "was pressed")
-        end
-    end
-
-@see os.pullEventRaw To pull the terminate event.
-@changed 1.3 Added filter argument.
-]]
 function pullEvent(filter) end
-
---[[- Pause execution of the current thread and waits for events, including the
-`terminate` event.
-
-This behaves almost the same as @{os.pullEvent}, except it allows you to handle
-the `terminate` event yourself - the program will not stop execution when
-<kbd>Ctrl+T</kbd> is pressed.
-
-@tparam[opt] string filter Event to filter for.
-@treturn string event The name of the event that fired.
-@treturn any param... Optional additional parameters of the event.
-@usage Listen for `terminate` events.
-
-    while true do
-        local event = os.pullEventRaw()
-        if event == "terminate" then
-            print("Caught terminate event!")
-        end
-    end
-
-@see os.pullEvent To pull events normally.
-]]
 function pullEventRaw(filter) end
-
---- Pauses execution for the specified number of seconds, alias of @{_G.sleep}.
---
--- @tparam number time The number of seconds to sleep for, rounded up to the
--- nearest multiple of 0.05.
-function sleep(time) end
-
---- Get the current CraftOS version (for example, `CraftOS 1.8`).
---
--- This is defined by `bios.lua`. For the current version of CC:Tweaked, this
--- should return `CraftOS 1.8`.
---
--- @treturn string The current CraftOS version.
--- @usage os.version()
 function version() end
-
---[[- Run the program at the given path with the specified environment and
-arguments.
-
-This function does not resolve program names like the shell does. This means
-that, for example, `os.run("edit")` will not work. As well as this, it does not
-provide access to the @{shell} API in the environment. For this behaviour, use
-@{shell.run} instead.
-
-If the program cannot be found, or failed to run, it will print the error and
-return `false`. If you want to handle this more gracefully, use an alternative
-such as @{loadfile}.
-
-@tparam table env The environment to run the program with.
-@tparam string path The exact path of the program to run.
-@param ... The arguments to pass to the program.
-@treturn boolean Whether or not the program ran successfully.
-@usage Run the default shell from within your program:
-
-    os.run({}, "/rom/programs/shell.lua")
-
-@see shell.run
-@see loadfile
-]]
 function run(env, path, ...) end

doc/stub/pocket.lua

@@ -0,0 +1,28 @@
+--[[-
+Control the current pocket computer, adding or removing upgrades.
+
+This API is only available on pocket computers. As such, you may use its
+presence to determine what kind of computer you are using:
+
+```lua
+if pocket then
+  print("On a pocket computer")
+else
+  print("On something else")
+end
+```
+]]
+
+--- Search the player's inventory for another upgrade, replacing the existing
+-- one with that item if found.
+--
+-- This inventory search starts from the player's currently selected slot,
+-- allowing you to prioritise upgrades.
+--
+-- @throws If an upgrade cannot be found.
+function equipBack() end
+
+--- Remove the pocket computer's current upgrade.
+--
+-- @throws If this pocket computer does not currently have an upgrade.
+function unequipBack() end

doc/stub/redstone.lua

@@ -0,0 +1,120 @@
+--[[- Interact with redstone attached to this computer.
+
+The @{redstone} library exposes three "types" of redstone control:
+ - Binary input/output (@{setOutput}/@{getInput}): These simply check if a
+   redstone wire has any input or output. A signal strength of 1 and 15 are
+   treated the same.
+ - Analogue input/output (@{setAnalogueOutput}/@{getAnalogueInput}): These
+   work with the actual signal strength of the redstone wired, from 0 to 15.
+ - Bundled cables (@{setBundledOutput}/@{getBundledInput}): These interact with
+   "bundled" cables, such as those from Project:Red. These allow you to send
+   16 separate on/off signals. Each channel corresponds to a colour, with the
+   first being @{colors.white} and the last @{colors.black}.
+
+Whenever a redstone input changes, a `redstone` event will be fired. This may
+be used in or
+
+This module may also be referred to as `rs`. For example, one may call
+`rs.getSides()` instead of @{redstone.getSides}.
+
+@module redstone
+@usage Toggle the redstone signal above the computer every 0.5 seconds.
+
+    while true do
+        redstone.setOutput("top", not redstone.getOutput("top"))
+        sleep(0.5)
+    end
+@usage Mimic a redstone comparator in [subtraction mode][comparator].
+
+    while true do
+      local rear = rs.getAnalogueInput("back")
+      local sides = math.max(rs.getAnalogueInput("left"), rs.getAnalogueInput("right"))
+      rs.setAnalogueOutput("front", math.max(rear - sides, 0))
+
+      os.pullEvent("redstone") -- Wait for a change to inputs.
+    end
+
+[comparator]: https://minecraft.gamepedia.com/Redstone_Comparator#Subtract_signal_strength "Redstone Comparator on the Minecraft wiki."
+]]
+
+--- Returns a table containing the six sides of the computer. Namely, "top",
+-- "bottom", "left", "right", "front" and "back".
+--
+-- @treturn { string... } A table of valid sides.
+function getSides() end
+
+--- Turn the redstone signal of a specific side on or off.
+--
+-- @tparam string side The side to set.
+-- @tparam boolean on Whether the redstone signal should be on or off. When on,
+-- a signal strength of 15 is emitted.
+function setOutput(side, on) end
+
+--- Get the current redstone output of a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn boolean Whether the redstone output is on or off.
+-- @see setOutput
+function getOutput(side) end
+
+--- Get the current redstone input of a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn boolean Whether the redstone input is on or off.
+function getInput(side) end
+
+--- Set the redstone signal strength for a specific side.
+--
+-- @tparam string side The side to set.
+-- @tparam number value The signal strength, between 0 and 15.
+-- @throws If `value` is not between 0 and 15.
+function setAnalogOutput(side, value) end
+setAnalogueOutput = setAnalogOutput
+
+--- Get the redstone output signal strength for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The output signal strength, between 0 and 15.
+-- @see setAnalogueOutput
+function getAnalogOutput(sid) end
+getAnalogueOutput = getAnalogOutput
+
+--- Get the redstone input signal strength for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The input signal strength, between 0 and 15.
+function getAnalogInput(side) end
+getAnalogueInput = getAnalogInput
+
+--- Set the bundled cable output for a specific side.
+--
+-- @tparam string side The side to set.
+-- @tparam number The colour bitmask to set.
+-- @see colors.subtract For removing a colour from the bitmask.
+-- @see colors.combine For adding a colour to the bitmask.
+function setBundledOutput(side, output) end
+
+--- Get the bundled cable output for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The bundled cable's output.
+function getBundledOutput(side) end
+
+--- Get the bundled cable input for a specific side.
+--
+-- @tparam string side The side to get.
+-- @treturn number The bundled cable's input.
+-- @see testBundledInput To determine if a specific colour is set.
+function getBundledInput(side) end
+
+--- Determine if a specific combination of colours are on for the given side.
+--
+-- @tparam string side The side to test.
+-- @tparam number mask The mask to test.
+-- @see getBundledInput
+-- @see colors.combine For adding a colour to the bitmask.
+-- @usage Check if @{colors.white} and @{colors.black} are on for above the
+-- computer.
+--
+--     print(redstone.testBundledInput("top", colors.combine(colors.white, colors.black)))
+function testBundledInput(side, mask) end

doc/stub/term.lua

@@ -0,0 +1,52 @@
+function write(text) end
+function scroll(lines) end
+function setCursorPos(x, y) end
+function setCursorBlink(blink) end
+function getCursorPos() end
+function getSize() end
+function clear() end
+function clearLine() end
+function setTextColour(colour) end
+setTextColor = setTextColour
+function setBackgroundColour(colour) end
+setBackgroundColor = setBackgroundColour
+function isColour() end
+isColor = isColour
+function getTextColour() end
+getTextColor = getTextColor
+function getBackgroundColour() end
+getBackgroundColor = getBackgroundColour
+function blit(text, text_colours, background_colours) end
+function setPaletteColour(colour, ...) end
+setPaletteColor = setPaletteColour
+function getPaletteColour(colour, ...) end
+getPaletteColor = getPaletteColour
+function nativePaletteColour(colour) end
+nativePaletteColor = nativePaletteColour
+
+--- @type Redirect
+local Redirect = {}
+
+Redirect.write = write
+Redirect.scroll = scroll
+Redirect.setCursorPos = setCursorPos
+Redirect.setCursorBlink = setCursorBlink
+Redirect.getCursorPos = getCursorPos
+Redirect.getSize = getSize
+Redirect.clear = clear
+Redirect.clearLine = clearLine
+Redirect.setTextColour = setTextColour
+Redirect.setTextColor = setTextColor
+Redirect.setBackgroundColour = setBackgroundColour
+Redirect.setBackgroundColor = setBackgroundColor
+Redirect.isColour = isColour
+Redirect.isColor = isColor
+Redirect.getTextColour = getTextColour
+Redirect.getTextColor = getTextColor
+Redirect.getBackgroundColour = getBackgroundColour
+Redirect.getBackgroundColor = getBackgroundColor
+Redirect.blit = blit
+Redirect.setPaletteColour = setPaletteColour
+Redirect.setPaletteColor = setPaletteColor
+Redirect.getPaletteColour = getPaletteColour
+Redirect.getPaletteColor = getPaletteColor

doc/stub/turtle.lua

@@ -1,14 +1,230 @@
---[[- Craft a recipe based on the turtle's inventory.
+--- Move the turtle forward one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function forward() end
 
-The turtle's inventory should set up like a crafting grid. For instance, to
-craft sticks, slots 1 and 5 should contain planks. _All_ other slots should be
-empty, including those outside the crafting "grid".
+--- Move the turtle backwards one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function back() end
+
+--- Move the turtle up one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function up() end
+
+--- Move the turtle down one block.
+-- @treturn boolean Whether the turtle could successfully move.
+-- @treturn string|nil The reason the turtle could not move.
+function down() end
+
+--- Rotate the turtle 90 degress to the left.
+function turnLeft() end
+
+--- Rotate the turtle 90 degress to the right.
+function turnRight() end
+
+--- Attempt to break the block in front of the turtle.
+--
+-- This requires a turtle tool capable of breaking the block. Diamond pickaxes
+-- (mining turtles) can break any vanilla block, but other tools (such as axes)
+-- are more limited.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function dig(side) end
+
+--- Attempt to break the block above the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digUp(side) end
+
+--- Attempt to break the block below the turtle. See @{dig} for full details.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether a block was broken.
+-- @treturn string|nil The reason no block was broken.
+function digDown(side) end
+
+--- Attack the entity in front of the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attack(side) end
+
+--- Attack the entity above the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackUp(side) end
+
+--- Attack the entity below the turtle.
+--
+-- @tparam[opt] "left"|"right" side The specific tool to use.
+-- @treturn boolean Whether an entity was attacked.
+-- @treturn string|nil The reason nothing was attacked.
+function attackDown(side) end
+
+--- Place a block or item into the world in front of the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function place() end
+
+--- Place a block or item into the world above the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeUp() end
+
+--- Place a block or item into the world below the turtle.
+--
+-- @treturn boolean Whether the block could be placed.
+-- @treturn string|nil The reason the block was not placed.
+function placeDown() end
+
+--- Drop the currently selected stack into the inventory in front of the turtle,
+-- or as an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function drop(count) end
+
+--- Drop the currently selected stack into the inventory above the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropUp(count) end
+
+--- Drop the currently selected stack into the inventory below the turtle, or as
+-- an item into the world if there is no inventory.
+--
+-- @tparam[opt] number count The number of items to drop. If not given, the
+-- entire stack will be dropped.
+-- @treturn boolean Whether items were dropped.
+-- @treturn string|nil The reason the no items were dropped.
+-- @see select
+function dropDown(count) end
+
+--- Suck an item from the inventory in front of the turtle, or from an item
+-- floating in the world.
+--
+-- This will pull items into the first acceptable slot, starting at the
+-- @{select|currently selected} one.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suck(count) end
+
+--- Suck an item from the inventory above the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckUp(count) end
+
+--- Suck an item from the inventory below the turtle, or from an item floating
+-- in the world.
+--
+-- @tparam[opt] number count The number of items to suck. If not given, up to a
+-- stack of items will be picked up.
+-- @treturn boolean Whether items were picked up.
+-- @treturn string|nil The reason the no items were picked up.
+function suckDown(count) end
+
+--- Check if there is a solid block in front of the turtle. In this case, solid
+-- refers to any non-air or liquid block.
+--
+-- @treturn boolean If there is a solid block in front.
+function detect() end
+
+--- Check if there is a solid block above the turtle.
+--
+-- @treturn boolean If there is a solid block above.
+function detectUp() end
+
+--- Check if there is a solid block below the turtle.
+--
+-- @treturn boolean If there is a solid block below.
+function detectDown() end
+
+function compare() end
+function compareUp() end
+function compareDown() end
+
+function inspect() end
+function inspectUp() end
+function inspectDown() end
+
+
+--- Change the currently selected slot.
+--
+-- The selected slot is determines what slot actions like @{drop} or
+-- @{getItemCount} act on.
+--
+-- @tparam number slot The slot to select.
+-- @see getSelectedSlot
+function select(slot) end
+
+--- Get the currently selected slot.
+--
+-- @treturn number The current slot.
+-- @see select
+function getSelectedSlot() end
+
+--- Get the number of items in the given slot.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The number of items in this slot.
+function getItemCount(slot) end
+
+--- Get the remaining number of items which may be stored in this stack.
+--
+-- For instance, if a slot contains 13 blocks of dirt, it has room for another 51.
+--
+-- @tparam[opt] number slot The slot we wish to check. Defaults to the @{turtle.select|selected slot}.
+-- @treturn number The space left in this slot.
+function getItemSpace(slot) end
+
+
+--- Get detailed information about the items in the given slot.
+--
+-- @tparam[opt] number slot The slot to get information about. Defaults to the @{turtle.select|selected slot}.
+-- @treturn nil|table Information about the given slot, or @{nil} if it is empty.
+-- @usage Print the current slot, assuming it contains 13 dirt.
+--
+--     print(textutils.serialize(turtle.getItemDetail()))
+--     -- => {
+--     --    name = "minecraft:dirt",
+--     --    damage = 0,
+--     --    count = 13,
+--     -- }
+function getItemDetail(slot) end
+
+function getFuelLevel() end
+
+function refuel(count) end
+function compareTo(slot) end
+function transferTo(slot, count) end
+
+function getFuelLimit() end
+function equipLeft() end
+function equipRight() end
 
-@tparam[opt=64] number limit The maximum number of crafting steps to run.
-@throws When limit is less than 1 or greater than 64.
-@treturn[1] true If crafting succeeds.
-@treturn[2] false If crafting fails.
-@treturn string A string describing why crafting failed.
-@since 1.4
-]]
 function craft(limit) end

doc/styles.css

@@ -0,0 +1,186 @@
+/* Basic reset on elements */
+h1, h2, h3, h4, p, table, div, body {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font-size: 100%;
+    font: inherit;
+    vertical-align: baseline;
+}
+/* Make the page a little more airy */
+body {
+    margin: 20px auto;
+    max-width: 1200px;
+    padding: 0 10px;
+    line-height: 1.6;
+    color: #222;
+    background: #fff;
+}
+
+/* Try to use system default fonts. */
+body {
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans",
+                 "Droid Sans", "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+}
+
+code, pre, .parameter, .type, .definition-name, .reference-code {
+    font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+}
+
+/* Some definitions of basic tags */
+code {
+    color: #c7254e;
+    background-color: #f9f2f4;
+}
+
+p {
+    margin: 0.9em 0;
+}
+
+h1 {
+    font-size: 1.5em;
+    font-weight: lighter;
+    border-bottom: solid 1px #aaa;
+}
+
+h2, h3, h4 { margin: 1.4em 0 0.3em;}
+h2 { font-size: 1.25em; }
+h3 { font-size: 1.15em; font-weight: bold; }
+h4 { font-size: 1.06em; }
+
+a, a:visited, a:active { font-weight: bold; color: #004080; text-decoration: none; }
+a:hover { text-decoration: underline; }
+
+blockquote { margin-left: 3em; }
+
+/* Stop sublists from having initial vertical space */
+ul ul { margin-top: 0px; }
+ol ul { margin-top: 0px; }
+ol ol { margin-top: 0px; }
+ul ol { margin-top: 0px; }
+
+/* Make the target distinct; helps when we're navigating to a function */
+a:target + * { background-color: #FFFF99; }
+
+/* Allow linking to any subsection */
+a[name]::before { content: "#"; }
+
+/* Layout */
+#main {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    min-height: calc(100vh - 100px);
+}
+
+#main > nav {
+    flex-basis: 30%;
+    min-width: 150px;
+    max-width: 250px;
+    background-color: #f0f0f0;
+}
+
+nav h1, nav ul { padding: 0em 10px; }
+
+nav h2 {
+    background-color:#e7e7e7;
+    font-size: 1.1em;
+    color:#000000;
+    padding: 5px 10px;
+}
+
+nav ul {
+    list-style-type: none;
+    margin: 0;
+}
+
+#content {
+    flex-shrink: 1;
+    flex-basis: 80%;
+    padding: 0px 10px;
+}
+
+footer {
+    text-align: right;
+    font-size: 0.8em;
+}
+
+/* The definition lists at the top of each page */
+table.definition-list {
+    border-collapse: collapse;
+    width: 100%;
+}
+
+table.definition-list td, table.definition-list th {
+    border: 1px solid #cccccc;
+    padding: 5px;
+}
+
+table.definition-list th {
+    background-color: #f0f0f0;
+    min-width: 200px;
+    white-space: nowrap;
+    text-align: right;
+}
+
+table.definition-list td { width: 100%; }
+
+dl.definition dt {
+    border-top: 1px solid #ccc;
+    padding-top: 1em;
+    display: flex;
+}
+
+dl.definition dt .definition-name {
+    padding: 0 0.1em;
+    margin: 0 0.1em;
+    flex-grow: 1;
+}
+
+
+dl.definition dd {
+    padding-bottom: 1em;
+    margin: 10px 0 0 20px;
+}
+
+dl.definition h3 {
+    font-size: .95em;
+}
+
+/* Links to source-code */
+.source-link { font-size: 0.8em; }
+.source-link::before { content: '[' }
+.source-link::after  { content: ']' }
+a.source-link, a.source-link:visited, a.source-link:active { color: #505050; }
+
+/* Method definitions */
+span.parameter:after { content:":"; padding-left: 0.3em; }
+.optional { text-decoration: underline dotted; }
+
+/** Fancy colour display. */
+.colour-ref {
+    display: inline-block;
+    width: 0.8em;
+    height: 0.8em;
+    margin: 0.1em 0.1em 0.3em 0.1em; /* Terrrible hack to force vertical alignment. */
+    border: solid 1px black;
+    box-sizing: border-box;
+    vertical-align: middle;
+}
+
+/* styles for prettification of source */
+.highlight .comment { color: #558817; }
+.highlight .constant { color: #a8660d; }
+.highlight .escape { color: #844631; }
+.highlight .keyword { color: #aa5050; font-weight: bold; }
+.highlight .library { color: #0e7c6b; }
+.highlight .marker { color: #512b1e; background: #fedc56; font-weight: bold; }
+.highlight .string { color: #8080ff; }
+.highlight .literal-kw { color: #8080ff; }
+.highlight .number { color: #f8660d; }
+.highlight .operator { color: #2239a8; font-weight: bold; }
+.highlight .preprocessor, pre .prepro { color: #a33243; }
+.highlight .global { color: #800080; }
+.highlight .user-keyword { color: #800080; }
+.highlight .prompt { color: #558817; }
+.highlight .url { color: #272fc2; text-decoration: underline; }

gradle.properties

@@ -1,14 +1,7 @@
-# Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx3G
-
 # Mod properties
-mod_version=1.100.0-rc.1
+mod_version=1.89.2
 
 # Minecraft properties
-mc_version=1.18.1
-fabric_api_version=0.44.0+1.18
-fabric_loader_version=0.12.11
-
-cloth_api_version=2.0.54
-cloth_config_version=6.0.42
-modmenu_version=3.0.0
+mc_version=1.12.2
+forge_version=14.23.4.2749
+mappings_version=snapshot_20180724

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

gradlew.bat

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

illuaminate.sexp

@@ -1,47 +1,27 @@
 ; -*- mode: Lisp;-*-
 
 (sources
-  /doc/events/
-  /doc/guides/
   /doc/stub/
-  /build/docs/luaJavadoc/
   /src/main/resources/*/computercraft/lua/bios.lua
   /src/main/resources/*/computercraft/lua/rom/
-  /src/test/resources/test-rom
-  /src/web/mount)
+  /src/test/resources/test-rom)
 
 
 (doc
-  (destination build/docs/lua)
+  (title "CC: Tweaked")
   (index doc/index.md)
-
-  (site
-    (title "CC: Tweaked")
-    (logo src/main/resources/pack.png)
-    (url https://tweaked.cc/)
-    (source-link https://github.com/cc-tweaked/CC-Tweaked/blob/${commit}/${path}#L${line})
-
-    (styles src/web/styles.css)
-    (scripts build/rollup/index.js)
-    (head doc/head.html))
-
-  (module-kinds
-    (peripheral Peripherals)
-    (generic_peripheral "Generic Peripherals")
-    (event Events)
-    (guide Guides))
+  (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
 
   (library-path
     /doc/stub/
-    /build/docs/luaJavadoc/
 
-    /src/main/resources/*/computercraft/lua/rom/apis/
-    /src/main/resources/*/computercraft/lua/rom/apis/command/
-    /src/main/resources/*/computercraft/lua/rom/apis/turtle/
+    /src/main/resources/*/computercraft/lua/rom/apis
+    /src/main/resources/*/computercraft/lua/rom/apis/command
+    /src/main/resources/*/computercraft/lua/rom/apis/turtle
 
-    /src/main/resources/*/computercraft/lua/rom/modules/main/
-    /src/main/resources/*/computercraft/lua/rom/modules/command/
-    /src/main/resources/*/computercraft/lua/rom/modules/turtle/))
+    /src/main/resources/*/computercraft/lua/rom/modules/main
+    /src/main/resources/*/computercraft/lua/rom/modules/command
+    /src/main/resources/*/computercraft/lua/rom/modules/turtle))
 
 (at /
   (linters
@@ -63,17 +43,14 @@
       (table space)
       (index no-space))
 
-    (allow-clarifying-parens true)
-
     ;; colours imports from colors, and we don't handle that right now.
     ;; keys is entirely dynamic, so we skip it.
-    (dynamic-modules colours keys _G)
+    (dynamic-modules colours keys)
 
     (globals
       :max
       _CC_DEFAULT_SETTINGS
       _CC_DISABLE_LUA51_FEATURES
-      _HOST
       ;; Ideally we'd pick these up from bios.lua, but illuaminate currently
       ;; isn't smart enough.
       sleep write printError read rs)))
@@ -87,31 +64,32 @@
   (lint (allow-toplevel-global true)))
 
 ;; Silence some variable warnings in documentation stubs.
-(at (/doc/stub/ /build/docs/luaJavadoc/)
+(at /doc/stub
   (linters -var:unused-global)
   (lint (allow-toplevel-global true)))
 
 ;; Suppress warnings for currently undocumented modules.
 (at
-  (; Lua APIs
+  (/doc/stub/fs.lua
+   /doc/stub/http.lua
+   /doc/stub/os.lua
+   /doc/stub/term.lua
+   /doc/stub/turtle.lua
    /src/main/resources/*/computercraft/lua/rom/apis/io.lua
    /src/main/resources/*/computercraft/lua/rom/apis/window.lua)
 
-  (linters -doc:undocumented -doc:undocumented-arg -doc:undocumented-return))
+  (linters -doc:undocumented -doc:undocumented-arg))
 
-;; Suppress warnings for various APIs using its own deprecated members.
+;; These currently rely on unknown references.
 (at
-  (/src/main/resources/*/computercraft/lua/bios.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/turtle/turtle.lua)
-  (linters -var:deprecated))
+  (/src/main/resources/*/computercraft/lua/rom/apis/textutils.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/modules/main/cc/shell/completion.lua
+   /src/main/resources/*/computercraft/lua/rom/programs/shell.lua)
+  (linters -doc:unresolved-reference))
 
 (at /src/test/resources/test-rom
-  ; We should still be able to test deprecated members.
-  (linters -var:deprecated)
-
   (lint
     (globals
       :max sleep write
       cct_test describe expect howlci fail it pending stub)))
-
-(at /src/web/mount/expr_template.lua (lint (globals :max __expr__)))

jitpack.yml

@@ -1,5 +0,0 @@
-before_install:
-  - wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
-  - source ./install-jdk.sh --feature 16 --license GPL
-jdk:
-  - openjdk16

patchwork.md

@@ -1,627 +0,0 @@
-# Just my list of things I have ported over
-
-Format for the changelog of ported stuff
-```
-commit    // Shows commit from CC:T
-commit2   // Shows a commit that is the same thing, just a clean up, only if right after
-Title     // Commit Title
-SubScript // Desc of commit
-```
-
-If a edit that is present in CC:T is not needed, I will skip over it.
-Any and all references to an issue number, are to be found on CC:T's repo.
-
-Any commit that starts with `[Patchwork]` are purely edits made by my hand, and not based on other commits from CC:T, this is to help differentiate my changes from the official changes
-
-Lines that are found above a commit in this log like this one, (excluding this one) are comments about how i had to implement things that are not a simple 1:1 (excluding fabric/forge differences) conversion
-
-```md
-5155e18de279a193c558aa029963486fd1294769
-Added translation for Vietnamese
-Co-authored-by: Boom <boom@flyingpackets.net>
-```
-
-```
-7e121ff72f2b1504cd6af47b57500876682bac45
-ae6124d1f477487abab1858abde8c4ec49dfee3c
-Translations for Vienamese
-Co-authored-by: Boom <boom@flyingpackets.net>
-```
-
-```
-59de21eae29849988e77fad6bc335f5ce78dfec7
-Handle tabs when parsing JSON
-Fixes #539
-```
-
-```
-748ebbe66bf0a4239bde34f557e4b4b75d61d990
-Bump to 1.92.0
-A tiny release, but there's new features so it's technically a minor
-bump.
-```
-
-Cherry Picked because this update was partially related to forge updates rather than mod updates
-```
-8b4a01df27ff7f6fa9ffd9c2188c6e3166edd515
-Update to Minecraft 1.16.3
-
-I hope the Fabric folks now realise this is gonna be a race of who can
-update first :p. Either way, this was a very easy update - only changes
-were due to unrelated Forge changes.
-```
-
-```
-87393e8aef9ddfaca465d626ee7cff5ff499a7e8
-Fix additional `-` in docs
-
-Why isn't this automatically stripped! Bad squid.
-```
-
-```
-275ca58a82c627128a145a8754cbe32568536bd9
-HTTP rules now allow filtering by port
-
-The HTTP filtering system becomes even more complex! Though in this
-case, it's pretty minimal, and definitely worth doing.
-
-For instance, the following rule will allow connecting to localhost on
-port :8080.
-
-    [[http.rules]]
-    host = "127.0.0.1"
-    port = 8080
-    action = "allow"
-
-    # Other rules as before.
-
-Closes #540
-```
-
-The alterations in ColourUtils.java were not needed so they were not ported over
-```
-6f868849ab2f264508e12c184cc56f2632aaf5bc
-Use tags to check if something is a dye
-
-We half did this already, just needed to change a couple of checks.
-Closes #541.
-```
-
-```
-6cee4efcd3610536ee74330cd728f7371011e5a8
-Fix incorrect open container check
-
-Was this always broken, or did it happen in a Minecraft update? Don't
-know, but it's a very silly mistake either way. Fixes #544
-```
-
-```
-0832974725b2478c5227b81f82c35bbf03cf6aba
-Translations for Swedish
-
-Co-authored-by: David Isaksson <davidisaksson93@gmail.com>
-```
-
-```
-84036d97d99efd8762e0170002060ae3471508bf
-Fix io.open documentation
-
-Well, that was silly.
-```
-
-I set the default properties for computers as `Block.GLASS` and then set their strength to `2F` and their soundgroup to stone
-```
-8472112fc1eaad18ed6ed2c6c62b040fe421e81a
-Don't propagate adjacent redstone signals for computers (#549)
-
-Minecraft propagates "strong" redstone signals (such as those directly
-from comparators or repeaters) through solid blocks. This includes
-computers, which is a little annoying as it means one cannot feed
-redstone wire from one side and a repeater from another.
-
-This changes computers to not propagate strong redstone signals, in the
-same way transparent blocks like glass do.
-
-Closes #548.
-```
-
-```
-30d35883b83831900b34040f0131c7e06f5c3e52
-Fix my docs
-
-Thanks @plt-hokusai. Kinda embarrassing this slipped through - I
-evidently need to lint examples too.
-```
-
-```
-34a2c835d412c0d9e1fb20a42b7f2cd2738289c7
-Add color table to docs (#553)
-```
-
-All API Documentation updates,
-`Not Needed` for this repo.
-```
-93068402a2ffec00eedb8fe2d859ebdc005a1989
-Document remaining OS functions (#554)
-
-01d81cb91da938836f953b290ad6b8fc87cb7e35
-Update illuaminate CSS for deprecation (#556)
-```
-
-```
-Not Needed
-4766833cf2d041ed179529eecb9402ad09b2b79b
-Bump JEI/crafttweaker versions
-
-In my defence, they weren't out when I started the 1.15 update.
-```
-
-```
-bf6053906dc6a3c7b0d40d5b097e745dce1f33bc
-Fix TBO norm issues on old GPUs
-```
-
-```
-Not Needed
-113b560a201dbdea9de2a2ef536bcce1d6e51978
-Update configuration to match latest illuaminate
-
-Ooooooh, it's all fancy now. Well, that or horrifically broken.
-```
-
-```
-c334423d42ba3b653ac3a8c27bce7970457f8f96
-Add function to get window visibility
-
-Closes #562
-
-Co-authored-by: devomaa <lmao@distruzione.org>
-```
-
-[WARN] Could not implement changes to the following files
-* `src/main/java/dan200/computercraft/ComputerCraft.java` < Structure too different, cannot find equivalent to alter
-* `src/main/java/dan200/computercraft/shared/Config.java` < Files Does not exist in this repo
-```
-84a6bb1cf3b0668ddc7d8c409a2477a42390e3f7
-Make generic peripherals on by default
-
-This is a long way away from "feature complete" as it were. However,
-it's definitely at a point where it's suitable for general usage - I'm
-happy with the API, and don't think I'm going to be breaking things any
-time soon.
-
-That said, things aren't exposed yet for Java-side public consumption. I
-was kinda waiting until working on Plethora to actually do that, but not
-sure if/when that'll happen.
-
-If someone else wants to work on an integration mod (or just adding
-integrations for their own mod), do get in touch and I can work out how
-to expose this.
-
-Closes #452
-```
-
-```
-Not Needed
-6aae4e576621090840724e094aa25e51696530fc
-Remove superfluous imports
-
-Hah, this is embarassing
-```
-
-[TODO] [M3R1-01] Code has been applied, players still dont get achievments
-```
-f6160bdc57b3d9850607c2c7c2ce9734b4963478
-Fix players not getting advancements when they own turtles
-
-When we construct a new ServerPlayerEntity (and thus TurtlePlayer), we
-get the current (global) advancement state and call .setPlayer() on it.
-
-As grantCriterion blocks FakePlayers from getting advancements, this
-means a player will no longer receive any advancements, as the "wrong"
-player object is being consulted.
-
-As a temporary work around, we attempt to restore the previous player to
-the advancement store. I'll try to upstream something into Forge to
-resolve this properly.
-
-Fixes #564
-```
-
-```
-17a932920711a5c0361a5048c9e0a5e7a58e6364
-Bump cct-javadoc version
-
-Documentation will now be sorted (somewhat) correctly!
-```
-
-```
-a6fcfb6af2fc1bef8ca3a19122c9267549202424
-Draw in-hand pocket computers with blending
-
-It might be worth switching to RenderTypes here, rather than a pure
-Tesselator, but this'll do for now.
-
-Fixes Zundrel/cc-tweaked-fabric#20.
-```
-
-```
-c58441b29c3715f092e7f3747bb3ec65ae5a3d29
-Various SNBT parsing improvements
-
-Correctly handle:
- - Typed arrays ([I; 1, 2, 3])
- - All suffixed numbers (1.2d)
- - Single-quoted strings
-
-Fixes #559
-```
-
-```
-e2a635b6e5f5942f999213434054e06833c5cb06
-Dont fail when codecov is being finicky
-```
-
-```
-666e83cf4fd0eb327f465d5b919a708790f99b00
-Fix JSON objects failing to pass
-
-Maybe I should run the whole test suite, not just the things I think
-matter? Nah....
-```
-
-```
-741adfa7bb2b950d2851c3f0072d6a4769f22773
-
-Use blit to draw boxes, add colors.toBlit (#570)
-```
-
-```
-d13bd2cce8d102ad7f61f557e707d6fe3731bc37
-
-use arg[0] in all usage printouts (#571)
-```
-
-```
-74ac5bb3d17e5bee30643a5d6702696600c06229
-
-Bump to 1.94.0
-```
-
-[TODO] [M3R1-02] Zero Clue how to reimplement this in fabric.
-```
-c8aeddedd4ed430f9cb6428676ebb4fa39834182
-
-Auto-generate monitor models
-
-I didn't think it was worth it, and then I found myself needing to
-update a dozen of them. The code isn't especially pretty, but it works,
-so that's fine.
-
-Also fixes several issues with us using the wrong texture (closes #572).
-I've put together a wiki page[1] which describes each texture in a
-little more detail.
-
-[1] https://github.com/SquidDev-CC/CC-Tweaked/wiki/Monitor-texture-reference
-```
-
-```
-7f90f2f7cadce0d5b9177b16626979591bce8137
-
-Clean up some examples a little bit
-
-Would be good if they didn't crash and burn on entry :).
-```
-
-```
-f194f4fa3a17c48ff1a9088d50063f4a675a23b6
-
-Fix epoch documentation to use milliseconds (#580)
-```
-
-```
-d2a1a00dc43e5b65f6b64111ce76dd3db16c919f
-
-Clear gets an option to reset the palette (#582)
-
-Fixes #555.
-```
-
-```
-aab0cd34cd64fdf837ff1c3b91a957a25c2cf7f9
-
-Use term.blit on original paint render
-
-This makes it super speedy, meaning an initial refresh doesn't take ages
-to load.
-```
-
-```
-b0651082f472baee8f0fa8ec7ba95f433e2637bb
-
-Cleanup examples for the various modules
-```
-
-Ignored Documentation Changes, these are locate
-
-```
-9a749642d294506095e697a3a4345dfe260bd68c
-
-Strict Globals (#583)
-```
-
-```
-fff8353451451be5ae31e0f63d8e529b127fd186
-
-Remove extra space (#586)
-```
-
-```
-486f41f08286ddcfad91d72b83a9361bd9c215cb
-
-Fixed length check on function name in `expect` (#589)
-```
-
-```
-04f9644ae75dafc72da4c4790f334d2e90b03e6f
-
-Allow strings or numbers in textutils.*tabulate
-
-A little dubious, but apparently CC used to support it. This means we're
-consistent with methods like io.write or string.len which accept strings
-or numbers.
-
-Fixes #591
-```
-
-```
-d4199064ae5ae8023c589f80f12d94e1c6bbc2b5
-
-Make fs.combine accept multiple arguments
-
-Means we can now do fs.combine("a", "b", "c"). Of course, one may just
-write "a/b/c" in this case, but it's definitely useful elsewhere.
-
-This is /technically/ a breaking change as fs.combine(a, b:gsub(...))
-will no longer function (as gsub returns multiple arguments). However,
-I've done a quick search through GH and my Pastebin archives and can't
-find any programs which would break. Fingers crossed.
-```
-
-```
-24af36743d08fcdb58439c52bf587b33ed828263
-
-Try to handle a turtle being broken while ticked
-
-Hopefully fixes #585. Hopefully.
-```
-
-```
-511eea39a11956c82e2c11a47b2e7cad27f9887e
-
-Remove <!-- -->s in usages
-```
-
-```
-826797cbd579e867f0f35f0be44b6a28c8c094a9
-
-Added documentation for global functions (#592)
-```
-Didn't port the docs over.
-
-```
-d83a68f3ff6e3833278a38798d06215293656e85
-
-Allow $private HTTP rule to block any private IP
-```
-The config still uses a `blacklist` and `whitelist` array.
-
-```
-24d3777722812f975d2bc4594437fbbb0431d910
-
-Added improved help viewer (#595)
-```
-Didn't port the lua tests over.
-
-```
-737b3cb57696fb5517252e7db38bc88ce960b4d8
-
-Don't use capabilities for generic peripherals
-```
-Not ported, related to forges capability system which is not used in the port.
-
-```
-ea3a16036794357c3a44edffc90fdb652e03881e
-
-Remove a couple of todos
-```
-
-```
-bb8f4c624bf87169b73fb631d8250cfc38181e15
-
-Some sanity checks for get{Direction,Orientation}
-```
-Use `getCachedState` instead of forge's `getBlockState` and `contains` instead of `has`.
-
-```
-05c3c8ad3269c9025757f9261e7f609889fb6bdc
-
-Generate docs for generic peripherals
-```
-Skipped everything except some removed whitespace.
-
-```
-85cf2d5ff1b63010de4661301801aa504e5b9015
-
-Docs for energy and inventory methods
-```
-and
-```
-5865e9c41a0140b9f1acdd2fb095353c467fbb45
-
-Not sure what irritates me more
-```
-both skipped because the changes where already ported.
-
-```
-4ae370b9dbaf1de0ed32a5f32340b1448136c9cc
-
-Merge pull request #606 from TheWireLord/numpadenter-support
-```
-Just lua changes.
-
-```
-f5eb6ce03e0d9bbbf77130452afd4b49e758f7bd
-
-Fix copy-paste error in inventory docs
-```
-Skipped because it was already ported.
-
-```
-663859d2e5a97edefebf9ac36206903d7dd33a3e
-Fix double URL decode
-```
-
-```
-abf425dfb5553483cdc51c50a6b7d8b5e44814f4
-
-Fix overflow in os.epoch
-```
-
-```
-e3a672099c1b5d2c06f9fe4d8ccd024fef0873a2
-
-Fix JEI integration with turtle/pocket upgrades
-```
-Skipped because there seems to be no REI integration.
-
-```
-2f0cae0bc1b038ac092bafa7f65a317537203cd8
-
-Make upgrade recipe requirements a little more lax
-```
-[TODO] [JUMT-01] Crafting is still messed up, but this port didn't change the behavior.
-[TODO] [JUMT-02] Tag comparison code doesn't need to be that verbose, a simple `isEqual` check would suffice.
-
-```
-7f9a707f75636d5816f752dc93d7b6b998c61a03
-
-Bump version to 1.95.0
-```
-Changed the name from CC: Tweaked to CC: Restitched in the changelog and whatsnew files. New version is 1.95.0-beta.
-
-```
-4af5bcc0b0ff464e7e7428c389d47140580ea7a7
-
-Fix serveral 1.15 -> 1.16 issues
-```
-Skipped, changes where already made.
-
-```
-b8d5a89446ac02fc5b38cc5c0b4805de9d11a7d5
-
-Add explicit @module annotation
-```
-Tiny lua change.
-
-```
-8b17ec76a8e94251803e6f4ba4e65970c6a70b7f
-
-Fixed missing argument names in file handle docs (#632)
-```
-A java doc change.
-
-```
-e4b0a5b3ce035eb23feb4191432fc49af5772c5b
-
-2020 -> 2021
-```
-A huge amount of changes.
-
-```
-542b66c79a9b08e080c39c9a73d74ffe71c0106a
-
-Add back command computer block drops
-```
-Didn't port some forge-related changes, but it works.
-
-```
-dd6f97622e6c18ce0d8988da6a5bede45c94ca5d
-
-Prevent reflection errors crashing the game
-```
-
-```
-92be0126df63927d07fc695945f8b98e328f945a
-
-Fix disk recipes
-```
-Dye recipes actually work now.
-
-```
-1edb7288b974aec3764b0a820edce7e9eee38e66
-
-Merge branch 'mc-1.15.x' into mc-1.16.x
-```
-New version: 1.95.1.
-
-```
-41226371f3b5fd35f48b6d39c2e8e0c277125b21
-
-Add isReadOnly to fs.attributes (#639)
-```
-Also changed some lua test files, but made the changes anyway.
-
-```
-b2e54014869fac4b819b01b6c24e550ca113ce8a
-
-Added Numpad Enter Support in rom lua programs. (#657)
-```
-Just lua changes.
-
-```
-247c05305d106af430fcdaee41371a152bf7c38c
-
-Fix problem with RepeatArgumentType
-```
-
-```
-c864576619751077a0d8ac1a18123e14b095ec03
-
-Fix impostor recipes for disks
-```
-[TODO] [JUMT-03] REI still shows white disks, probably because it doesn' show nbt items.
-
-```
-c5694ea9661c7a40021ebd280c378bd7bdc56988
-
-Merge branch 'mc-1.15.x' into mc-1.16.x
-```
-Update to 1.16.4.
-
-```
-1f84480a80677cfaaf19d319290f5b44635eba47
-
-Make rightAlt only close menu, never open it. (#672)
-```
-Lua changes.
-
-```
-1255bd00fd21247a50046020d7d9a396f66bc6bd
-
-Fix mounts being usable after a disk is ejected
-```
-Reverted a lot of code style changes made by Zundrel, so the diffs are huge.
-
-```
-b90611b4b4c176ec1c80df002cc4ac36aa0c4dc8
-
-Preserve registration order of upgrades
-```
-Again, a huge diff because of code style changes.
-
-```
-8494ba8ce29cd8d7b9105eef497fe3fe3f89d350
-
-Improve UX when a resource mount cannot be found
-```

settings.gradle

@@ -1,11 +1 @@
-pluginManagement {
-    repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        gradlePluginPortal()
-    }
-}
-
-rootProject.name = "cc-restitched"
+rootProject.name = "cc-tweaked-${mc_version}"

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

@@ -0,0 +1,29 @@
+/*
+ * 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,82 +1,143 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
 package dan200.computercraft;
 
-import dan200.computercraft.core.apis.http.options.Action;
-import dan200.computercraft.core.apis.http.options.AddressRule;
-import dan200.computercraft.shared.Registry.ModBlocks;
-import dan200.computercraft.shared.common.ColourableRecipe;
+import dan200.computercraft.api.filesystem.IMount;
+import dan200.computercraft.api.filesystem.IWritableMount;
+import dan200.computercraft.api.lua.ILuaAPIFactory;
+import dan200.computercraft.api.media.IMedia;
+import dan200.computercraft.api.media.IMediaProvider;
+import dan200.computercraft.api.network.IPacketNetwork;
+import dan200.computercraft.api.network.wired.IWiredElement;
+import dan200.computercraft.api.network.wired.IWiredNode;
+import dan200.computercraft.api.peripheral.IPeripheral;
+import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
+import dan200.computercraft.api.pocket.IPocketUpgrade;
+import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.event.TurtleAction;
+import dan200.computercraft.core.apis.AddressPredicate;
+import dan200.computercraft.core.apis.ApiFactories;
+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.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.core.ClientComputerRegistry;
 import dan200.computercraft.shared.computer.core.ServerComputerRegistry;
-import dan200.computercraft.shared.computer.recipe.ComputerUpgradeRecipe;
-import dan200.computercraft.shared.data.BlockNamedEntityLootCondition;
-import dan200.computercraft.shared.data.HasComputerIdLootCondition;
-import dan200.computercraft.shared.data.PlayerCreativeLootCondition;
-import dan200.computercraft.shared.media.recipes.DiskRecipe;
-import dan200.computercraft.shared.media.recipes.PrintoutRecipe;
+import dan200.computercraft.shared.computer.items.ItemCommandComputer;
+import dan200.computercraft.shared.computer.items.ItemComputer;
+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.peripheral.common.BlockPeripheral;
+import dan200.computercraft.shared.peripheral.common.ItemPeripheral;
+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.monitor.MonitorRenderer;
-import dan200.computercraft.shared.pocket.recipes.PocketComputerUpgradeRecipe;
+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.turtle.recipes.TurtleRecipe;
-import dan200.computercraft.shared.turtle.recipes.TurtleUpgradeRecipe;
-import dan200.computercraft.shared.util.ImpostorRecipe;
-import dan200.computercraft.shared.util.ImpostorShapelessRecipe;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
-import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
-import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import org.apache.logging.log4j.LogManager;
+import dan200.computercraft.shared.turtle.blocks.BlockTurtle;
+import dan200.computercraft.shared.turtle.items.ItemTurtleAdvanced;
+import dan200.computercraft.shared.turtle.items.ItemTurtleLegacy;
+import dan200.computercraft.shared.turtle.items.ItemTurtleNormal;
+import dan200.computercraft.shared.turtle.upgrades.*;
+import dan200.computercraft.shared.util.CreativeTabMain;
+import dan200.computercraft.shared.util.IDAssigner;
+import dan200.computercraft.shared.util.IoUtil;
+import dan200.computercraft.shared.wired.CapabilityWiredElement;
+import dan200.computercraft.shared.wired.WiredNode;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
+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.event.*;
+import net.minecraftforge.fml.relauncher.Side;
 import org.apache.logging.log4j.Logger;
 
-import java.util.List;
+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.zip.ZipEntry;
+import java.util.zip.ZipFile;
 
-import static dan200.computercraft.shared.Registry.init;
-
-public final class ComputerCraft implements ModInitializer
+@Mod(
+    modid = ComputerCraft.MOD_ID, name = ComputerCraft.NAME, version = ComputerCraft.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";
+
+    // Configuration options
+    public static final String[] DEFAULT_HTTP_WHITELIST = new String[] { "*" };
+    public static final String[] DEFAULT_HTTP_BLACKLIST = new String[] {
+        "127.0.0.0/8",
+        "10.0.0.0/8",
+        "172.16.0.0/12",
+        "192.168.0.0/16",
+        "fd00::/8",
+    };
 
     public static int computerSpaceLimit = 1000 * 1000;
     public static int floppySpaceLimit = 125 * 1000;
     public static int maximumFilesOpen = 128;
-    public static boolean disableLua51Features = false;
-    public static String defaultComputerSettings = "";
-    public static boolean logComputerErrors = true;
+    public static boolean disable_lua51_features = false;
+    public static String default_computer_settings = "";
+    public static boolean debug_enable = true;
+    public static boolean logPeripheralErrors = true;
     public static boolean commandRequireCreative = true;
 
-    public static int computerThreads = 1;
+    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 httpEnabled = true;
-    public static boolean httpWebsocketEnabled = true;
-    public static List<AddressRule> httpRules = List.of(
-        AddressRule.parse( "$private", null, Action.DENY.toPartial() ),
-        AddressRule.parse( "*", null, Action.ALLOW.toPartial() )
-    );
+    public static boolean http_enable = true;
+    public static boolean http_websocket_enable = true;
+    public static AddressPredicate http_whitelist = new AddressPredicate( DEFAULT_HTTP_WHITELIST );
+    public static AddressPredicate http_blacklist = new AddressPredicate( DEFAULT_HTTP_BLACKLIST );
 
+    public static int httpTimeout = 30000;
     public static int httpMaxRequests = 16;
+    public static long httpMaxDownload = 16 * 1024 * 1024;
+    public static long httpMaxUpload = 4 * 1024 * 1024;
     public static int httpMaxWebsockets = 4;
-    public static int httpDownloadBandwidth = 32 * 1024 * 1024;
-    public static int httpUploadBandwidth = 32 * 1024 * 1024;
+    public static int httpMaxWebsocketMessage = 128 * 1024;
 
     public static boolean enableCommandBlock = false;
-    public static int modemRange = 64;
-    public static int modemHighAltitudeRange = 384;
-    public static int modemRangeDuringStorm = 64;
-    public static int modemHighAltitudeRangeDuringStorm = 384;
+    public static int modem_range = 64;
+    public static int modem_highAltitudeRange = 384;
+    public static int modem_rangeDuringStorm = 64;
+    public static int modem_highAltitudeRangeDuringStorm = 384;
     public static int maxNotesPerTick = 8;
     public static MonitorRenderer monitorRenderer = MonitorRenderer.BEST;
-    public static int monitorDistance = 65;
     public static long monitorBandwidth = 1_000_000;
 
     public static boolean turtlesNeedFuel = true;
@@ -84,50 +145,523 @@ public final class ComputerCraft implements ModInitializer
     public static int advancedTurtleFuelLimit = 100000;
     public static boolean turtlesObeyBlockProtection = true;
     public static boolean turtlesCanPush = true;
+    public static EnumSet<TurtleAction> turtleDisabledActions = EnumSet.noneOf( TurtleAction.class );
 
-    public static int computerTermWidth = 51;
-    public static int computerTermHeight = 19;
+    public static final int terminalWidth_computer = 51;
+    public static final int terminalHeight_computer = 19;
 
-    public static final int turtleTermWidth = 39;
-    public static final int turtleTermHeight = 13;
+    public static final int terminalWidth_turtle = 39;
+    public static final int terminalHeight_turtle = 13;
 
-    public static int pocketTermWidth = 26;
-    public static int pocketTermHeight = 20;
+    public static final int terminalWidth_pocketComputer = 26;
+    public static final int terminalHeight_pocketComputer = 20;
 
-    public static int monitorWidth = 8;
-    public static int monitorHeight = 6;
+    // Blocks and Items
+    public static final class Blocks
+    {
+        public static BlockComputer computer;
+        public static BlockCommandComputer commandComputer;
+
+        public static BlockTurtle turtle;
+        public static BlockTurtle turtleExpanded;
+        public static BlockTurtle turtleAdvanced;
+
+        public static BlockPeripheral peripheral;
+        public static BlockCable cable;
+        public static BlockAdvancedModem advancedModem;
+        public static BlockWiredModemFull wiredModemFull;
+    }
+
+    public static final class Items
+    {
+        public static ItemComputer computer;
+        public static ItemCommandComputer commandComputer;
+
+        public static ItemTurtleLegacy turtle;
+        public static ItemTurtleNormal turtleExpanded;
+        public static ItemTurtleAdvanced turtleAdvanced;
+
+        public static ItemPocketComputer pocketComputer;
+
+        public static ItemDiskLegacy disk;
+        public static ItemDiskExpanded diskExpanded;
+        public static ItemTreasureDisk treasureDisk;
+
+        public static ItemPrintout printout;
+
+        public static ItemPeripheral peripheral;
+        public static ItemAdvancedModem advancedModem;
+        public static ItemCable cable;
+        public static ItemBlock wiredModemFull;
+    }
+
+    public static final class TurtleUpgrades
+    {
+        public static TurtleModem wirelessModem;
+        public static TurtleModem advancedModem;
+        public static TurtleSpeaker speaker;
+
+        public static TurtleCraftingTable craftingTable;
+        public static TurtleSword diamondSword;
+        public static TurtleShovel diamondShovel;
+        public static TurtleTool diamondPickaxe;
+        public static TurtleAxe diamondAxe;
+        public static TurtleHoe diamondHoe;
+    }
+
+    public static final class PocketUpgrades
+    {
+        public static PocketModem wirelessModem;
+        public static PocketModem advancedModem;
+        public static PocketSpeaker speaker;
+
+        @Deprecated
+        public static PocketSpeaker pocketSpeaker;
+    }
+
+    @Deprecated
+    public static final class Upgrades
+    {
+        public static TurtleModem advancedModem;
+    }
 
     // Registries
     public static final ClientComputerRegistry clientComputerRegistry = new ClientComputerRegistry();
     public static final ServerComputerRegistry serverComputerRegistry = new ServerComputerRegistry();
 
+    // Creative
+    public static CreativeTabMain mainCreativeTab;
+
     // Logging
-    public static final Logger log = LogManager.getLogger( MOD_ID );
+    public static Logger log;
 
-    public static CreativeModeTab MAIN_GROUP = FabricItemGroupBuilder.build( new ResourceLocation( MOD_ID, "main" ), () -> new ItemStack( ModBlocks.COMPUTER_NORMAL ) );
+    // Peripheral providers. This is still here to ensure compatibility with Plethora and Computronics
+    public static List<IPeripheralProvider> peripheralProviders = new ArrayList<>();
 
-    @Override
-    public void onInitialize()
+    // Implementation
+    @Mod.Instance( ComputerCraft.MOD_ID )
+    public static ComputerCraft instance;
+
+    @SidedProxy(
+        clientSide = "dan200.computercraft.client.proxy.ComputerCraftProxyClient",
+        serverSide = "dan200.computercraft.shared.proxy.ComputerCraftProxyCommon"
+    )
+    private static ComputerCraftProxyCommon proxy;
+
+    @Mod.EventHandler
+    public void preInit( FMLPreInitializationEvent event )
     {
-        ComputerCraftProxyCommon.init();
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "colour" ), ColourableRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "computer_upgrade" ), ComputerUpgradeRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER,
-            new ResourceLocation( ComputerCraft.MOD_ID, "pocket_computer_upgrade" ),
-            PocketComputerUpgradeRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "disk" ), DiskRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "printout" ), PrintoutRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "turtle" ), TurtleRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "turtle_upgrade" ), TurtleUpgradeRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "impostor_shaped" ), ImpostorRecipe.SERIALIZER );
-        Registry.register( Registry.RECIPE_SERIALIZER, new ResourceLocation( ComputerCraft.MOD_ID, "impostor_shapeless" ), ImpostorShapelessRecipe.SERIALIZER );
-        Registry.register( Registry.LOOT_CONDITION_TYPE, new ResourceLocation( ComputerCraft.MOD_ID, "block_named" ), BlockNamedEntityLootCondition.TYPE );
-        Registry.register( Registry.LOOT_CONDITION_TYPE, new ResourceLocation( ComputerCraft.MOD_ID, "player_creative" ), PlayerCreativeLootCondition.TYPE );
-        Registry.register( Registry.LOOT_CONDITION_TYPE, new ResourceLocation( ComputerCraft.MOD_ID, "has_id" ), HasComputerIdLootCondition.TYPE );
-        init();
-        FabricLoader.getInstance().getModContainer( MOD_ID ).ifPresent( modContainer -> {
-            ResourceManagerHelper.registerBuiltinResourcePack( new ResourceLocation( MOD_ID, "classic" ), modContainer, ResourcePackActivationType.NORMAL );
-            ResourceManagerHelper.registerBuiltinResourcePack( new ResourceLocation( MOD_ID, "overhaul" ), modContainer, ResourcePackActivationType.NORMAL );
-        } );
+        log = event.getModLog();
+
+        // Load config
+        Config.load( event.getSuggestedConfigurationFile() );
+
+        proxy.preInit();
     }
+
+    @Mod.EventHandler
+    public void init( FMLInitializationEvent event )
+    {
+        proxy.init();
+    }
+
+    @Mod.EventHandler
+    public void onServerStarting( FMLServerStartingEvent event )
+    {
+        ComputerCraftProxyCommon.initServer( event.getServer() );
+    }
+
+    @Mod.EventHandler
+    public void onServerStart( FMLServerStartedEvent event )
+    {
+        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
+        {
+            ComputerCraft.serverComputerRegistry.reset();
+            WirelessNetwork.resetNetworks();
+            MainThread.reset();
+            Tracking.reset();
+        }
+    }
+
+    @Mod.EventHandler
+    public void onServerStopped( FMLServerStoppedEvent event )
+    {
+        if( FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER )
+        {
+            ComputerCraft.serverComputerRegistry.reset();
+            WirelessNetwork.resetNetworks();
+            MainThread.reset();
+            Tracking.reset();
+        }
+    }
+
+    public static String getVersion()
+    {
+        return VERSION;
+    }
+
+    private static File getBaseDir()
+    {
+        return FMLCommonHandler.instance().getMinecraftServerInstance().getDataDirectory();
+    }
+
+    private static File getResourcePackDir()
+    {
+        return new File( getBaseDir(), "resourcepacks" );
+    }
+
+    @Deprecated
+    public static void registerPermissionProvider( ITurtlePermissionProvider provider )
+    {
+        TurtlePermissions.register( provider );
+    }
+
+    @Deprecated
+    public static void registerPocketUpgrade( IPocketUpgrade upgrade )
+    {
+        dan200.computercraft.shared.PocketUpgrades.register( upgrade );
+    }
+
+    @Deprecated
+    public static void registerPeripheralProvider( IPeripheralProvider provider )
+    {
+        Peripherals.register( provider );
+    }
+
+    @Deprecated
+    public static void registerBundledRedstoneProvider( IBundledRedstoneProvider provider )
+    {
+        BundledRedstone.register( provider );
+    }
+
+    @Deprecated
+    public static void registerMediaProvider( IMediaProvider provider )
+    {
+        MediaProviders.register( provider );
+    }
+
+    @Deprecated
+    public static void registerAPIFactory( ILuaAPIFactory factory )
+    {
+        ApiFactories.register( factory );
+    }
+
+    @Deprecated
+    public static IWiredNode createWiredNodeForElement( IWiredElement element )
+    {
+        return new WiredNode( element );
+    }
+
+    @Deprecated
+    public static IWiredElement getWiredElementAt( IBlockAccess world, BlockPos pos, EnumFacing side )
+    {
+        TileEntity tile = world.getTileEntity( pos );
+        return tile != null && tile.hasCapability( CapabilityWiredElement.CAPABILITY, side )
+            ? tile.getCapability( CapabilityWiredElement.CAPABILITY, side )
+            : null;
+    }
+
+    @Deprecated
+    public static int getDefaultBundledRedstoneOutput( World world, BlockPos pos, EnumFacing side )
+    {
+        return BundledRedstone.getDefaultOutput( world, pos, side );
+    }
+
+    @Deprecated
+    public static IPacketNetwork getWirelessNetwork()
+    {
+        return WirelessNetwork.getUniversal();
+    }
+
+    @Deprecated
+    public static int createUniqueNumberedSaveDir( World world, String parentSubPath )
+    {
+        return IDAssigner.getNextIDFromDirectory( parentSubPath );
+    }
+
+    @Deprecated
+    public static IWritableMount createSaveDirMount( World world, String subPath, long capacity )
+    {
+        try
+        {
+            return new FileMount( new File( getWorldDir(), subPath ), capacity );
+        }
+        catch( Exception e )
+        {
+            return null;
+        }
+    }
+
+    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 )
+    {
+        // Start building list of mounts
+        List<IMount> mounts = new ArrayList<>();
+        subPath = "assets/" + domain + "/" + subPath;
+
+        // Mount from debug dir
+        File codeDir = getDebugCodeDir( modClass );
+        if( codeDir != null )
+        {
+            File subResource = new File( codeDir, subPath );
+            if( subResource.exists() )
+            {
+                IMount resourcePackMount = new FileMount( subResource, 0 );
+                mounts.add( resourcePackMount );
+            }
+        }
+
+        // Mount from mod jars, preferring the specified one.
+        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 );
+        }
+
+        // Mount from resource packs
+        File resourcePackDir = getResourcePackDir();
+        if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
+        {
+            String[] resourcePacks = resourcePackDir.list();
+            for( String resourcePackName : resourcePacks )
+            {
+                File resourcePack = new File( resourcePackDir, resourcePackName );
+                loadFromFile( mounts, resourcePack, subPath, true );
+            }
+        }
+
+        // Return the combination of all the mounts found
+        if( mounts.size() >= 2 )
+        {
+            IMount[] mountArray = new IMount[mounts.size()];
+            mounts.toArray( mountArray );
+            return new ComboMount( mountArray );
+        }
+        else if( mounts.size() == 1 )
+        {
+            return mounts.get( 0 );
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    public static InputStream getResourceFile( Class<?> modClass, String domain, String subPath )
+    {
+        // Start searching in possible locations
+        subPath = "assets/" + domain + "/" + subPath;
+
+        // Look in resource packs
+        File resourcePackDir = getResourcePackDir();
+        if( resourcePackDir.exists() && resourcePackDir.isDirectory() )
+        {
+            String[] resourcePacks = resourcePackDir.list();
+            for( String resourcePackPath : resourcePacks )
+            {
+                File resourcePack = new File( resourcePackDir, resourcePackPath );
+                if( resourcePack.isDirectory() )
+                {
+                    // Mount a resource pack from a folder
+                    File subResource = new File( resourcePack, subPath );
+                    if( subResource.exists() && subResource.isFile() )
+                    {
+                        try
+                        {
+                            return new FileInputStream( subResource );
+                        }
+                        catch( FileNotFoundException ignored )
+                        {
+                        }
+                    }
+                }
+                else
+                {
+                    ZipFile zipFile = null;
+                    try
+                    {
+                        final ZipFile zip = zipFile = new ZipFile( resourcePack );
+                        ZipEntry entry = zipFile.getEntry( subPath );
+                        if( entry != null )
+                        {
+                            // Return a custom InputStream which will close the original zip when finished.
+                            return new FilterInputStream( zipFile.getInputStream( entry ) )
+                            {
+                                @Override
+                                public void close() throws IOException
+                                {
+                                    super.close();
+                                    zip.close();
+                                }
+                            };
+                        }
+                        else
+                        {
+                            IoUtil.closeQuietly( zipFile );
+                        }
+                    }
+                    catch( IOException e )
+                    {
+                        IoUtil.closeQuietly( zipFile );
+                    }
+                }
+            }
+        }
+
+        // Look in debug dir
+        File codeDir = getDebugCodeDir( modClass );
+        if( codeDir != null )
+        {
+            File subResource = new File( codeDir, subPath );
+            if( subResource.exists() && subResource.isFile() )
+            {
+                try
+                {
+                    return new FileInputStream( subResource );
+                }
+                catch( FileNotFoundException ignored )
+                {
+                }
+            }
+        }
+
+        // Look in class loader
+        return modClass.getClassLoader().getResourceAsStream( subPath );
+    }
+
+    private static File getContainingJar( Class<?> modClass )
+    {
+        String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
+        int bangIndex = path.indexOf( '!' );
+        if( bangIndex >= 0 )
+        {
+            path = path.substring( 0, bangIndex );
+        }
+
+        URL url;
+        try
+        {
+            url = new URL( path );
+        }
+        catch( MalformedURLException e1 )
+        {
+            return null;
+        }
+
+        File file;
+        try
+        {
+            file = new File( url.toURI() );
+        }
+        catch( URISyntaxException e )
+        {
+            file = new File( url.getPath() );
+        }
+        return file;
+    }
+
+    private static File getDebugCodeDir( Class<?> modClass )
+    {
+        String path = modClass.getProtectionDomain().getCodeSource().getLocation().getPath();
+        int bangIndex = path.indexOf( '!' );
+        return bangIndex >= 0 ? null : new File( new File( path ).getParentFile(), "../.." );
+    }
+
+    @Deprecated
+    public static void registerTurtleUpgrade( ITurtleUpgrade upgrade )
+    {
+        dan200.computercraft.shared.TurtleUpgrades.register( upgrade );
+    }
+
+    public static File getWorldDir()
+    {
+        return DimensionManager.getCurrentSaveRootDirectory();
+    }
+
+    //region Compatibility
+    @Deprecated
+    public static File getWorldDir( World world )
+    {
+        return DimensionManager.getCurrentSaveRootDirectory();
+    }
+
+    @Deprecated
+    public static IMedia getMedia( ItemStack stack )
+    {
+        return MediaProviders.get( stack );
+    }
+
+    @Deprecated
+    public static IPocketUpgrade getPocketUpgrade( ItemStack stack )
+    {
+        return dan200.computercraft.shared.PocketUpgrades.get( stack );
+    }
+
+    @Deprecated
+    public static ITurtleUpgrade getTurtleUpgrade( ItemStack stack )
+    {
+        return dan200.computercraft.shared.TurtleUpgrades.get( stack );
+    }
+
+    @Deprecated
+    public static IPocketUpgrade getPocketUpgrade( String id )
+    {
+        return dan200.computercraft.shared.PocketUpgrades.get( id );
+    }
+
+    @Deprecated
+    public static ITurtleUpgrade getTurtleUpgrade( String id )
+    {
+        return dan200.computercraft.shared.TurtleUpgrades.get( id );
+    }
+
+    @Deprecated
+    public static IPeripheral getPeripheralAt( World world, BlockPos pos, EnumFacing side )
+    {
+        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/ComputerCraftAPIImpl.java

@@ -1,185 +0,0 @@
-/*
- * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. Do not distribute without permission.
- * Send enquiries to dratcliffe@gmail.com
- */
-package dan200.computercraft;
-
-import dan200.computercraft.api.ComputerCraftAPI.IComputerCraftAPI;
-import dan200.computercraft.api.filesystem.IMount;
-import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.GenericSource;
-import dan200.computercraft.api.lua.ILuaAPIFactory;
-import dan200.computercraft.api.media.IMediaProvider;
-import dan200.computercraft.api.network.IPacketNetwork;
-import dan200.computercraft.api.network.wired.IWiredElement;
-import dan200.computercraft.api.network.wired.IWiredNode;
-import dan200.computercraft.api.peripheral.IPeripheralProvider;
-import dan200.computercraft.api.pocket.IPocketUpgrade;
-import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
-import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import dan200.computercraft.core.apis.ApiFactories;
-import dan200.computercraft.core.asm.GenericMethod;
-import dan200.computercraft.core.filesystem.FileMount;
-import dan200.computercraft.core.filesystem.ResourceMount;
-import dan200.computercraft.fabric.mixin.MinecraftServerAccess;
-import dan200.computercraft.shared.*;
-import dan200.computercraft.shared.peripheral.modem.wired.TileCable;
-import dan200.computercraft.shared.peripheral.modem.wired.TileWiredModemFull;
-import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
-import dan200.computercraft.shared.util.IDAssigner;
-import dan200.computercraft.shared.wired.WiredNode;
-import me.shedaniel.cloth.api.utils.v1.GameInstanceUtils;
-import net.fabricmc.loader.api.FabricLoader;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ReloadableResourceManager;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-
-public final class ComputerCraftAPIImpl implements IComputerCraftAPI
-{
-    public static final ComputerCraftAPIImpl INSTANCE = new ComputerCraftAPIImpl();
-
-    private String version;
-
-    private ComputerCraftAPIImpl()
-    {
-    }
-
-    public static InputStream getResourceFile( String domain, String subPath )
-    {
-        ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) GameInstanceUtils.getServer()).callGetResourceManager();
-        try
-        {
-            return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
-        }
-        catch( IOException ignored )
-        {
-            return null;
-        }
-    }
-
-    @Nonnull
-    @Override
-    public String getInstalledVersion()
-    {
-        if( version != null ) return version;
-        return version = FabricLoader.getInstance().getModContainer( ComputerCraft.MOD_ID )
-            .map( x -> x.getMetadata().getVersion().toString() )
-            .orElse( "unknown" );
-    }
-
-    @Override
-    public int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
-    {
-        return IDAssigner.getNextId( parentSubPath );
-    }
-
-    @Override
-    public IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
-    {
-        try
-        {
-            return new FileMount( new File( IDAssigner.getDir(), subPath ), capacity );
-        }
-        catch( Exception e )
-        {
-            return null;
-        }
-    }
-
-    @Override
-    public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
-    {
-        ReloadableResourceManager manager = (ReloadableResourceManager) ((MinecraftServerAccess) GameInstanceUtils.getServer()).callGetResourceManager();
-        ResourceMount mount = ResourceMount.get( domain, subPath, manager );
-        return mount.exists( "" ) ? mount : null;
-    }
-
-    @Override
-    public void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
-    {
-        Peripherals.register( provider );
-    }
-
-    @Override
-    public void registerGenericSource( @Nonnull GenericSource source )
-    {
-        GenericMethod.register( source );
-    }
-
-    @Override
-    public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
-    {
-        TurtleUpgrades.register( upgrade );
-    }
-
-    @Override
-    public void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-    {
-        PocketUpgrades.register( upgrade );
-    }
-
-    @Override
-    public void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
-    {
-        BundledRedstone.register( provider );
-    }
-
-    @Override
-    public int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        return BundledRedstone.getDefaultOutput( world, pos, side );
-    }
-
-    @Override
-    public void registerMediaProvider( @Nonnull IMediaProvider provider )
-    {
-        MediaProviders.register( provider );
-    }
-
-    @Nonnull
-    @Override
-    public IPacketNetwork getWirelessNetwork()
-    {
-        return WirelessNetwork.getUniversal();
-    }
-
-    @Override
-    public void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
-    {
-        ApiFactories.register( factory );
-    }
-
-    @Nonnull
-    @Override
-    public IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
-    {
-        return new WiredNode( element );
-    }
-
-    @Nullable
-    @Override
-    public IWiredElement getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
-    {
-        BlockEntity tile = world.getBlockEntity( pos );
-        if( tile instanceof TileCable )
-        {
-            return ((TileCable) tile).getElement( side );
-        }
-        else if( tile instanceof TileWiredModemFull )
-        {
-            return ((TileWiredModemFull) tile).getElement();
-        }
-        return null;
-    }
-}

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

@@ -0,0 +1,97 @@
+/*
+ * 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;
+
+import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.api.turtle.TurtleUpgradeType;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+
+import javax.annotation.Nonnull;
+
+/**
+ * A base class for {@link ITurtleUpgrade}s.
+ *
+ * One does not have to use this, but it does provide a convenient template.
+ */
+public abstract class AbstractTurtleUpgrade implements ITurtleUpgrade
+{
+    private final ResourceLocation id;
+    private final int legacyId;
+    private final TurtleUpgradeType type;
+    private final String adjective;
+    private final ItemStack stack;
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, ItemStack stack )
+    {
+        this.id = id;
+        this.legacyId = legacyId;
+        this.type = type;
+        this.adjective = adjective;
+        this.stack = stack;
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Item item )
+    {
+        this( id, legacyId, type, adjective, new ItemStack( item ) );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, String adjective, Block block )
+    {
+        this( id, legacyId, type, adjective, new ItemStack( block ) );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, ItemStack stack )
+    {
+        this( id, legacyId, type, "upgrade." + id + ".adjective", stack );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Item item )
+    {
+        this( id, legacyId, type, new ItemStack( item ) );
+    }
+
+    protected AbstractTurtleUpgrade( ResourceLocation id, int legacyId, TurtleUpgradeType type, Block block )
+    {
+        this( id, legacyId, type, new ItemStack( block ) );
+    }
+
+    @Nonnull
+    @Override
+    public final ResourceLocation getUpgradeID()
+    {
+        return id;
+    }
+
+    @Override
+    public final int getLegacyUpgradeID()
+    {
+        return legacyId;
+    }
+
+    @Nonnull
+    @Override
+    public final String getUnlocalisedAdjective()
+    {
+        return adjective;
+    }
+
+    @Nonnull
+    @Override
+    public final TurtleUpgradeType getType()
+    {
+        return type;
+    }
+
+    @Nonnull
+    @Override
+    public final ItemStack getCraftingItem()
+    {
+        return stack;
+    }
+}

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

@@ -1,13 +1,12 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * 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;
 
 import dan200.computercraft.api.filesystem.IMount;
 import dan200.computercraft.api.filesystem.IWritableMount;
-import dan200.computercraft.api.lua.GenericSource;
 import dan200.computercraft.api.lua.ILuaAPIFactory;
 import dan200.computercraft.api.media.IMedia;
 import dan200.computercraft.api.media.IMediaProvider;
@@ -17,16 +16,18 @@ import dan200.computercraft.api.network.wired.IWiredNode;
 import dan200.computercraft.api.peripheral.IComputerAccess;
 import dan200.computercraft.api.peripheral.IPeripheral;
 import dan200.computercraft.api.peripheral.IPeripheralProvider;
+import dan200.computercraft.api.permissions.ITurtlePermissionProvider;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.Level;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.lang.reflect.Method;
 
 /**
  * The static entry point to the ComputerCraft API.
@@ -36,12 +37,34 @@ import javax.annotation.Nullable;
  */
 public final class ComputerCraftAPI
 {
-    public static final String MOD_ID = "computercraft";
+    public static boolean isInstalled()
+    {
+        findCC();
+        return computerCraft != null;
+    }
 
     @Nonnull
     public static String getInstalledVersion()
     {
-        return getInstance().getInstalledVersion();
+        findCC();
+        if( computerCraft_getVersion != null )
+        {
+            try
+            {
+                return (String) computerCraft_getVersion.invoke( null );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return "";
+    }
+
+    @Nonnull
+    public static String getAPIVersion()
+    {
+        return "${version}";
     }
 
     /**
@@ -55,11 +78,23 @@ public final class ComputerCraftAPI
      *
      * eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now
      * available for writing.
-     * @see #createSaveDirMount(Level, String, long)
+     * @see #createSaveDirMount(World, String, long)
      */
-    public static int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath )
+    public static int createUniqueNumberedSaveDir( @Nonnull World world, @Nonnull String parentSubPath )
     {
-        return getInstance().createUniqueNumberedSaveDir( world, parentSubPath );
+        findCC();
+        if( computerCraft_createUniqueNumberedSaveDir != null )
+        {
+            try
+            {
+                return (Integer) computerCraft_createUniqueNumberedSaveDir.invoke( null, world, parentSubPath );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return -1;
     }
 
     /**
@@ -74,44 +109,68 @@ public final class ComputerCraftAPI
      * @param capacity The amount of data that can be stored in the directory before it fills up, in bytes.
      * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable()
      * to mount this on a Computers' file system.
-     * @see #createUniqueNumberedSaveDir(Level, String)
+     * @see #createUniqueNumberedSaveDir(World, String)
      * @see IComputerAccess#mount(String, IMount)
      * @see IComputerAccess#mountWritable(String, IWritableMount)
      * @see IMount
      * @see IWritableMount
      */
     @Nullable
-    public static IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity )
+    public static IWritableMount createSaveDirMount( @Nonnull World world, @Nonnull String subPath, long capacity )
     {
-        return getInstance().createSaveDirMount( world, subPath, capacity );
+        findCC();
+        if( computerCraft_createSaveDirMount != null )
+        {
+            try
+            {
+                return (IWritableMount) computerCraft_createSaveDirMount.invoke( null, world, subPath, capacity );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return null;
     }
 
     /**
      * Creates a file system mount to a resource folder, and returns it.
      *
-     * Use in conjunction with {@link IComputerAccess#mount} or {@link IComputerAccess#mountWritable} to mount a
-     * resource folder onto a computer's file system.
+     * Use in conjunction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a resource folder
+     * onto a computer's file system.
      *
-     * The files in this mount will be a combination of files in all mod jar, and data packs that contain
-     * resources with the same domain and path. For instance, ComputerCraft's resources are stored in
-     * "/data/computercraft/lua/rom". We construct a mount for that with
-     * {@code createResourceMount("computercraft", "lua/rom")}.
+     * The files in this mount will be a combination of files in the specified mod jar, and resource packs that contain
+     * resources with the same domain and path.
      *
-     * @param domain  The domain under which to look for resources. eg: "mymod".
-     * @param subPath The subPath under which to look for resources. eg: "lua/myfiles".
-     * @return The mount, or {@code null} if it could be created for some reason.
+     * @param modClass A class in whose jar to look first for the resources to mount. Using your main mod class is recommended. eg: MyMod.class
+     * @param domain   The domain under which to look for resources. eg: "mymod".
+     * @param subPath  The domain under which to look for resources. eg: "mymod/lua/myfiles".
+     * @return The mount, or {@code null} if it could be created for some reason. Use IComputerAccess.mount() or
+     * IComputerAccess.mountWritable() to mount this on a Computers' file system.
      * @see IComputerAccess#mount(String, IMount)
      * @see IComputerAccess#mountWritable(String, IWritableMount)
      * @see IMount
      */
     @Nullable
-    public static IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
+    public static IMount createResourceMount( @Nonnull Class<?> modClass, @Nonnull String domain, @Nonnull String subPath )
     {
-        return getInstance().createResourceMount( domain, subPath );
+        findCC();
+        if( computerCraft_createResourceMount != null )
+        {
+            try
+            {
+                return (IMount) computerCraft_createResourceMount.invoke( null, modClass, domain, subPath );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return null;
     }
 
     /**
-     * rers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
+     * Registers a peripheral provider to convert blocks into {@link IPeripheral} implementations.
      *
      * @param provider The peripheral provider to register.
      * @see IPeripheral
@@ -119,44 +178,45 @@ public final class ComputerCraftAPI
      */
     public static void registerPeripheralProvider( @Nonnull IPeripheralProvider provider )
     {
-        getInstance().registerPeripheralProvider( provider );
+        findCC();
+        if( computerCraft_registerPeripheralProvider != null )
+        {
+            try
+            {
+                computerCraft_registerPeripheralProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
-     * Registers a method source for generic peripherals.
-     *
-     * @param source The method source to register.
-     * @see GenericSource
-     */
-    public static void registerGenericSource( @Nonnull GenericSource source )
-    {
-        getInstance().registerGenericSource( source );
-    }
-
-    /**
-     * Registers a new turtle upgrade for use in ComputerCraft. After calling this,
-     * users should be able to craft Turtles with your upgrade's ItemStack. It is
-     * recommended to call this during the load() method of your mod.
+     * Registers a new turtle turtle for use in ComputerCraft. After calling this,
+     * users should be able to craft Turtles with your new turtle. It is recommended to call
+     * this during the load() method of your mod.
      *
      * @param upgrade The turtle upgrade to register.
      * @see ITurtleUpgrade
      */
     public static void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {
-        getInstance().registerTurtleUpgrade( upgrade );
-    }
-
-    /**
-     * Registers a new pocket upgrade for use in ComputerCraft. After calling this,
-     * users should be able to craft pocket computers with your upgrade's ItemStack. It is
-     * recommended to call this during the load() method of your mod.
-     *
-     * @param upgrade The pocket upgrade to register.
-     * @see IPocketUpgrade
-     */
-    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
-    {
-        getInstance().registerPocketUpgrade( upgrade );
+        if( upgrade != null )
+        {
+            findCC();
+            if( computerCraft_registerTurtleUpgrade != null )
+            {
+                try
+                {
+                    computerCraft_registerTurtleUpgrade.invoke( null, upgrade );
+                }
+                catch( Exception e )
+                {
+                    // It failed
+                }
+            }
+        }
     }
 
     /**
@@ -167,7 +227,18 @@ public final class ComputerCraftAPI
      */
     public static void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider )
     {
-        getInstance().registerBundledRedstoneProvider( provider );
+        findCC();
+        if( computerCraft_registerBundledRedstoneProvider != null )
+        {
+            try
+            {
+                computerCraft_registerBundledRedstoneProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -180,9 +251,21 @@ public final class ComputerCraftAPI
      * If there is no block capable of emitting bundled redstone at the location, -1 will be returned.
      * @see IBundledRedstoneProvider
      */
-    public static int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static int getBundledRedstoneOutput( @Nonnull World world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
     {
-        return getInstance().getBundledRedstoneOutput( world, pos, side );
+        findCC();
+        if( computerCraft_getDefaultBundledRedstoneOutput != null )
+        {
+            try
+            {
+                return (Integer) computerCraft_getDefaultBundledRedstoneOutput.invoke( null, world, pos, side );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+        return -1;
     }
 
     /**
@@ -193,7 +276,58 @@ public final class ComputerCraftAPI
      */
     public static void registerMediaProvider( @Nonnull IMediaProvider provider )
     {
-        getInstance().registerMediaProvider( provider );
+        findCC();
+        if( computerCraft_registerMediaProvider != null )
+        {
+            try
+            {
+                computerCraft_registerMediaProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+    }
+
+    /**
+     * Registers a permission provider to restrict where turtles can move or build.
+     *
+     * @param provider The turtle permission provider to register.
+     * @see ITurtlePermissionProvider
+     * @deprecated Prefer using {@link dan200.computercraft.api.turtle.event.TurtleBlockEvent} or the standard Forge events.
+     */
+    @Deprecated
+    public static void registerPermissionProvider( @Nonnull ITurtlePermissionProvider provider )
+    {
+        findCC();
+        if( computerCraft_registerPermissionProvider != null )
+        {
+            try
+            {
+                computerCraft_registerPermissionProvider.invoke( null, provider );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
+    }
+
+    public static void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade )
+    {
+        findCC();
+        if( computerCraft_registerPocketUpgrade != null )
+        {
+            try
+            {
+                computerCraft_registerPocketUpgrade.invoke( null, upgrade );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -203,12 +337,36 @@ public final class ComputerCraftAPI
      */
     public static IPacketNetwork getWirelessNetwork()
     {
-        return getInstance().getWirelessNetwork();
+        findCC();
+        if( computerCraft_getWirelessNetwork != null )
+        {
+            try
+            {
+                return (IPacketNetwork) computerCraft_getWirelessNetwork.invoke( null );
+            }
+            catch( Exception e )
+            {
+                // It failed;
+            }
+        }
+
+        return null;
     }
 
-    public static void registerAPIFactory( @Nonnull ILuaAPIFactory factory )
+    public static void registerAPIFactory( @Nonnull ILuaAPIFactory upgrade )
     {
-        getInstance().registerAPIFactory( factory );
+        findCC();
+        if( computerCraft_registerAPIFactory != null )
+        {
+            try
+            {
+                computerCraft_registerAPIFactory.invoke( null, upgrade );
+            }
+            catch( Exception e )
+            {
+                // It failed
+            }
+        }
     }
 
     /**
@@ -221,7 +379,22 @@ public final class ComputerCraftAPI
     @Nonnull
     public static IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element )
     {
-        return getInstance().createWiredNodeForElement( element );
+        findCC();
+        if( computerCraft_createWiredNodeForElement != null )
+        {
+            try
+            {
+                return (IWiredNode) computerCraft_createWiredNodeForElement.invoke( null, element );
+            }
+            catch( ReflectiveOperationException e )
+            {
+                throw new IllegalStateException( "Error creating wired node", e );
+            }
+        }
+        else
+        {
+            throw new IllegalStateException( "ComputerCraft cannot be found" );
+        }
     }
 
     /**
@@ -234,64 +407,117 @@ public final class ComputerCraftAPI
      * @see IWiredElement#getNode()
      */
     @Nullable
-    public static IWiredElement getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side )
+    public static IWiredElement getWiredElementAt( @Nonnull IBlockAccess world, @Nonnull BlockPos pos, @Nonnull EnumFacing side )
     {
-        return getInstance().getWiredElementAt( world, pos, side );
+        findCC();
+        if( computerCraft_getWiredElementAt != null )
+        {
+            try
+            {
+                return (IWiredElement) computerCraft_getWiredElementAt.invoke( null, world, pos, side );
+            }
+            catch( ReflectiveOperationException ignored )
+            {
+            }
+        }
+
+        return null;
     }
 
-    private static IComputerCraftAPI instance;
+    // The functions below here are private, and are used to interface with the non-API ComputerCraft classes.
+    // Reflection is used here so you can develop your mod without decompiling ComputerCraft and including
+    // it in your solution, and so your mod won't crash if ComputerCraft is installed.
 
-    @Nonnull
-    private static IComputerCraftAPI getInstance()
+    private static void findCC()
     {
-        if( instance != null ) return instance;
+        if( !ccSearched )
+        {
+            try
+            {
+                computerCraft = Class.forName( "dan200.computercraft.ComputerCraft" );
+                computerCraft_getVersion = findCCMethod( "getVersion", new Class<?>[] {
+                } );
+                computerCraft_createUniqueNumberedSaveDir = findCCMethod( "createUniqueNumberedSaveDir", new Class<?>[] {
+                    World.class, String.class,
+                } );
+                computerCraft_createSaveDirMount = findCCMethod( "createSaveDirMount", new Class<?>[] {
+                    World.class, String.class, Long.TYPE,
+                } );
+                computerCraft_createResourceMount = findCCMethod( "createResourceMount", new Class<?>[] {
+                    Class.class, String.class, String.class,
+                } );
+                computerCraft_registerPeripheralProvider = findCCMethod( "registerPeripheralProvider", new Class<?>[] {
+                    IPeripheralProvider.class,
+                } );
+                computerCraft_registerTurtleUpgrade = findCCMethod( "registerTurtleUpgrade", new Class<?>[] {
+                    ITurtleUpgrade.class,
+                } );
+                computerCraft_registerBundledRedstoneProvider = findCCMethod( "registerBundledRedstoneProvider", new Class<?>[] {
+                    IBundledRedstoneProvider.class,
+                } );
+                computerCraft_getDefaultBundledRedstoneOutput = findCCMethod( "getDefaultBundledRedstoneOutput", new Class<?>[] {
+                    World.class, BlockPos.class, EnumFacing.class,
+                } );
+                computerCraft_registerMediaProvider = findCCMethod( "registerMediaProvider", new Class<?>[] {
+                    IMediaProvider.class,
+                } );
+                computerCraft_registerPermissionProvider = findCCMethod( "registerPermissionProvider", new Class<?>[] {
+                    ITurtlePermissionProvider.class,
+                } );
+                computerCraft_registerPocketUpgrade = findCCMethod( "registerPocketUpgrade", new Class<?>[] {
+                    IPocketUpgrade.class,
+                } );
+                computerCraft_getWirelessNetwork = findCCMethod( "getWirelessNetwork", new Class<?>[] {
+                } );
+                computerCraft_registerAPIFactory = findCCMethod( "registerAPIFactory", new Class<?>[] {
+                    ILuaAPIFactory.class,
+                } );
+                computerCraft_createWiredNodeForElement = findCCMethod( "createWiredNodeForElement", new Class<?>[] {
+                    IWiredElement.class,
+                } );
+                computerCraft_getWiredElementAt = findCCMethod( "getWiredElementAt", new Class<?>[] {
+                    IBlockAccess.class, BlockPos.class, EnumFacing.class,
+                } );
+            }
+            catch( Exception e )
+            {
+                System.err.println( "ComputerCraftAPI: ComputerCraft not found." );
+            }
+            finally
+            {
+                ccSearched = true;
+            }
+        }
+    }
 
+    private static Method findCCMethod( String name, Class<?>[] args )
+    {
         try
         {
-            return instance = (IComputerCraftAPI) Class.forName( "dan200.computercraft.ComputerCraftAPIImpl" )
-                .getField( "INSTANCE" ).get( null );
+            return computerCraft != null ? computerCraft.getMethod( name, args ) : null;
         }
-        catch( ReflectiveOperationException e )
+        catch( NoSuchMethodException e )
         {
-            throw new IllegalStateException( "Cannot find ComputerCraft API", e );
+            System.err.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." );
+            return null;
         }
     }
 
-    public interface IComputerCraftAPI
-    {
-        @Nonnull
-        String getInstalledVersion();
-
-        int createUniqueNumberedSaveDir( @Nonnull Level world, @Nonnull String parentSubPath );
-
-        @Nullable
-        IWritableMount createSaveDirMount( @Nonnull Level world, @Nonnull String subPath, long capacity );
-
-        @Nullable
-        IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath );
-
-        void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
-
-        void registerGenericSource( @Nonnull GenericSource source );
-
-        void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
-
-        void registerPocketUpgrade( @Nonnull IPocketUpgrade upgrade );
-
-        void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );
-
-        int getBundledRedstoneOutput( @Nonnull Level world, @Nonnull BlockPos pos, @Nonnull Direction side );
-
-        void registerMediaProvider( @Nonnull IMediaProvider provider );
-        @Nonnull
-        IPacketNetwork getWirelessNetwork();
-
-        void registerAPIFactory( @Nonnull ILuaAPIFactory factory );
-
-        @Nonnull
-        IWiredNode createWiredNodeForElement( @Nonnull IWiredElement element );
-
-        @Nullable
-        IWiredElement getWiredElementAt( @Nonnull BlockGetter world, @Nonnull BlockPos pos, @Nonnull Direction side );
-    }
+    private static boolean ccSearched = false;
+    private static Class<?> computerCraft = null;
+    private static Method computerCraft_getVersion = null;
+    private static Method computerCraft_createUniqueNumberedSaveDir = null;
+    private static Method computerCraft_createSaveDirMount = null;
+    private static Method computerCraft_createResourceMount = null;
+    private static Method computerCraft_registerPeripheralProvider = null;
+    private static Method computerCraft_registerTurtleUpgrade = null;
+    private static Method computerCraft_registerBundledRedstoneProvider = null;
+    private static Method computerCraft_getDefaultBundledRedstoneOutput = null;
+    private static Method computerCraft_registerMediaProvider = null;
+    private static Method computerCraft_registerPermissionProvider = null;
+    private static Method computerCraft_registerPocketUpgrade = null;
+    private static Method computerCraft_getWirelessNetwork = null;
+    private static Method computerCraft_registerAPIFactory = null;
+    private static Method computerCraft_createWiredNodeForElement = null;
+    private static Method computerCraft_getWiredElementAt = null;
 }

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

@@ -1,65 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. 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.ComputerCraft;
-import net.fabricmc.fabric.api.tag.TagFactory;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-
-/**
- * Tags provided by ComputerCraft.
- */
-public class ComputerCraftTags
-{
-    public static class Items
-    {
-        public static final Tag.Named<Item> COMPUTER = make( "computer" );
-        public static final Tag.Named<Item> TURTLE = make( "turtle" );
-        public static final Tag.Named<Item> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Item> MONITOR = make( "monitor" );
-
-        private static Tag.Named<Item> make( String name )
-        {
-            return TagFactory.ITEM.create( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
-        }
-    }
-
-    public static class Blocks
-    {
-        public static final Tag.Named<Block> COMPUTER = make( "computer" );
-        public static final Tag.Named<Block> TURTLE = make( "turtle" );
-        public static final Tag.Named<Block> WIRED_MODEM = make( "wired_modem" );
-        public static final Tag.Named<Block> MONITOR = make( "monitor" );
-
-        /**
-         * Blocks which can be broken by any turtle tool.
-         */
-        public static final Tag.Named<Block> TURTLE_ALWAYS_BREAKABLE = make( "turtle_always_breakable" );
-
-        /**
-         * Blocks which can be broken by the default shovel tool.
-         */
-        public static final Tag.Named<Block> TURTLE_SHOVEL_BREAKABLE = make( "turtle_shovel_harvestable" );
-
-        /**
-         * Blocks which can be broken with the default sword tool.
-         */
-        public static final Tag.Named<Block> TURTLE_SWORD_BREAKABLE = make( "turtle_sword_harvestable" );
-
-        /**
-         * Blocks which can be broken with the default hoe tool.
-         */
-        public static final Tag.Named<Block> TURTLE_HOE_BREAKABLE = make( "turtle_hoe_harvestable" );
-
-        private static Tag.Named<Block> make( String name )
-        {
-            return TagFactory.BLOCK.create( new ResourceLocation( ComputerCraft.MOD_ID, name ) );
-        }
-    }
-}

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

@@ -1,81 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. 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.client;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Transformation;
-import com.mojang.math.Vector3f;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelManager;
-import net.minecraft.client.resources.model.ModelResourceLocation;
-import net.minecraft.world.item.ItemStack;
-
-import javax.annotation.Nonnull;
-import java.util.Objects;
-
-/**
- * A model to render, combined with a transformation matrix to apply.
- */
-@Environment( EnvType.CLIENT )
-public final class TransformedModel
-{
-    private final BakedModel model;
-    private final Transformation matrix;
-
-    public TransformedModel( @Nonnull BakedModel model, @Nonnull Transformation matrix )
-    {
-        this.model = Objects.requireNonNull( model );
-        this.matrix = Objects.requireNonNull( matrix );
-    }
-
-    public TransformedModel( @Nonnull BakedModel model )
-    {
-        this.model = Objects.requireNonNull( model );
-        matrix = Transformation.identity();
-    }
-
-    public static TransformedModel of( @Nonnull ModelResourceLocation location )
-    {
-        ModelManager modelManager = Minecraft.getInstance().getModelManager();
-        return new TransformedModel( modelManager.getModel( location ) );
-    }
-
-    public static TransformedModel of( @Nonnull ItemStack item, @Nonnull Transformation transform )
-    {
-        BakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
-        return new TransformedModel( model, transform );
-    }
-
-    @Nonnull
-    public BakedModel getModel()
-    {
-        return model;
-    }
-
-    @Nonnull
-    public Transformation getMatrix()
-    {
-        return matrix;
-    }
-
-    public void push( PoseStack matrixStack )
-    {
-        matrixStack.pushPose();
-
-        Vector3f translation = matrix.getTranslation();
-        matrixStack.translate( translation.x(), translation.y(), translation.z() );
-
-        matrixStack.mulPose( matrix.getLeftRotation() );
-
-        Vector3f scale = matrix.getScale();
-        matrixStack.scale( scale.x(), scale.y(), scale.z() );
-
-        matrixStack.mulPose( matrix.getRightRotation() );
-    }
-}

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * 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;
@@ -30,7 +30,7 @@ public class FileOperationException extends IOException
     public FileOperationException( @Nonnull String message )
     {
         super( Objects.requireNonNull( message, "message cannot be null" ) );
-        filename = null;
+        this.filename = null;
     }
 
     @Nullable

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

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

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

@@ -1,16 +1,18 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * 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 dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
 import java.nio.channels.ReadableByteChannel;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.List;
@@ -20,11 +22,11 @@ import java.util.List;
  * {@link IComputerAccess#mount(String, IMount)}.
  *
  * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(Level, String, long)} or
- * {@link ComputerCraftAPI#createResourceMount(String, String)}, or you're free to implement it yourselves!
+ * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or
+ * {@link ComputerCraftAPI#createResourceMount(Class, String, String)}, or you're free to implement it yourselves!
  *
- * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
- * @see ComputerCraftAPI#createResourceMount(String, String)
+ * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
+ * @see ComputerCraftAPI#createResourceMount(Class, String, String)
  * @see IComputerAccess#mount(String, IMount)
  * @see IWritableMount
  */
@@ -66,6 +68,18 @@ public interface IMount
      */
     long getSize( @Nonnull String path ) throws IOException;
 
+    /**
+     * Opens a file with a given path, and returns an {@link InputStream} representing its contents.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
+     * @return A stream representing the contents of the file.
+     * @throws IOException If the file does not exist, or could not be opened.
+     * @deprecated Use {@link #openChannelForRead(String)} instead
+     */
+    @Nonnull
+    @Deprecated
+    InputStream openForRead( @Nonnull String path ) throws IOException;
+
     /**
      * Opens a file with a given path, and returns an {@link ReadableByteChannel} representing its contents.
      *
@@ -76,7 +90,10 @@ public interface IMount
      * @throws IOException If the file does not exist, or could not be opened.
      */
     @Nonnull
-    ReadableByteChannel openForRead( @Nonnull String path ) throws IOException;
+    default ReadableByteChannel openChannelForRead( @Nonnull String path ) throws IOException
+    {
+        return Channels.newChannel( openForRead( path ) );
+    }
 
     /**
      * Get attributes about the given file.

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

@@ -1,17 +1,18 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. This API may be redistributed unmodified and in full only.
+ * 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 dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.api.peripheral.IComputerAccess;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.World;
 
 import javax.annotation.Nonnull;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
 import java.util.OptionalLong;
 
@@ -20,9 +21,9 @@ import java.util.OptionalLong;
  * or {@link IComputerAccess#mountWritable(String, IWritableMount)}, that can also be written to.
  *
  * Ready made implementations of this interface can be created using
- * {@link ComputerCraftAPI#createSaveDirMount(Level, String, long)}, or you're free to implement it yourselves!
+ * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)}, or you're free to implement it yourselves!
  *
- * @see ComputerCraftAPI#createSaveDirMount(Level, String, long)
+ * @see ComputerCraftAPI#createSaveDirMount(World, String, long)
  * @see IComputerAccess#mount(String, IMount)
  * @see IComputerAccess#mountWritable(String, IWritableMount)
  * @see IMount
@@ -45,6 +46,18 @@ public interface IWritableMount extends IMount
      */
     void delete( @Nonnull String path ) throws IOException;
 
+    /**
+     * Opens a file with a given path, and returns an {@link OutputStream} for writing to it.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
+     * @return A stream for writing to
+     * @throws IOException If the file could not be opened for writing.
+     * @deprecated Use {@link #openChannelForWrite(String)} instead.
+     */
+    @Nonnull
+    @Deprecated
+    OutputStream openForWrite( @Nonnull String path ) throws IOException;
+
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for writing to it.
      *
@@ -54,7 +67,22 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForWrite( @Nonnull String path ) throws IOException;
+    default WritableByteChannel openChannelForWrite( @Nonnull String path ) throws IOException
+    {
+        return Channels.newChannel( openForWrite( path ) );
+    }
+
+    /**
+     * Opens a file with a given path, and returns an {@link OutputStream} for appending to it.
+     *
+     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
+     * @return A stream for writing to.
+     * @throws IOException If the file could not be opened for writing.
+     * @deprecated Use {@link #openChannelForAppend(String)} instead.
+     */
+    @Nonnull
+    @Deprecated
+    OutputStream openForAppend( @Nonnull String path ) throws IOException;
 
     /**
      * Opens a file with a given path, and returns an {@link OutputStream} for appending to it.
@@ -65,7 +93,10 @@ public interface IWritableMount extends IMount
      * @throws IOException If the file could not be opened for writing.
      */
     @Nonnull
-    WritableByteChannel openForAppend( @Nonnull String path ) throws IOException;
+    default WritableByteChannel openChannelForAppend( @Nonnull String path ) throws IOException
+    {
+        return Channels.newChannel( openForAppend( path ) );
+    }
 
     /**
      * Get the amount of free space on the mount, in bytes. You should decrease this value as the user writes to the

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

@@ -0,0 +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.
+ * 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;
+
+import net.minecraftforge.fml.common.API;

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

@@ -0,0 +1,334 @@
+/*
+ * 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/GenericSource.java

@@ -1,56 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2022. 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;
-import dan200.computercraft.api.peripheral.IPeripheral;
-import dan200.computercraft.api.peripheral.IPeripheralProvider;
-import dan200.computercraft.core.asm.LuaMethod;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.Container;
-
-import javax.annotation.Nonnull;
-
-/**
- * A generic source of {@link LuaMethod} functions.
- *
- * Unlike normal objects ({@link IDynamicLuaObject} or {@link IPeripheral}), methods do not target this object but
- * instead are defined as {@code static} and accept their target as the first parameter. This allows you to inject
- * methods onto objects you do not own, as well as declaring methods for a specific "trait" (well, interface).
- *
- * Currently the "generic peripheral" system is incompatible with normal peripherals. Normal {@link IPeripheralProvider}
- * or {@link IPeripheral} implementations take priority. Tile entities which use this system are given a peripheral name
- * determined by their id, rather than any peripheral provider. This will hopefully change in the future, once a suitable
- * design has been established.
- *
- * For example, the main CC: Tweaked mod defines a generic source for inventories, which works on {@link Container}s:
- *
- * <pre>{@code
- * public class InventoryMethods implements GenericSource {
- *     \@LuaFunction( mainThread = true )
- *     public static int size(Container inventory) {
- *         return inventory.getSlots();
- *     }
- *
- *     // ...
- * }
- * }</pre>
- *
- * @see ComputerCraftAPI#registerGenericSource(GenericSource)
- */
-public interface GenericSource
-{
-    /**
-     * A unique identifier for this generic source.
-     *
-     * This is currently unused, but may be used in the future to allow disabling specific sources. It is recommended
-     * to return an identifier using your mod's ID.
-     *
-     * @return This source's identifier.
-     */
-    @Nonnull
-    ResourceLocation id();
-}