Fix serveral 1.15 -> 1.16 issues

Well, strictly speaking some mapping changes.

.editorconfig

@@ -16,3 +16,6 @@ indent_size = 2
 
 [*.yml]
 indent_size = 2
+
+[*.properties]
+insert_final_newline = false

.gitattributes

@@ -1,15 +1,2 @@
 # Ignore changes in generated files
 src/generated/resources/data/** linguist-generated
-src/test/server-files/structures linguist-generated
-
-* text=auto
-
-*.gradle eol=lf diff=java
-*.java   eol=lf diff=java
-*.kt     eol=lf diff=java
-*.lua    eol=lf
-*.md     eol=lf diff=markdown
-*.txt    eol=lf
-
-*.png binary
-*.jar binary

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,16 @@
+---
+name: Bug report
+about: Report some misbehaviour in the mod
+labels: bug
+---
+
+<!--
+## Before reporting
+ - Search for the bug on the issue tracker. Make sure to look at closed issues too!
+-->
+
+## Useful information to include:
+ - Minecraft version
+ - CC: Tweaked version
+ - Logs: These will be located in the `logs/` directory of your Minecraft instance. Please upload them as a gist or directly into this editor.
+ - Detailed reproduction steps: sometimes I can spot a bug pretty easily, but often it's much more obscure. The more information I have to help reproduce it, the quicker it'll get fixed.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,33 +0,0 @@
-name: Bug report
-description: Report some misbehaviour in the mod
-labels: [ bug ]
-body:
-- type: dropdown
-  id: mc-version
-  attributes:
-    label: Minecraft Version
-    description: What version of Minecraft are you using?
-    options:
-      - 1.15.x
-      - 1.16.x
-  validations:
-    required: true
-- type: input
-  id: version
-  attributes:
-    label: Version
-    description: "What version of CC: Tweaked are you using?"
-    placeholder: "e.g. 1.96.0"
-  validations:
-    required: true
-- type: textarea
-  id: details
-  attributes:
-    label: Details
-    description: |
-      Description of the bug. Please include the following:
-      - Logs: These will be located in the `logs/` directory of your Minecraft
-        instance. Please upload them as a gist or directly into this editor.
-      - Detailed reproduction steps: sometimes I can spot a bug pretty easily,
-        but often it's much more obscure. The more information I have to help
-        reproduce it, the quicker it'll get fixed.

.github/matchers/checkstyle.json

@@ -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

@@ -16,46 +16,35 @@ jobs:
         java-version: 8
 
     - name: Cache gradle dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       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 downloadAssets || ./gradlew downloadAssets
-        ./gradlew build
+      run: ./gradlew build --no-daemon || ./gradlew build --no-daemon
 
     - name: Upload Jar
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v1
       with:
         name: CC-Tweaked
         path: build/libs
 
     - name: Upload Coverage
-      uses: codecov/codecov-action@v1
+      run: bash <(curl -s https://codecov.io/bash)
+      continue-on-error: true
 
-    - name: Parse test reports
-      run: ./tools/parse-reports.py
-      if: ${{ failure() }}
+    - name: Generate Java documentation stubs
+      run: ./gradlew luaJavadoc --no-daemon
 
-    - 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
+    - name: Lint Lua code
       run: |
-        pip install pre-commit
-        pre-commit run --config config/pre-commit/config.yml --show-diff-on-failure --all --color=always
+        test -d bin || mkdir bin
+        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/linux-x86-64/illuaminate
+        chmod +x bin/illuaminate
+        bin/illuaminate lint
+
+    - name: Check whitespace
+      run: python3 tools/check-lines.py

.github/workflows/make-doc.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v1
 
     - name: Set up Java 8
       uses: actions/setup-java@v1
@@ -19,7 +19,7 @@ jobs:
         java-version: 8
 
     - name: Cache gradle dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}

.gitpod.yml

@@ -1,22 +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
-  - name: Install npm packages
-    init: npm ci

CONTRIBUTING.md

@@ -8,10 +8,6 @@ If you've any other questions, [just ask the community][community] or [open an i
 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.
 
-## Translations
-Translations are managed through [Weblate], an online interface for managing language strings. This is synced
-automatically with GitHub, so please don't submit PRs adding/changing translations!
-
 ## 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. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.
@@ -19,20 +15,11 @@ process. When building on Windows, Use `gradlew.bat` instead of `./gradlew`.
  - **Clone the repository:** `git clone https://github.com/SquidDev-CC/CC-Tweaked.git && cd CC-Tweaked`
  - **Setup Forge:** `./gradlew build`
  - **Run Minecraft:** `./gradlew runClient` (or run the `GradleStart` class from your IDE).
- - **Optionally:** For small PRs (especially those only touching Lua code), it may be easier to use GitPod, which
-   provides a pre-configured environment: [![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-2b2b2b?logo=gitpod)](https://gitpod.io/#https://github.com/SquidDev-CC/CC-Tweaked/)
-
-   Do note you will need to download the mod after compiling to test.
 
 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.
 
-The following sections describe the more niche sections of CC: Tweaked's build system. Some bits of these are
-quite-complex, and (dare I say) over-engineered, so you may wish to ignore them. Well tested/documented PRs are always
-preferred (and I'd definitely recommend setting up the tooling if you're doing serious development work), but for
-small changes it can be a lot.
-
 ### 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.
@@ -40,75 +27,15 @@ are run whenever you submit a PR, it's often useful to run this before committin
  - **[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. You may need to generate the Java documentation stubs (see "Documentation" below) for all
-   lints to pass.
+   how to download and run it.
 
-### Documentation
-When writing documentation for [CC: Tweaked's documentation website][docs], it may be useful to build the documentation
-and preview it yourself before submitting a PR.
-
-Building all documentation is, sadly, a multi-stage process (though this is largely hidden by Gradle). First we need to
-convert Java doc-comments into Lua ones, we also generate some Javascript to embed. All of this is then finally fed into
-illuaminate, which spits out our HTML.
-
-#### Setting up the tooling
-For various reasons, getting the environment set up to build documentation can be pretty complex. I'd quite like to
-automate this via Docker and/or nix in the future, but this needs to be done manually for now.
-
-This tooling is only needed if you need to build the whole website. If you just want to generate the Lua stubs, you can
-skp this section.
- - Install Node/npm and install our Node packages with `npm ci`.
- - Install [illuaminate][illuaminate-usage] as described above.
-
-#### Building documentation
-Gradle should be your entrypoint to building most documentation. There's two tasks which are of interest:
-
- - `./gradlew luaJavadoc` - Generate documentation stubs for Java methods.
- - `./gradlew docWebsite` - Generate the whole website (including Javascript pages). The resulting HTML is stored at
-   `./build/docs/lua/`.
-
-#### Writing documentation
-illuaminate's documentation system is not currently documented (somewhat ironic), but is _largely_ the same as
-[ldoc][ldoc]. Documentation comments are written in Markdown,
-
-Our markdown engine does _not_ support GitHub flavoured markdown, and so does not support all the features one might
-expect (such as tables). It is very much recommended that you build and preview the docs locally first.
-
-### Testing
-Thankfully running tests is much simpler than running the documentation generator! `./gradlew check` will run the
-entire test suite (and some additional bits of verification).
-
-Before we get into writing tests, it's worth mentioning the various test suites that CC: Tweaked has:
- - "Core" Java (`./src/test/java`): These test core bits of the mod which don't require any Minecraft interaction.
-   This includes the `@LuaFunction` system, file system code, etc...
-
-   These tests are run by `./gradlew test`.
-
- - CraftOS (`./src/test/resources/test-rom/`): These tests are written in Lua, and ensure the Lua environment, libraries
-   and programs work as expected. These are (generally) written to be able to be run on emulators too, to provide some
-   sort of compliance test.
-
-   These tests are run by the '"Core" Java' test suite, and so are also run with `./gradlew test`.
-
- - In-game (`./src/test/java/dan200/computercraft/ingame/`): These tests are run on an actual Minecraft server, using
-   [the same system Mojang do][mc-test]. The aim of these is to test in-game behaviour of blocks and peripherals.
-
-   These are run by `./gradlew testInGame`.
-
-## CraftOS tests
-CraftOS's tests are written using a test system called "mcfly", heavily inspired by [busted] (and thus RSpec). Groups of
-tests go inside `describe` blocks, and a single test goes inside `it`.
-
-Assertions are generally written using `expect` (inspired by Hamcrest and the like). For instance, `expect(foo):eq("bar")`
-asserts that your variable `foo` is equal to the expected value `"bar"`.
+## Translations
+Translations are managed through [Weblate], an online interface for managing language strings. This is synced
+automatically with GitHub, so please don't submit PRs adding/changing translations!
 
 [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 on GitHub"
-[illuaminate-usage]: https://github.com/SquidDev/illuaminate/blob/master/README.md#usage "Installing Illuaminate"
-[weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/ "CC: Tweaked weblate instance"
-[docs]: https://tweaked.cc/ "CC: Tweaked documentation"
-[ldoc]: http://stevedonovan.github.io/ldoc/ "ldoc, a Lua documentation generator."
-[mc-test]: https://www.youtube.com/watch?v=vXaWOJTCYNg
-[busted]: https://github.com/Olivine-Labs/busted "busted: Elegant Lua unit testing."
+[illuaminate]: https://github.com/SquidDev/illuaminate/
+[illuaminate-usage]: https://github.com/SquidDev/illuaminate/blob/master/README.md#usage
+[weblate]: https://i18n.tweaked.cc/projects/cc-tweaked/minecraft/

build.gradle

@@ -1,58 +1,39 @@
 buildscript {
     repositories {
+        jcenter()
         mavenCentral()
         maven {
             name = "forge"
-            url = "https://maven.minecraftforge.net"
+            url = "https://files.minecraftforge.net/maven"
         }
     }
     dependencies {
         classpath 'com.google.code.gson:gson:2.8.1'
-        classpath 'net.minecraftforge.gradle:ForgeGradle:5.0.6'
+        classpath 'net.minecraftforge.gradle:ForgeGradle:3.0.187'
+        classpath 'net.sf.proguard:proguard-gradle:6.1.0beta2'
+        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 "com.matthewprenger.cursegradle" version "1.4.0"
-    id "com.github.breadmoirai.github-release" version "2.2.12"
-    id "org.jetbrains.kotlin.jvm" version "1.3.72"
-    id "com.modrinth.minotaur" version "1.2.1"
+    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"
 }
 
 apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.ajoberstar.grgit'
+apply plugin: 'maven-publish'
+apply plugin: 'maven'
 
 version = mod_version
 
 group = "org.squiddev"
 archivesBaseName = "cc-tweaked-${mc_version}"
 
-def javaVersion = JavaLanguageVersion.of(8)
-java {
-    toolchain {
-        languageVersion = javaVersion
-    }
-
-    withSourcesJar()
-    withJavadocJar()
-}
-
-// Tragically java.toolchain.languageVersion doesn't apply to ForgeGradle's
-// tasks, so we force all launchers to use the right Java version.
-tasks.withType(JavaCompile).configureEach {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = javaVersion
-    }
-}
-
-tasks.withType(JavaExec).configureEach {
-    javaLauncher = javaToolchains.launcherFor {
-        languageVersion = javaVersion
-    }
-}
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 minecraft {
     runs {
@@ -69,10 +50,9 @@ minecraft {
         }
 
         server {
-            workingDirectory project.file("run/server")
-            property 'forge.logging.markers', 'REGISTRIES'
+            workingDirectory project.file("run/server-${mc_version}")
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
-            arg "--nogui"
 
             mods {
                 computercraft {
@@ -83,7 +63,7 @@ minecraft {
 
         data {
             workingDirectory project.file('run')
-            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
             property 'forge.logging.console.level', 'debug'
 
             args '--mod', 'computercraft', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
@@ -93,20 +73,9 @@ minecraft {
                 }
             }
         }
-
-        testServer {
-            workingDirectory project.file('test-files/server')
-            parent runs.server
-
-            mods {
-                cctest {
-                    source sourceSets.test
-                }
-            }
-        }
     }
 
-    mappings channel: 'official', version: project.mc_version
+    mappings channel: 'snapshot', version: "${mappings_version}".toString()
 
     accessTransformer file('src/main/resources/META-INF/accesstransformer.cfg')
 }
@@ -128,6 +97,7 @@ repositories {
 configurations {
     shade
     compile.extendsFrom shade
+    deployerJars
     cctJavadoc
 }
 
@@ -136,22 +106,24 @@ dependencies {
 
     minecraft "net.minecraftforge:forge:${mc_version}-${forge_version}"
 
-    compileOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3:api")
-    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.15.2:6.0.0.9")
+    compileOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58:api")
+    compileOnly fg.deobf("com.blamejared.crafttweaker:CraftTweaker-1.16.4:7.0.0.63")
 
-    runtimeOnly fg.deobf("mezz.jei:jei-1.15.2:6.0.0.3")
+    runtimeOnly fg.deobf("mezz.jei:jei-1.16.4:7.6.0.58")
 
-    shade 'org.squiddev:Cobalt:0.5.2-SNAPSHOT'
+    compileOnly 'com.google.auto.service:auto-service:1.0-rc7'
+    annotationProcessor 'com.google.auto.service:auto-service:1.0-rc7'
+
+    shade 'org.squiddev:Cobalt:0.5.1-SNAPSHOT'
 
     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.3.72'
-    testImplementation 'org.jetbrains.kotlin:kotlin-reflect:1.3.72'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8'
 
-    cctJavadoc 'cc.tweaked:cct-javadoc:1.4.0'
+    deployerJars "org.apache.maven.wagon:wagon-ssh:3.0.0"
+
+    cctJavadoc 'cc.tweaked:cct-javadoc:1.3.0'
 }
 
 // Compile tasks
@@ -170,14 +142,17 @@ task luaJavadoc(type: Javadoc) {
 
     options.docletpath = configurations.cctJavadoc.files as List
     options.doclet = "cc.tweaked.javadoc.LuaDoclet"
-    options.noTimestamp = false
 
-    javadocTool = javaToolchains.javadocToolFor {
-        languageVersion = JavaLanguageVersion.of(11)
+    // Attempt to run under Java 11 (any Java >= 9 will work though).
+    if(System.getProperty("java.version").startsWith("1.")
+        && (System.getenv("JAVA_HOME_11_X64") != null || project.hasProperty("java11Home"))) {
+        executable = "${System.getenv("JAVA_HOME_11_X64") ?: project.property("java11Home")}/bin/javadoc"
     }
 }
 
 jar {
+    dependsOn javadoc
+
     manifest {
         attributes(["Specification-Title": "computercraft",
                     "Specification-Vendor": "SquidDev",
@@ -188,6 +163,10 @@ jar {
                     "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")])
     }
 
+    from (sourceSets.main.allSource) {
+        include "dan200/computercraft/api/**/*.java"
+    }
+
     from configurations.shade.collect { it.isDirectory() ? it : zipTree(it) }
 }
 
