Remove accessibility modifiers from all enums and interfaces

src/main/java/dan200/computercraft/core/apis/IAPIEnvironment.java

@@ -14,32 +14,32 @@ import dan200.computercraft.core.terminal.Terminal;
 
 public interface IAPIEnvironment
 {
-    public static interface IPeripheralChangeListener
+    interface IPeripheralChangeListener
     {
-        public void onPeripheralChanged( int side, IPeripheral newPeripheral );
+        void onPeripheralChanged( int side, IPeripheral newPeripheral );
     }
     
-    public Computer getComputer();
+    Computer getComputer();
-    public int getComputerID();
+    int getComputerID();
-    public IComputerEnvironment getComputerEnvironment();
+    IComputerEnvironment getComputerEnvironment();
-    public Terminal getTerminal();
+    Terminal getTerminal();
-    public FileSystem getFileSystem();
+    FileSystem getFileSystem();
     
-    public void shutdown();
+    void shutdown();
-    public void reboot();
+    void reboot();
-    public void queueEvent( String event, Object[] args );
+    void queueEvent( String event, Object[] args );
 
-    public void setOutput( int side, int output );
+    void setOutput( int side, int output );
-    public int getOutput( int side );
+    int getOutput( int side );
-    public int getInput( int side );
+    int getInput( int side );
 
-    public void setBundledOutput( int side, int output );
+    void setBundledOutput( int side, int output );
-    public int getBundledOutput( int side );
+    int getBundledOutput( int side );
-    public int getBundledInput( int side );
+    int getBundledInput( int side );
     
-    public void setPeripheralChangeListener( IPeripheralChangeListener listener );
+    void setPeripheralChangeListener( IPeripheralChangeListener listener );
-    public IPeripheral getPeripheral( int side );
+    IPeripheral getPeripheral( int side );
 
-    public String getLabel();
+    String getLabel();
-    public void setLabel( String label );
+    void setLabel( String label );
 }

src/main/java/dan200/computercraft/core/apis/ILuaAPI.java

@@ -9,9 +9,9 @@ import dan200.computercraft.api.lua.ILuaObject;
 
 public interface ILuaAPI extends ILuaObject
 {
-    public String[] getNames();
+    String[] getNames();
 
-    public void startup(); // LT
+    void startup(); // LT
-    public void advance( double _dt ); // MT
+    void advance( double _dt ); // MT
-    public void shutdown(); // LT
+    void shutdown(); // LT
 }

src/main/java/dan200/computercraft/core/computer/Computer.java

@@ -29,7 +29,7 @@ public class Computer
         "bottom", "top", "back", "front", "right", "left",
     };
     
