diff --git a/build.gradle b/build.gradle
index 856a8173b..826343e4c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -471,6 +471,7 @@ task setupServer(type: Copy) {
jacoco.applyTo(it)
it.jacoco.setIncludes(["dan200.computercraft.*"])
it.jacoco.setClassDumpDir(coverageOut)
+ it.outputs.dir(coverageOut)
// Older versions of modlauncher don't include a protection domain (and thus no code
// source). Jacoco skips such classes by default, so we need to explicitly include them.
it.jacoco.setIncludeNoLocationClasses(true)
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index 89de6f153..aaafdfd01 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -97,20 +97,11 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
diff --git a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
index 164c0f70e..e5301601d 100644
--- a/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
+++ b/src/main/java/dan200/computercraft/client/ClientTableFormatter.java
@@ -25,7 +25,7 @@ public class ClientTableFormatter implements TableFormatter
{
public static final ClientTableFormatter INSTANCE = new ClientTableFormatter();
- private static Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
+ private static final Int2IntOpenHashMap lastHeights = new Int2IntOpenHashMap();
private static FontRenderer renderer()
{
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
index 9574d3f04..a6252bbc8 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiPrintout.java
@@ -24,11 +24,11 @@ public class GuiPrintout extends ContainerScreen
{
private static final Matrix4f IDENTITY = TransformationMatrix.identity().getMatrix();
- private final boolean m_book;
- private final int m_pages;
- private final TextBuffer[] m_text;
- private final TextBuffer[] m_colours;
- private int m_page;
+ private final boolean book;
+ private final int pages;
+ private final TextBuffer[] text;
+ private final TextBuffer[] colours;
+ private int page;
public GuiPrintout( ContainerHeldItem container, PlayerInventory player, ITextComponent title )
{
@@ -37,16 +37,16 @@ public GuiPrintout( ContainerHeldItem container, PlayerInventory player, ITextCo
imageHeight = Y_SIZE;
String[] text = ItemPrintout.getText( container.getStack() );
- m_text = new TextBuffer[text.length];
- for( int i = 0; i < m_text.length; i++ ) m_text[i] = new TextBuffer( text[i] );
+ this.text = new TextBuffer[text.length];
+ for( int i = 0; i < this.text.length; i++ ) this.text[i] = new TextBuffer( text[i] );
String[] colours = ItemPrintout.getColours( container.getStack() );
- m_colours = new TextBuffer[colours.length];
- for( int i = 0; i < m_colours.length; i++ ) m_colours[i] = new TextBuffer( colours[i] );
+ this.colours = new TextBuffer[colours.length];
+ for( int i = 0; i < this.colours.length; i++ ) this.colours[i] = new TextBuffer( colours[i] );
- m_page = 0;
- m_pages = Math.max( m_text.length / ItemPrintout.LINES_PER_PAGE, 1 );
- m_book = ((ItemPrintout) container.getStack().getItem()).getType() == ItemPrintout.Type.BOOK;
+ page = 0;
+ pages = Math.max( this.text.length / ItemPrintout.LINES_PER_PAGE, 1 );
+ book = ((ItemPrintout) container.getStack().getItem()).getType() == ItemPrintout.Type.BOOK;
}
@Override
@@ -56,13 +56,13 @@ public boolean keyPressed( int key, int scancode, int modifiers )
if( key == GLFW.GLFW_KEY_RIGHT )
{
- if( m_page < m_pages - 1 ) m_page++;
+ if( page < pages - 1 ) page++;
return true;
}
if( key == GLFW.GLFW_KEY_LEFT )
{
- if( m_page > 0 ) m_page--;
+ if( page > 0 ) page--;
return true;
}
@@ -76,14 +76,14 @@ public boolean mouseScrolled( double x, double y, double delta )
if( delta < 0 )
{
// Scroll up goes to the next page
- if( m_page < m_pages - 1 ) m_page++;
+ if( page < pages - 1 ) page++;
return true;
}
if( delta > 0 )
{
// Scroll down goes to the previous page
- if( m_page > 0 ) m_page--;
+ if( page > 0 ) page--;
return true;
}
@@ -98,8 +98,8 @@ public void renderBg( float partialTicks, int mouseX, int mouseY )
RenderSystem.enableDepthTest();
IRenderTypeBuffer.Impl renderer = Minecraft.getInstance().renderBuffers().bufferSource();
- drawBorder( IDENTITY, renderer, leftPos, topPos, getBlitOffset(), m_page, m_pages, m_book );
- drawText( IDENTITY, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * m_page, m_text, m_colours );
+ drawBorder( IDENTITY, renderer, leftPos, topPos, getBlitOffset(), page, pages, book );
+ drawText( IDENTITY, renderer, leftPos + X_TEXT_MARGIN, topPos + Y_TEXT_MARGIN, ItemPrintout.LINES_PER_PAGE * page, text, colours );
renderer.endBatch();
}
diff --git a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
index 4548bbaa2..6af2a5790 100644
--- a/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
+++ b/src/main/java/dan200/computercraft/client/gui/GuiTurtle.java
@@ -20,13 +20,13 @@
public class GuiTurtle extends ContainerScreen
{
- private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( "computercraft", "textures/gui/turtle_normal.png" );
- private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( "computercraft", "textures/gui/turtle_advanced.png" );
+ private static final ResourceLocation BACKGROUND_NORMAL = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/turtle_normal.png" );
+ private static final ResourceLocation BACKGROUND_ADVANCED = new ResourceLocation( ComputerCraft.MOD_ID, "textures/gui/turtle_advanced.png" );
- private ContainerTurtle m_container;
+ private final ContainerTurtle container;
- private final ComputerFamily m_family;
- private final ClientComputer m_computer;
+ private final ComputerFamily family;
+ private final ClientComputer computer;
private WidgetTerminal terminal;
private WidgetWrapper terminalWrapper;
@@ -35,9 +35,9 @@ public GuiTurtle( ContainerTurtle container, PlayerInventory player, ITextCompon
{
super( container, player, title );
- m_container = container;
- m_family = container.getFamily();
- m_computer = (ClientComputer) container.getComputer();
+ this.container = container;
+ family = container.getFamily();
+ computer = (ClientComputer) container.getComputer();
imageWidth = 254;
imageHeight = 217;
@@ -53,7 +53,7 @@ protected void init()
int termPxHeight = ComputerCraft.turtleTermHeight * FixedWidthFontRenderer.FONT_HEIGHT;
terminal = new WidgetTerminal(
- minecraft, () -> m_computer,
+ minecraft, () -> computer,
ComputerCraft.turtleTermWidth,
ComputerCraft.turtleTermHeight,
2, 2, 2, 2
@@ -95,7 +95,7 @@ public boolean keyPressed( int key, int scancode, int modifiers )
private void drawSelectionSlot( boolean advanced )
{
// Draw selection slot
- int slot = m_container.getSelectedSlot();
+ int slot = container.getSelectedSlot();
if( slot >= 0 )
{
RenderSystem.color4f( 1.0F, 1.0F, 1.0F, 1.0F );
@@ -110,7 +110,7 @@ private void drawSelectionSlot( boolean advanced )
protected void renderBg( float partialTicks, int mouseX, int mouseY )
{
// Draw term
- boolean advanced = m_family == ComputerFamily.ADVANCED;
+ boolean advanced = family == ComputerFamily.ADVANCED;
terminal.draw( terminalWrapper.getX(), terminalWrapper.getY() );
// Draw border/inventory
diff --git a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
index b099ce309..8613f7464 100644
--- a/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleMultiModel.java
@@ -23,22 +23,22 @@
public class TurtleMultiModel implements IBakedModel
{
- private final IBakedModel m_baseModel;
- private final IBakedModel m_overlayModel;
- private final TransformationMatrix m_generalTransform;
- private final TransformedModel m_leftUpgradeModel;
- private final TransformedModel m_rightUpgradeModel;
- private List m_generalQuads = null;
- private Map> m_faceQuads = new EnumMap<>( Direction.class );
+ private final IBakedModel baseModel;
+ private final IBakedModel overlayModel;
+ private final TransformationMatrix generalTransform;
+ private final TransformedModel leftUpgradeModel;
+ private final TransformedModel rightUpgradeModel;
+ private List generalQuads = null;
+ private final Map> faceQuads = new EnumMap<>( Direction.class );
public TurtleMultiModel( IBakedModel baseModel, IBakedModel overlayModel, TransformationMatrix generalTransform, TransformedModel leftUpgradeModel, TransformedModel rightUpgradeModel )
{
// Get the models
- m_baseModel = baseModel;
- m_overlayModel = overlayModel;
- m_leftUpgradeModel = leftUpgradeModel;
- m_rightUpgradeModel = rightUpgradeModel;
- m_generalTransform = generalTransform;
+ this.baseModel = baseModel;
+ this.overlayModel = overlayModel;
+ this.leftUpgradeModel = leftUpgradeModel;
+ this.rightUpgradeModel = rightUpgradeModel;
+ this.generalTransform = generalTransform;
}
@Nonnull
@@ -55,13 +55,13 @@ public List getQuads( BlockState state, Direction side, @Nonnull Rand
{
if( side != null )
{
- if( !m_faceQuads.containsKey( side ) ) m_faceQuads.put( side, buildQuads( state, side, rand ) );
- return m_faceQuads.get( side );
+ if( !faceQuads.containsKey( side ) ) faceQuads.put( side, buildQuads( state, side, rand ) );
+ return faceQuads.get( side );
}
else
{
- if( m_generalQuads == null ) m_generalQuads = buildQuads( state, side, rand );
- return m_generalQuads;
+ if( generalQuads == null ) generalQuads = buildQuads( state, side, rand );
+ return generalQuads;
}
}
@@ -70,20 +70,20 @@ private List buildQuads( BlockState state, Direction side, Random ran
ArrayList quads = new ArrayList<>();
- transformQuadsTo( quads, m_baseModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
- if( m_overlayModel != null )
+ transformQuadsTo( quads, baseModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), generalTransform );
+ if( overlayModel != null )
{
- transformQuadsTo( quads, m_overlayModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), m_generalTransform );
+ transformQuadsTo( quads, overlayModel.getQuads( state, side, rand, EmptyModelData.INSTANCE ), generalTransform );
}
- if( m_leftUpgradeModel != null )
+ if( leftUpgradeModel != null )
{
- TransformationMatrix upgradeTransform = m_generalTransform.compose( m_leftUpgradeModel.getMatrix() );
- transformQuadsTo( quads, m_leftUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+ TransformationMatrix upgradeTransform = generalTransform.compose( leftUpgradeModel.getMatrix() );
+ transformQuadsTo( quads, leftUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
}
- if( m_rightUpgradeModel != null )
+ if( rightUpgradeModel != null )
{
- TransformationMatrix upgradeTransform = m_generalTransform.compose( m_rightUpgradeModel.getMatrix() );
- transformQuadsTo( quads, m_rightUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
+ TransformationMatrix upgradeTransform = generalTransform.compose( rightUpgradeModel.getMatrix() );
+ transformQuadsTo( quads, rightUpgradeModel.getModel().getQuads( state, side, rand, EmptyModelData.INSTANCE ), upgradeTransform );
}
quads.trimToSize();
return quads;
@@ -92,25 +92,25 @@ private List buildQuads( BlockState state, Direction side, Random ran
@Override
public boolean useAmbientOcclusion()
{
- return m_baseModel.useAmbientOcclusion();
+ return baseModel.useAmbientOcclusion();
}
@Override
public boolean isGui3d()
{
- return m_baseModel.isGui3d();
+ return baseModel.isGui3d();
}
@Override
public boolean isCustomRenderer()
{
- return m_baseModel.isCustomRenderer();
+ return baseModel.isCustomRenderer();
}
@Override
public boolean usesBlockLight()
{
- return m_baseModel.usesBlockLight();
+ return baseModel.usesBlockLight();
}
@Nonnull
@@ -118,7 +118,7 @@ public boolean usesBlockLight()
@Deprecated
public TextureAtlasSprite getParticleIcon()
{
- return m_baseModel.getParticleIcon();
+ return baseModel.getParticleIcon();
}
@Nonnull
@@ -126,7 +126,7 @@ public TextureAtlasSprite getParticleIcon()
@Deprecated
public net.minecraft.client.renderer.model.ItemCameraTransforms getTransforms()
{
- return m_baseModel.getTransforms();
+ return baseModel.getTransforms();
}
@Nonnull
diff --git a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
index 047e5470c..f6a244d1b 100644
--- a/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
+++ b/src/main/java/dan200/computercraft/client/render/TurtleSmartItemModel.java
@@ -47,21 +47,21 @@ public class TurtleSmartItemModel implements IBakedModel
private static class TurtleModelCombination
{
- final boolean m_colour;
- final ITurtleUpgrade m_leftUpgrade;
- final ITurtleUpgrade m_rightUpgrade;
- final ResourceLocation m_overlay;
- final boolean m_christmas;
- final boolean m_flip;
+ final boolean colour;
+ final ITurtleUpgrade leftUpgrade;
+ final ITurtleUpgrade rightUpgrade;
+ final ResourceLocation overlay;
+ final boolean christmas;
+ final boolean flip;
TurtleModelCombination( boolean colour, ITurtleUpgrade leftUpgrade, ITurtleUpgrade rightUpgrade, ResourceLocation overlay, boolean christmas, boolean flip )
{
- m_colour = colour;
- m_leftUpgrade = leftUpgrade;
- m_rightUpgrade = rightUpgrade;
- m_overlay = overlay;
- m_christmas = christmas;
- m_flip = flip;
+ this.colour = colour;
+ this.leftUpgrade = leftUpgrade;
+ this.rightUpgrade = rightUpgrade;
+ this.overlay = overlay;
+ this.christmas = christmas;
+ this.flip = flip;
}
@Override
@@ -71,12 +71,12 @@ public boolean equals( Object other )
if( !(other instanceof TurtleModelCombination) ) return false;
TurtleModelCombination otherCombo = (TurtleModelCombination) other;
- return otherCombo.m_colour == m_colour &&
- otherCombo.m_leftUpgrade == m_leftUpgrade &&
- otherCombo.m_rightUpgrade == m_rightUpgrade &&
- Objects.equal( otherCombo.m_overlay, m_overlay ) &&
- otherCombo.m_christmas == m_christmas &&
- otherCombo.m_flip == m_flip;
+ return otherCombo.colour == colour &&
+ otherCombo.leftUpgrade == leftUpgrade &&
+ otherCombo.rightUpgrade == rightUpgrade &&
+ Objects.equal( otherCombo.overlay, overlay ) &&
+ otherCombo.christmas == christmas &&
+ otherCombo.flip == flip;
}
@Override
@@ -84,12 +84,12 @@ public int hashCode()
{
final int prime = 31;
int result = 0;
- result = prime * result + (m_colour ? 1 : 0);
- result = prime * result + (m_leftUpgrade != null ? m_leftUpgrade.hashCode() : 0);
- result = prime * result + (m_rightUpgrade != null ? m_rightUpgrade.hashCode() : 0);
- result = prime * result + (m_overlay != null ? m_overlay.hashCode() : 0);
- result = prime * result + (m_christmas ? 1 : 0);
- result = prime * result + (m_flip ? 1 : 0);
+ result = prime * result + (colour ? 1 : 0);
+ result = prime * result + (leftUpgrade != null ? leftUpgrade.hashCode() : 0);
+ result = prime * result + (rightUpgrade != null ? rightUpgrade.hashCode() : 0);
+ result = prime * result + (overlay != null ? overlay.hashCode() : 0);
+ result = prime * result + (christmas ? 1 : 0);
+ result = prime * result + (flip ? 1 : 0);
return result;
}
}
@@ -97,15 +97,15 @@ public int hashCode()
private final IBakedModel familyModel;
private final IBakedModel colourModel;
- private final HashMap m_cachedModels = new HashMap<>();
- private final ItemOverrideList m_overrides;
+ private final HashMap cachedModels = new HashMap<>();
+ private final ItemOverrideList overrides;
public TurtleSmartItemModel( IBakedModel familyModel, IBakedModel colourModel )
{
this.familyModel = familyModel;
this.colourModel = colourModel;
- m_overrides = new ItemOverrideList()
+ overrides = new ItemOverrideList()
{
@Nonnull
@Override
@@ -121,8 +121,8 @@ public IBakedModel resolve( @Nonnull IBakedModel originalModel, @Nonnull ItemSta
boolean flip = label != null && (label.equals( "Dinnerbone" ) || label.equals( "Grumm" ));
TurtleModelCombination combo = new TurtleModelCombination( colour != -1, leftUpgrade, rightUpgrade, overlay, christmas, flip );
- IBakedModel model = m_cachedModels.get( combo );
- if( model == null ) m_cachedModels.put( combo, model = buildModel( combo ) );
+ IBakedModel model = cachedModels.get( combo );
+ if( model == null ) cachedModels.put( combo, model = buildModel( combo ) );
return model;
}
};
@@ -132,20 +132,20 @@ public IBakedModel resolve( @Nonnull IBakedModel originalModel, @Nonnull ItemSta
@Override
public ItemOverrideList getOverrides()
{
- return m_overrides;
+ return overrides;
}
private IBakedModel buildModel( TurtleModelCombination combo )
{
Minecraft mc = Minecraft.getInstance();
ModelManager modelManager = mc.getItemRenderer().getItemModelShaper().getModelManager();
- ModelResourceLocation overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.m_overlay, combo.m_christmas );
+ ModelResourceLocation overlayModelLocation = TileEntityTurtleRenderer.getTurtleOverlayModel( combo.overlay, combo.christmas );
- IBakedModel baseModel = combo.m_colour ? colourModel : familyModel;
+ IBakedModel baseModel = combo.colour ? colourModel : familyModel;
IBakedModel overlayModel = overlayModelLocation != null ? modelManager.getModel( overlayModelLocation ) : null;
- TransformationMatrix transform = combo.m_flip ? flip : identity;
- TransformedModel leftModel = combo.m_leftUpgrade != null ? combo.m_leftUpgrade.getModel( null, TurtleSide.LEFT ) : null;
- TransformedModel rightModel = combo.m_rightUpgrade != null ? combo.m_rightUpgrade.getModel( null, TurtleSide.RIGHT ) : null;
+ TransformationMatrix transform = combo.flip ? flip : identity;
+ TransformedModel leftModel = combo.leftUpgrade != null ? combo.leftUpgrade.getModel( null, TurtleSide.LEFT ) : null;
+ TransformedModel rightModel = combo.rightUpgrade != null ? combo.rightUpgrade.getModel( null, TurtleSide.RIGHT ) : null;
return new TurtleMultiModel( baseModel, overlayModel, transform, leftModel, rightModel );
}
diff --git a/src/main/java/dan200/computercraft/core/apis/ComputerAccess.java b/src/main/java/dan200/computercraft/core/apis/ComputerAccess.java
index a0f762070..39c4a2ff3 100644
--- a/src/main/java/dan200/computercraft/core/apis/ComputerAccess.java
+++ b/src/main/java/dan200/computercraft/core/apis/ComputerAccess.java
@@ -19,22 +19,22 @@
public abstract class ComputerAccess implements IComputerAccess
{
- private final IAPIEnvironment m_environment;
- private final Set m_mounts = new HashSet<>();
+ private final IAPIEnvironment environment;
+ private final Set mounts = new HashSet<>();
protected ComputerAccess( IAPIEnvironment environment )
{
- this.m_environment = environment;
+ this.environment = environment;
}
public void unmountAll()
{
- FileSystem fileSystem = m_environment.getFileSystem();
- for( String mount : m_mounts )
+ FileSystem fileSystem = environment.getFileSystem();
+ for( String mount : mounts )
{
fileSystem.unmount( mount );
}
- m_mounts.clear();
+ mounts.clear();
}
@Override
@@ -46,7 +46,7 @@ public synchronized String mount( @Nonnull String desiredLoc, @Nonnull IMount mo
// Mount the location
String location;
- FileSystem fileSystem = m_environment.getFileSystem();
+ FileSystem fileSystem = environment.getFileSystem();
if( fileSystem == null ) throw new IllegalStateException( "File system has not been created" );
synchronized( fileSystem )
@@ -64,7 +64,7 @@ public synchronized String mount( @Nonnull String desiredLoc, @Nonnull IMount mo
}
}
- if( location != null ) m_mounts.add( location );
+ if( location != null ) mounts.add( location );
return location;
}
@@ -77,7 +77,7 @@ public synchronized String mountWritable( @Nonnull String desiredLoc, @Nonnull I
// Mount the location
String location;
- FileSystem fileSystem = m_environment.getFileSystem();
+ FileSystem fileSystem = environment.getFileSystem();
if( fileSystem == null ) throw new IllegalStateException( "File system has not been created" );
synchronized( fileSystem )
@@ -95,7 +95,7 @@ public synchronized String mountWritable( @Nonnull String desiredLoc, @Nonnull I
}
}
- if( location != null ) m_mounts.add( location );
+ if( location != null ) mounts.add( location );
return location;
}
@@ -103,37 +103,37 @@ public synchronized String mountWritable( @Nonnull String desiredLoc, @Nonnull I
public void unmount( String location )
{
if( location == null ) return;
- if( !m_mounts.contains( location ) ) throw new IllegalStateException( "You didn't mount this location" );
+ if( !mounts.contains( location ) ) throw new IllegalStateException( "You didn't mount this location" );
- m_environment.getFileSystem().unmount( location );
- m_mounts.remove( location );
+ environment.getFileSystem().unmount( location );
+ mounts.remove( location );
}
@Override
public int getID()
{
- return m_environment.getComputerID();
+ return environment.getComputerID();
}
@Override
public void queueEvent( @Nonnull String event, Object... arguments )
{
Objects.requireNonNull( event, "event cannot be null" );
- m_environment.queueEvent( event, arguments );
+ environment.queueEvent( event, arguments );
}
@Nonnull
@Override
public IWorkMonitor getMainThreadMonitor()
{
- return m_environment.getMainThreadMonitor();
+ return environment.getMainThreadMonitor();
}
private String findFreeLocation( String desiredLoc )
{
try
{
- FileSystem fileSystem = m_environment.getFileSystem();
+ FileSystem fileSystem = environment.getFileSystem();
if( !fileSystem.exists( desiredLoc ) ) return desiredLoc;
// We used to check foo2, foo3, foo4, etc here but the disk drive does this itself now
diff --git a/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java b/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
index 4363b9684..0494066ce 100644
--- a/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
+++ b/src/main/java/dan200/computercraft/core/apis/HTTPAPI.java
@@ -34,7 +34,7 @@
*/
public class HTTPAPI implements ILuaAPI
{
- private final IAPIEnvironment m_apiEnvironment;
+ private final IAPIEnvironment apiEnvironment;
private final ResourceGroup checkUrls = new ResourceGroup<>();
private final ResourceGroup requests = new ResourceQueue<>( () -> ComputerCraft.httpMaxRequests );
@@ -42,7 +42,7 @@ public class HTTPAPI implements ILuaAPI
public HTTPAPI( IAPIEnvironment environment )
{
- m_apiEnvironment = environment;
+ apiEnvironment = environment;
}
@Override
@@ -123,7 +123,7 @@ public final Object[] request( IArguments args ) throws LuaException
try
{
URI uri = HttpRequest.checkUri( address );
- HttpRequest request = new HttpRequest( requests, m_apiEnvironment, address, postString, headers, binary, redirect );
+ HttpRequest request = new HttpRequest( requests, apiEnvironment, address, postString, headers, binary, redirect );
// Make the request
request.queue( r -> r.request( uri, httpMethod ) );
@@ -142,7 +142,7 @@ public final Object[] checkURL( String address )
try
{
URI uri = HttpRequest.checkUri( address );
- new CheckUrl( checkUrls, m_apiEnvironment, address, uri ).queue( CheckUrl::run );
+ new CheckUrl( checkUrls, apiEnvironment, address, uri ).queue( CheckUrl::run );
return new Object[] { true };
}
@@ -165,7 +165,7 @@ public final Object[] websocket( String address, Optional