▲ version

Allow returning collections and arrays from Java
Closes #344
2025-11-03 07:03:00 +00:00 · 2020-01-13 13:43:38 +00:00 · 2020-01-13 13:20:15 +00:00 · 2020-01-08 17:07:01 +00:00 · 2020-01-01 09:55:44 +00:00 · 2020-01-01 09:01:00 +00:00
510 changed files with 3033 additions and 2508 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,5 +11,8 @@ insert_final_newline = true
 [*.md]
 trim_trailing_whitespace = false

+[*.sexp]
+indent_size = 2
+
 [*.properties]
 insert_final_newline = false
--- a/.github/workflows/main-ci.yml
+++ b/.github/workflows/main-ci.yml
@@ -4,6 +4,7 @@ on: [push, pull_request]

 jobs:
  build:
+    name: Build
    runs-on: ubuntu-latest

    steps:
@@ -16,3 +17,23 @@ jobs:

    - name: Build with Gradle
      run: ./gradlew build --no-daemon
+
+    - name: Upload Jar
+      uses: actions/upload-artifact@v1
+      with:
+        name: CC-Tweaked
+        path: build/libs
+
+  lint-lua:
+    name: Lint Lua
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: Lint Lua code
+      run: |
+        test -d bin || mkdir bin
+        test -f bin/illuaminate || wget -q -Obin/illuaminate https://squiddev.cc/illuaminate/bin/illuaminate
+        chmod +x bin/illuaminate
+        bin/illuaminate lint
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -1,35 +0,0 @@
-std = "max"
-
-ignore = {
-    -- Allow access to undefined globals or their fields. In the future we'll
-    -- define all of CC's globals within this file
-    '113', '143',
-
-    -- FIXME: Ignore unused arguments and loop variables
-    '212', '213',
-
-    -- Disable line is too long for now. It would be possible to clean
-    -- this up in the future.
-    '631',
-}
-
-- Only run the linter on ROM and bios for now, as the treasure disks
-- are largely unsupported.
-include_files = {
-    'src/main/resources/assets/computercraft/lua/rom',
-    'src/main/resources/assets/computercraft/lua/bios.lua',
-    'src/test/resources/test-rom',
-}
-
-files['src/main/resources/assets/computercraft/lua/bios.lua'] = {
-    -- Allow declaring and mutating globals
-    allow_defined_top = true,
-    ignore = { '112', '121', '122', '131', '142' },
-}
-
-files['src/main/resources/assets/computercraft/lua/rom/apis'] = {
-    -- APIs may define globals on the top level. We'll ignore unused globals,
-    -- as obviously they may be used outside that API.
-    allow_defined_top = true,
-    ignore = { '131' },
-}
--- a/build.gradle
+++ b/build.gradle
@@ -59,6 +59,10 @@ repositories {
        name "Amadornes"
        url "https://maven.amadornes.com/"
    }