-    private static enum State
+    private enum State
     {
         Off,
         Starting,

src/main/java/dan200/computercraft/core/computer/IComputerEnvironment.java

@@ -10,13 +10,13 @@ import dan200.computercraft.api.filesystem.IWritableMount;
 
 public interface IComputerEnvironment
 {
-    public int getDay();
+    int getDay();
-    public double getTimeOfDay();
+    double getTimeOfDay();
-    public boolean isColour();
+    boolean isColour();
-    public long getComputerSpaceLimit();
+    long getComputerSpaceLimit();
-    public String getHostString();
+    String getHostString();
 
-    public int assignNewID();
+    int assignNewID();
-    public IWritableMount createSaveDirMount( String subPath, long capacity );
+    IWritableMount createSaveDirMount( String subPath, long capacity );
-    public IMount createResourceMount( String domain, String subPath );
+    IMount createResourceMount( String domain, String subPath );
 }

src/main/java/dan200/computercraft/core/computer/ITask.java

@@ -8,6 +8,6 @@ package dan200.computercraft.core.computer;
 
 public interface ITask
 {
-    public Computer getOwner();
+    Computer getOwner();
-    public void execute();
+    void execute();
 }

src/main/java/dan200/computercraft/core/filesystem/IMountedFile.java

@@ -9,5 +9,5 @@ package dan200.computercraft.core.filesystem;
 import java.io.IOException;
 
 public interface IMountedFile {
-    public void close() throws IOException;
+    void close() throws IOException;
 }

src/main/java/dan200/computercraft/core/filesystem/IMountedFileBinary.java

@@ -9,8 +9,8 @@ package dan200.computercraft.core.filesystem;
 import java.io.IOException;
 
 public interface IMountedFileBinary extends IMountedFile {
-    public int read() throws IOException;
+    int read() throws IOException;
-    public void write(int i) throws IOException;
+    void write( int i ) throws IOException;
-    public void close() throws IOException;
+    void close() throws IOException;
-    public void flush() throws IOException;
+    void flush() throws IOException;
 }

src/main/java/dan200/computercraft/core/filesystem/IMountedFileNormal.java

@@ -9,8 +9,8 @@ package dan200.computercraft.core.filesystem;
 import java.io.IOException;
 
 public interface IMountedFileNormal extends IMountedFile {
-    public String readLine() throws IOException;
+    String readLine() throws IOException;
-    public void write(String s, int off, int len, boolean newLine) throws IOException;
+    void write( String s, int off, int len, boolean newLine ) throws IOException;
-    public void close() throws IOException;
+    void close() throws IOException;
-    public void flush() throws IOException;
+    void flush() throws IOException;
 }

src/main/java/dan200/computercraft/core/lua/ILuaMachine.java

@@ -12,17 +12,17 @@ import java.io.OutputStream;
 
 public interface ILuaMachine
 {
-    public void addAPI( ILuaAPI api );
+    void addAPI( ILuaAPI api );
     
-    public void loadBios( InputStream bios );
+    void loadBios( InputStream bios );
-    public void handleEvent( String eventName, Object[] arguments );
+    void handleEvent( String eventName, Object[] arguments );
-    public void softAbort( String abortMessage );
+    void softAbort( String abortMessage );
-    public void hardAbort( String abortMessage );
+    void hardAbort( String abortMessage );
     
-    public boolean saveState( OutputStream output );
+    boolean saveState( OutputStream output );
-    public boolean restoreState( InputStream input );
+    boolean restoreState( InputStream input );
     
-    public boolean isFinished();
+    boolean isFinished();
     
-    public void unload();
+    void unload();
 }

src/main/java/dan200/computercraft/shared/common/IDirectionalTile.java

@@ -10,6 +10,6 @@ import net.minecraft.util.EnumFacing;
 
 public interface IDirectionalTile
 {
-    public EnumFacing getDirection();
+    EnumFacing getDirection();
-    public void setDirection( EnumFacing dir );
+    void setDirection( EnumFacing dir );
 }

src/main/java/dan200/computercraft/shared/common/ITerminal.java

@@ -10,6 +10,6 @@ import dan200.computercraft.core.terminal.Terminal;
 
 public interface ITerminal
 {
-    public Terminal getTerminal();
+    Terminal getTerminal();
-    public boolean isColour();
+    boolean isColour();
 }

src/main/java/dan200/computercraft/shared/common/ITerminalTile.java

@@ -8,5 +8,5 @@ package dan200.computercraft.shared.common;
 
 public interface ITerminalTile
 {
-    public ITerminal getTerminal();
+    ITerminal getTerminal();
 }

src/main/java/dan200/computercraft/shared/computer/blocks/ComputerState.java

@@ -18,7 +18,7 @@ public enum ComputerState implements IStringSerializable
 
     private String m_name;
 
-    private ComputerState( String name )
+    ComputerState( String name )
     {
         m_name = name;
     }

src/main/java/dan200/computercraft/shared/computer/blocks/IComputerTile.java

@@ -12,9 +12,9 @@ import dan200.computercraft.shared.computer.core.IComputer;
 
 public interface IComputerTile extends ITerminalTile
 {
-    public void setComputerID( int id );
+    void setComputerID( int id );
-    public void setLabel( String label );
+    void setLabel( String label );
-    public IComputer getComputer();
+    IComputer getComputer();
-    public IComputer createComputer();
+    IComputer createComputer();
-    public ComputerFamily getFamily();
+    ComputerFamily getFamily();
 }

src/main/java/dan200/computercraft/shared/computer/core/IComputer.java

@@ -10,16 +10,16 @@ import dan200.computercraft.shared.common.ITerminal;
 
 public interface IComputer extends ITerminal
 {
-    public int getInstanceID();
+    int getInstanceID();
-    public int getID();
+    int getID();
-    public String getLabel();
+    String getLabel();
 
-    public boolean isOn();
+    boolean isOn();
-    public boolean isCursorDisplayed();
+    boolean isCursorDisplayed();
-    public void turnOn();
+    void turnOn();
-    public void shutdown();
+    void shutdown();
-    public void reboot();
+    void reboot();
 
-    public void queueEvent( String event );
+    void queueEvent( String event );
-    public void queueEvent( String event, Object[] arguments );
+    void queueEvent( String event, Object[] arguments );
 }

src/main/java/dan200/computercraft/shared/computer/core/IComputerContainer.java

@@ -8,5 +8,5 @@ package dan200.computercraft.shared.computer.core;
 
 public interface IComputerContainer
 {
-    public IComputer getComputer();
+    IComputer getComputer();
 }

src/main/java/dan200/computercraft/shared/computer/items/IComputerItem.java

@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
 
 public interface IComputerItem
 {
-    public int getComputerID( ItemStack stack );
+    int getComputerID( ItemStack stack );
-    public String getLabel( ItemStack stack );
+    String getLabel( ItemStack stack );
-    public ComputerFamily getFamily( ItemStack stack );
+    ComputerFamily getFamily( ItemStack stack );
 }

src/main/java/dan200/computercraft/shared/network/INetworkedThing.java

@@ -9,5 +9,5 @@ import net.minecraft.entity.player.EntityPlayer;
 
 public interface INetworkedThing
 {
-    public void handlePacket( ComputerCraftPacket packet, EntityPlayer sender );
+    void handlePacket( ComputerCraftPacket packet, EntityPlayer sender );
 }

src/main/java/dan200/computercraft/shared/peripheral/PeripheralType.java

@@ -24,7 +24,7 @@ public enum PeripheralType implements IStringSerializable
 
     private String m_name;
 
-    private PeripheralType( String name )
+    PeripheralType( String name )
     {
         m_name = name;
     }

src/main/java/dan200/computercraft/shared/peripheral/common/BlockCableModemVariant.java

@@ -56,7 +56,7 @@ public enum BlockCableModemVariant implements IStringSerializable
     private String m_name;
     private EnumFacing m_facing;
 
-    private BlockCableModemVariant( String name, EnumFacing facing )
+    BlockCableModemVariant( String name, EnumFacing facing )
     {
         m_name = name;
         m_facing = facing;

src/main/java/dan200/computercraft/shared/peripheral/common/BlockPeripheralVariant.java

@@ -126,7 +126,7 @@ public enum BlockPeripheralVariant implements IStringSerializable
     private String m_name;
     private PeripheralType m_peripheralType;
 
-    private BlockPeripheralVariant( String name, PeripheralType peripheralType )
+    BlockPeripheralVariant( String name, PeripheralType peripheralType )
     {
         m_name = name;
         m_peripheralType = peripheralType;

src/main/java/dan200/computercraft/shared/peripheral/common/IPeripheralItem.java

@@ -11,5 +11,5 @@ import net.minecraft.item.ItemStack;
 
 public interface IPeripheralItem
 {
-    public PeripheralType getPeripheralType( ItemStack stack );
+    PeripheralType getPeripheralType( ItemStack stack );
 }

src/main/java/dan200/computercraft/shared/peripheral/common/IPeripheralTile.java

@@ -13,7 +13,7 @@ import net.minecraft.util.EnumFacing;
 
 public interface IPeripheralTile extends IDirectionalTile
 {
-    public PeripheralType getPeripheralType();
+    PeripheralType getPeripheralType();
-    public IPeripheral getPeripheral( EnumFacing side );
+    IPeripheral getPeripheral( EnumFacing side );
-    public String getLabel();
+    String getLabel();
 }

src/main/java/dan200/computercraft/shared/peripheral/modem/INetwork.java

@@ -11,8 +11,8 @@ import net.minecraft.world.World;
 
 public interface INetwork
 {
-    public void addReceiver( IReceiver receiver );
+    void addReceiver( IReceiver receiver );
-    public void removeReceiver( IReceiver receiver );
+    void removeReceiver( IReceiver receiver );
-    public void transmit( int channel, int replyChannel, Object payload, World world, Vec3d pos, double range, boolean interdimensional, Object senderObject );
+    void transmit( int channel, int replyChannel, Object payload, World world, Vec3d pos, double range, boolean interdimensional, Object senderObject );
-    public boolean isWireless();
+    boolean isWireless();
 }

src/main/java/dan200/computercraft/shared/peripheral/modem/IReceiver.java

@@ -10,11 +10,11 @@ import net.minecraft.world.World;
 
 public interface IReceiver
 {
-    public int getChannel();
+    int getChannel();
-    public World getWorld();
+    World getWorld();
-    public Vec3d getWorldPosition();
+    Vec3d getWorldPosition();
-    public boolean isInterdimensional();
+    boolean isInterdimensional();
-    public double getReceiveRange();
+    double getReceiveRange();
-    public void receiveSameDimension( int replyChannel, Object payload, double distance, Object senderObject );
+    void receiveSameDimension( int replyChannel, Object payload, double distance, Object senderObject );
-    public void receiveDifferentDimension( int replyChannel, Object payload, Object senderObject );
+    void receiveDifferentDimension( int replyChannel, Object payload, Object senderObject );
 }

src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java

@@ -986,9 +986,9 @@ public class TileCable extends TileModemBase
     
     // Generic network search stuff
     
-    private static interface ICableVisitor
+    private interface ICableVisitor
     {
-        public void visit( TileCable modem, int distance );
+        void visit( TileCable modem, int distance );
     }
     
     private static class SearchLoc

src/main/java/dan200/computercraft/shared/proxy/ICCTurtleProxy.java

@@ -15,15 +15,15 @@ import java.util.List;
 
 public interface ICCTurtleProxy
 {
-    public void preInit();
+    void preInit();
-    public void init();
+    void init();
 
-    public void registerTurtleUpgrade( ITurtleUpgrade upgrade );
+    void registerTurtleUpgrade( ITurtleUpgrade upgrade );
-    public ITurtleUpgrade getTurtleUpgrade( String id );
+    ITurtleUpgrade getTurtleUpgrade( String id );
-    public ITurtleUpgrade getTurtleUpgrade( int legacyId );
+    ITurtleUpgrade getTurtleUpgrade( int legacyId );
-    public ITurtleUpgrade getTurtleUpgrade( ItemStack item );
+    ITurtleUpgrade getTurtleUpgrade( ItemStack item );
-    public void addAllUpgradedTurtles( List<ItemStack> list );
+    void addAllUpgradedTurtles( List<ItemStack> list );
 
-    public void setEntityDropConsumer( Entity entity, IEntityDropConsumer consumer );
+    void setEntityDropConsumer( Entity entity, IEntityDropConsumer consumer );
-    public void clearEntityDropConsumer( Entity entity );
+    void clearEntityDropConsumer( Entity entity );
 }

src/main/java/dan200/computercraft/shared/proxy/IComputerCraftProxy.java

@@ -23,25 +23,25 @@ import java.io.File;
 
 public interface IComputerCraftProxy
 {
-    public void preInit();
+    void preInit();
-    public void init();
+    void init();
-    public boolean isClient();
+    boolean isClient();
 
-    public boolean getGlobalCursorBlink();
+    boolean getGlobalCursorBlink();
-    public long getRenderFrame();
+    long getRenderFrame();
-    public void deleteDisplayLists( int list, int range );
+    void deleteDisplayLists( int list, int range );
-    public Object getFixedWidthFontRenderer();
+    Object getFixedWidthFontRenderer();
 
-    public String getRecordInfo( ItemStack item );
+    String getRecordInfo( ItemStack item );
-    public void playRecord( SoundEvent record, String recordInfo, World world, BlockPos pos );
+    void playRecord( SoundEvent record, String recordInfo, World world, BlockPos pos );
 
-    public Object getDiskDriveGUI( InventoryPlayer inventory, TileDiskDrive drive );
+    Object getDiskDriveGUI( InventoryPlayer inventory, TileDiskDrive drive );
-    public Object getComputerGUI( TileComputer computer );
+    Object getComputerGUI( TileComputer computer );
-    public Object getPrinterGUI( InventoryPlayer inventory, TilePrinter printer );
+    Object getPrinterGUI( InventoryPlayer inventory, TilePrinter printer );
-    public Object getTurtleGUI( InventoryPlayer inventory, TileTurtle turtle );
+    Object getTurtleGUI( InventoryPlayer inventory, TileTurtle turtle );
-    public abstract Object getPrintoutGUI( EntityPlayer player, EnumHand hand );
+    Object getPrintoutGUI( EntityPlayer player, EnumHand hand );
-    public abstract Object getPocketComputerGUI( EntityPlayer player, EnumHand hand );
+    Object getPocketComputerGUI( EntityPlayer player, EnumHand hand );
 
-    public File getWorldDir( World world );
+    File getWorldDir( World world );
-    public void handlePacket( ComputerCraftPacket packet, EntityPlayer player );
+    void handlePacket( ComputerCraftPacket packet, EntityPlayer player );
 }

src/main/java/dan200/computercraft/shared/turtle/blocks/ITurtleTile.java

@@ -17,12 +17,12 @@ import net.minecraft.util.math.Vec3d;
 
 public interface ITurtleTile extends IComputerTile, IDirectionalTile
 {
-    public Colour getColour();
+    Colour getColour();
-    public ResourceLocation getOverlay();
+    ResourceLocation getOverlay();
-    public ITurtleUpgrade getUpgrade( TurtleSide side );
+    ITurtleUpgrade getUpgrade( TurtleSide side );
-    public ITurtleAccess getAccess();
+    ITurtleAccess getAccess();
 
-    public Vec3d getRenderOffset( float f );
+    Vec3d getRenderOffset( float f );
-    public float getRenderYaw( float f );
+    float getRenderYaw( float f );
-    public float getToolRenderAngle( TurtleSide side, float f );
+    float getToolRenderAngle( TurtleSide side, float f );
 }

src/main/java/dan200/computercraft/shared/turtle/items/ITurtleItem.java

@@ -15,8 +15,8 @@ import net.minecraft.util.ResourceLocation;
 
 public interface ITurtleItem extends IComputerItem
 {
-    public ITurtleUpgrade getUpgrade( ItemStack stack, TurtleSide side );
+    ITurtleUpgrade getUpgrade( ItemStack stack, TurtleSide side );
-    public int getFuelLevel( ItemStack stack );
+    int getFuelLevel( ItemStack stack );
-    public Colour getColour( ItemStack stack );
+    Colour getColour( ItemStack stack );
-    public ResourceLocation getOverlay( ItemStack stack );
+    ResourceLocation getOverlay( ItemStack stack );
 }

src/main/java/dan200/computercraft/shared/util/Colour.java

@@ -37,7 +37,7 @@ public enum Colour
     private int m_hex;
     private float[] m_rgb;
 
-    private Colour( int hex )
+    Colour( int hex )
     {
         m_hex = hex;
         m_rgb = new float[] {

src/main/java/dan200/computercraft/shared/util/IEntityDropConsumer.java

@@ -10,5 +10,5 @@ import net.minecraft.item.ItemStack;
 
 public interface IEntityDropConsumer
 {
-    public void consumeDrop( Entity dropper, ItemStack drop );
+    void consumeDrop( Entity dropper, ItemStack drop );
 }