diff --git a/build.gradle b/build.gradle
index b4bf1056f..793175ac9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,9 @@
}
plugins {
- id 'com.matthewprenger.cursegradle' version '1.2.0'
+ id "checkstyle"
+ id "com.github.hierynomus.license" version "0.15.0"
+ id "com.matthewprenger.cursegradle" version "1.3.0"
id "com.github.breadmoirai.github-release" version "2.2.4"
}
@@ -66,6 +68,8 @@
}
dependencies {
+ checkstyle "com.puppycrawl.tools:checkstyle:8.21"
+
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"
@@ -104,6 +108,8 @@
import com.google.gson.GsonBuilder
import com.google.gson.JsonElement
+import com.hierynomus.gradle.license.tasks.LicenseCheck
+import com.hierynomus.gradle.license.tasks.LicenseFormat
import org.ajoberstar.grgit.Grgit
import proguard.gradle.ProGuardTask
@@ -227,6 +233,42 @@ task compressJson(dependsOn: extractAnnotationsJar) {
assemble.dependsOn compressJson
+/* Check tasks */
+
+license {
+ mapping("java", "SLASHSTAR_STYLE")
+ strictCheck true
+
+ ext.year = Calendar.getInstance().get(Calendar.YEAR)
+}
+
+[licenseMain, licenseFormatMain].forEach {
+ it.configure {
+ include("**/*.java")
+ exclude("dan200/computercraft/api/**")
+ header rootProject.file('config/license/main.txt')
+ }
+}
+
+[licenseTest, licenseFormatTest].forEach {
+ it.configure {
+ include("**/*.java")
+ header rootProject.file('config/license/main.txt')
+ }
+}
+
+task licenseAPI(type: LicenseCheck);
+task licenseFormatAPI(type: LicenseFormat);
+[licenseAPI, licenseFormatAPI].forEach {
+ it.configure {
+ source = sourceSets.main.java
+ include("dan200/computercraft/api/**")
+ header rootProject.file('config/license/api.txt')
+ }
+}
+
+/* Upload tasks */
+
task checkRelease {
group "upload"
description "Verifies that everything is ready for a release"
@@ -266,7 +308,6 @@ task compressJson(dependsOn: extractAnnotationsJar) {
}
}
-
curseforge {
apiKey = project.hasProperty('curseForgeApiKey') ? project.curseForgeApiKey : ''
project {
@@ -369,6 +410,10 @@ task uploadAll(dependsOn: uploadTasks) {
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint" << "-Xlint:-processing" << "-Werror"
}
+
+ tasks.withType(LicenseFormat) {
+ outputs.upToDateWhen { false }
+ }
}
runClient.outputs.upToDateWhen { false }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
new file mode 100644
index 000000000..3dcaa94a2
--- /dev/null
+++ b/config/checkstyle/checkstyle.xml
@@ -0,0 +1,159 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
new file mode 100644
index 000000000..a6dd2983d
--- /dev/null
+++ b/config/checkstyle/suppressions.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/codeInspectionSettings.xml b/config/idea/codeInspectionSettings.xml
similarity index 100%
rename from codeInspectionSettings.xml
rename to config/idea/codeInspectionSettings.xml
diff --git a/codeStyleSettings.xml b/config/idea/codeStyleSettings.xml
similarity index 100%
rename from codeStyleSettings.xml
rename to config/idea/codeStyleSettings.xml
diff --git a/config/license/api.txt b/config/license/api.txt
new file mode 100644
index 000000000..5c1d391fe
--- /dev/null
+++ b/config/license/api.txt
@@ -0,0 +1,3 @@
+This file is part of the public ComputerCraft API - http://www.computercraft.info
+Copyright Daniel Ratcliffe, 2011-${year}. This API may be redistributed unmodified and in full only.
+For help using the API, and posting your mods, visit the forums at computercraft.info.
diff --git a/config/license/main.txt b/config/license/main.txt
new file mode 100644
index 000000000..bab494b2e
--- /dev/null
+++ b/config/license/main.txt
@@ -0,0 +1,3 @@
+This file is part of ComputerCraft - http://www.computercraft.info
+Copyright Daniel Ratcliffe, 2011-${year}. Do not distribute without permission.
+Send enquiries to dratcliffe@gmail.com
diff --git a/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java b/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java
index ab9f86b50..3cbbfb339 100644
--- a/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/AbstractTurtleUpgrade.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
*/
-
package dan200.computercraft.api;
import dan200.computercraft.api.turtle.ITurtleUpgrade;
diff --git a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
index 6f9713808..76d9ad311 100644
--- a/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
+++ b/src/main/java/dan200/computercraft/api/ComputerCraftAPI.java
@@ -438,45 +438,45 @@ private static void findCC()
computerCraft_getVersion = findCCMethod( "getVersion", new Class>[] {
} );
computerCraft_createUniqueNumberedSaveDir = findCCMethod( "createUniqueNumberedSaveDir", new Class>[] {
- World.class, String.class
+ World.class, String.class,
} );
computerCraft_createSaveDirMount = findCCMethod( "createSaveDirMount", new Class>[] {
- World.class, String.class, Long.TYPE
+ World.class, String.class, Long.TYPE,
} );
computerCraft_createResourceMount = findCCMethod( "createResourceMount", new Class>[] {
- Class.class, String.class, String.class
+ Class.class, String.class, String.class,
} );
computerCraft_registerPeripheralProvider = findCCMethod( "registerPeripheralProvider", new Class>[] {
- IPeripheralProvider.class
+ IPeripheralProvider.class,
} );
computerCraft_registerTurtleUpgrade = findCCMethod( "registerTurtleUpgrade", new Class>[] {
- ITurtleUpgrade.class
+ ITurtleUpgrade.class,
} );
computerCraft_registerBundledRedstoneProvider = findCCMethod( "registerBundledRedstoneProvider", new Class>[] {
- IBundledRedstoneProvider.class
+ IBundledRedstoneProvider.class,
} );
computerCraft_getDefaultBundledRedstoneOutput = findCCMethod( "getDefaultBundledRedstoneOutput", new Class>[] {
- World.class, BlockPos.class, EnumFacing.class
+ World.class, BlockPos.class, EnumFacing.class,
} );
computerCraft_registerMediaProvider = findCCMethod( "registerMediaProvider", new Class>[] {
- IMediaProvider.class
+ IMediaProvider.class,
} );
computerCraft_registerPermissionProvider = findCCMethod( "registerPermissionProvider", new Class>[] {
- ITurtlePermissionProvider.class
+ ITurtlePermissionProvider.class,
} );
computerCraft_registerPocketUpgrade = findCCMethod( "registerPocketUpgrade", new Class>[] {
- IPocketUpgrade.class
+ IPocketUpgrade.class,
} );
computerCraft_getWirelessNetwork = findCCMethod( "getWirelessNetwork", new Class>[] {
} );
computerCraft_registerAPIFactory = findCCMethod( "registerAPIFactory", new Class>[] {
- ILuaAPIFactory.class
+ ILuaAPIFactory.class,
} );
computerCraft_createWiredNodeForElement = findCCMethod( "createWiredNodeForElement", new Class>[] {
- IWiredElement.class
+ IWiredElement.class,
} );
computerCraft_getWiredElementAt = findCCMethod( "getWiredElementAt", new Class>[] {
- IBlockAccess.class, BlockPos.class, EnumFacing.class
+ IBlockAccess.class, BlockPos.class, EnumFacing.class,
} );
}
catch( Exception e )
diff --git a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java b/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
index 79c873051..eef6cf4f3 100644
--- a/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.java
+++ b/src/main/java/dan200/computercraft/api/filesystem/FileOperationException.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
*/
-
package dan200.computercraft.api.filesystem;
import javax.annotation.Nonnull;
@@ -20,7 +19,7 @@ public class FileOperationException extends IOException
{
private static final long serialVersionUID = -8809108200853029849L;
- private String filename;
+ private final String filename;
public FileOperationException( @Nullable String filename, @Nonnull String message )
{
@@ -31,6 +30,7 @@ public FileOperationException( @Nullable String filename, @Nonnull String messag
public FileOperationException( String message )
{
super( Objects.requireNonNull( message, "message cannot be null" ) );
+ this.filename = null;
}
@Nullable
diff --git a/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java b/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
index 0c0783026..68da2d1d9 100644
--- a/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.java
+++ b/src/main/java/dan200/computercraft/api/peripheral/IWorkMonitor.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
*/
-
package dan200.computercraft.api.peripheral;
import javax.annotation.Nonnull;
diff --git a/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java b/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java
index 5f345a894..7965a7c3e 100644
--- a/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.java
+++ b/src/main/java/dan200/computercraft/api/pocket/AbstractPocketUpgrade.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * For help using the API, and posting your mods, visit the forums at computercraft.info.
*/
-
package dan200.computercraft.api.pocket;
import net.minecraft.item.ItemStack;
diff --git a/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java b/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java
index 1bd2164d2..26abb36bb 100644
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleInspectItemEvent.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * 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;
diff --git a/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java b/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
index 33dbc3d2f..773de6ff0 100644
--- a/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.java
+++ b/src/main/java/dan200/computercraft/api/turtle/event/TurtleRefuelEvent.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.
- * Send enquiries to dratcliffe@gmail.com
+ * 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.
+ * 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;
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
index 80f283889..79798ec89 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -120,7 +120,7 @@ protected void drawSelectionSlot( boolean advanced )
int slotX = slot % 4;
int slotY = slot / 4;
mc.getTextureManager().bindTexture( advanced ? BACKGROUND_ADVANCED : BACKGROUND_NORMAL );
- drawTexturedModalRect( guiLeft + m_container.m_turtleInvStartX - 2 + slotX * 18, guiTop + m_container.m_playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
+ drawTexturedModalRect( guiLeft + m_container.turtleInvStartX - 2 + slotX * 18, guiTop + m_container.playerInvStartY - 2 + slotY * 18, 0, 217, 24, 24 );
}
}
diff --git a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java
index 7f67c3178..01cfd8e22 100644
--- a/src/main/java/dan200/computercraft/client/render/ModelTransformer.java
+++ b/src/main/java/dan200/computercraft/client/render/ModelTransformer.java
@@ -94,7 +94,7 @@ private static class NormalAwareTransformer extends VertexTransformer
private final Point3f[] before = new Point3f[4];
private final Point3f[] after = new Point3f[4];
- public NormalAwareTransformer( IVertexConsumer parent, Matrix4f positionMatrix, Matrix4f normalMatrix )
+ NormalAwareTransformer( IVertexConsumer parent, Matrix4f positionMatrix, Matrix4f normalMatrix )
{
super( parent );
this.positionMatrix = positionMatrix;
diff --git a/src/main/java/dan200/computercraft/core/apis/FSAPI.java b/src/main/java/dan200/computercraft/core/apis/FSAPI.java
index 2f1f92299..71178d1fe 100644
--- a/src/main/java/dan200/computercraft/core/apis/FSAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/FSAPI.java
@@ -43,9 +43,7 @@ public FSAPI( IAPIEnvironment env )
@Override
public String[] getNames()
{
- return new String[] {
- "fs"
- };
+ return new String[] { "fs" };
}
@Override
diff --git a/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java b/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
index d1d808f6e..d7b36491c 100644
--- a/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
@@ -42,9 +42,7 @@ public HTTPAPI( IAPIEnvironment environment )
@Override
public String[] getNames()
{
- return new String[] {
- "http"
- };
+ return new String[] { "http" };
}
@Override
diff --git a/src/main/java/dan200/computercraft/core/apis/ILuaAPI.java b/src/main/java/dan200/computercraft/core/apis/ILuaAPI.java
index 63d49879c..a4a34fa11 100644
--- a/src/main/java/dan200/computercraft/core/apis/ILuaAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/ILuaAPI.java
@@ -10,6 +10,7 @@
* This exists purely to ensure binary compatibility.
*
* @see dan200.computercraft.api.lua.ILuaAPI
+ * @deprecated Use the version in the public API. Only exists for compatibility with CCEmuX.
*/
@Deprecated
public interface ILuaAPI extends dan200.computercraft.api.lua.ILuaAPI
diff --git a/src/main/java/dan200/computercraft/core/apis/OSAPI.java b/src/main/java/dan200/computercraft/core/apis/OSAPI.java
index d83559207..40f22d176 100644
--- a/src/main/java/dan200/computercraft/core/apis/OSAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/OSAPI.java
@@ -36,9 +36,9 @@ public class OSAPI implements ILuaAPI
private static class Timer
{
- public int m_ticksLeft;
+ int m_ticksLeft;
- public Timer( int ticksLeft )
+ Timer( int ticksLeft )
{
m_ticksLeft = ticksLeft;
}
@@ -46,10 +46,10 @@ public Timer( int ticksLeft )
private static class Alarm implements Comparable
{
- public final double m_time;
- public final int m_day;
+ final double m_time;
+ final int m_day;
- public Alarm( double time, int day )
+ Alarm( double time, int day )
{
m_time = time;
m_day = day;
@@ -78,9 +78,7 @@ public OSAPI( IAPIEnvironment environment )
@Override
public String[] getNames()
{
- return new String[] {
- "os"
- };
+ return new String[] { "os" };
}
@Override
@@ -385,9 +383,7 @@ public Object[] callMethod( @Nonnull ILuaContext context, int method, @Nonnull O
// Get in-game epoch
synchronized( m_alarms )
{
- return new Object[] {
- m_day * 86400000 + (int) (m_time * 3600000.0f)
- };
+ return new Object[] { m_day * 86400000 + (int) (m_time * 3600000.0f) };
}
default:
throw new LuaException( "Unsupported operation" );
diff --git a/src/main/java/dan200/computercraft/core/apis/PeripheralAPI.java b/src/main/java/dan200/computercraft/core/apis/PeripheralAPI.java
index 09025978c..cd27ca756 100644
--- a/src/main/java/dan200/computercraft/core/apis/PeripheralAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/PeripheralAPI.java
@@ -36,7 +36,7 @@ private class PeripheralWrapper extends ComputerAccess
private Map m_methodMap;
private boolean m_attached;
- public PeripheralWrapper( IPeripheral peripheral, String side )
+ PeripheralWrapper( IPeripheral peripheral, String side )
{
super( m_environment );
m_side = side;
@@ -282,9 +282,7 @@ public void onPeripheralChanged( ComputerSide side, IPeripheral newPeripheral )
@Override
public String[] getNames()
{
- return new String[] {
- "peripheral"
- };
+ return new String[] { "peripheral" };
}
@Override
@@ -326,7 +324,7 @@ public String[] getMethodNames()
"isPresent",
"getType",
"getMethods",
- "call"
+ "call",
};
}
diff --git a/src/main/java/dan200/computercraft/core/apis/RedstoneAPI.java b/src/main/java/dan200/computercraft/core/apis/RedstoneAPI.java
index d36ba9186..1a0217c2f 100644
--- a/src/main/java/dan200/computercraft/core/apis/RedstoneAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/RedstoneAPI.java
@@ -29,9 +29,7 @@ public RedstoneAPI( IAPIEnvironment environment )
@Override
public String[] getNames()
{
- return new String[] {
- "rs", "redstone"
- };
+ return new String[] { "rs", "redstone" };
}
@Nonnull
diff --git a/src/main/java/dan200/computercraft/core/apis/TermAPI.java b/src/main/java/dan200/computercraft/core/apis/TermAPI.java
index 70460d3ed..382ae4069 100644
--- a/src/main/java/dan200/computercraft/core/apis/TermAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/TermAPI.java
@@ -33,9 +33,7 @@ public TermAPI( IAPIEnvironment environment )
@Override
public String[] getNames()
{
- return new String[] {
- "term"
- };
+ return new String[] { "term" };
}
@Nonnull
@@ -89,9 +87,7 @@ public static int parseColour( Object[] args ) throws LuaException
public static Object[] encodeColour( int colour ) throws LuaException
{
- return new Object[] {
- 1 << colour
- };
+ return new Object[] { 1 << colour };
}
public static void setColour( Terminal terminal, int colour, double r, double g, double b )
diff --git a/src/main/java/dan200/computercraft/core/apis/http/Resource.java b/src/main/java/dan200/computercraft/core/apis/http/Resource.java
index 60a6c0590..f7bec3f28 100644
--- a/src/main/java/dan200/computercraft/core/apis/http/Resource.java
+++ b/src/main/java/dan200/computercraft/core/apis/http/Resource.java
@@ -72,7 +72,8 @@ protected final boolean tryClose()
*/
protected void dispose()
{
- @SuppressWarnings( "unchecked" ) T thisT = (T) this;
+ @SuppressWarnings( "unchecked" )
+ T thisT = (T) this;
limiter.release( thisT );
}
@@ -95,7 +96,8 @@ public final void close()
public boolean queue( Consumer task )
{
- @SuppressWarnings( "unchecked" ) T thisT = (T) this;
+ @SuppressWarnings( "unchecked" )
+ T thisT = (T) this;
return limiter.queue( thisT, () -> task.accept( thisT ) );
}
diff --git a/src/main/java/dan200/computercraft/core/computer/ComputerSide.java b/src/main/java/dan200/computercraft/core/computer/ComputerSide.java
index d2937fd3b..1cbbfa294 100644
--- a/src/main/java/dan200/computercraft/core/computer/ComputerSide.java
+++ b/src/main/java/dan200/computercraft/core/computer/ComputerSide.java
@@ -30,7 +30,10 @@ public enum ComputerSide
private final String name;
- ComputerSide( String name ) {this.name = name;}
+ ComputerSide( String name )
+ {
+ this.name = name;
+ }
@Nonnull
public static ComputerSide valueOf( int side )
diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java
index 98185cc96..c02d6def3 100644
--- a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java
+++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java
@@ -46,7 +46,7 @@ private static class MountWrapper
m_writableMount = null;
}
- public MountWrapper( String label, String location, IWritableMount mount )
+ MountWrapper( String label, String location, IWritableMount mount )
{
this( label, location, (IMount) mount );
m_writableMount = mount;
@@ -779,7 +779,7 @@ private static String sanitizePath( String path, boolean allowWildcards )
// Clean the path or illegal characters.
final char[] specialChars = new char[] {
- '"', ':', '<', '>', '?', '|' // Sorted by ascii value (important)
+ '"', ':', '<', '>', '?', '|', // Sorted by ascii value (important)
};
StringBuilder cleanName = new StringBuilder();
diff --git a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
index 55a986e16..64a34df5c 100644
--- a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
+++ b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java
@@ -550,7 +550,7 @@ public long issueMainThreadTask( @Nonnull final ILuaTask task ) throws LuaExcept
{
if( ComputerCraft.logPeripheralErrors ) ComputerCraft.log.error( "Error running task", t );
m_computer.queueEvent( "task_complete", new Object[] {
- taskID, false, "Java Exception Thrown: " + t
+ taskID, false, "Java Exception Thrown: " + t,
} );
}
};
diff --git a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
index b7e0aa5ab..fa24e9d51 100644
--- a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
+++ b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java
@@ -8,7 +8,7 @@
public class TextBuffer
{
- public char[] m_text;
+ private final char[] m_text;
public TextBuffer( char c, int length )
{
diff --git a/src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java b/src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java
index 5ebf305c9..08e4c4afa 100644
--- a/src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java
+++ b/src/main/java/dan200/computercraft/shared/computer/apis/CommandAPI.java
@@ -47,9 +47,7 @@ public CommandAPI( TileCommandComputer computer )
@Override
public String[] getNames()
{
- return new String[] {
- "commands"
- };
+ return new String[] { "commands" };
}
@Nonnull
@@ -62,7 +60,7 @@ public String[] getMethodNames()
"list",
"getBlockPosition",
"getBlockInfos",
- "getBlockInfo"
+ "getBlockInfo",
};
}
diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java b/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java
index ca9e8c567..9c795878c 100644
--- a/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java
+++ b/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java
@@ -11,9 +11,9 @@
import java.util.Map;
import java.util.Random;
-public class ComputerRegistry
+public class ComputerRegistry
{
- private Map m_computers;
+ private Map m_computers;
private int m_nextUnusedInstanceID;
private int m_sessionID;
@@ -33,12 +33,12 @@ public int getUnusedInstanceID()
return m_nextUnusedInstanceID++;
}
- public Collection getComputers()
+ public Collection getComputers()
{
return m_computers.values();
}
- public TComputer get( int instanceID )
+ public T get( int instanceID )
{
if( instanceID >= 0 )
{
@@ -55,7 +55,7 @@ public boolean contains( int instanceID )
return m_computers.containsKey( instanceID );
}
- public void add( int instanceID, TComputer computer )
+ public void add( int instanceID, T computer )
{
if( m_computers.containsKey( instanceID ) )
{
diff --git a/src/main/java/dan200/computercraft/shared/integration/charset/BundledCapabilityProvider.java b/src/main/java/dan200/computercraft/shared/integration/charset/BundledCapabilityProvider.java
index e5ceb8374..fe478f7c2 100644
--- a/src/main/java/dan200/computercraft/shared/integration/charset/BundledCapabilityProvider.java
+++ b/src/main/java/dan200/computercraft/shared/integration/charset/BundledCapabilityProvider.java
@@ -1,9 +1,8 @@
/*
* This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
* Send enquiries to dratcliffe@gmail.com
*/
-
package dan200.computercraft.shared.integration.charset;
import dan200.computercraft.shared.common.TileGeneric;
diff --git a/src/main/java/dan200/computercraft/shared/integration/charset/BundledRedstoneProvider.java b/src/main/java/dan200/computercraft/shared/integration/charset/BundledRedstoneProvider.java
index 137835784..e7ac4768a 100644
--- a/src/main/java/dan200/computercraft/shared/integration/charset/BundledRedstoneProvider.java
+++ b/src/main/java/dan200/computercraft/shared/integration/charset/BundledRedstoneProvider.java
@@ -1,9 +1,8 @@
/*
* This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
* Send enquiries to dratcliffe@gmail.com
*/
-
package dan200.computercraft.shared.integration.charset;
import dan200.computercraft.api.redstone.IBundledRedstoneProvider;
diff --git a/src/main/java/dan200/computercraft/shared/integration/charset/IntegrationCharset.java b/src/main/java/dan200/computercraft/shared/integration/charset/IntegrationCharset.java
index fec2e8959..32055fc92 100644
--- a/src/main/java/dan200/computercraft/shared/integration/charset/IntegrationCharset.java
+++ b/src/main/java/dan200/computercraft/shared/integration/charset/IntegrationCharset.java
@@ -1,9 +1,8 @@
/*
* This file is part of ComputerCraft - http://www.computercraft.info
- * Copyright Daniel Ratcliffe, 2011-2018. Do not distribute without permission.
+ * Copyright Daniel Ratcliffe, 2011-2019. Do not distribute without permission.
* Send enquiries to dratcliffe@gmail.com
*/
-
package dan200.computercraft.shared.integration.charset;
import dan200.computercraft.ComputerCraft;
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/PeripheralType.java b/src/main/java/dan200/computercraft/shared/peripheral/PeripheralType.java
index 3bb4dfa2b..5fc318e28 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/PeripheralType.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/PeripheralType.java
@@ -39,5 +39,8 @@ public String getName()
}
@Override
- public String toString() { return name; }
+ public String toString()
+ {
+ return name;
+ }
}
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
index 58fedd28b..f81a862b8 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/commandblock/CommandBlockPeripheral.java
@@ -52,7 +52,7 @@ public Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaCont
{
case 0: // getCommand
return context.executeMainThreadTask( () -> new Object[] {
- m_commandBlock.getCommandBlockLogic().getCommand()
+ m_commandBlock.getCommandBlockLogic().getCommand(),
} );
case 1:
{
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java
index f15dcaf44..048127ab0 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/DiskDrivePeripheral.java
@@ -51,7 +51,7 @@ public String[] getMethodNames()
"playAudio",
"stopAudio",
"ejectDisk",
- "getDiskID"
+ "getDiskID",
};
}
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
index 1f920432c..9009b4ec7 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java
@@ -87,7 +87,7 @@ public void receiveSameDimension( @Nonnull Packet packet, double distance )
for( IComputerAccess computer : m_computers )
{
computer.queueEvent( "modem_message", new Object[] {
- computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload(), distance
+ computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload(), distance,
} );
}
}
@@ -103,7 +103,7 @@ public void receiveDifferentDimension( @Nonnull Packet packet )
for( IComputerAccess computer : m_computers )
{
computer.queueEvent( "modem_message", new Object[] {
- computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload()
+ computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload(),
} );
}
}
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java
index 2c76c05d5..2cb992793 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/WiredModemPeripheral.java
@@ -277,7 +277,7 @@ private static class RemotePeripheralWrapper implements IComputerAccess
private final String[] m_methods;
private final Map m_methodMap;
- public RemotePeripheralWrapper( WiredModemElement element, IPeripheral peripheral, IComputerAccess computer, String name )
+ RemotePeripheralWrapper( WiredModemElement element, IPeripheral peripheral, IComputerAccess computer, String name )
{
m_element = element;
m_peripheral = peripheral;
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
index 7e02de778..66307dd98 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java
@@ -142,7 +142,7 @@ public void updateTick()
for( IComputerAccess computer : monitor.m_computers )
{
computer.queueEvent( "monitor_resize", new Object[] {
- computer.getAttachmentName()
+ computer.getAttachmentName(),
} );
}
}
@@ -660,7 +660,7 @@ public void monitorTouched( float xPos, float yPos, float zPos )
for( IComputerAccess computer : monitor.m_computers )
{
computer.queueEvent( "monitor_touch", new Object[] {
- computer.getAttachmentName(), xCharPos, yCharPos
+ computer.getAttachmentName(), xCharPos, yCharPos,
} );
}
}
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
index bda1fe4e0..f92074f7e 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java
@@ -71,8 +71,8 @@ public String getType()
public String[] getMethodNames()
{
return new String[] {
- "playSound", // Plays sound at resourceLocator
- "playNote" // Plays note
+ "playSound",
+ "playNote",
};
}
diff --git a/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java b/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java
index 906890b49..f5ef6f79e 100644
--- a/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java
+++ b/src/main/java/dan200/computercraft/shared/pocket/apis/PocketAPI.java
@@ -35,9 +35,7 @@ public PocketAPI( PocketServerComputer computer )
@Override
public String[] getNames()
{
- return new String[] {
- "pocket"
- };
+ return new String[] { "pocket" };
}
@Nonnull
@@ -46,7 +44,7 @@ public String[] getMethodNames()
{
return new String[] {
"equipBack",
- "unequipBack"
+ "unequipBack",
};
}
diff --git a/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java b/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
index 2d5863e76..475400aaa 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/apis/TurtleAPI.java
@@ -45,9 +45,7 @@ public TurtleAPI( IAPIEnvironment environment, ITurtleAccess turtle )
@Override
public String[] getNames()
{
- return new String[] {
- "turtle"
- };
+ return new String[] { "turtle" };
}
@Nonnull
diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
index 01df6fcdd..494b8750d 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java
@@ -908,14 +908,14 @@ private void updateCommands()
else
{
computer.queueEvent( "turtle_response", new Object[] {
- callbackID, true
+ callbackID, true,
} );
}
}
else
{
computer.queueEvent( "turtle_response", new Object[] {
- callbackID, false, result != null ? result.getErrorMessage() : null
+ callbackID, false, result != null ? result.getErrorMessage() : null,
} );
}
}
diff --git a/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java b/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
index 3982e7770..26a00a3a0 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/inventory/ContainerTurtle.java
@@ -26,8 +26,8 @@ public class ContainerTurtle extends Container implements IContainerComputer
{
private static final int PROGRESS_ID_SELECTED_SLOT = 0;
- public final int m_playerInvStartY;
- public final int m_turtleInvStartX;
+ public final int playerInvStartY;
+ public final int turtleInvStartX;
private final ITurtleAccess m_turtle;
private IComputer m_computer;
@@ -36,8 +36,8 @@ public class ContainerTurtle extends Container implements IContainerComputer
protected ContainerTurtle( IInventory playerInventory, ITurtleAccess turtle, int playerInvStartY, int turtleInvStartX )
{
- m_playerInvStartY = playerInvStartY;
- m_turtleInvStartX = turtleInvStartX;
+ this.playerInvStartY = playerInvStartY;
+ this.turtleInvStartX = turtleInvStartX;
m_turtle = turtle;
m_selectedSlot = m_turtle.getWorld().isRemote ? 0 : m_turtle.getSelectedSlot();
diff --git a/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleLegacy.java b/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleLegacy.java
index 75a31ac71..2d5b36ab0 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleLegacy.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleLegacy.java
@@ -73,7 +73,10 @@ public int getColour( @Nonnull ItemStack stack )
}
@Override
- public ResourceLocation getOverlay( @Nonnull ItemStack stack ) { return null; }
+ public ResourceLocation getOverlay( @Nonnull ItemStack stack )
+ {
+ return null;
+ }
@Override
public int getFuelLevel( @Nonnull ItemStack stack )
diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java
index be57b1995..4e6a2de00 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleHoe.java
@@ -54,7 +54,7 @@ public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull Turt
{
if( verb == TurtleVerb.Dig )
{
- ItemStack hoe = m_item.copy();
+ ItemStack hoe = item.copy();
ItemStack remainder = TurtlePlaceCommand.deploy( hoe, turtle, direction, null, null );
if( remainder != hoe )
{
diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleShovel.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleShovel.java
index a8f287c23..4e1c44689 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleShovel.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleShovel.java
@@ -60,7 +60,7 @@ public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull Turt
{
if( verb == TurtleVerb.Dig )
{
- ItemStack shovel = m_item.copy();
+ ItemStack shovel = item.copy();
ItemStack remainder = TurtlePlaceCommand.deploy( shovel, turtle, direction, null, null );
if( remainder != shovel )
{
diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
index ce61cd1cb..d91c02a77 100644
--- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
+++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleTool.java
@@ -48,18 +48,18 @@
public class TurtleTool extends AbstractTurtleUpgrade
{
- protected ItemStack m_item;
+ protected final ItemStack item;
public TurtleTool( ResourceLocation id, int legacyID, String adjective, Item item )
{
super( id, legacyID, TurtleUpgradeType.Tool, adjective, item );
- m_item = new ItemStack( item, 1, 0 );
+ this.item = new ItemStack( item, 1, 0 );
}
public TurtleTool( ResourceLocation id, int legacyID, Item item )
{
super( id, legacyID, TurtleUpgradeType.Tool, item );
- m_item = new ItemStack( item, 1, 0 );
+ this.item = new ItemStack( item, 1, 0 );
}
@Nonnull
@@ -76,7 +76,7 @@ public Pair getModel( ITurtleAccess turtle, @Nonnull Turt
);
Minecraft mc = Minecraft.getMinecraft();
return Pair.of(
- mc.getRenderItem().getItemModelMesher().getItemModel( m_item ),
+ mc.getRenderItem().getItemModelMesher().getItemModel( item ),
transform
);
}
@@ -124,7 +124,7 @@ private TurtleCommandResult attack( final ITurtleAccess turtle, EnumFacing direc
if( hit != null )
{
// Load up the turtle's inventory
- ItemStack stackCopy = m_item.copy();
+ ItemStack stackCopy = item.copy();
turtlePlayer.loadInventory( stackCopy );
Entity hitEntity = hit.getKey();
@@ -202,7 +202,7 @@ private TurtleCommandResult dig( ITurtleAccess turtle, EnumFacing direction, Tur
IBlockState state = world.getBlockState( blockPosition );
TurtlePlayer turtlePlayer = TurtlePlaceCommand.createPlayer( turtle, turtlePosition, direction );
- turtlePlayer.loadInventory( m_item.copy() );
+ turtlePlayer.loadInventory( item.copy() );
if( ComputerCraft.turtlesObeyBlockProtection )
{
diff --git a/src/main/java/dan200/computercraft/shared/util/ColourUtils.java b/src/main/java/dan200/computercraft/shared/util/ColourUtils.java
index 08c4ec6b1..d4dccc176 100644
--- a/src/main/java/dan200/computercraft/shared/util/ColourUtils.java
+++ b/src/main/java/dan200/computercraft/shared/util/ColourUtils.java
@@ -20,7 +20,7 @@ public final class ColourUtils
"dyeBlack", "dyeRed", "dyeGreen", "dyeBrown",
"dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray",
"dyeGray", "dyePink", "dyeLime", "dyeYellow",
- "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite"
+ "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite",
};
private static int[] ids;
diff --git a/src/main/java/dan200/computercraft/shared/util/Palette.java b/src/main/java/dan200/computercraft/shared/util/Palette.java
index b332e8b5f..8d4a0649c 100644
--- a/src/main/java/dan200/computercraft/shared/util/Palette.java
+++ b/src/main/java/dan200/computercraft/shared/util/Palette.java
@@ -72,12 +72,11 @@ public static int encodeRGB8( double[] rgb )
public static double[] decodeRGB8( int rgb )
{
- return new double[]
- {
- ((rgb >> 16) & 0xFF) / 255.0f,
- ((rgb >> 8) & 0xFF) / 255.0f,
- (rgb & 0xFF) / 255.0f
- };
+ return new double[] {
+ ((rgb >> 16) & 0xFF) / 255.0f,
+ ((rgb >> 8) & 0xFF) / 255.0f,
+ (rgb & 0xFF) / 255.0f,
+ };
}
public NBTTagCompound writeToNBT( NBTTagCompound nbt )
diff --git a/src/main/java/dan200/computercraft/shared/util/StringUtil.java b/src/main/java/dan200/computercraft/shared/util/StringUtil.java
index d08f0f8ba..8c92a25a4 100644
--- a/src/main/java/dan200/computercraft/shared/util/StringUtil.java
+++ b/src/main/java/dan200/computercraft/shared/util/StringUtil.java
@@ -35,6 +35,7 @@ public static String normaliseLabel( String label )
/**
* Translates a Stat name
*/
+ @SuppressWarnings( "deprecation" )
public static String translate( String key )
{
return net.minecraft.util.text.translation.I18n.translateToLocal( key );
@@ -43,6 +44,7 @@ public static String translate( String key )
/**
* Translates a Stat name with format args
*/
+ @SuppressWarnings( "deprecation" )
public static String translateFormatted( String key, Object... format )
{
return net.minecraft.util.text.translation.I18n.translateToLocalFormatted( key, format );
diff --git a/src/test/java/dan200/computercraft/core/computer/BasicEnvironment.java b/src/test/java/dan200/computercraft/core/computer/BasicEnvironment.java
index dbd3ccf35..b43ef3bda 100644
--- a/src/test/java/dan200/computercraft/core/computer/BasicEnvironment.java
+++ b/src/test/java/dan200/computercraft/core/computer/BasicEnvironment.java
@@ -96,7 +96,7 @@ public InputStream createResourceFile( String domain, String subPath )
public static IMount createMount( Class> klass, String path, String fallback )
{
- File file = getContainingFile(klass);
+ File file = getContainingFile( klass );
if( file.isFile() )
{
@@ -128,7 +128,7 @@ public static IMount createMount( Class> klass, String path, String fallback )
}
- private static File getContainingFile(Class> klass)
+ private static File getContainingFile( Class> klass )
{
String path = klass.getProtectionDomain().getCodeSource().getLocation().getPath();
int bangIndex = path.indexOf( "!" );
diff --git a/src/test/java/dan200/computercraft/core/computer/ComputerBootstrap.java b/src/test/java/dan200/computercraft/core/computer/ComputerBootstrap.java
index 1f4151244..926596d90 100644
--- a/src/test/java/dan200/computercraft/core/computer/ComputerBootstrap.java
+++ b/src/test/java/dan200/computercraft/core/computer/ComputerBootstrap.java
@@ -42,7 +42,7 @@ public static void run( String program )
.addFile( "test.lua", program )
.addFile( "startup", "assertion.assert(pcall(loadfile('test.lua', _ENV))) os.shutdown()" );
- run( mount, x -> {} );
+ run( mount, x -> { } );
}
public static void run( IWritableMount mount, Consumer setup )
diff --git a/src/test/java/dan200/computercraft/shared/wired/NetworkTest.java b/src/test/java/dan200/computercraft/shared/wired/NetworkTest.java
index 24f121a2a..614b3b6b7 100644
--- a/src/test/java/dan200/computercraft/shared/wired/NetworkTest.java
+++ b/src/test/java/dan200/computercraft/shared/wired/NetworkTest.java
@@ -253,14 +253,14 @@ public void testRemoveSplit()
assertEquals( Sets.newHashSet(), cE.allPeripherals().keySet(), "C's peripheral set should be empty" );
}
+ private static final int BRUTE_SIZE = 16;
+ private static final int TOGGLE_CONNECTION_TIMES = 5;
+ private static final int TOGGLE_NODE_TIMES = 5;
+
@Test
@Disabled( "Takes a long time to run, mostly for stress testing" )
public void testLarge()
{
- final int BRUTE_SIZE = 16;
- final int TOGGLE_CONNECTION_TIMES = 5;
- final int TOGGLE_NODE_TIMES = 5;
-
Grid grid = new Grid<>( BRUTE_SIZE );
grid.map( ( existing, pos ) -> new NetworkElement( null, null, "n_" + pos ).getNode() );
@@ -324,7 +324,7 @@ public void testLarge()
}
}
- private static class NetworkElement implements IWiredElement
+ private static final class NetworkElement implements IWiredElement
{
private final World world;
private final Vec3d position;
@@ -433,7 +433,7 @@ private static class Grid
private final T[] box;
@SuppressWarnings( "unchecked" )
- public Grid( int size )
+ Grid( int size )
{
this.size = size;
this.box = (T[]) new Object[size * size * size];