@@ -197,6 +176,60 @@ jar {
     }
 }
 
+import java.nio.charset.StandardCharsets
+import java.nio.file.*
+import java.util.zip.*
+
+import com.google.gson.GsonBuilder
+import com.google.gson.JsonElement
+import com.hierynomus.gradle.license.tasks.LicenseCheck
+import com.hierynomus.gradle.license.tasks.LicenseFormat
+import org.ajoberstar.grgit.Grgit
+import proguard.gradle.ProGuardTask
+
+task proguard(type: ProGuardTask, dependsOn: jar) {
+    description "Removes unused shadowed classes from the jar"
+    group "compact"
+
+    injars jar.archivePath
+    outjars "${jar.archivePath.absolutePath.replace(".jar", "")}-min.jar"
+
+    // Add the main runtime jar and all non-shadowed dependencies
+    libraryjars "${System.getProperty('java.home')}/lib/rt.jar"
+    libraryjars "${System.getProperty('java.home')}/lib/jce.jar"
+    doFirst {
+        sourceSets.main.compileClasspath
+            .filter { !it.name.contains("Cobalt") }
+            .each { libraryjars it }
+    }
+
+    // We want to avoid as much obfuscation as possible. We're only doing this to shrink code size.
+    dontobfuscate; dontoptimize; keepattributes; keepparameternames
+
+    // Proguard will remove directories by default, but that breaks JarMount.
+    keepdirectories 'data/computercraft/lua**'
+
+    // Preserve ComputerCraft classes - we only want to strip shadowed files.
+    keep 'class dan200.computercraft.** { *; }'
+
+    // LWJGL and Apache bundle Java 9 versions, which is great, but rather breaks Proguard
+    dontwarn 'module-info'
+    dontwarn 'org.apache.**,org.lwjgl.**'
+}
+
+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
+        )
+    }
+}
+
 processResources {
     inputs.property "version", mod_version
     inputs.property "mcversion", mc_version
@@ -204,17 +237,17 @@ processResources {
     def hash = 'none'
     Set<String> contributors = []
     try {
-        hash = ["git", "-C", projectDir, "rev-parse", "HEAD"].execute().text.trim()
+        def grgit = Grgit.open(dir: '.')
+        hash = grgit.head().id
 
         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()
+        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
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
 
     from(sourceSets.main.resources.srcDirs) {
         include 'META-INF/mods.toml'
@@ -231,9 +264,48 @@ processResources {
     }
 }
 
-sourcesJar {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+task compressJson(dependsOn: jar) {
+    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
 
 // Web tasks
 
@@ -264,7 +336,7 @@ task minifyWeb(type: Exec, dependsOn: rollup) {
     inputs.file("package-lock.json").withPropertyName("package-lock.json")
     outputs.file("$buildDir/rollup/index.min.js").withPropertyName("output")
 
-    commandLine mkCommand('"node_modules/.bin/terser"' + " -o '$buildDir/rollup/index.min.js' '$buildDir/rollup/index.js'")
+    commandLine mkCommand('"node_modules/.bin/terser"' + " -o $buildDir/rollup/index.min.js $buildDir/rollup/index.js")
 }
 
 task illuaminateDocs(type: Exec, dependsOn: [minifyWeb, luaJavadoc]) {
@@ -297,7 +369,6 @@ test {
 }
 
 jacocoTestReport {
-    dependsOn('test')
     reports {
         xml.enabled true
         html.enabled true
@@ -306,10 +377,6 @@ jacocoTestReport {
 
 check.dependsOn jacocoTestReport
 
-
-import com.hierynomus.gradle.license.tasks.LicenseCheck
-import com.hierynomus.gradle.license.tasks.LicenseFormat
-
 license {
     mapping("java", "SLASHSTAR_STYLE")
     strictCheck true
@@ -321,14 +388,14 @@ license {
     it.configure {
         include("**/*.java")
         exclude("dan200/computercraft/api/**")
-        header file('config/license/main.txt')
+        header rootProject.file('config/license/main.txt')
     }
 }
 
 [licenseTest, licenseFormatTest].forEach {
     it.configure {
         include("**/*.java")
-        header file('config/license/main.txt')
+        header rootProject.file('config/license/main.txt')
     }
 }
 
@@ -345,71 +412,10 @@ task licenseFormatAPI(type: LicenseFormat);
     it.configure {
         source = sourceSets.main.java
         include("dan200/computercraft/api/**")
-        header file('config/license/api.txt')
+        header rootProject.file('config/license/api.txt')
     }
 }
 
-task setupServer(type: Copy) {
-    group "test server"
-    description "Sets up the environment for the test server."
-
-    from("src/test/server-files") {
-        include "eula.txt"
-        include "server.properties"
-    }
-    into "test-files/server"
-}
-
-tasks.register('testInGame', JavaExec.class).configure {
-    it.group('test server')
-    it.description("Runs tests on a temporary Minecraft server.")
-    it.dependsOn(setupServer, 'prepareRunTestServer', 'cleanTestInGame')
-
-    // Copy from runTestServer. We do it in this slightly odd way as runTestServer
-    // isn't created until the task is configured (which is no good for us).
-    JavaExec exec = tasks.getByName('runTestServer')
-    it.setWorkingDir(exec.getWorkingDir())
-    it.setSystemProperties(exec.getSystemProperties())
-    it.setBootstrapClasspath(exec.getBootstrapClasspath())
-    it.setClasspath(exec.getClasspath())
-    it.setMain(exec.getMain())
-    it.setEnvironment(exec.getEnvironment())
-    it.setArgs(exec.getArgs())
-    it.setJvmArgs(exec.getJvmArgs())
-
-    it.systemProperty('forge.logging.console.level', 'info')
-    it.systemProperty('cctest.run', 'true')
-
-    // Jacoco and modlauncher don't play well together as the classes loaded in-game don't
-    // match up with those written to disk. We get Jacoco to dump all classes to disk, and
-    // use that when generating the report.
-    def coverageOut = new File(buildDir, 'jacocoClassDump/testInGame')
-    jacoco.applyTo(it)
-    it.jacoco.setIncludes(["dan200.computercraft.*"])
-    it.jacoco.setClassDumpDir(coverageOut)
-    it.outputs.dir(coverageOut)
-    // Older versions of modlauncher don't include a protection domain (and thus no code
-    // source). Jacoco skips such classes by default, so we need to explicitly include them.
-    it.jacoco.setIncludeNoLocationClasses(true)
-}
-
-tasks.register('jacocoTestInGameReport', JacocoReport.class).configure {
-    it.group('test server')
-    it.description('Generate coverage reports for in-game tests (testInGame)')
-    it.dependsOn('testInGame')
-
-    it.executionData(new File(buildDir, 'jacoco/testInGame.exec'))
-    it.sourceDirectories.from(sourceSets.main.allJava.srcDirs)
-    it.classDirectories.from(new File(buildDir, 'jacocoClassDump/testInGame'))
-
-    it.reports {
-        xml.enabled true
-        html.enabled true
-    }
-}
-check.dependsOn('jacocoTestInGameReport')
-
-
 // Upload tasks
 
 task checkRelease {
@@ -417,31 +423,31 @@ task checkRelease {
     description "Verifies that everything is ready for a release"
 
     inputs.property "version", mod_version
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.md")
-    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.md")
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/changelog.txt")
+    inputs.file("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
 
     doLast {
         def ok = true
 
         // Check we're targetting the current version
-        def whatsnew = new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.md").readLines()
+        def whatsnew = new File("src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt").readLines()
         if (whatsnew[0] != "New features in CC: Tweaked $mod_version") {
             ok = false
-            project.logger.error("Expected `whatsnew.md' to target $mod_version.")
+            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.md")
+            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(projectDir, "src/main/resources/data/computercraft/lua/rom/help/changelog.md").getText()
+        def changelog = new File("src/main/resources/data/computercraft/lua/rom/help/changelog.txt").getText()
         if (!changelog.startsWith(versionChangelog)) {
             ok = false
             project.logger.error("whatsnew and changelog are not in sync")
@@ -465,65 +471,53 @@ curseforge {
     }
 }
 
-import com.modrinth.minotaur.TaskModrinthUpload
-tasks.register('publishModrinth', TaskModrinthUpload.class).configure {
-    dependsOn('assemble', 'reobfJar')
-    onlyIf {
-        project.hasProperty('modrinthApiKey')
-    }
-
-    token = project.hasProperty('curseForgeApiKey')
-    projectId = 'gu7yAYhd'
-    versionNumber = project.mod_version
-    uploadFile = jar
-    addGameVersion(project.mc_version)
-    addLoader('forge')
-}
-
-tasks.withType(GenerateModuleMetadata) {
-    // We can't generate metadata as that includes Forge as a dependency.
-    enabled = false
-}
-
 publishing {
     publications {
-        maven(MavenPublication) {
+        mavenJava(MavenPublication) {
             from components.java
+            // artifact sourceJar
+        }
+    }
+}
 
-            pom {
-                name = 'CC: Tweaked'
-                description = 'CC: Tweaked is a fork of ComputerCraft, adding programmable computers, turtles and more to Minecraft.'
-                url = 'https://github.com/SquidDev-CC/CC-Tweaked'
+uploadArchives {
+    repositories {
+        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'
+                        url 'https://github.com/SquidDev-CC/CC-Tweaked.git'
                     }
 
                     issueManagement {
-                    system = 'github'
-                    url = 'https://github.com/SquidDev-CC/CC-Tweaked/issues'
+                        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/mc-1.15.x/LICENSE'
-                    }
-                }
-
-                withXml { asNode().remove(asNode().get("dependencies")) }
+                            name 'ComputerCraft Public License, Version 1.0'
+                            url 'https://github.com/SquidDev-CC/CC-Tweaked/blob/master/LICENSE'
+                            distribution 'repo'
                         }
                     }
                 }
 
-    repositories {
-        if (project.hasProperty("mavenUser")) {
-            maven {
-                name = "SquidDev"
-                url = "https://squiddev.cc/maven"
-                credentials {
-                    username = project.property("mavenUser") as String
-                    password = project.property("mavenPass") as String
+                pom.whenConfigured { pom ->
+                    pom.dependencies.clear()
                 }
             }
         }
@@ -534,30 +528,25 @@ githubRelease {
     token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
     owner 'SquidDev-CC'
     repo 'CC-Tweaked'
-    targetCommitish.set(project.provider({
     try {
-            return ["git", "-C", projectDir, "rev-parse", "--abbrev-ref", "HEAD"].execute().text.trim()
-        } catch (Exception e) {
-            e.printStackTrace()
-        }
-        return "master"
-    }))
+        targetCommitish = Grgit.open(dir: '.').branch.current().name
+    } catch(Exception ignored) { }
 
     tagName "v${mc_version}-${mod_version}"
     releaseName "[${mc_version}] ${mod_version}"
-    body.set(project.provider({
-        "## " + new File(projectDir, "src/main/resources/data/computercraft/lua/rom/help/whatsnew.txt")
+    body {
+        "## " + new File("src/main/resources/data/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 = ["publish", "curseforge", "publishModrinth", "githubRelease"]
+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, Modrinth, GitHub release)"
+    description "Uploads to all repositories (Maven, Curse, GitHub release)"
 }

config/checkstyle/checkstyle.xml

@@ -7,7 +7,7 @@
     <property name="charset" value="UTF-8" />
 
     <module name="SuppressionFilter">
-	<property name="file" value="${config_loc}/suppressions.xml" />
+        <property name="file" value="config/checkstyle/suppressions.xml" />
     </module>
 
     <module name="BeforeExecutionExclusionFileFilter">
@@ -97,11 +97,20 @@
         <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">

config/checkstyle/suppressions.xml

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

config/gitpod/Dockerfile

@@ -1,8 +0,0 @@
-FROM gitpod/workspace-base
-
-USER gitpod
-
-RUN sudo apt-get -q update \
- && sudo apt-get install -yq openjdk-8-jdk openjdk-16-jdk python3-pip npm \
- && sudo pip3 install pre-commit \
- && sudo update-java-alternatives --set java-1.8.0-openjdk-amd64

config/pre-commit/config.yml

@@ -1,55 +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: v3.2.0
-  hooks:
-  - id: trailing-whitespace
-  - id: end-of-file-fixer
-  - id: check-merge-conflict
-
-  # Quick syntax checkers
-  - id: check-xml
-  - id: check-yaml
-  - id: check-toml
-  - id: check-json
-    exclude: "tsconfig\\.json$"
-
-- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-  rev: 2.3.5
-  hooks:
-  - id: editorconfig-checker
-    args: ['-disable-indentation']
-    exclude: "^(.*\\.(bat)|LICENSE)$"
-
-- repo: local
-  hooks:
-  - id: checkstyle
-    name: Check Java codestyle
-    files: ".*\\.java$"
-    language: system
-    entry: ./gradlew checkstyleMain checkstyleTest
-    pass_filenames: false
-    require_serial: true
-  - id: license
-    name: Check Java license headers
-    files: ".*\\.java$"
-    language: system
-    entry: ./gradlew licenseFormat
-    pass_filenames: false
-    require_serial: true
-  - 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/
-  )

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,22 +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 (decimal).
-
-## Example
-Prints a message when one is sent:
-```lua
-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 @{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/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,15 +0,0 @@
----
-module: [kind=event] term_resize
----
-
-The @{term_resize} event is fired when the main terminal is resized, mainly when a new tab is opened or closed in @{multishell}.
-
-## 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,26 +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.
-
-## 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/head.html

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

doc/stub/http.lua

@@ -58,10 +58,10 @@ function request(...) end
 -- @treturn string A message detailing why the request failed.
 -- @treturn Response|nil The failing http response, if available.
 --
--- @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()
@@ -123,7 +123,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

doc/stub/turtle.lua

@@ -1,13 +1 @@
---[[- Craft a recipe based on the turtle's inventory.
-
-The turtle's inventory should set up like a crafting grid. For instance, to
-craft sticks, slots 1 and 5 should contain sticks. _All_ other slots should be
-empty, including those outside the crafting "grid".
-
-@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.
-]]
 function craft(limit) end

gradle.properties

@@ -1,6 +1,7 @@
 # Mod properties
-mod_version=1.97.0
+mod_version=1.95.0
 
 # Minecraft properties (update mods.toml when changing)
-mc_version=1.15.2
-forge_version=31.1.41
+mc_version=1.16.4
+forge_version=35.0.1
+mappings_version=20201028-1.16.3

gradle/wrapper/gradle-wrapper.properties

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

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,19 +1,3 @@
-@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
@@ -29,18 +13,15 @@ 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"
+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 execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ 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 %*
+"%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

illuaminate.sexp

@@ -2,7 +2,6 @@
 
 (sources
   /doc/stub/
-  /doc/events/
   /build/docs/luaJavadoc/
   /src/main/resources/*/computercraft/lua/bios.lua
   /src/main/resources/*/computercraft/lua/rom/
@@ -11,35 +10,29 @@
 
 
 (doc
-  (destination build/docs/lua)
-  (index doc/index.md)
-
-  (site
   (title "CC: Tweaked")
+  (destination build/docs/lua)
   (logo src/main/resources/pack.png)
-    (url https://tweaked.cc/)
-    (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
-
+  (index doc/index.md)
   (styles src/web/styles.css)
   (scripts build/rollup/index.js)
-    (head doc/head.html))
+  (source-link https://github.com/SquidDev-CC/CC-Tweaked/blob/${commit}/${path}#L${line})
 
   (module-kinds
     (peripheral Peripherals)
-    (generic_peripheral "Generic Peripherals")
-    (event Events))
+    (generic_peripheral "Generic Peripherals"))
 
   (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
@@ -88,16 +81,27 @@
 
 ;; Suppress warnings for currently undocumented modules.
 (at
-  (; Lua APIs
+  (; Java APIs
+   /doc/stub/http.lua
+   /doc/stub/os.lua
+   /doc/stub/turtle.lua
+   /doc/stub/global.lua
+   ; Java generated APIs
+   /build/docs/luaJavadoc/turtle.lua
+   ; Peripherals
+   /build/docs/luaJavadoc/drive.lua
+   /build/docs/luaJavadoc/speaker.lua
+   /build/docs/luaJavadoc/printer.lua
+   ; Generic peripherals
+   /build/docs/luaJavadoc/fluid_storage.lua
+   ; Lua APIs
    /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))
 
-;; Suppress warnings for various APIs using its own deprecated members.
-(at
-  (/src/main/resources/*/computercraft/lua/bios.lua
-   /src/main/resources/*/computercraft/lua/rom/apis/turtle/turtle.lua)
+;; Suppress warnings for the BIOS using its own deprecated members for now.
+(at /src/main/resources/*/computercraft/lua/bios.lua
   (linters -var:deprecated))
 
 (at /src/test/resources/test-rom

src/generated/resources/data/computercraft/loot_tables/blocks/computer_command.json

@@ -1,34 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:dynamic",
-          "name": "computercraft:computer"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:alternative",
-          "terms": [
-            {
-              "condition": "computercraft:block_named"
-            },
-            {
-              "condition": "computercraft:has_id"
-            },
-            {
-              "condition": "minecraft:inverted",
-              "term": {
-                "condition": "computercraft:player_creative"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

src/generated/resources/data/computercraft/recipes/disk_1.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:1118481}"
+    "nbt": "{color:1118481}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_10.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:15905484}"
+    "nbt": "{color:15905484}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_11.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:8375321}"
+    "nbt": "{color:8375321}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_12.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:14605932}"
+    "nbt": "{color:14605932}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_13.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:10072818}"
+    "nbt": "{color:10072818}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_14.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:15040472}"
+    "nbt": "{color:15040472}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_15.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:15905331}"
+    "nbt": "{color:15905331}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_16.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:15790320}"
+    "nbt": "{color:15790320}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_2.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:13388876}"
+    "nbt": "{color:13388876}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_3.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:5744206}"
+    "nbt": "{color:5744206}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_4.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:8349260}"
+    "nbt": "{color:8349260}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_5.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:3368652}"
+    "nbt": "{color:3368652}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_6.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:11691749}"
+    "nbt": "{color:11691749}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_7.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:5020082}"
+    "nbt": "{color:5020082}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_8.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:10066329}"
+    "nbt": "{color:10066329}"
   }
 }

src/generated/resources/data/computercraft/recipes/disk_9.json

@@ -14,6 +14,6 @@
   ],
   "result": {
     "item": "computercraft:disk",
-    "nbt": "{Color:5000268}"
+    "nbt": "{color:5000268}"
   }
 }

src/generated/resources/data/minecraft/tags/items/piglin_loved.json

@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "computercraft:computer_advanced",
+    "computercraft:turtle_advanced",
+    "computercraft:wireless_modem_advanced",
+    "computercraft:pocket_computer_advanced",
+    "computercraft:monitor_advanced"
+  ]
+}

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
 package dan200.computercraft;
@@ -8,6 +8,7 @@ package dan200.computercraft;
 import dan200.computercraft.api.turtle.event.TurtleAction;
 import dan200.computercraft.core.apis.http.options.Action;
 import dan200.computercraft.core.apis.http.options.AddressRule;
+import dan200.computercraft.core.asm.GenericSource;
 import dan200.computercraft.shared.Config;
 import dan200.computercraft.shared.Registry;
 import dan200.computercraft.shared.computer.core.ClientComputerRegistry;
@@ -16,6 +17,7 @@ import dan200.computercraft.shared.peripheral.monitor.MonitorRenderer;
 import dan200.computercraft.shared.pocket.peripherals.PocketModem;
 import dan200.computercraft.shared.pocket.peripherals.PocketSpeaker;
 import dan200.computercraft.shared.turtle.upgrades.*;
+import dan200.computercraft.shared.util.ServiceUtil;
 import net.minecraftforge.fml.common.Mod;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -36,6 +38,7 @@ public final class ComputerCraft
     public static int maximumFilesOpen = 128;
     public static boolean disableLua51Features = false;
     public static String defaultComputerSettings = "";
+    public static boolean debugEnable = true;
     public static boolean logComputerErrors = true;
     public static boolean commandRequireCreative = true;
 
@@ -114,5 +117,6 @@ public final class ComputerCraft
     {
         Config.setup();
         Registry.setup();
+        GenericSource.setup( () -> ServiceUtil.loadServicesForge( GenericSource.class ) );
     }
 }

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
  * Send enquiries to dratcliffe@gmail.com
  */
 package dan200.computercraft;
@@ -8,7 +8,6 @@ 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;
@@ -19,11 +18,9 @@ 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.shared.*;
-import dan200.computercraft.shared.peripheral.generic.GenericPeripheralProvider;
 import dan200.computercraft.shared.peripheral.modem.wireless.WirelessNetwork;
 import dan200.computercraft.shared.util.IDAssigner;
 import dan200.computercraft.shared.wired.WiredNode;
@@ -34,7 +31,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.server.ServerLifecycleHooks;
@@ -58,7 +54,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
 
     public static InputStream getResourceFile( String domain, String subPath )
     {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResources();
+        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
         try
         {
             return manager.getResource( new ResourceLocation( domain, subPath ) ).getInputStream();
@@ -101,7 +97,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     @Override
     public IMount createResourceMount( @Nonnull String domain, @Nonnull String subPath )
     {
-        IReloadableResourceManager manager = ServerLifecycleHooks.getCurrentServer().getResources();
+        IReloadableResourceManager manager = (IReloadableResourceManager) ServerLifecycleHooks.getCurrentServer().getDataPackRegistries().getResourceManager();
         ResourceMount mount = ResourceMount.get( domain, subPath, manager );
         return mount.exists( "" ) ? mount : null;
     }
@@ -112,18 +108,6 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
         Peripherals.register( provider );
     }
 
-    @Override
-    public void registerGenericSource( @Nonnull GenericSource source )
-    {
-        GenericMethod.register( source );
-    }
-
-    @Override
-    public void registerGenericCapability( @Nonnull Capability<?> capability )
-    {
-        GenericPeripheralProvider.addCapability( capability );
-    }
-
     @Override
     public void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade )
     {
@@ -178,7 +162,7 @@ public final class ComputerCraftAPIImpl implements IComputerCraftAPI
     @Override
     public LazyOptional<IWiredElement> getWiredElementAt( @Nonnull IBlockReader world, @Nonnull BlockPos pos, @Nonnull Direction side )
     {
-        TileEntity tile = world.getBlockEntity( pos );
+        TileEntity tile = world.getTileEntity( pos );
         return tile == null ? LazyOptional.empty() : tile.getCapability( CAPABILITY_WIRED_ELEMENT, side );
     }
 }

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-2021. 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;
@@ -24,7 +23,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockReader;
 import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.util.LazyOptional;
 
 import javax.annotation.Nonnull;
@@ -100,9 +98,7 @@ public final class ComputerCraftAPI
      * 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")}.
+     * 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".
@@ -118,7 +114,7 @@ public final class ComputerCraftAPI
     }
 
     /**
-     * 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
@@ -129,28 +125,6 @@ public final class ComputerCraftAPI
         getInstance().registerPeripheralProvider( provider );
     }
 
-    /**
-     * 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 capability that can be used by generic peripherals.
-     *
-     * @param capability The capability to register.
-     * @see GenericSource
-     */
-    public static void registerGenericCapability( @Nonnull Capability<?> capability )
-    {
-        getInstance().registerGenericCapability( capability );
-    }
-
     /**
      * 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
@@ -282,10 +256,6 @@ public final class ComputerCraftAPI
 
         void registerPeripheralProvider( @Nonnull IPeripheralProvider provider );
 
-        void registerGenericSource( @Nonnull GenericSource source );
-
-        void registerGenericCapability( @Nonnull Capability<?> capability );
-
         void registerTurtleUpgrade( @Nonnull ITurtleUpgrade upgrade );
 
         void registerBundledRedstoneProvider( @Nonnull IBundledRedstoneProvider provider );

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

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

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

@@ -1,16 +1,16 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
+ * 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.client;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.TransformationMatrix;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.ModelManager;
 import net.minecraft.client.renderer.model.ModelResourceLocation;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.math.vector.TransformationMatrix;
 
 import javax.annotation.Nonnull;
 import java.util.Objects;
@@ -32,7 +32,7 @@ public final class TransformedModel
     public TransformedModel( @Nonnull IBakedModel model )
     {
         this.model = Objects.requireNonNull( model );
-        matrix = TransformationMatrix.identity();
+        this.matrix = TransformationMatrix.identity();
     }
 
     public static TransformedModel of( @Nonnull ModelResourceLocation location )
@@ -43,7 +43,7 @@ public final class TransformedModel
 
     public static TransformedModel of( @Nonnull ItemStack item, @Nonnull TransformationMatrix transform )
     {
-        IBakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelShaper().getItemModel( item );
+        IBakedModel model = Minecraft.getInstance().getItemRenderer().getItemModelMesher().getItemModel( item );
         return new TransformedModel( model, transform );
     }
 

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

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

@@ -1,60 +0,0 @@
-/*
- * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
- * For help using the API, and posting your mods, visit the forums at computercraft.info.
- */
-package dan200.computercraft.api.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.util.ResourceLocation;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.items.IItemHandler;
-
-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" (for instance, a
- * {@link Capability}).
- *
- * 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 IItemHandler}s:
- *
- * <pre>{@code
- * public class InventoryMethods implements GenericSource {
- *     \@LuaFunction( mainThread = true )
- *     public static int size(IItemHandler inventory) {
- *         return inventory.getSlots();
- *     }
- *
- *     // ...
- * }
- * }</pre>
- *
- * @see ComputerCraftAPI#registerGenericSource(GenericSource)
- * @see ComputerCraftAPI#registerGenericCapability(Capability) New capabilities (those not built into Forge) must be
- * explicitly given to the generic peripheral system, as there is no way to enumerate all capabilities.
- */
-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();
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
+ * 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;
@@ -19,14 +19,14 @@ public class LuaException extends Exception
     public LuaException( @Nullable String message )
     {
         super( message );
-        hasLevel = false;
-        level = 1;
+        this.hasLevel = false;
+        this.level = 1;
     }
 
     public LuaException( @Nullable String message, int level )
     {
         super( message );
-        hasLevel = true;
+        this.hasLevel = true;
         this.level = level;
     }
 

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

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

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

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

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

@@ -1,6 +1,6 @@
 /*
  * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2021. This API may be redistributed unmodified and in full only.
+ * 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;
@@ -30,14 +30,14 @@ public final class MethodResult
 
     private MethodResult( Object[] arguments, ILuaCallback callback )
     {
-        result = arguments;
+        this.result = arguments;
         this.callback = callback;
-        adjust = 0;
+        this.adjust = 0;
     }
 
     private MethodResult( Object[] arguments, ILuaCallback callback, int adjust )
     {
-        result = arguments;
+        this.result = arguments;
         this.callback = callback;
         this.adjust = adjust;
     }

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

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