+    maven {
+        name "CraftTweaker"
+        url "https://maven.blamejared.com/"
+    }
 }

 configurations {
@@ -68,11 +72,12 @@ configurations {
 }

 dependencies {
-    checkstyle "com.puppycrawl.tools:checkstyle:8.21"
+    checkstyle "com.puppycrawl.tools:checkstyle:8.25"

+    deobfProvided "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.20.554"
+    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"
    deobfProvided "mezz.jei:jei_1.12.2:4.15.0.269:api"
    deobfProvided "pl.asie:Charset-Lib:0.5.4.6"
-    deobfProvided "MCMultiPart2:MCMultiPart:2.5.3"

    runtime "mezz.jei:jei_1.12.2:4.15.0.269"

@@ -132,6 +137,7 @@ task proguard(type: ProGuardTask, dependsOn: 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") }
@@ -146,9 +152,6 @@ task proguard(type: ProGuardTask, dependsOn: jar) {

    // Preserve ComputerCraft classes - we only want to strip shadowed files.
    keep 'class dan200.computercraft.** { *; }'
-
-    // Preserve the constructors in Cobalt library class, as we init them via reflection
-    keepclassmembers 'class org.squiddev.cobalt.lib.** { <init>(...); }'
 }

 task proguardMove(dependsOn: proguard) {
@@ -331,6 +334,7 @@ task checkRelease {
        if (!ok) throw new IllegalStateException("Could not check release")
    }
 }
+check.dependsOn checkRelease

 curseforge {
    apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
@@ -402,7 +406,9 @@ githubRelease {
    token project.hasProperty('githubApiKey') ? project.githubApiKey : ''
    owner 'SquidDev-CC'
    repo 'CC-Tweaked'
-    targetCommitish { Grgit.open(dir: '.').branch.current().name }
+    try {
+        targetCommitish = Grgit.open(dir: '.').branch.current().name
+    } catch(Exception ignored) { }

    tagName "v${mc_version}-${mod_version}"
    releaseName "[${mc_version}] ${mod_version}"
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -14,9 +14,7 @@
        <!-- Annotations -->
        <module name="AnnotationLocation" />
        <module name="AnnotationUseStyle" />
-        <module name="MissingDeprecated">
-            <property name="skipNoJavadoc" value="true" />
-        </module>
+        <module name="MissingDeprecated" />
        <module name="MissingOverride" />

        <!-- Blocks -->
@@ -57,6 +55,9 @@
        <module name="SimplifyBooleanReturn" />
        <module name="StringLiteralEquality" />
        <module name="UnnecessaryParentheses" />
+        <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
+        <module name="UnnecessarySemicolonInTryWithResources" />
+        <module name="UnnecessarySemicolonInEnumeration" />

        <!-- Imports -->
        <module name="CustomImportOrder" />
@@ -65,10 +66,16 @@
        <module name="UnusedImports" />

        <!-- Javadoc -->
+        <!-- TODO: Missing* checks for the dan200.computercraft.api package? -->
        <module name="AtclauseOrder" />
-        <!-- TODO: Cleanup our documentation before enabling JavadocMethod, JavadocStyle, JavadocType and SummaryJavadoc. -->
+        <module name="InvalidJavadocPosition" />
+        <module name="JavadocBlockTagLocation" />
+        <module name="JavadocMethod"/>
+        <module name="JavadocType"/>
+        <module name="JavadocStyle" />
        <module name="NonEmptyAtclauseDescription" />
        <module name="SingleLineJavadoc" />
+        <module name="SummaryJavadocCheck"/>

        <!-- Misc -->
        <module name="ArrayTypeStyle" />
@@ -155,5 +162,8 @@

    <module name="FileTabCharacter" />
    <module name="NewlineAtEndOfFile" />
+    <module name="RegexpSingleline">
+        <property name="format" value="\s+$"/>
+        <property name="message" value="Trailing whitespace"/>
+    </module>
 </module>
-
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -6,4 +6,7 @@
    <!-- All the config options and method fields. -->
    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraft.java" />
    <suppress checks="StaticVariableName" files=".*[\\/]ComputerCraftAPI.java" />
+
+    <!-- Do not check for missing package Javadoc. -->
+    <suppress checks="JavadocStyle" files=".*[\\/]package-info.java" />
 </suppressions>
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Mod properties
-mod_version=1.85.0
+mod_version=1.86.1

 # Minecraft properties
 mc_version=1.12.2
--- a/illuaminate.sexp
+++ b/illuaminate.sexp
@@ -0,0 +1,28 @@
+; -*- mode: Lisp;-*-
+
+(sources
+  /src/main/resources/assets/computercraft/lua/bios.lua
+  /src/main/resources/assets/computercraft/lua/rom/
+  /src/test/resources/test-rom)
+
+(at /
+  (linters
+    ;; It'd be nice to avoid this, but right now there's a lot of instances of
+    ;; it.
+    -var:set-loop
+
+    ;; It's useful to name arguments for documentation, so we allow this. It'd
+    ;; be good to find a compromise in the future, but this works for now.
+    -var:unused-arg))
+
+;; We disable the unused global linter in bios.lua and the APIs. In the future
+;; hopefully we'll get illuaminate to handle this.
+(at
+  (/src/main/resources/assets/computercraft/lua/bios.lua
+   /src/main/resources/assets/computercraft/lua/rom/apis/)
+  (linters -var:unused-global)
+  (lint
+    (allow-toplevel-global true)))
+
+;; These warnings are broken right now
+(at (bios.lua worm.lua) (linters -control:unreachable))
--- a/src/main/java/dan200/computercraft/CCTweaked.java
+++ b/src/main/java/dan200/computercraft/CCTweaked.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft;

 import net.minecraftforge.fml.common.Mod;
--- a/src/main/java/dan200/computercraft/ComputerCraft.java
+++ b/src/main/java/dan200/computercraft/ComputerCraft.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft;

 import dan200.computercraft.api.filesystem.IMount;
--- a/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-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;
--- a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-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;
@@ -32,8 +31,9 @@ import java.lang.reflect.Method;

 /**
 * The static entry point to the ComputerCraft API.
- * Members in this class must be called after mod_ComputerCraft has been initialised,
- * but may be called before it is fully loaded.
+ *
+ * Members in this class must be called after mod_ComputerCraft has been initialised, but may be called before it is
+ * fully loaded.
 */
 public final class ComputerCraftAPI
 {
@@ -269,7 +269,7 @@ public final class ComputerCraftAPI
    }

    /**
-     * Registers a media provider to provide {@link IMedia} implementations for Items
+     * Registers a media provider to provide {@link IMedia} implementations for Items.
     *
     * @param provider The media provider to register.
     * @see IMediaProvider
@@ -370,7 +370,7 @@ public final class ComputerCraftAPI
    }

    /**
-     * Construct a new wired node for a given wired element
+     * Construct a new wired node for a given wired element.
     *
     * @param element The element to construct it for
     * @return The element's node
@@ -398,7 +398,7 @@ public final class ComputerCraftAPI
    }

    /**
-     * Get the wired network element for a block in world
+     * Get the wired network element for a block in world.
     *
     * @param world The world the block exists in
     * @param pos   The position the block exists in
--- a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
+++ b/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-2019. 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;
--- a/src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IFileSystem.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.filesystem;

 import java.io.IOException;
--- a/src/main/java/dan200/computercraft/api/filesystem/IMount.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IMount.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.filesystem;

 import dan200.computercraft.api.ComputerCraftAPI;
@@ -19,7 +18,7 @@ import java.util.List;

 /**
 * Represents a read only part of a virtual filesystem that can be mounted onto a computer using
- * {@link IComputerAccess#mount(String, IMount)}
+ * {@link IComputerAccess#mount(String, IMount)}.
 *
 * Ready made implementations of this interface can be created using
 * {@link ComputerCraftAPI#createSaveDirMount(World, String, long)} or
@@ -60,7 +59,7 @@ public interface IMount
    void list( @Nonnull String path, @Nonnull List<String> contents ) throws IOException;

    /**
-     * Returns the size of a file with a given path, in bytes
+     * Returns the size of a file with a given path, in bytes.
     *
     * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram".
     * @return The size of the file, in bytes.
--- a/src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/IWritableMount.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.filesystem;

 import dan200.computercraft.api.ComputerCraftAPI;
--- a/src/main/java/dan200/computercraft/api/filesystem/package-info.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|FileSystem", apiVersion = "${version}" )
 package dan200.computercraft.api.filesystem;

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

 import dan200.computercraft.api.filesystem.IFileSystem;
@@ -26,7 +25,7 @@ public interface IComputerSystem extends IComputerAccess
    IFileSystem getFileSystem();

    /**
-     * Get the label for this computer
+     * Get the label for this computer.
     *
     * @return This computer's label, or {@code null} if it is not set.
     */
--- a/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaAPI.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import dan200.computercraft.api.ComputerCraftAPI;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaAPIFactory.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import dan200.computercraft.api.ComputerCraftAPI;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaContext.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaContext.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import javax.annotation.Nonnull;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaObject.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaObject.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import dan200.computercraft.api.peripheral.IComputerAccess;
--- a/src/main/java/dan200/computercraft/api/lua/ILuaTask.java
+++ b/src/main/java/dan200/computercraft/api/lua/ILuaTask.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import javax.annotation.Nullable;
--- a/src/main/java/dan200/computercraft/api/lua/LuaException.java
+++ b/src/main/java/dan200/computercraft/api/lua/LuaException.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.lua;

 import javax.annotation.Nullable;
--- a/src/main/java/dan200/computercraft/api/lua/package-info.java
+++ b/src/main/java/dan200/computercraft/api/lua/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Lua", apiVersion = "${version}" )
 package dan200.computercraft.api.lua;

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

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

 import net.minecraft.item.ItemStack;
--- a/src/main/java/dan200/computercraft/api/media/package-info.java
+++ b/src/main/java/dan200/computercraft/api/media/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Media", apiVersion = "${version}" )
 package dan200.computercraft.api.media;

--- a/src/main/java/dan200/computercraft/api/network/IPacketNetwork.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketNetwork.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketReceiver.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/IPacketSender.java
+++ b/src/main/java/dan200/computercraft/api/network/IPacketSender.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/Packet.java
+++ b/src/main/java/dan200/computercraft/api/network/Packet.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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.network;
--- a/src/main/java/dan200/computercraft/api/network/package-info.java
+++ b/src/main/java/dan200/computercraft/api/network/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network", apiVersion = "${version}" )
 package dan200.computercraft.api.network;

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

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

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

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

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

 import dan200.computercraft.api.network.IPacketSender;
--- a/src/main/java/dan200/computercraft/api/network/wired/package-info.java
+++ b/src/main/java/dan200/computercraft/api/network/wired/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Network|Wired", apiVersion = "${version}" )
 package dan200.computercraft.api.network.wired;

--- a/src/main/java/dan200/computercraft/api/package-info.java
+++ b/src/main/java/dan200/computercraft/api/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API", apiVersion = "${version}" )
 package dan200.computercraft.api;

--- a/src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IComputerAccess.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.peripheral;

 import dan200.computercraft.api.ComputerCraftAPI;
--- a/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IPeripheral.java
@@ -1,11 +1,11 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. 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.peripheral;

+import dan200.computercraft.api.lua.ArgumentHelper;
 import dan200.computercraft.api.lua.ILuaContext;
 import dan200.computercraft.api.lua.LuaException;

@@ -58,9 +58,11 @@ public interface IPeripheral
     *                  Lua values of type "table" will be represented by Object type Map.<br>
     *                  Lua values of any other type will be represented by a null object.<br>
     *                  This array will be empty if no arguments are passed.
+     *
+     *                  It is recommended you use {@link ArgumentHelper} in order to validate and process arguments.
     * @return An array of objects, representing values you wish to return to the lua program. Integers, Doubles, Floats,
-     * Strings, Booleans, Maps and ILuaObject and null be converted to their corresponding lua type. All other types
-     * will be converted to nil.
+     * Strings, Booleans, Maps, ILuaObject and null be converted to their corresponding lua type. All other types will
+     * be converted to nil.
     *
     * You may return null to indicate no values should be returned.
     * @throws LuaException         If you throw any exception from this function, a lua error will be raised with the
@@ -70,6 +72,7 @@ public interface IPeripheral
     *                              InterruptedException will be thrown. This exception must not be caught or
     *                              intercepted, or the computer will leak memory and end up in a broken state.
     * @see #getMethodNames
+     * @see ArgumentHelper
     */
    @Nullable
    Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException, InterruptedException;
--- a/src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.peripheral;

 import net.minecraft.tileentity.TileEntity;
--- a/src/main/java/dan200/computercraft/api/peripheral/IPeripheralTile.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IPeripheralTile.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
 package dan200.computercraft.api.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
 package dan200.computercraft.api.peripheral;
--- a/src/main/java/dan200/computercraft/api/peripheral/package-info.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Peripheral", apiVersion = "${version}" )
 package dan200.computercraft.api.peripheral;

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

 import net.minecraft.util.math.BlockPos;
--- a/src/main/java/dan200/computercraft/api/permissions/package-info.java
+++ b/src/main/java/dan200/computercraft/api/permissions/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Permissions", apiVersion = "${version}" )
 package dan200.computercraft.api.permissions;

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

 import dan200.computercraft.api.peripheral.IPeripheral;
@@ -16,7 +15,7 @@ import javax.annotation.Nullable;
 import java.util.Map;

 /**
- * Wrapper class for pocket computers
+ * Wrapper class for pocket computers.
 */
 public interface IPocketAccess
 {
--- a/src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/pocket/IPocketUpgrade.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-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.pocket;

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

 import net.minecraft.util.EnumFacing;
--- a/src/main/java/dan200/computercraft/api/redstone/package-info.java
+++ b/src/main/java/dan200/computercraft/api/redstone/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Redstone", apiVersion = "${version}" )
 package dan200.computercraft.api.redstone;

--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleAccess.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 import com.mojang.authlib.GameProfile;
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleCommand.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 import dan200.computercraft.api.lua.ILuaContext;
--- a/src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 import dan200.computercraft.api.ComputerCraftAPI;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleAnimation.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 /**
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleCommandResult.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 import net.minecraft.util.EnumFacing;
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleSide.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 /**
@@ -12,12 +11,12 @@ package dan200.computercraft.api.turtle;
 public enum TurtleSide
 {
    /**
-     * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle)
+     * The turtle's left side (where the pickaxe usually is on a Wireless Mining Turtle).
     */
    Left,

    /**
-     * The turtle's right side (where the modem usually is on a Wireless Mining Turtle)
+     * The turtle's right side (where the modem usually is on a Wireless Mining Turtle).
     */
    Right,
 }
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 /**
--- a/src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java
+++ b/src/main/java/dan200/computercraft/api/turtle/TurtleVerb.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle;

 import net.minecraft.util.EnumFacing;
@@ -18,12 +17,12 @@ import net.minecraft.util.EnumFacing;
 public enum TurtleVerb
 {
    /**
-     * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}
+     * The turtle called {@code turtle.dig()}, {@code turtle.digUp()} or {@code turtle.digDown()}.
     */
    Dig,

    /**
-     * The turtle called {@code turtle.attack()}, {@code turtle.attackUp()} or {@code turtle.attackDown()}
+     * The turtle called {@code turtle.attack()}, {@code turtle.attackUp()} or {@code turtle.attackDown()}.
     */
    Attack,
 }
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleAction.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleAction.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 /**
@@ -71,7 +70,7 @@ public enum TurtleAction
    EQUIP,

    /**
-     * Inspect a block in world
+     * Inspect a block in world.
     *
     * @see TurtleBlockEvent.Inspect
     */
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleActionEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleActionEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.turtle.ITurtleAccess;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleAttackEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleAttackEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.turtle.ITurtleAccess;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleBlockEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleBlockEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.lua.ILuaContext;
@@ -112,7 +111,7 @@ public abstract class TurtleBlockEvent extends TurtlePlayerEvent
        }

        /**
-         * Get the upgrade doing the digging
+         * Get the upgrade doing the digging.
         *
         * @return The upgrade doing the digging.
         */
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.turtle.ITurtleAccess;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
 package dan200.computercraft.api.turtle.event;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleInventoryEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleInventoryEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.turtle.ITurtleAccess;
@@ -31,7 +30,7 @@ public abstract class TurtleInventoryEvent extends TurtleBlockEvent
    }

    /**
-     * Get the inventory being interacted with
+     * Get the inventory being interacted with.
     *
     * @return The inventory being interacted with, {@code null} if the item will be dropped to/sucked from the world.
     */
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtlePlayerEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtlePlayerEvent.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
 package dan200.computercraft.api.turtle.event;

 import dan200.computercraft.api.turtle.ITurtleAccess;
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
@@ -1,6 +1,6 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
 package dan200.computercraft.api.turtle.event;
--- a/src/main/java/dan200/computercraft/api/turtle/event/package-info.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle|Event", apiVersion = "${version}" )
 package dan200.computercraft.api.turtle.event;

--- a/src/main/java/dan200/computercraft/api/turtle/package-info.java
+++ b/src/main/java/dan200/computercraft/api/turtle/package-info.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of the public ComputerCraft API - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. This API may be redistributed unmodified and in full only.
+ * Copyright Daniel Ratcliffe, 2011-2020. This API may be redistributed unmodified and in full only.
 * For help using the API, and posting your mods, visit the forums at computercraft.info.
 */
-
@API( owner = "ComputerCraft", provides = "ComputerCraft|API|Turtle", apiVersion = "${version}" )
 package dan200.computercraft.api.turtle;

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

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

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

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

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

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

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

 import dan200.computercraft.shared.peripheral.diskdrive.ContainerDiskDrive;
--- a/src/main/java/dan200/computercraft/client/gui/GuiPocketComputer.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPocketComputer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.gui;

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

 import dan200.computercraft.shared.peripheral.printer.ContainerPrinter;
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.gui;

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

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

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

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

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

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

 import net.minecraft.client.Minecraft;
@@ -18,7 +17,7 @@ import net.minecraft.util.math.MathHelper;
 public abstract class ItemMapLikeRenderer
 {
    /**
-     * The main rendering method for the item
+     * The main rendering method for the item.
     *
     * @param stack The stack to render
     * @see ItemRenderer#renderMapFirstPerson(ItemStack)
@@ -87,7 +86,7 @@ public abstract class ItemMapLikeRenderer
    }

    /**
-     * Render an item in the middle of the screen
+     * Render an item in the middle of the screen.
     *
     * @param pitch         The pitch of the player
     * @param equipProgress The equip progress of this item
--- a/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPocketRenderer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

 import dan200.computercraft.ComputerCraft;
@@ -32,7 +31,7 @@ import static dan200.computercraft.client.gui.FixedWidthFontRenderer.*;
 import static dan200.computercraft.client.gui.GuiComputer.*;

 /**
- * Emulates map rendering for pocket computers
+ * Emulates map rendering for pocket computers.
 */
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ItemPocketRenderer extends ItemMapLikeRenderer
--- a/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/ItemPrintoutRenderer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

 import dan200.computercraft.ComputerCraft;
@@ -23,7 +22,7 @@ import static dan200.computercraft.shared.media.items.ItemPrintout.LINES_PER_PAG
 import static dan200.computercraft.shared.media.items.ItemPrintout.LINE_MAX_LENGTH;

 /**
- * Emulates map and item-frame rendering for printouts
+ * Emulates map and item-frame rendering for printouts.
 */
@Mod.EventBusSubscriber( modid = ComputerCraft.MOD_ID, value = Side.CLIENT )
 public final class ItemPrintoutRenderer extends ItemMapLikeRenderer
--- a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java
+++ b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

 import net.minecraft.client.renderer.block.model.BakedQuad;
--- a/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/MonitorHighlightRenderer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

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

 import dan200.computercraft.client.gui.FixedWidthFontRenderer;
@@ -28,32 +27,32 @@ public final class PrintoutRenderer
    private static final double BG_SIZE = 256.0;

    /**
-     * Width of a page
+     * Width of a page.
     */
    public static final int X_SIZE = 172;

    /**
-     * Height of a page
+     * Height of a page.
     */
    public static final int Y_SIZE = 209;

    /**
-     * Padding between the left and right of a page and the text
+     * Padding between the left and right of a page and the text.
     */
    public static final int X_TEXT_MARGIN = 13;

    /**
-     * Padding between the top and bottom of a page and the text
+     * Padding between the top and bottom of a page and the text.
     */
    public static final int Y_TEXT_MARGIN = 11;

    /**
-     * Width of the extra page texture
+     * Width of the extra page texture.
     */
    private static final int X_FOLD_SIZE = 12;

    /**
-     * Size of the leather cover
+     * Size of the leather cover.
     */
    public static final int COVER_SIZE = 12;

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

 import dan200.computercraft.ComputerCraft;
@@ -97,6 +96,8 @@ public class TileEntityCableRenderer extends TileEntitySpecialRenderer<TileCable
    }

    /**
+     * Set up the state for rendering block-breaking progress.
+     *
     * @see RenderGlobal#preRenderDamagedBlocks()
     */
    private void preRenderDamagedBlocks()
@@ -115,6 +116,8 @@ public class TileEntityCableRenderer extends TileEntitySpecialRenderer<TileCable
    }

    /**
+     * Tear down the state for rendering block-breaking progress.
+     *
     * @see RenderGlobal#postRenderDamagedBlocks()
     */
    private void postRenderDamagedBlocks()
--- a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
+++ b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

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

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

 import com.google.common.collect.ImmutableMap;
--- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

 import net.minecraft.block.state.IBlockState;
--- a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
@@ -1,9 +1,8 @@
 /*
 * This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2020. Do not distribute without permission.
 * Send enquiries to dratcliffe@gmail.com
 */
-
 package dan200.computercraft.client.render;

 import com.google.common.base.Objects;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
SquidDev	018ecfbaa0	▲ version	2020-01-13 13:43:38 +00:00
SquidDev	4c8fd4fc35	Allow returning collections and arrays from Java Closes #344	2020-01-13 13:20:15 +00:00
Oliver Marks	35c1b10224	Anonymized GPS (#341 ) GPS requests are now sent and received on CHANNEL_GPS by default instead. This means it should not be possible to distinguish computers (and thus locate them) via their GPS requests.	2020-01-08 17:07:01 +00:00
SquidDev	c1c01bef7c	Fix argument index in expect call	2020-01-01 09:55:44 +00:00
SquidDev	a48c3d0ba8	A couple of io fixes - Use expect within io.write before calling the handle's write function. Closes #338 - Coerce to string in write before doing any writing. Fixes #339	2020-01-01 09:01:00 +00:00
SquidDev	93a9ebc4f6	Happy new year	2020-01-01 00:09:18 +00:00
JakobDev	7cc2bd43c6	Make builded Jar downloadable (#332 )	2020-01-01 00:08:31 +00:00
Oliver Marks	393e628721	More MOTDs (#333 )	2019-12-30 16:26:57 +00:00
Jonathan Coates	0bcd28e58c	Fix incorrect module names	2019-12-29 19:47:52 +00:00
SquidDev	42f5389fb8	Make Lua's "exit" function a little prettier "exit" now has a custom __tostring method, which prints an explanation message. This is very similar to how Python achives the same functionality: lua> exit Call exit() to exit lua> exit() > Actually leaves the REPL	2019-12-29 18:51:39 +00:00
Jacob	041cfe91b4	wilcards > wildcards (#331 )	2019-12-29 06:12:55 +00:00
SquidDev	0dde859582	Bump version	2019-12-23 22:10:32 +00:00
SquidDev	e59c043fb6	Fix a couple of comments to use the new config names	2019-12-23 21:34:03 +00:00
SquidDev	ae928c4397	Make http domain configuration a little clearer	2019-12-23 18:59:36 +00:00
SquidDev	da41c65128	Update proguard configuration - Remove redundant preservation of cobalt lib constructors. We use lambdas now, so this is no longer needed. - Fix Java crypto lib not being included.	2019-12-23 18:54:19 +00:00
SquidDev	4d18234714	Use a fake network handler too It appears that WB opens containers manually, and thus all of our stubs network stubs are entirely ignored. Thus the only solution here is to stub out the whole network handler code. Thankfully this is simple enough - we do the same for Plethora and 1.14. Fixes #328	2019-12-23 17:17:32 +00:00
JakobDev	d254c6464b	Add more MOTD messages again (#241 )	2019-12-23 14:43:48 +00:00
Jonathan Coates	3a5d50e572	Basic Minetweaker support (#327 ) This provides the following methods: - dan200.computercraft.turtle.removeUpgrade(id: String) - dan200.computercraft.turtle.removeUpgrade(stack: IItemStack) - dan200.computercraft.turtle.addTool(id: String, craftItem: IItemStack[, toolItem: IItemStack][, kind: string]) While it's pretty minimal, it should allow for a reasonable amount of functionality. Closes #327 and #97.	2019-12-18 15:29:24 +00:00
Jonathan Coates	03b6d2f1ab	Replace string.len with #	2019-12-10 18:55:11 +00:00
Jared Allard	b0397ed3c5	Add support for HTTP PATCH and TRACE (#324 )	2019-12-08 17:10:58 +00:00
Jonathan Coates	fa70ebcac2	Fix spacing on all of the rom (#323 )	2019-12-07 10:33:47 +00:00
SquidDev	86e0330100	Lint bios and the rom (#321 ) We now use illuaminate[1]'s linting facilities to check the rom and bios.lua for a couple of common bugs and other problems. Right now this doesn't detect any especially important bugs, though it has caught lots of small things (unused variables, some noisy code). In the future, the linter will grow in scope and features, which should allow us to be stricter and catch most issues. As a fun aside, we started off with ~150 bugs, and illuaminate was able to fix all but 30 of them, which is pretty neat. [1]: https://github.com/SquidDev/illuaminate	2019-12-03 23:26:13 +00:00
SquidDev	0ae70fed13	Correctly implement mouse movement within read Note to self: if you're going to modify the rom, make sure you test on a computer which doesn't overwrite the rom with something else.	2019-11-29 20:15:58 +00:00
SquidDev	121802a683	Bump version	2019-11-25 08:58:36 +00:00
SquidDev	08cf55e55f	Correct implementation of clamp That's what I get for inlining definitions.	2019-11-23 14:36:43 +00:00
SquidDev	3c8c0d78ef	Use correct render type for turtles This fixes them not rendering particles when broken. Particle rendering is a little janky right now, as it uses the whole texture - we should probably split up the texture into smaller images. Fixes #315	2019-11-23 13:24:36 +00:00
SquidDev	c4d18aa9ca	Allow navigating `read`'s input using the mouse	2019-11-23 13:21:07 +00:00
SquidDev	a8fadabaf1	Correct spelling in error message	2019-11-23 09:59:37 +00:00
SquidDev	38f9a015ca	Wrap all remaining uses of Grgit This allows you to build from a zip folder of CC:T. Fixes #307. Also fix the build, woops.	2019-10-30 17:07:29 +00:00
SquidDev	c311cdc6f5	Make our Javadoc validation a little stricter I'm not sure there's much utility in this, but still feels worth doing.	2019-10-27 15:16:47 +00:00
SquidDev	a93e0f3284	Expose ArgumentHelper in the public API This is sufficiently useful a class, that it's worthwhile exposing it. Hopefully we can slowly encourage other mods to migrate to it (well, at least in 1.14), and so make error messages more consistent. Also: - Add Javadoc for all public methods - Clarify the method names a little (getNumber -> getDouble, getReal -> getFiniteDouble). - Make the *Table methods return a Map<?,?> instead of Map<Object, Object>.	2019-10-27 14:29:07 +00:00
SquidDev	14b3065ba4	Check for trailing whitespace I'd rather assumed one of the existing checkers did this already, but apparently not.	2019-10-16 09:22:38 +01:00