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> headerTbl ) try { URI uri = Websocket.checkUri( address ); - if( !new Websocket( websockets, m_apiEnvironment, uri, address, headers ).queue( Websocket::connect ) ) + if( !new Websocket( websockets, apiEnvironment, uri, address, headers ).queue( Websocket::connect ) ) { throw new LuaException( "Too many websockets already open" ); } diff --git a/src/main/java/dan200/computercraft/core/apis/OSAPI.java b/src/main/java/dan200/computercraft/core/apis/OSAPI.java index d8da0a23d..9b59ffcef 100644 --- a/src/main/java/dan200/computercraft/core/apis/OSAPI.java +++ b/src/main/java/dan200/computercraft/core/apis/OSAPI.java @@ -32,29 +32,29 @@ public class OSAPI implements ILuaAPI { private final IAPIEnvironment apiEnvironment; - private final Int2ObjectMap m_alarms = new Int2ObjectOpenHashMap<>(); - private int m_clock; - private double m_time; - private int m_day; + private final Int2ObjectMap alarms = new Int2ObjectOpenHashMap<>(); + private int clock; + private double time; + private int day; - private int m_nextAlarmToken = 0; + private int nextAlarmToken = 0; private static class Alarm implements Comparable { - final double m_time; - final int m_day; + final double time; + final int day; Alarm( double time, int day ) { - m_time = time; - m_day = day; + this.time = time; + this.day = day; } @Override public int compareTo( @Nonnull Alarm o ) { - double t = m_day * 24.0 + m_time; - double ot = m_day * 24.0 + m_time; + double t = day * 24.0 + time; + double ot = day * 24.0 + time; return Double.compare( t, ot ); } } @@ -73,38 +73,38 @@ public String[] getNames() @Override public void startup() { - m_time = apiEnvironment.getComputerEnvironment().getTimeOfDay(); - m_day = apiEnvironment.getComputerEnvironment().getDay(); - m_clock = 0; + time = apiEnvironment.getComputerEnvironment().getTimeOfDay(); + day = apiEnvironment.getComputerEnvironment().getDay(); + clock = 0; - synchronized( m_alarms ) + synchronized( alarms ) { - m_alarms.clear(); + alarms.clear(); } } @Override public void update() { - m_clock++; + clock++; // Wait for all of our alarms - synchronized( m_alarms ) + synchronized( alarms ) { - double previousTime = m_time; - int previousDay = m_day; + double previousTime = time; + int previousDay = day; double time = apiEnvironment.getComputerEnvironment().getTimeOfDay(); int day = apiEnvironment.getComputerEnvironment().getDay(); if( time > previousTime || day > previousDay ) { - double now = m_day * 24.0 + m_time; - Iterator> it = m_alarms.int2ObjectEntrySet().iterator(); + double now = this.day * 24.0 + this.time; + Iterator> it = alarms.int2ObjectEntrySet().iterator(); while( it.hasNext() ) { Int2ObjectMap.Entry entry = it.next(); Alarm alarm = entry.getValue(); - double t = alarm.m_day * 24.0 + alarm.m_time; + double t = alarm.day * 24.0 + alarm.time; if( now >= t ) { apiEnvironment.queueEvent( "alarm", entry.getIntKey() ); @@ -113,17 +113,17 @@ public void update() } } - m_time = time; - m_day = day; + this.time = time; + this.day = day; } } @Override public void shutdown() { - synchronized( m_alarms ) + synchronized( alarms ) { - m_alarms.clear(); + alarms.clear(); } } @@ -219,11 +219,11 @@ public final int setAlarm( double time ) throws LuaException { checkFinite( 0, time ); if( time < 0.0 || time >= 24.0 ) throw new LuaException( "Number out of range" ); - synchronized( m_alarms ) + synchronized( alarms ) { - int day = time > m_time ? m_day : m_day + 1; - m_alarms.put( m_nextAlarmToken, new Alarm( time, day ) ); - return m_nextAlarmToken++; + int day = time > this.time ? this.day : this.day + 1; + alarms.put( nextAlarmToken, new Alarm( time, day ) ); + return nextAlarmToken++; } } @@ -237,9 +237,9 @@ public final int setAlarm( double time ) throws LuaException @LuaFunction public final void cancelAlarm( int token ) { - synchronized( m_alarms ) + synchronized( alarms ) { - m_alarms.remove( token ); + alarms.remove( token ); } } @@ -304,7 +304,7 @@ public final void setComputerLabel( Optional label ) @LuaFunction public final double clock() { - return m_clock * 0.05; + return clock * 0.05; } /** @@ -341,7 +341,7 @@ public final Object time( IArguments args ) throws LuaException case "local": // Get Hour of day (local time) return getTimeForCalendar( Calendar.getInstance() ); case "ingame": // Get in-game hour - return m_time; + return time; default: throw new LuaException( "Unsupported operation" ); } @@ -371,7 +371,7 @@ public final int day( Optional args ) throws LuaException case "local": // Get numbers of days since 1970-01-01 (local time) return getDayForCalendar( Calendar.getInstance() ); case "ingame":// Get game day - return m_day; + return day; default: throw new LuaException( "Unsupported operation" ); } @@ -410,9 +410,9 @@ public final long epoch( Optional args ) throws LuaException } case "ingame": // Get in-game epoch - synchronized( m_alarms ) + synchronized( alarms ) { - return m_day * 86400000L + (long) (m_time * 3600000.0); + return day * 86400000L + (long) (time * 3600000.0); } default: throw new LuaException( "Unsupported operation" ); diff --git a/src/main/java/dan200/computercraft/core/computer/Computer.java b/src/main/java/dan200/computercraft/core/computer/Computer.java index a40e104e6..005625230 100644 --- a/src/main/java/dan200/computercraft/core/computer/Computer.java +++ b/src/main/java/dan200/computercraft/core/computer/Computer.java @@ -32,28 +32,28 @@ public class Computer private static final int START_DELAY = 50; // Various properties of the computer - private int m_id; - private String m_label = null; + private int id; + private String label = null; // Read-only fields about the computer - private final IComputerEnvironment m_environment; - private final Terminal m_terminal; + private final IComputerEnvironment environment; + private final Terminal terminal; private final ComputerExecutor executor; private final MainThreadExecutor serverExecutor; // Additional state about the computer and its environment. - private boolean m_blinking = false; + private boolean blinking = false; private final Environment internalEnvironment = new Environment( this ); private final AtomicBoolean externalOutputChanged = new AtomicBoolean(); private boolean startRequested; - private int m_ticksSinceStart = -1; + private int ticksSinceStart = -1; public Computer( IComputerEnvironment environment, Terminal terminal, int id ) { - m_id = id; - m_environment = environment; - m_terminal = terminal; + this.id = id; + this.environment = environment; + this.terminal = terminal; executor = new ComputerExecutor( this ); serverExecutor = new MainThreadExecutor( this ); @@ -61,7 +61,7 @@ public Computer( IComputerEnvironment environment, Terminal terminal, int id ) IComputerEnvironment getComputerEnvironment() { - return m_environment; + return environment; } FileSystem getFileSystem() @@ -71,7 +71,7 @@ FileSystem getFileSystem() Terminal getTerminal() { - return m_terminal; + return terminal; } public Environment getEnvironment() @@ -132,33 +132,33 @@ public IWorkMonitor getMainThreadMonitor() public int getID() { - return m_id; + return id; } public int assignID() { - if( m_id < 0 ) + if( id < 0 ) { - m_id = m_environment.assignNewID(); + id = environment.assignNewID(); } - return m_id; + return id; } public void setID( int id ) { - m_id = id; + this.id = id; } public String getLabel() { - return m_label; + return label; } public void setLabel( String label ) { - if( !Objects.equal( label, m_label ) ) + if( !Objects.equal( label, this.label ) ) { - m_label = label; + this.label = label; externalOutputChanged.set( true ); } } @@ -166,14 +166,14 @@ public void setLabel( String label ) public void tick() { // We keep track of the number of ticks since the last start, only - if( m_ticksSinceStart >= 0 && m_ticksSinceStart <= START_DELAY ) m_ticksSinceStart++; + if( ticksSinceStart >= 0 && ticksSinceStart <= START_DELAY ) ticksSinceStart++; - if( startRequested && (m_ticksSinceStart < 0 || m_ticksSinceStart > START_DELAY) ) + if( startRequested && (ticksSinceStart < 0 || ticksSinceStart > START_DELAY) ) { startRequested = false; if( !executor.isOn() ) { - m_ticksSinceStart = 0; + ticksSinceStart = 0; executor.queueStart(); } } @@ -187,12 +187,12 @@ public void tick() if( internalEnvironment.updateOutput() ) externalOutputChanged.set( true ); // Set output changed if the terminal has changed from blinking to not - boolean blinking = m_terminal.getCursorBlink() && - m_terminal.getCursorX() >= 0 && m_terminal.getCursorX() < m_terminal.getWidth() && - m_terminal.getCursorY() >= 0 && m_terminal.getCursorY() < m_terminal.getHeight(); - if( blinking != m_blinking ) + boolean blinking = terminal.getCursorBlink() && + terminal.getCursorX() >= 0 && terminal.getCursorX() < terminal.getWidth() && + terminal.getCursorY() >= 0 && terminal.getCursorY() < terminal.getHeight(); + if( blinking != this.blinking ) { - m_blinking = blinking; + this.blinking = blinking; externalOutputChanged.set( true ); } } @@ -209,7 +209,7 @@ public boolean pollAndResetChanged() public boolean isBlinking() { - return isOn() && m_blinking; + return isOn() && blinking; } public void addApi( ILuaAPI api ) diff --git a/src/main/java/dan200/computercraft/core/filesystem/ComboMount.java b/src/main/java/dan200/computercraft/core/filesystem/ComboMount.java index 17ad177ed..46e63e9ac 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/ComboMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/ComboMount.java @@ -19,11 +19,11 @@ public class ComboMount implements IMount { - private IMount[] m_parts; + private final IMount[] parts; public ComboMount( IMount[] parts ) { - m_parts = parts; + this.parts = parts; } // IMount implementation @@ -31,9 +31,9 @@ public ComboMount( IMount[] parts ) @Override public boolean exists( @Nonnull String path ) throws IOException { - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.exists( path ) ) { return true; @@ -45,9 +45,9 @@ public boolean exists( @Nonnull String path ) throws IOException @Override public boolean isDirectory( @Nonnull String path ) throws IOException { - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.isDirectory( path ) ) { return true; @@ -62,9 +62,9 @@ public void list( @Nonnull String path, @Nonnull List contents ) throws // Combine the lists from all the mounts List foundFiles = null; int foundDirs = 0; - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.exists( path ) && part.isDirectory( path ) ) { if( foundFiles == null ) @@ -102,9 +102,9 @@ else if( foundDirs > 1 ) @Override public long getSize( @Nonnull String path ) throws IOException { - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.exists( path ) ) { return part.getSize( path ); @@ -117,9 +117,9 @@ public long getSize( @Nonnull String path ) throws IOException @Override public ReadableByteChannel openForRead( @Nonnull String path ) throws IOException { - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.exists( path ) && !part.isDirectory( path ) ) { return part.openForRead( path ); @@ -132,9 +132,9 @@ public ReadableByteChannel openForRead( @Nonnull String path ) throws IOExceptio @Override public BasicFileAttributes getAttributes( @Nonnull String path ) throws IOException { - for( int i = m_parts.length - 1; i >= 0; --i ) + for( int i = parts.length - 1; i >= 0; --i ) { - IMount part = m_parts[i]; + IMount part = parts[i]; if( part.exists( path ) && !part.isDirectory( path ) ) { return part.getAttributes( path ); diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileMount.java b/src/main/java/dan200/computercraft/core/filesystem/FileMount.java index 61a237215..bcd19adbe 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileMount.java @@ -32,57 +32,57 @@ public class FileMount implements IWritableMount private class WritableCountingChannel implements WritableByteChannel { - private final WritableByteChannel m_inner; - long m_ignoredBytesLeft; + private final WritableByteChannel inner; + long ignoredBytesLeft; WritableCountingChannel( WritableByteChannel inner, long bytesToIgnore ) { - m_inner = inner; - m_ignoredBytesLeft = bytesToIgnore; + this.inner = inner; + ignoredBytesLeft = bytesToIgnore; } @Override public int write( @Nonnull ByteBuffer b ) throws IOException { count( b.remaining() ); - return m_inner.write( b ); + return inner.write( b ); } void count( long n ) throws IOException { - m_ignoredBytesLeft -= n; - if( m_ignoredBytesLeft < 0 ) + ignoredBytesLeft -= n; + if( ignoredBytesLeft < 0 ) { - long newBytes = -m_ignoredBytesLeft; - m_ignoredBytesLeft = 0; + long newBytes = -ignoredBytesLeft; + ignoredBytesLeft = 0; - long bytesLeft = m_capacity - m_usedSpace; + long bytesLeft = capacity - usedSpace; if( newBytes > bytesLeft ) throw new IOException( "Out of space" ); - m_usedSpace += newBytes; + usedSpace += newBytes; } } @Override public boolean isOpen() { - return m_inner.isOpen(); + return inner.isOpen(); } @Override public void close() throws IOException { - m_inner.close(); + inner.close(); } } private class SeekableCountingChannel extends WritableCountingChannel implements SeekableByteChannel { - private final SeekableByteChannel m_inner; + private final SeekableByteChannel inner; SeekableCountingChannel( SeekableByteChannel inner, long bytesToIgnore ) { super( inner, bytesToIgnore ); - m_inner = inner; + this.inner = inner; } @Override @@ -94,17 +94,17 @@ public SeekableByteChannel position( long newPosition ) throws IOException throw new IllegalArgumentException( "Cannot seek before the beginning of the stream" ); } - long delta = newPosition - m_inner.position(); + long delta = newPosition - inner.position(); if( delta < 0 ) { - m_ignoredBytesLeft -= delta; + ignoredBytesLeft -= delta; } else { count( delta ); } - return m_inner.position( newPosition ); + return inner.position( newPosition ); } @Override @@ -116,32 +116,32 @@ public SeekableByteChannel truncate( long size ) throws IOException @Override public int read( ByteBuffer dst ) throws ClosedChannelException { - if( !m_inner.isOpen() ) throw new ClosedChannelException(); + if( !inner.isOpen() ) throw new ClosedChannelException(); throw new NonReadableChannelException(); } @Override public long position() throws IOException { - return m_inner.position(); + return inner.position(); } @Override public long size() throws IOException { - return m_inner.size(); + return inner.size(); } } - private File m_rootPath; - private long m_capacity; - private long m_usedSpace; + private final File rootPath; + private final long capacity; + private long usedSpace; public FileMount( File rootPath, long capacity ) { - m_rootPath = rootPath; - m_capacity = capacity + MINIMUM_FILE_SIZE; - m_usedSpace = created() ? measureUsedSpace( m_rootPath ) : MINIMUM_FILE_SIZE; + this.rootPath = rootPath; + this.capacity = capacity + MINIMUM_FILE_SIZE; + usedSpace = created() ? measureUsedSpace( this.rootPath ) : MINIMUM_FILE_SIZE; } // IMount implementation @@ -253,7 +253,7 @@ public void makeDirectory( @Nonnull String path ) throws IOException if( file.mkdirs() ) { - m_usedSpace += dirsToCreate * MINIMUM_FILE_SIZE; + usedSpace += dirsToCreate * MINIMUM_FILE_SIZE; } else { @@ -290,7 +290,7 @@ private void deleteRecursively( File file ) throws IOException boolean success = file.delete(); if( success ) { - m_usedSpace -= Math.max( MINIMUM_FILE_SIZE, fileSize ); + usedSpace -= Math.max( MINIMUM_FILE_SIZE, fileSize ); } else { @@ -308,13 +308,13 @@ public WritableByteChannel openForWrite( @Nonnull String path ) throws IOExcepti if( file.exists() ) { - m_usedSpace -= Math.max( file.length(), MINIMUM_FILE_SIZE ); + usedSpace -= Math.max( file.length(), MINIMUM_FILE_SIZE ); } else if( getRemainingSpace() < MINIMUM_FILE_SIZE ) { throw new FileOperationException( path, "Out of space" ); } - m_usedSpace += MINIMUM_FILE_SIZE; + usedSpace += MINIMUM_FILE_SIZE; return new SeekableCountingChannel( Files.newByteChannel( file.toPath(), WRITE_OPTIONS ), MINIMUM_FILE_SIZE ); } @@ -342,31 +342,31 @@ public WritableByteChannel openForAppend( @Nonnull String path ) throws IOExcept @Override public long getRemainingSpace() { - return Math.max( m_capacity - m_usedSpace, 0 ); + return Math.max( capacity - usedSpace, 0 ); } @Nonnull @Override public OptionalLong getCapacity() { - return OptionalLong.of( m_capacity - MINIMUM_FILE_SIZE ); + return OptionalLong.of( capacity - MINIMUM_FILE_SIZE ); } private File getRealPath( String path ) { - return new File( m_rootPath, path ); + return new File( rootPath, path ); } private boolean created() { - return m_rootPath.exists(); + return rootPath.exists(); } private void create() throws IOException { - if( !m_rootPath.exists() ) + if( !rootPath.exists() ) { - boolean success = m_rootPath.mkdirs(); + boolean success = rootPath.mkdirs(); if( !success ) { throw new IOException( "Access denied" ); diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java index 2904f0fb3..cfbc9d92e 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java @@ -37,11 +37,11 @@ public class FileSystem */ private static final int MAX_COPY_DEPTH = 128; - private final FileSystemWrapperMount m_wrapper = new FileSystemWrapperMount( this ); + private final FileSystemWrapperMount wrapper = new FileSystemWrapperMount( this ); private final Map mounts = new HashMap<>(); - private final HashMap>, ChannelWrapper> m_openFiles = new HashMap<>(); - private final ReferenceQueue> m_openFileQueue = new ReferenceQueue<>(); + private final HashMap>, ChannelWrapper> openFiles = new HashMap<>(); + private final ReferenceQueue> openFileQueue = new ReferenceQueue<>(); public FileSystem( String rootLabel, IMount rootMount ) throws FileSystemException { @@ -56,11 +56,11 @@ public FileSystem( String rootLabel, IWritableMount rootMount ) throws FileSyste public void close() { // Close all dangling open files - synchronized( m_openFiles ) + synchronized( openFiles ) { - for( Closeable file : m_openFiles.values() ) IoUtil.closeQuietly( file ); - m_openFiles.clear(); - while( m_openFileQueue.poll() != null ) ; + for( Closeable file : openFiles.values() ) IoUtil.closeQuietly( file ); + openFiles.clear(); + while( openFileQueue.poll() != null ) ; } } @@ -101,11 +101,11 @@ public synchronized void unmount( String path ) cleanup(); // Close any files which belong to this mount - don't want people writing to a disk after it's been ejected! - // There's no point storing a Mount -> Wrapper[] map, as m_openFiles is small and unmount isn't called very + // There's no point storing a Mount -> Wrapper[] map, as openFiles is small and unmount isn't called very // often. - synchronized( m_openFiles ) + synchronized( openFiles ) { - for( Iterator>> iterator = m_openFiles.keySet().iterator(); iterator.hasNext(); ) + for( Iterator>> iterator = openFiles.keySet().iterator(); iterator.hasNext(); ) { WeakReference> reference = iterator.next(); FileSystemWrapper wrapper = reference.get(); @@ -383,22 +383,22 @@ private synchronized void copyRecursive( String sourcePath, MountWrapper sourceM private void cleanup() { - synchronized( m_openFiles ) + synchronized( openFiles ) { Reference ref; - while( (ref = m_openFileQueue.poll()) != null ) + while( (ref = openFileQueue.poll()) != null ) { - IoUtil.closeQuietly( m_openFiles.remove( ref ) ); + IoUtil.closeQuietly( openFiles.remove( ref ) ); } } } private synchronized FileSystemWrapper openFile( @Nonnull MountWrapper mount, @Nonnull Channel channel, @Nonnull T file ) throws FileSystemException { - synchronized( m_openFiles ) + synchronized( openFiles ) { if( ComputerCraft.maximumFilesOpen > 0 && - m_openFiles.size() >= ComputerCraft.maximumFilesOpen ) + openFiles.size() >= ComputerCraft.maximumFilesOpen ) { IoUtil.closeQuietly( file ); IoUtil.closeQuietly( channel ); @@ -406,17 +406,17 @@ private synchronized FileSystemWrapper openFile( @Nonnu } ChannelWrapper channelWrapper = new ChannelWrapper<>( file, channel ); - FileSystemWrapper fsWrapper = new FileSystemWrapper<>( this, mount, channelWrapper, m_openFileQueue ); - m_openFiles.put( fsWrapper.self, channelWrapper ); + FileSystemWrapper fsWrapper = new FileSystemWrapper<>( this, mount, channelWrapper, openFileQueue ); + openFiles.put( fsWrapper.self, channelWrapper ); return fsWrapper; } } void removeFile( FileSystemWrapper handle ) { - synchronized( m_openFiles ) + synchronized( openFiles ) { - m_openFiles.remove( handle.self ); + openFiles.remove( handle.self ); } } @@ -483,7 +483,7 @@ private synchronized MountWrapper getMount( String path ) throws FileSystemExcep public IFileSystem getMountWrapper() { - return m_wrapper; + return wrapper; } private static String sanitizePath( String path ) diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java b/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java index ba2d4008d..e0082dcbe 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystemWrapperMount.java @@ -17,11 +17,11 @@ public class FileSystemWrapperMount implements IFileSystem { - private final FileSystem m_filesystem; + private final FileSystem filesystem; public FileSystemWrapperMount( FileSystem filesystem ) { - this.m_filesystem = filesystem; + this.filesystem = filesystem; } @Override @@ -29,7 +29,7 @@ public void makeDirectory( @Nonnull String path ) throws IOException { try { - m_filesystem.makeDir( path ); + filesystem.makeDir( path ); } catch( FileSystemException e ) { @@ -42,7 +42,7 @@ public void delete( @Nonnull String path ) throws IOException { try { - m_filesystem.delete( path ); + filesystem.delete( path ); } catch( FileSystemException e ) { @@ -57,7 +57,7 @@ public ReadableByteChannel openForRead( @Nonnull String path ) throws IOExceptio try { // FIXME: Think of a better way of implementing this, so closing this will close on the computer. - return m_filesystem.openForRead( path, Function.identity() ).get(); + return filesystem.openForRead( path, Function.identity() ).get(); } catch( FileSystemException e ) { @@ -71,7 +71,7 @@ public WritableByteChannel openForWrite( @Nonnull String path ) throws IOExcepti { try { - return m_filesystem.openForWrite( path, false, Function.identity() ).get(); + return filesystem.openForWrite( path, false, Function.identity() ).get(); } catch( FileSystemException e ) { @@ -85,7 +85,7 @@ public WritableByteChannel openForAppend( @Nonnull String path ) throws IOExcept { try { - return m_filesystem.openForWrite( path, true, Function.identity() ).get(); + return filesystem.openForWrite( path, true, Function.identity() ).get(); } catch( FileSystemException e ) { @@ -98,7 +98,7 @@ public long getRemainingSpace() throws IOException { try { - return m_filesystem.getFreeSpace( "/" ); + return filesystem.getFreeSpace( "/" ); } catch( FileSystemException e ) { @@ -111,7 +111,7 @@ public boolean exists( @Nonnull String path ) throws IOException { try { - return m_filesystem.exists( path ); + return filesystem.exists( path ); } catch( FileSystemException e ) { @@ -124,7 +124,7 @@ public boolean isDirectory( @Nonnull String path ) throws IOException { try { - return m_filesystem.isDir( path ); + return filesystem.isDir( path ); } catch( FileSystemException e ) { @@ -137,7 +137,7 @@ public void list( @Nonnull String path, @Nonnull List contents ) throws { try { - Collections.addAll( contents, m_filesystem.list( path ) ); + Collections.addAll( contents, filesystem.list( path ) ); } catch( FileSystemException e ) { @@ -150,7 +150,7 @@ public long getSize( @Nonnull String path ) throws IOException { try { - return m_filesystem.getSize( path ); + return filesystem.getSize( path ); } catch( FileSystemException e ) { @@ -161,7 +161,7 @@ public long getSize( @Nonnull String path ) throws IOException @Override public String combine( String path, String child ) { - return m_filesystem.combine( path, child ); + return filesystem.combine( path, child ); } @Override @@ -169,7 +169,7 @@ public void copy( String from, String to ) throws IOException { try { - m_filesystem.copy( from, to ); + filesystem.copy( from, to ); } catch( FileSystemException e ) { @@ -182,7 +182,7 @@ public void move( String from, String to ) throws IOException { try { - m_filesystem.move( from, to ); + filesystem.move( from, to ); } catch( FileSystemException e ) { diff --git a/src/main/java/dan200/computercraft/core/filesystem/SubMount.java b/src/main/java/dan200/computercraft/core/filesystem/SubMount.java index bc62e875d..b596896c8 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/SubMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/SubMount.java @@ -15,8 +15,8 @@ public class SubMount implements IMount { - private IMount parent; - private String subPath; + private final IMount parent; + private final String subPath; public SubMount( IMount parent, String subPath ) { diff --git a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java index 2721d10bb..d0e58c5a2 100644 --- a/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java +++ b/src/main/java/dan200/computercraft/core/lua/CobaltLuaMachine.java @@ -50,29 +50,29 @@ public class CobaltLuaMachine implements ILuaMachine private static final LuaMethod FUNCTION_METHOD = ( target, context, args ) -> ((ILuaFunction) target).call( args ); - private final Computer m_computer; + private final Computer computer; private final TimeoutState timeout; private final TimeoutDebugHandler debug; private final ILuaContext context = new CobaltLuaContext(); - private LuaState m_state; - private LuaTable m_globals; + private LuaState state; + private LuaTable globals; - private LuaThread m_mainRoutine = null; - private String m_eventFilter = null; + private LuaThread mainRoutine = null; + private String eventFilter = null; public CobaltLuaMachine( Computer computer, TimeoutState timeout ) { - m_computer = computer; + this.computer = computer; this.timeout = timeout; debug = new TimeoutDebugHandler(); // Create an environment to run in - LuaState state = m_state = LuaState.builder() + LuaState state = this.state = LuaState.builder() .resourceManipulator( new VoidResourceManipulator() ) .debug( debug ) .coroutineExecutor( command -> { - Tracking.addValue( m_computer, TrackingField.COROUTINES_CREATED, 1 ); + Tracking.addValue( this.computer, TrackingField.COROUTINES_CREATED, 1 ); COROUTINES.execute( () -> { try { @@ -80,38 +80,38 @@ public CobaltLuaMachine( Computer computer, TimeoutState timeout ) } finally { - Tracking.addValue( m_computer, TrackingField.COROUTINES_DISPOSED, 1 ); + Tracking.addValue( this.computer, TrackingField.COROUTINES_DISPOSED, 1 ); } } ); } ) .build(); - m_globals = new LuaTable(); - state.setupThread( m_globals ); + globals = new LuaTable(); + state.setupThread( globals ); // Add basic libraries - m_globals.load( state, new BaseLib() ); - m_globals.load( state, new TableLib() ); - m_globals.load( state, new StringLib() ); - m_globals.load( state, new MathLib() ); - m_globals.load( state, new CoroutineLib() ); - m_globals.load( state, new Bit32Lib() ); - m_globals.load( state, new Utf8Lib() ); - if( ComputerCraft.debugEnable ) m_globals.load( state, new DebugLib() ); + globals.load( state, new BaseLib() ); + globals.load( state, new TableLib() ); + globals.load( state, new StringLib() ); + globals.load( state, new MathLib() ); + globals.load( state, new CoroutineLib() ); + globals.load( state, new Bit32Lib() ); + globals.load( state, new Utf8Lib() ); + if( ComputerCraft.debugEnable ) globals.load( state, new DebugLib() ); // Remove globals we don't want to expose - m_globals.rawset( "collectgarbage", Constants.NIL ); - m_globals.rawset( "dofile", Constants.NIL ); - m_globals.rawset( "loadfile", Constants.NIL ); - m_globals.rawset( "print", Constants.NIL ); + globals.rawset( "collectgarbage", Constants.NIL ); + globals.rawset( "dofile", Constants.NIL ); + globals.rawset( "loadfile", Constants.NIL ); + globals.rawset( "print", Constants.NIL ); // Add version globals - m_globals.rawset( "_VERSION", valueOf( "Lua 5.1" ) ); - m_globals.rawset( "_HOST", valueOf( computer.getAPIEnvironment().getComputerEnvironment().getHostString() ) ); - m_globals.rawset( "_CC_DEFAULT_SETTINGS", valueOf( ComputerCraft.defaultComputerSettings ) ); + globals.rawset( "_VERSION", valueOf( "Lua 5.1" ) ); + globals.rawset( "_HOST", valueOf( computer.getAPIEnvironment().getComputerEnvironment().getHostString() ) ); + globals.rawset( "_CC_DEFAULT_SETTINGS", valueOf( ComputerCraft.defaultComputerSettings ) ); if( ComputerCraft.disableLua51Features ) { - m_globals.rawset( "_CC_DISABLE_LUA51_FEATURES", Constants.TRUE ); + globals.rawset( "_CC_DISABLE_LUA51_FEATURES", Constants.TRUE ); } } @@ -127,19 +127,19 @@ public void addAPI( @Nonnull ILuaAPI api ) } String[] names = api.getNames(); - for( String name : names ) m_globals.rawset( name, table ); + for( String name : names ) globals.rawset( name, table ); } @Override public MachineResult loadBios( @Nonnull InputStream bios ) { // Begin executing a file (ie, the bios) - if( m_mainRoutine != null ) return MachineResult.OK; + if( mainRoutine != null ) return MachineResult.OK; try { - LuaFunction value = LoadState.load( m_state, bios, "@bios.lua", m_globals ); - m_mainRoutine = new LuaThread( m_state, value, m_globals ); + LuaFunction value = LoadState.load( state, bios, "@bios.lua", globals ); + mainRoutine = new LuaThread( state, value, globals ); return MachineResult.OK; } catch( CompileException e ) @@ -158,9 +158,9 @@ public MachineResult loadBios( @Nonnull InputStream bios ) @Override public MachineResult handleEvent( String eventName, Object[] arguments ) { - if( m_mainRoutine == null ) return MachineResult.OK; + if( mainRoutine == null ) return MachineResult.OK; - if( m_eventFilter != null && eventName != null && !eventName.equals( m_eventFilter ) && !eventName.equals( "terminate" ) ) + if( eventFilter != null && eventName != null && !eventName.equals( eventFilter ) && !eventName.equals( "terminate" ) ) { return MachineResult.OK; } @@ -178,17 +178,17 @@ public MachineResult handleEvent( String eventName, Object[] arguments ) } // Resume the current thread, or the main one when first starting off. - LuaThread thread = m_state.getCurrentThread(); - if( thread == null || thread == m_state.getMainThread() ) thread = m_mainRoutine; + LuaThread thread = state.getCurrentThread(); + if( thread == null || thread == state.getMainThread() ) thread = mainRoutine; Varargs results = LuaThread.run( thread, resumeArgs ); if( timeout.isHardAborted() ) throw HardAbortError.INSTANCE; if( results == null ) return MachineResult.PAUSE; LuaValue filter = results.first(); - m_eventFilter = filter.isString() ? filter.toString() : null; + eventFilter = filter.isString() ? filter.toString() : null; - if( m_mainRoutine.getStatus().equals( "dead" ) ) + if( mainRoutine.getStatus().equals( "dead" ) ) { close(); return MachineResult.GENERIC_ERROR; @@ -214,13 +214,13 @@ public MachineResult handleEvent( String eventName, Object[] arguments ) @Override public void close() { - LuaState state = m_state; + LuaState state = this.state; if( state == null ) return; state.abandon(); - m_mainRoutine = null; - m_state = null; - m_globals = null; + mainRoutine = null; + this.state = null; + globals = null; } @Nullable @@ -457,7 +457,7 @@ public void onInstruction( DebugState ds, DebugFrame di, int pc ) throws LuaErro if( (count = (count + 1) & 127) == 0 ) { // If we've been hard aborted or closed then abort. - if( timeout.isHardAborted() || m_state == null ) throw HardAbortError.INSTANCE; + if( timeout.isHardAborted() || state == null ) throw HardAbortError.INSTANCE; timeout.refresh(); if( timeout.isPaused() ) @@ -483,7 +483,7 @@ public void onInstruction( DebugState ds, DebugFrame di, int pc ) throws LuaErro public void poll() throws LuaError { // If we've been hard aborted or closed then abort. - LuaState state = m_state; + LuaState state = CobaltLuaMachine.this.state; if( timeout.isHardAborted() || state == null ) throw HardAbortError.INSTANCE; timeout.refresh(); @@ -526,26 +526,26 @@ public long issueMainThreadTask( @Nonnull final ILuaTask task ) throws LuaExcept eventArguments[0] = taskID; eventArguments[1] = true; System.arraycopy( results, 0, eventArguments, 2, results.length ); - m_computer.queueEvent( "task_complete", eventArguments ); + computer.queueEvent( "task_complete", eventArguments ); } else { - m_computer.queueEvent( "task_complete", new Object[] { taskID, true } ); + computer.queueEvent( "task_complete", new Object[] { taskID, true } ); } } catch( LuaException e ) { - m_computer.queueEvent( "task_complete", new Object[] { taskID, false, e.getMessage() } ); + computer.queueEvent( "task_complete", new Object[] { taskID, false, e.getMessage() } ); } catch( Throwable t ) { if( ComputerCraft.logComputerErrors ) ComputerCraft.log.error( "Error running task", t ); - m_computer.queueEvent( "task_complete", new Object[] { + computer.queueEvent( "task_complete", new Object[] { taskID, false, "Java Exception Thrown: " + t, } ); } }; - if( m_computer.queueMainThread( iTask ) ) + if( computer.queueMainThread( iTask ) ) { return taskID; } diff --git a/src/main/java/dan200/computercraft/core/terminal/Terminal.java b/src/main/java/dan200/computercraft/core/terminal/Terminal.java index 7b200ef56..61ddb65fd 100644 --- a/src/main/java/dan200/computercraft/core/terminal/Terminal.java +++ b/src/main/java/dan200/computercraft/core/terminal/Terminal.java @@ -16,20 +16,20 @@ public class Terminal { private static final String base16 = "0123456789abcdef"; - private int m_cursorX = 0; - private int m_cursorY = 0; - private boolean m_cursorBlink = false; - private int m_cursorColour = 0; - private int m_cursorBackgroundColour = 15; + private int cursorX = 0; + private int cursorY = 0; + private boolean cursorBlink = false; + private int cursorColour = 0; + private int cursorBackgroundColour = 15; - private int m_width; - private int m_height; + private int width; + private int height; - private TextBuffer[] m_text; - private TextBuffer[] m_textColour; - private TextBuffer[] m_backgroundColour; + private TextBuffer[] text; + private TextBuffer[] textColour; + private TextBuffer[] backgroundColour; - private final Palette m_palette = new Palette(); + private final Palette palette = new Palette(); private final Runnable onChanged; @@ -40,84 +40,84 @@ public Terminal( int width, int height ) public Terminal( int width, int height, Runnable changedCallback ) { - m_width = width; - m_height = height; + this.width = width; + this.height = height; onChanged = changedCallback; - m_text = new TextBuffer[m_height]; - m_textColour = new TextBuffer[m_height]; - m_backgroundColour = new TextBuffer[m_height]; - for( int i = 0; i < m_height; i++ ) + text = new TextBuffer[this.height]; + textColour = new TextBuffer[this.height]; + backgroundColour = new TextBuffer[this.height]; + for( int i = 0; i < this.height; i++ ) { - m_text[i] = new TextBuffer( ' ', m_width ); - m_textColour[i] = new TextBuffer( base16.charAt( m_cursorColour ), m_width ); - m_backgroundColour[i] = new TextBuffer( base16.charAt( m_cursorBackgroundColour ), m_width ); + text[i] = new TextBuffer( ' ', this.width ); + textColour[i] = new TextBuffer( base16.charAt( cursorColour ), this.width ); + backgroundColour[i] = new TextBuffer( base16.charAt( cursorBackgroundColour ), this.width ); } } public synchronized void reset() { - m_cursorColour = 0; - m_cursorBackgroundColour = 15; - m_cursorX = 0; - m_cursorY = 0; - m_cursorBlink = false; + cursorColour = 0; + cursorBackgroundColour = 15; + cursorX = 0; + cursorY = 0; + cursorBlink = false; clear(); setChanged(); - m_palette.resetColours(); + palette.resetColours(); } public int getWidth() { - return m_width; + return width; } public int getHeight() { - return m_height; + return height; } public synchronized void resize( int width, int height ) { - if( width == m_width && height == m_height ) + if( width == this.width && height == this.height ) { return; } - int oldHeight = m_height; - int oldWidth = m_width; - TextBuffer[] oldText = m_text; - TextBuffer[] oldTextColour = m_textColour; - TextBuffer[] oldBackgroundColour = m_backgroundColour; + int oldHeight = this.height; + int oldWidth = this.width; + TextBuffer[] oldText = text; + TextBuffer[] oldTextColour = textColour; + TextBuffer[] oldBackgroundColour = backgroundColour; - m_width = width; - m_height = height; + this.width = width; + this.height = height; - m_text = new TextBuffer[m_height]; - m_textColour = new TextBuffer[m_height]; - m_backgroundColour = new TextBuffer[m_height]; - for( int i = 0; i < m_height; i++ ) + text = new TextBuffer[this.height]; + textColour = new TextBuffer[this.height]; + backgroundColour = new TextBuffer[this.height]; + for( int i = 0; i < this.height; i++ ) { if( i >= oldHeight ) { - m_text[i] = new TextBuffer( ' ', m_width ); - m_textColour[i] = new TextBuffer( base16.charAt( m_cursorColour ), m_width ); - m_backgroundColour[i] = new TextBuffer( base16.charAt( m_cursorBackgroundColour ), m_width ); + text[i] = new TextBuffer( ' ', this.width ); + textColour[i] = new TextBuffer( base16.charAt( cursorColour ), this.width ); + backgroundColour[i] = new TextBuffer( base16.charAt( cursorBackgroundColour ), this.width ); } - else if( m_width == oldWidth ) + else if( this.width == oldWidth ) { - m_text[i] = oldText[i]; - m_textColour[i] = oldTextColour[i]; - m_backgroundColour[i] = oldBackgroundColour[i]; + text[i] = oldText[i]; + textColour[i] = oldTextColour[i]; + backgroundColour[i] = oldBackgroundColour[i]; } else { - m_text[i] = new TextBuffer( ' ', m_width ); - m_textColour[i] = new TextBuffer( base16.charAt( m_cursorColour ), m_width ); - m_backgroundColour[i] = new TextBuffer( base16.charAt( m_cursorBackgroundColour ), m_width ); - m_text[i].write( oldText[i] ); - m_textColour[i].write( oldTextColour[i] ); - m_backgroundColour[i].write( oldBackgroundColour[i] ); + text[i] = new TextBuffer( ' ', this.width ); + textColour[i] = new TextBuffer( base16.charAt( cursorColour ), this.width ); + backgroundColour[i] = new TextBuffer( base16.charAt( cursorBackgroundColour ), this.width ); + text[i].write( oldText[i] ); + textColour[i].write( oldTextColour[i] ); + backgroundColour[i].write( oldBackgroundColour[i] ); } } setChanged(); @@ -125,94 +125,94 @@ else if( m_width == oldWidth ) public void setCursorPos( int x, int y ) { - if( m_cursorX != x || m_cursorY != y ) + if( cursorX != x || cursorY != y ) { - m_cursorX = x; - m_cursorY = y; + cursorX = x; + cursorY = y; setChanged(); } } public void setCursorBlink( boolean blink ) { - if( m_cursorBlink != blink ) + if( cursorBlink != blink ) { - m_cursorBlink = blink; + cursorBlink = blink; setChanged(); } } public void setTextColour( int colour ) { - if( m_cursorColour != colour ) + if( cursorColour != colour ) { - m_cursorColour = colour; + cursorColour = colour; setChanged(); } } public void setBackgroundColour( int colour ) { - if( m_cursorBackgroundColour != colour ) + if( cursorBackgroundColour != colour ) { - m_cursorBackgroundColour = colour; + cursorBackgroundColour = colour; setChanged(); } } public int getCursorX() { - return m_cursorX; + return cursorX; } public int getCursorY() { - return m_cursorY; + return cursorY; } public boolean getCursorBlink() { - return m_cursorBlink; + return cursorBlink; } public int getTextColour() { - return m_cursorColour; + return cursorColour; } public int getBackgroundColour() { - return m_cursorBackgroundColour; + return cursorBackgroundColour; } @Nonnull public Palette getPalette() { - return m_palette; + return palette; } public synchronized void blit( String text, String textColour, String backgroundColour ) { - int x = m_cursorX; - int y = m_cursorY; - if( y >= 0 && y < m_height ) + int x = cursorX; + int y = cursorY; + if( y >= 0 && y < height ) { - m_text[y].write( text, x ); - m_textColour[y].write( textColour, x ); - m_backgroundColour[y].write( backgroundColour, x ); + this.text[y].write( text, x ); + this.textColour[y].write( textColour, x ); + this.backgroundColour[y].write( backgroundColour, x ); setChanged(); } } public synchronized void write( String text ) { - int x = m_cursorX; - int y = m_cursorY; - if( y >= 0 && y < m_height ) + int x = cursorX; + int y = cursorY; + if( y >= 0 && y < height ) { - m_text[y].write( text, x ); - m_textColour[y].fill( base16.charAt( m_cursorColour ), x, x + text.length() ); - m_backgroundColour[y].fill( base16.charAt( m_cursorBackgroundColour ), x, x + text.length() ); + this.text[y].write( text, x ); + textColour[y].fill( base16.charAt( cursorColour ), x, x + text.length() ); + backgroundColour[y].fill( base16.charAt( cursorBackgroundColour ), x, x + text.length() ); setChanged(); } } @@ -221,86 +221,86 @@ public synchronized void scroll( int yDiff ) { if( yDiff != 0 ) { - TextBuffer[] newText = new TextBuffer[m_height]; - TextBuffer[] newTextColour = new TextBuffer[m_height]; - TextBuffer[] newBackgroundColour = new TextBuffer[m_height]; - for( int y = 0; y < m_height; y++ ) + TextBuffer[] newText = new TextBuffer[height]; + TextBuffer[] newTextColour = new TextBuffer[height]; + TextBuffer[] newBackgroundColour = new TextBuffer[height]; + for( int y = 0; y < height; y++ ) { int oldY = y + yDiff; - if( oldY >= 0 && oldY < m_height ) + if( oldY >= 0 && oldY < height ) { - newText[y] = m_text[oldY]; - newTextColour[y] = m_textColour[oldY]; - newBackgroundColour[y] = m_backgroundColour[oldY]; + newText[y] = text[oldY]; + newTextColour[y] = textColour[oldY]; + newBackgroundColour[y] = backgroundColour[oldY]; } else { - newText[y] = new TextBuffer( ' ', m_width ); - newTextColour[y] = new TextBuffer( base16.charAt( m_cursorColour ), m_width ); - newBackgroundColour[y] = new TextBuffer( base16.charAt( m_cursorBackgroundColour ), m_width ); + newText[y] = new TextBuffer( ' ', width ); + newTextColour[y] = new TextBuffer( base16.charAt( cursorColour ), width ); + newBackgroundColour[y] = new TextBuffer( base16.charAt( cursorBackgroundColour ), width ); } } - m_text = newText; - m_textColour = newTextColour; - m_backgroundColour = newBackgroundColour; + text = newText; + textColour = newTextColour; + backgroundColour = newBackgroundColour; setChanged(); } } public synchronized void clear() { - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { - m_text[y].fill( ' ' ); - m_textColour[y].fill( base16.charAt( m_cursorColour ) ); - m_backgroundColour[y].fill( base16.charAt( m_cursorBackgroundColour ) ); + text[y].fill( ' ' ); + textColour[y].fill( base16.charAt( cursorColour ) ); + backgroundColour[y].fill( base16.charAt( cursorBackgroundColour ) ); } setChanged(); } public synchronized void clearLine() { - int y = m_cursorY; - if( y >= 0 && y < m_height ) + int y = cursorY; + if( y >= 0 && y < height ) { - m_text[y].fill( ' ' ); - m_textColour[y].fill( base16.charAt( m_cursorColour ) ); - m_backgroundColour[y].fill( base16.charAt( m_cursorBackgroundColour ) ); + text[y].fill( ' ' ); + textColour[y].fill( base16.charAt( cursorColour ) ); + backgroundColour[y].fill( base16.charAt( cursorBackgroundColour ) ); setChanged(); } } public synchronized TextBuffer getLine( int y ) { - if( y >= 0 && y < m_height ) + if( y >= 0 && y < height ) { - return m_text[y]; + return text[y]; } return null; } public synchronized void setLine( int y, String text, String textColour, String backgroundColour ) { - m_text[y].write( text ); - m_textColour[y].write( textColour ); - m_backgroundColour[y].write( backgroundColour ); + this.text[y].write( text ); + this.textColour[y].write( textColour ); + this.backgroundColour[y].write( backgroundColour ); setChanged(); } public synchronized TextBuffer getTextColourLine( int y ) { - if( y >= 0 && y < m_height ) + if( y >= 0 && y < height ) { - return m_textColour[y]; + return textColour[y]; } return null; } public synchronized TextBuffer getBackgroundColourLine( int y ) { - if( y >= 0 && y < m_height ) + if( y >= 0 && y < height ) { - return m_backgroundColour[y]; + return backgroundColour[y]; } return null; } @@ -312,18 +312,18 @@ public final void setChanged() public synchronized void write( PacketBuffer buffer ) { - buffer.writeInt( m_cursorX ); - buffer.writeInt( m_cursorY ); - buffer.writeBoolean( m_cursorBlink ); - buffer.writeByte( m_cursorBackgroundColour << 4 | m_cursorColour ); + buffer.writeInt( cursorX ); + buffer.writeInt( cursorY ); + buffer.writeBoolean( cursorBlink ); + buffer.writeByte( cursorBackgroundColour << 4 | cursorColour ); - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { - TextBuffer text = m_text[y]; - TextBuffer textColour = m_textColour[y]; - TextBuffer backColour = m_backgroundColour[y]; + TextBuffer text = this.text[y]; + TextBuffer textColour = this.textColour[y]; + TextBuffer backColour = backgroundColour[y]; - for( int x = 0; x < m_width; x++ ) + for( int x = 0; x < width; x++ ) { buffer.writeByte( text.charAt( x ) & 0xFF ); buffer.writeByte( getColour( @@ -333,26 +333,26 @@ public synchronized void write( PacketBuffer buffer ) } } - m_palette.write( buffer ); + palette.write( buffer ); } public synchronized void read( PacketBuffer buffer ) { - m_cursorX = buffer.readInt(); - m_cursorY = buffer.readInt(); - m_cursorBlink = buffer.readBoolean(); + cursorX = buffer.readInt(); + cursorY = buffer.readInt(); + cursorBlink = buffer.readBoolean(); byte cursorColour = buffer.readByte(); - m_cursorBackgroundColour = (cursorColour >> 4) & 0xF; - m_cursorColour = cursorColour & 0xF; + cursorBackgroundColour = (cursorColour >> 4) & 0xF; + this.cursorColour = cursorColour & 0xF; - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { - TextBuffer text = m_text[y]; - TextBuffer textColour = m_textColour[y]; - TextBuffer backColour = m_backgroundColour[y]; + TextBuffer text = this.text[y]; + TextBuffer textColour = this.textColour[y]; + TextBuffer backColour = backgroundColour[y]; - for( int x = 0; x < m_width; x++ ) + for( int x = 0; x < width; x++ ) { text.setChar( x, (char) (buffer.readByte() & 0xFF) ); @@ -362,56 +362,56 @@ public synchronized void read( PacketBuffer buffer ) } } - m_palette.read( buffer ); + palette.read( buffer ); setChanged(); } public synchronized CompoundNBT writeToNBT( CompoundNBT nbt ) { - nbt.putInt( "term_cursorX", m_cursorX ); - nbt.putInt( "term_cursorY", m_cursorY ); - nbt.putBoolean( "term_cursorBlink", m_cursorBlink ); - nbt.putInt( "term_textColour", m_cursorColour ); - nbt.putInt( "term_bgColour", m_cursorBackgroundColour ); - for( int n = 0; n < m_height; n++ ) + nbt.putInt( "term_cursorX", cursorX ); + nbt.putInt( "term_cursorY", cursorY ); + nbt.putBoolean( "term_cursorBlink", cursorBlink ); + nbt.putInt( "term_textColour", cursorColour ); + nbt.putInt( "term_bgColour", cursorBackgroundColour ); + for( int n = 0; n < height; n++ ) { - nbt.putString( "term_text_" + n, m_text[n].toString() ); - nbt.putString( "term_textColour_" + n, m_textColour[n].toString() ); - nbt.putString( "term_textBgColour_" + n, m_backgroundColour[n].toString() ); + nbt.putString( "term_text_" + n, text[n].toString() ); + nbt.putString( "term_textColour_" + n, textColour[n].toString() ); + nbt.putString( "term_textBgColour_" + n, backgroundColour[n].toString() ); } - m_palette.writeToNBT( nbt ); + palette.writeToNBT( nbt ); return nbt; } public synchronized void readFromNBT( CompoundNBT nbt ) { - m_cursorX = nbt.getInt( "term_cursorX" ); - m_cursorY = nbt.getInt( "term_cursorY" ); - m_cursorBlink = nbt.getBoolean( "term_cursorBlink" ); - m_cursorColour = nbt.getInt( "term_textColour" ); - m_cursorBackgroundColour = nbt.getInt( "term_bgColour" ); + cursorX = nbt.getInt( "term_cursorX" ); + cursorY = nbt.getInt( "term_cursorY" ); + cursorBlink = nbt.getBoolean( "term_cursorBlink" ); + cursorColour = nbt.getInt( "term_textColour" ); + cursorBackgroundColour = nbt.getInt( "term_bgColour" ); - for( int n = 0; n < m_height; n++ ) + for( int n = 0; n < height; n++ ) { - m_text[n].fill( ' ' ); + text[n].fill( ' ' ); if( nbt.contains( "term_text_" + n ) ) { - m_text[n].write( nbt.getString( "term_text_" + n ) ); + text[n].write( nbt.getString( "term_text_" + n ) ); } - m_textColour[n].fill( base16.charAt( m_cursorColour ) ); + textColour[n].fill( base16.charAt( cursorColour ) ); if( nbt.contains( "term_textColour_" + n ) ) { - m_textColour[n].write( nbt.getString( "term_textColour_" + n ) ); + textColour[n].write( nbt.getString( "term_textColour_" + n ) ); } - m_backgroundColour[n].fill( base16.charAt( m_cursorBackgroundColour ) ); + backgroundColour[n].fill( base16.charAt( cursorBackgroundColour ) ); if( nbt.contains( "term_textBgColour_" + n ) ) { - m_backgroundColour[n].write( nbt.getString( "term_textBgColour_" + n ) ); + backgroundColour[n].write( nbt.getString( "term_textBgColour_" + n ) ); } } - m_palette.readFromNBT( nbt ); + palette.readFromNBT( nbt ); setChanged(); } diff --git a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java index 46f1c9656..e855ff5d1 100644 --- a/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java +++ b/src/main/java/dan200/computercraft/core/terminal/TextBuffer.java @@ -7,14 +7,14 @@ public class TextBuffer { - private final char[] m_text; + private final char[] text; public TextBuffer( char c, int length ) { - m_text = new char[length]; + text = new char[length]; for( int i = 0; i < length; i++ ) { - m_text[i] = c; + text[i] = c; } } @@ -26,12 +26,12 @@ public TextBuffer( String text ) public TextBuffer( String text, int repetitions ) { int textLength = text.length(); - m_text = new char[textLength * repetitions]; + this.text = new char[textLength * repetitions]; for( int i = 0; i < repetitions; i++ ) { for( int j = 0; j < textLength; j++ ) { - m_text[j + i * textLength] = text.charAt( j ); + this.text[j + i * textLength] = text.charAt( j ); } } } @@ -44,37 +44,37 @@ public TextBuffer( TextBuffer text ) public TextBuffer( TextBuffer text, int repetitions ) { int textLength = text.length(); - m_text = new char[textLength * repetitions]; + this.text = new char[textLength * repetitions]; for( int i = 0; i < repetitions; i++ ) { for( int j = 0; j < textLength; j++ ) { - m_text[j + i * textLength] = text.charAt( j ); + this.text[j + i * textLength] = text.charAt( j ); } } } public int length() { - return m_text.length; + return text.length; } public String read() { - return read( 0, m_text.length ); + return read( 0, text.length ); } public String read( int start ) { - return read( start, m_text.length ); + return read( start, text.length ); } public String read( int start, int end ) { start = Math.max( start, 0 ); - end = Math.min( end, m_text.length ); + end = Math.min( end, text.length ); int textLength = Math.max( end - start, 0 ); - return new String( m_text, start, textLength ); + return new String( text, start, textLength ); } public void write( String text ) @@ -92,10 +92,10 @@ public void write( String text, int start, int end ) int pos = start; start = Math.max( start, 0 ); end = Math.min( end, pos + text.length() ); - end = Math.min( end, m_text.length ); + end = Math.min( end, this.text.length ); for( int i = start; i < end; i++ ) { - m_text[i] = text.charAt( i - pos ); + this.text[i] = text.charAt( i - pos ); } } @@ -114,94 +114,94 @@ public void write( TextBuffer text, int start, int end ) int pos = start; start = Math.max( start, 0 ); end = Math.min( end, pos + text.length() ); - end = Math.min( end, m_text.length ); + end = Math.min( end, this.text.length ); for( int i = start; i < end; i++ ) { - m_text[i] = text.charAt( i - pos ); + this.text[i] = text.charAt( i - pos ); } } public void fill( char c ) { - fill( c, 0, m_text.length ); + fill( c, 0, text.length ); } public void fill( char c, int start ) { - fill( c, start, m_text.length ); + fill( c, start, text.length ); } public void fill( char c, int start, int end ) { start = Math.max( start, 0 ); - end = Math.min( end, m_text.length ); + end = Math.min( end, text.length ); for( int i = start; i < end; i++ ) { - m_text[i] = c; + text[i] = c; } } public void fill( String text ) { - fill( text, 0, m_text.length ); + fill( text, 0, this.text.length ); } public void fill( String text, int start ) { - fill( text, start, m_text.length ); + fill( text, start, this.text.length ); } public void fill( String text, int start, int end ) { int pos = start; start = Math.max( start, 0 ); - end = Math.min( end, m_text.length ); + end = Math.min( end, this.text.length ); int textLength = text.length(); for( int i = start; i < end; i++ ) { - m_text[i] = text.charAt( (i - pos) % textLength ); + this.text[i] = text.charAt( (i - pos) % textLength ); } } public void fill( TextBuffer text ) { - fill( text, 0, m_text.length ); + fill( text, 0, this.text.length ); } public void fill( TextBuffer text, int start ) { - fill( text, start, m_text.length ); + fill( text, start, this.text.length ); } public void fill( TextBuffer text, int start, int end ) { int pos = start; start = Math.max( start, 0 ); - end = Math.min( end, m_text.length ); + end = Math.min( end, this.text.length ); int textLength = text.length(); for( int i = start; i < end; i++ ) { - m_text[i] = text.charAt( (i - pos) % textLength ); + this.text[i] = text.charAt( (i - pos) % textLength ); } } public char charAt( int i ) { - return m_text[i]; + return text[i]; } public void setChar( int i, char c ) { - if( i >= 0 && i < m_text.length ) + if( i >= 0 && i < text.length ) { - m_text[i] = c; + text[i] = c; } } public String toString() { - return new String( m_text ); + return new String( text ); } } diff --git a/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java b/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java index 20e55f936..ac7a99aae 100644 --- a/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java +++ b/src/main/java/dan200/computercraft/shared/command/builder/CommandBuilder.java @@ -31,7 +31,7 @@ */ public class CommandBuilder implements CommandNodeBuilder> { - private List> args = new ArrayList<>(); + private final List> args = new ArrayList<>(); private Predicate requires; public static CommandBuilder args() diff --git a/src/main/java/dan200/computercraft/shared/common/ClientTerminal.java b/src/main/java/dan200/computercraft/shared/common/ClientTerminal.java index 389d8b4d7..1aca87cc6 100644 --- a/src/main/java/dan200/computercraft/shared/common/ClientTerminal.java +++ b/src/main/java/dan200/computercraft/shared/common/ClientTerminal.java @@ -10,21 +10,21 @@ public class ClientTerminal implements ITerminal { - private boolean m_colour; - private Terminal m_terminal; - private boolean m_terminalChanged; + private boolean colour; + private Terminal terminal; + private boolean terminalChanged; public ClientTerminal( boolean colour ) { - m_colour = colour; - m_terminal = null; - m_terminalChanged = false; + this.colour = colour; + terminal = null; + terminalChanged = false; } public boolean pollTerminalChanged() { - boolean changed = m_terminalChanged; - m_terminalChanged = false; + boolean changed = terminalChanged; + terminalChanged = false; return changed; } @@ -33,22 +33,22 @@ public boolean pollTerminalChanged() @Override public Terminal getTerminal() { - return m_terminal; + return terminal; } @Override public boolean isColour() { - return m_colour; + return colour; } public void read( TerminalState state ) { - m_colour = state.colour; + colour = state.colour; if( state.hasTerminal() ) { resizeTerminal( state.width, state.height ); - state.apply( m_terminal ); + state.apply( terminal ); } else { @@ -58,23 +58,23 @@ public void read( TerminalState state ) private void resizeTerminal( int width, int height ) { - if( m_terminal == null ) + if( terminal == null ) { - m_terminal = new Terminal( width, height, () -> m_terminalChanged = true ); - m_terminalChanged = true; + terminal = new Terminal( width, height, () -> terminalChanged = true ); + terminalChanged = true; } else { - m_terminal.resize( width, height ); + terminal.resize( width, height ); } } private void deleteTerminal() { - if( m_terminal != null ) + if( terminal != null ) { - m_terminal = null; - m_terminalChanged = true; + terminal = null; + terminalChanged = true; } } } diff --git a/src/main/java/dan200/computercraft/shared/common/ServerTerminal.java b/src/main/java/dan200/computercraft/shared/common/ServerTerminal.java index 13bb7bc8a..760a13152 100644 --- a/src/main/java/dan200/computercraft/shared/common/ServerTerminal.java +++ b/src/main/java/dan200/computercraft/shared/common/ServerTerminal.java @@ -12,74 +12,74 @@ public class ServerTerminal implements ITerminal { - private final boolean m_colour; - private Terminal m_terminal; - private final AtomicBoolean m_terminalChanged = new AtomicBoolean( false ); - private boolean m_terminalChangedLastFrame = false; + private final boolean colour; + private Terminal terminal; + private final AtomicBoolean terminalChanged = new AtomicBoolean( false ); + private boolean terminalChangedLastFrame = false; public ServerTerminal( boolean colour ) { - m_colour = colour; - m_terminal = null; + this.colour = colour; + terminal = null; } public ServerTerminal( boolean colour, int terminalWidth, int terminalHeight ) { - m_colour = colour; - m_terminal = new Terminal( terminalWidth, terminalHeight, this::markTerminalChanged ); + this.colour = colour; + terminal = new Terminal( terminalWidth, terminalHeight, this::markTerminalChanged ); } protected void resize( int width, int height ) { - if( m_terminal == null ) + if( terminal == null ) { - m_terminal = new Terminal( width, height, this::markTerminalChanged ); + terminal = new Terminal( width, height, this::markTerminalChanged ); markTerminalChanged(); } else { - m_terminal.resize( width, height ); + terminal.resize( width, height ); } } public void delete() { - if( m_terminal != null ) + if( terminal != null ) { - m_terminal = null; + terminal = null; markTerminalChanged(); } } protected void markTerminalChanged() { - m_terminalChanged.set( true ); + terminalChanged.set( true ); } public void update() { - m_terminalChangedLastFrame = m_terminalChanged.getAndSet( false ); + terminalChangedLastFrame = terminalChanged.getAndSet( false ); } public boolean hasTerminalChanged() { - return m_terminalChangedLastFrame; + return terminalChangedLastFrame; } @Override public Terminal getTerminal() { - return m_terminal; + return terminal; } @Override public boolean isColour() { - return m_colour; + return colour; } public TerminalState write() { - return new TerminalState( m_colour, m_terminal ); + return new TerminalState( colour, terminal ); } } diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerProxy.java b/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerProxy.java index 60ca49169..b877387db 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerProxy.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerProxy.java @@ -33,7 +33,7 @@ public void turnOn() ServerComputer computer = tile.getServerComputer(); if( computer == null ) { - tile.m_startOn = true; + tile.startOn = true; } else { @@ -47,7 +47,7 @@ public void shutdown() ServerComputer computer = tile.getServerComputer(); if( computer == null ) { - tile.m_startOn = false; + tile.startOn = false; } else { @@ -61,7 +61,7 @@ public void reboot() ServerComputer computer = tile.getServerComputer(); if( computer == null ) { - tile.m_startOn = true; + tile.startOn = true; } else { diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java index 44b41d796..fa40d3aab 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputerBase.java @@ -52,12 +52,12 @@ public abstract class TileComputerBase extends TileGeneric implements IComputerT private static final String NBT_LABEL = "Label"; private static final String NBT_ON = "On"; - private int m_instanceID = -1; - private int m_computerID = -1; + private int instanceID = -1; + private int computerID = -1; protected String label = null; - private boolean m_on = false; - boolean m_startOn = false; - private boolean m_fresh = false; + private boolean on = false; + boolean startOn = false; + private boolean fresh = false; private final NonNullConsumer>[] invalidate; private final ComputerFamily family; @@ -78,10 +78,10 @@ public TileComputerBase( TileEntityType type, ComputerFam protected void unload() { - if( m_instanceID >= 0 ) + if( instanceID >= 0 ) { - if( !getLevel().isClientSide ) ComputerCraft.serverComputerRegistry.remove( m_instanceID ); - m_instanceID = -1; + if( !getLevel().isClientSide ) ComputerCraft.serverComputerRegistry.remove( instanceID ); + instanceID = -1; } } @@ -162,18 +162,18 @@ public void tick() if( computer == null ) return; // If the computer isn't on and should be, then turn it on - if( m_startOn || (m_fresh && m_on) ) + if( startOn || (fresh && on) ) { computer.turnOn(); - m_startOn = false; + startOn = false; } computer.keepAlive(); - m_fresh = false; - m_computerID = computer.getID(); + fresh = false; + computerID = computer.getID(); label = computer.getLabel(); - m_on = computer.isOn(); + on = computer.isOn(); if( computer.hasOutputChanged() ) updateOutput(); @@ -192,9 +192,9 @@ public void tick() public CompoundNBT save( @Nonnull CompoundNBT nbt ) { // Save ID, label and power state - if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID ); + if( computerID >= 0 ) nbt.putInt( NBT_ID, computerID ); if( label != null ) nbt.putString( NBT_LABEL, label ); - nbt.putBoolean( NBT_ON, m_on ); + nbt.putBoolean( NBT_ON, on ); return super.save( nbt ); } @@ -205,9 +205,9 @@ public void load( @Nonnull CompoundNBT nbt ) super.load( nbt ); // Load ID, label and power state - m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1; + computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1; label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null; - m_on = m_startOn = nbt.getBoolean( NBT_ON ); + on = startOn = nbt.getBoolean( NBT_ON ); } protected boolean isPeripheralBlockedOnSide( ComputerSide localSide ) @@ -322,7 +322,7 @@ public void updateOutput() @Override public final int getComputerID() { - return m_computerID; + return computerID; } @Override @@ -334,11 +334,11 @@ public final String getLabel() @Override public final void setComputerID( int id ) { - if( getLevel().isClientSide || m_computerID == id ) return; + if( getLevel().isClientSide || computerID == id ) return; - m_computerID = id; + computerID = id; ServerComputer computer = getServerComputer(); - if( computer != null ) computer.setID( m_computerID ); + if( computer != null ) computer.setID( computerID ); setChanged(); } @@ -364,16 +364,16 @@ public ServerComputer createServerComputer() if( getLevel().isClientSide ) return null; boolean changed = false; - if( m_instanceID < 0 ) + if( instanceID < 0 ) { - m_instanceID = ComputerCraft.serverComputerRegistry.getUnusedInstanceID(); + instanceID = ComputerCraft.serverComputerRegistry.getUnusedInstanceID(); changed = true; } - if( !ComputerCraft.serverComputerRegistry.contains( m_instanceID ) ) + if( !ComputerCraft.serverComputerRegistry.contains( instanceID ) ) { - ServerComputer computer = createComputer( m_instanceID, m_computerID ); - ComputerCraft.serverComputerRegistry.add( m_instanceID, computer ); - m_fresh = true; + ServerComputer computer = createComputer( instanceID, computerID ); + ComputerCraft.serverComputerRegistry.add( instanceID, computer ); + fresh = true; changed = true; } if( changed ) @@ -381,12 +381,12 @@ public ServerComputer createServerComputer() updateBlock(); updateInput(); } - return ComputerCraft.serverComputerRegistry.get( m_instanceID ); + return ComputerCraft.serverComputerRegistry.get( instanceID ); } public ServerComputer getServerComputer() { - return getLevel().isClientSide ? null : ComputerCraft.serverComputerRegistry.get( m_instanceID ); + return getLevel().isClientSide ? null : ComputerCraft.serverComputerRegistry.get( instanceID ); } // Networking stuff @@ -396,7 +396,7 @@ protected void writeDescription( @Nonnull CompoundNBT nbt ) { super.writeDescription( nbt ); if( label != null ) nbt.putString( NBT_LABEL, label ); - if( m_computerID >= 0 ) nbt.putInt( NBT_ID, m_computerID ); + if( computerID >= 0 ) nbt.putInt( NBT_ID, computerID ); } @Override @@ -404,22 +404,22 @@ protected void readDescription( @Nonnull CompoundNBT nbt ) { super.readDescription( nbt ); label = nbt.contains( NBT_LABEL ) ? nbt.getString( NBT_LABEL ) : null; - m_computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1; + computerID = nbt.contains( NBT_ID ) ? nbt.getInt( NBT_ID ) : -1; } protected void transferStateFrom( TileComputerBase copy ) { - if( copy.m_computerID != m_computerID || copy.m_instanceID != m_instanceID ) + if( copy.computerID != computerID || copy.instanceID != instanceID ) { unload(); - m_instanceID = copy.m_instanceID; - m_computerID = copy.m_computerID; + instanceID = copy.instanceID; + computerID = copy.computerID; label = copy.label; - m_on = copy.m_on; - m_startOn = copy.m_startOn; + on = copy.on; + startOn = copy.startOn; updateBlock(); } - copy.m_instanceID = -1; + copy.instanceID = -1; } @Nonnull diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java b/src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java index 92fc32a4d..8ea986711 100644 --- a/src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/core/ClientComputer.java @@ -12,22 +12,21 @@ public class ClientComputer extends ClientTerminal implements IComputer { - private final int m_instanceID; - - private boolean m_on = false; - private boolean m_blinking = false; - private CompoundNBT m_userData = null; + private final int instanceID; + private boolean on = false; + private boolean blinking = false; + private CompoundNBT userData = null; public ClientComputer( int instanceID ) { super( false ); - m_instanceID = instanceID; + this.instanceID = instanceID; } public CompoundNBT getUserData() { - return m_userData; + return userData; } public void requestState() @@ -41,89 +40,89 @@ public void requestState() @Override public int getInstanceID() { - return m_instanceID; + return instanceID; } @Override public boolean isOn() { - return m_on; + return on; } @Override public boolean isCursorDisplayed() { - return m_on && m_blinking; + return on && blinking; } @Override public void turnOn() { // Send turnOn to server - NetworkHandler.sendToServer( new ComputerActionServerMessage( m_instanceID, ComputerActionServerMessage.Action.TURN_ON ) ); + NetworkHandler.sendToServer( new ComputerActionServerMessage( instanceID, ComputerActionServerMessage.Action.TURN_ON ) ); } @Override public void shutdown() { // Send shutdown to server - NetworkHandler.sendToServer( new ComputerActionServerMessage( m_instanceID, ComputerActionServerMessage.Action.SHUTDOWN ) ); + NetworkHandler.sendToServer( new ComputerActionServerMessage( instanceID, ComputerActionServerMessage.Action.SHUTDOWN ) ); } @Override public void reboot() { // Send reboot to server - NetworkHandler.sendToServer( new ComputerActionServerMessage( m_instanceID, ComputerActionServerMessage.Action.REBOOT ) ); + NetworkHandler.sendToServer( new ComputerActionServerMessage( instanceID, ComputerActionServerMessage.Action.REBOOT ) ); } @Override public void queueEvent( String event, Object[] arguments ) { // Send event to server - NetworkHandler.sendToServer( new QueueEventServerMessage( m_instanceID, event, arguments ) ); + NetworkHandler.sendToServer( new QueueEventServerMessage( instanceID, event, arguments ) ); } @Override public void keyDown( int key, boolean repeat ) { - NetworkHandler.sendToServer( new KeyEventServerMessage( m_instanceID, repeat ? KeyEventServerMessage.TYPE_REPEAT : KeyEventServerMessage.TYPE_DOWN, key ) ); + NetworkHandler.sendToServer( new KeyEventServerMessage( instanceID, repeat ? KeyEventServerMessage.TYPE_REPEAT : KeyEventServerMessage.TYPE_DOWN, key ) ); } @Override public void keyUp( int key ) { - NetworkHandler.sendToServer( new KeyEventServerMessage( m_instanceID, KeyEventServerMessage.TYPE_UP, key ) ); + NetworkHandler.sendToServer( new KeyEventServerMessage( instanceID, KeyEventServerMessage.TYPE_UP, key ) ); } @Override public void mouseClick( int button, int x, int y ) { - NetworkHandler.sendToServer( new MouseEventServerMessage( m_instanceID, MouseEventServerMessage.TYPE_CLICK, button, x, y ) ); + NetworkHandler.sendToServer( new MouseEventServerMessage( instanceID, MouseEventServerMessage.TYPE_CLICK, button, x, y ) ); } @Override public void mouseUp( int button, int x, int y ) { - NetworkHandler.sendToServer( new MouseEventServerMessage( m_instanceID, MouseEventServerMessage.TYPE_UP, button, x, y ) ); + NetworkHandler.sendToServer( new MouseEventServerMessage( instanceID, MouseEventServerMessage.TYPE_UP, button, x, y ) ); } @Override public void mouseDrag( int button, int x, int y ) { - NetworkHandler.sendToServer( new MouseEventServerMessage( m_instanceID, MouseEventServerMessage.TYPE_DRAG, button, x, y ) ); + NetworkHandler.sendToServer( new MouseEventServerMessage( instanceID, MouseEventServerMessage.TYPE_DRAG, button, x, y ) ); } @Override public void mouseScroll( int direction, int x, int y ) { - NetworkHandler.sendToServer( new MouseEventServerMessage( m_instanceID, MouseEventServerMessage.TYPE_SCROLL, direction, x, y ) ); + NetworkHandler.sendToServer( new MouseEventServerMessage( instanceID, MouseEventServerMessage.TYPE_SCROLL, direction, x, y ) ); } public void setState( ComputerState state, CompoundNBT userData ) { - m_on = state != ComputerState.OFF; - m_blinking = state == ComputerState.BLINKING; - m_userData = userData; + on = state != ComputerState.OFF; + blinking = state == ComputerState.BLINKING; + this.userData = userData; } } 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 fc7d0ed4a..24120048d 100644 --- a/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java +++ b/src/main/java/dan200/computercraft/shared/computer/core/ComputerRegistry.java @@ -12,38 +12,37 @@ public class ComputerRegistry { - private Map m_computers; - private int m_nextUnusedInstanceID; - private int m_sessionID; + private final Map computers = new HashMap<>(); + private int nextUnusedInstanceID; + private int sessionID; protected ComputerRegistry() { - m_computers = new HashMap<>(); reset(); } public int getSessionID() { - return m_sessionID; + return sessionID; } public int getUnusedInstanceID() { - return m_nextUnusedInstanceID++; + return nextUnusedInstanceID++; } public Collection getComputers() { - return m_computers.values(); + return computers.values(); } public T get( int instanceID ) { if( instanceID >= 0 ) { - if( m_computers.containsKey( instanceID ) ) + if( computers.containsKey( instanceID ) ) { - return m_computers.get( instanceID ); + return computers.get( instanceID ); } } return null; @@ -51,28 +50,28 @@ public T get( int instanceID ) public boolean contains( int instanceID ) { - return m_computers.containsKey( instanceID ); + return computers.containsKey( instanceID ); } public void add( int instanceID, T computer ) { - if( m_computers.containsKey( instanceID ) ) + if( computers.containsKey( instanceID ) ) { remove( instanceID ); } - m_computers.put( instanceID, computer ); - m_nextUnusedInstanceID = Math.max( m_nextUnusedInstanceID, instanceID + 1 ); + computers.put( instanceID, computer ); + nextUnusedInstanceID = Math.max( nextUnusedInstanceID, instanceID + 1 ); } public void remove( int instanceID ) { - m_computers.remove( instanceID ); + computers.remove( instanceID ); } public void reset() { - m_computers.clear(); - m_nextUnusedInstanceID = 0; - m_sessionID = new Random().nextInt(); + computers.clear(); + nextUnusedInstanceID = 0; + sessionID = new Random().nextInt(); } } diff --git a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java index a54893384..b4cf22061 100644 --- a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java @@ -37,116 +37,109 @@ public class ServerComputer extends ServerTerminal implements IComputer, IComputerEnvironment { - private final int m_instanceID; + private final int instanceID; - private World m_world; - private BlockPos m_position; + private World world; + private BlockPos position; - private final ComputerFamily m_family; - private final Computer m_computer; - private CompoundNBT m_userData; - private boolean m_changed; + private final ComputerFamily family; + private final Computer computer; + private CompoundNBT userData; + private boolean changed; - private boolean m_changedLastFrame; - private int m_ticksSincePing; + private boolean changedLastFrame; + private int ticksSincePing; public ServerComputer( World world, int computerID, String label, int instanceID, ComputerFamily family, int terminalWidth, int terminalHeight ) { super( family != ComputerFamily.NORMAL, terminalWidth, terminalHeight ); - m_instanceID = instanceID; + this.instanceID = instanceID; - m_world = world; - m_position = null; - - m_family = family; - m_computer = new Computer( this, getTerminal(), computerID ); - m_computer.setLabel( label ); - m_userData = null; - m_changed = false; - - m_changedLastFrame = false; - m_ticksSincePing = 0; + this.world = world; + this.family = family; + computer = new Computer( this, getTerminal(), computerID ); + computer.setLabel( label ); } public ComputerFamily getFamily() { - return m_family; + return family; } public World getWorld() { - return m_world; + return world; } public void setWorld( World world ) { - m_world = world; + this.world = world; } public BlockPos getPosition() { - return m_position; + return position; } public void setPosition( BlockPos pos ) { - m_position = new BlockPos( pos ); + position = new BlockPos( pos ); } public IAPIEnvironment getAPIEnvironment() { - return m_computer.getAPIEnvironment(); + return computer.getAPIEnvironment(); } public Computer getComputer() { - return m_computer; + return computer; } @Override public void update() { super.update(); - m_computer.tick(); + computer.tick(); - m_changedLastFrame = m_computer.pollAndResetChanged() || m_changed; - m_changed = false; + changedLastFrame = computer.pollAndResetChanged() || changed; + changed = false; - m_ticksSincePing++; + ticksSincePing++; } public void keepAlive() { - m_ticksSincePing = 0; + ticksSincePing = 0; } public boolean hasTimedOut() { - return m_ticksSincePing > 100; + return ticksSincePing > 100; } public boolean hasOutputChanged() { - return m_changedLastFrame; + return changedLastFrame; } public void unload() { - m_computer.unload(); + computer.unload(); } public CompoundNBT getUserData() { - if( m_userData == null ) + if( userData == null ) { - m_userData = new CompoundNBT(); + userData = new CompoundNBT(); } - return m_userData; + return userData; } public void updateUserData() { - m_changed = true; + changed = true; } private NetworkMessage createComputerPacket() @@ -204,7 +197,7 @@ public void broadcastDelete() public void setID( int id ) { - m_computer.setID( id ); + computer.setID( id ); } // IComputer @@ -212,97 +205,97 @@ public void setID( int id ) @Override public int getInstanceID() { - return m_instanceID; + return instanceID; } public int getID() { - return m_computer.getID(); + return computer.getID(); } public String getLabel() { - return m_computer.getLabel(); + return computer.getLabel(); } @Override public boolean isOn() { - return m_computer.isOn(); + return computer.isOn(); } @Override public boolean isCursorDisplayed() { - return m_computer.isOn() && m_computer.isBlinking(); + return computer.isOn() && computer.isBlinking(); } @Override public void turnOn() { // Turn on - m_computer.turnOn(); + computer.turnOn(); } @Override public void shutdown() { // Shutdown - m_computer.shutdown(); + computer.shutdown(); } @Override public void reboot() { // Reboot - m_computer.reboot(); + computer.reboot(); } @Override public void queueEvent( String event, Object[] arguments ) { // Queue event - m_computer.queueEvent( event, arguments ); + computer.queueEvent( event, arguments ); } public int getRedstoneOutput( ComputerSide side ) { - return m_computer.getEnvironment().getExternalRedstoneOutput( side ); + return computer.getEnvironment().getExternalRedstoneOutput( side ); } public void setRedstoneInput( ComputerSide side, int level ) { - m_computer.getEnvironment().setRedstoneInput( side, level ); + computer.getEnvironment().setRedstoneInput( side, level ); } public int getBundledRedstoneOutput( ComputerSide side ) { - return m_computer.getEnvironment().getExternalBundledRedstoneOutput( side ); + return computer.getEnvironment().getExternalBundledRedstoneOutput( side ); } public void setBundledRedstoneInput( ComputerSide side, int combination ) { - m_computer.getEnvironment().setBundledRedstoneInput( side, combination ); + computer.getEnvironment().setBundledRedstoneInput( side, combination ); } public void addAPI( ILuaAPI api ) { - m_computer.addApi( api ); + computer.addApi( api ); } public void setPeripheral( ComputerSide side, IPeripheral peripheral ) { - m_computer.getEnvironment().setPeripheral( side, peripheral ); + computer.getEnvironment().setPeripheral( side, peripheral ); } public IPeripheral getPeripheral( ComputerSide side ) { - return m_computer.getEnvironment().getPeripheral( side ); + return computer.getEnvironment().getPeripheral( side ); } public void setLabel( String label ) { - m_computer.setLabel( label ); + computer.setLabel( label ); } // IComputerEnvironment implementation @@ -310,19 +303,19 @@ public void setLabel( String label ) @Override public double getTimeOfDay() { - return (m_world.getDayTime() + 6000) % 24000 / 1000.0; + return (world.getDayTime() + 6000) % 24000 / 1000.0; } @Override public int getDay() { - return (int) ((m_world.getDayTime() + 6000) / 24000) + 1; + return (int) ((world.getDayTime() + 6000) / 24000) + 1; } @Override public IWritableMount createSaveDirMount( String subPath, long capacity ) { - return ComputerCraftAPI.createSaveDirMount( m_world, subPath, capacity ); + return ComputerCraftAPI.createSaveDirMount( world, subPath, capacity ); } @Override @@ -360,7 +353,7 @@ public String getUserAgent() @Override public int assignNewID() { - return ComputerCraftAPI.createUniqueNumberedSaveDir( m_world, "computer" ); + return ComputerCraftAPI.createUniqueNumberedSaveDir( world, "computer" ); } @Nullable diff --git a/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java b/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java index 0e48dad40..b3baff2c6 100644 --- a/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java +++ b/src/main/java/dan200/computercraft/shared/network/client/ChatTableClientMessage.java @@ -10,8 +10,6 @@ import dan200.computercraft.shared.network.NetworkMessage; import net.minecraft.network.PacketBuffer; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.network.NetworkEvent; import javax.annotation.Nonnull; @@ -80,7 +78,6 @@ public void fromBytes( @Nonnull PacketBuffer buf ) } @Override - @OnlyIn( Dist.CLIENT ) public void handle( NetworkEvent.Context context ) { ClientTableFormatter.INSTANCE.display( table ); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java index f2136367c..3f97e224a 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java @@ -59,18 +59,18 @@ private static class MountInfo ITextComponent customName; - private final Map m_computers = new HashMap<>(); + private final Map computers = new HashMap<>(); @Nonnull - private ItemStack m_diskStack = ItemStack.EMPTY; + private ItemStack diskStack = ItemStack.EMPTY; private LazyOptional itemHandlerCap; private LazyOptional peripheralCap; - private IMount m_diskMount = null; + private IMount diskMount = null; - private boolean m_recordQueued = false; - private boolean m_recordPlaying = false; - private boolean m_restartRecord = false; - private boolean m_ejectQueued; + private boolean recordQueued = false; + private boolean recordPlaying = false; + private boolean restartRecord = false; + private boolean ejectQueued; public TileDiskDrive( TileEntityType type ) { @@ -81,7 +81,7 @@ public TileDiskDrive( TileEntityType type ) public void destroy() { ejectContents( true ); - if( m_recordPlaying ) stopRecord(); + if( recordPlaying ) stopRecord(); } @Override @@ -129,8 +129,8 @@ public void load( @Nonnull CompoundNBT nbt ) if( nbt.contains( NBT_ITEM ) ) { CompoundNBT item = nbt.getCompound( NBT_ITEM ); - m_diskStack = ItemStack.of( item ); - m_diskMount = null; + diskStack = ItemStack.of( item ); + diskMount = null; } } @@ -140,10 +140,10 @@ public CompoundNBT save( @Nonnull CompoundNBT nbt ) { if( customName != null ) nbt.putString( NBT_NAME, ITextComponent.Serializer.toJson( customName ) ); - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { CompoundNBT item = new CompoundNBT(); - m_diskStack.save( item ); + diskStack.save( item ); nbt.put( NBT_ITEM, item ); } return super.save( nbt ); @@ -153,36 +153,36 @@ public CompoundNBT save( @Nonnull CompoundNBT nbt ) public void tick() { // Ejection - if( m_ejectQueued ) + if( ejectQueued ) { ejectContents( false ); - m_ejectQueued = false; + ejectQueued = false; } // Music synchronized( this ) { - if( !level.isClientSide && m_recordPlaying != m_recordQueued || m_restartRecord ) + if( !level.isClientSide && recordPlaying != recordQueued || restartRecord ) { - m_restartRecord = false; - if( m_recordQueued ) + restartRecord = false; + if( recordQueued ) { IMedia contents = getDiskMedia(); - SoundEvent record = contents != null ? contents.getAudio( m_diskStack ) : null; + SoundEvent record = contents != null ? contents.getAudio( diskStack ) : null; if( record != null ) { - m_recordPlaying = true; + recordPlaying = true; playRecord(); } else { - m_recordQueued = false; + recordQueued = false; } } else { stopRecord(); - m_recordPlaying = false; + recordPlaying = false; } } } @@ -199,23 +199,23 @@ public int getContainerSize() @Override public boolean isEmpty() { - return m_diskStack.isEmpty(); + return diskStack.isEmpty(); } @Nonnull @Override public ItemStack getItem( int slot ) { - return m_diskStack; + return diskStack; } @Nonnull @Override public ItemStack removeItemNoUpdate( int slot ) { - ItemStack result = m_diskStack; - m_diskStack = ItemStack.EMPTY; - m_diskMount = null; + ItemStack result = diskStack; + diskStack = ItemStack.EMPTY; + diskMount = null; return result; } @@ -224,17 +224,17 @@ public ItemStack removeItemNoUpdate( int slot ) @Override public ItemStack removeItem( int slot, int count ) { - if( m_diskStack.isEmpty() ) return ItemStack.EMPTY; + if( diskStack.isEmpty() ) return ItemStack.EMPTY; - if( m_diskStack.getCount() <= count ) + if( diskStack.getCount() <= count ) { - ItemStack disk = m_diskStack; + ItemStack disk = diskStack; setItem( slot, ItemStack.EMPTY ); return disk; } - ItemStack part = m_diskStack.split( count ); - setItem( slot, m_diskStack.isEmpty() ? ItemStack.EMPTY : m_diskStack ); + ItemStack part = diskStack.split( count ); + setItem( slot, diskStack.isEmpty() ? ItemStack.EMPTY : diskStack ); return part; } @@ -243,45 +243,45 @@ public void setItem( int slot, @Nonnull ItemStack stack ) { if( getLevel().isClientSide ) { - m_diskStack = stack; - m_diskMount = null; + diskStack = stack; + diskMount = null; setChanged(); return; } synchronized( this ) { - if( InventoryUtil.areItemsStackable( stack, m_diskStack ) ) + if( InventoryUtil.areItemsStackable( stack, diskStack ) ) { - m_diskStack = stack; + diskStack = stack; return; } // Unmount old disk - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { // TODO: Is this iteration thread safe? - Set computers = m_computers.keySet(); + Set computers = this.computers.keySet(); for( IComputerAccess computer : computers ) unmountDisk( computer ); } // Stop music - if( m_recordPlaying ) + if( recordPlaying ) { stopRecord(); - m_recordPlaying = false; - m_recordQueued = false; + recordPlaying = false; + recordQueued = false; } // Swap disk over - m_diskStack = stack; - m_diskMount = null; + diskStack = stack; + diskMount = null; setChanged(); // Mount new disk - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { - Set computers = m_computers.keySet(); + Set computers = this.computers.keySet(); for( IComputerAccess computer : computers ) mountDisk( computer ); } } @@ -326,7 +326,7 @@ String getDiskMountPath( IComputerAccess computer ) { synchronized( this ) { - MountInfo info = m_computers.get( computer ); + MountInfo info = computers.get( computer ); return info != null ? info.mountPath : null; } } @@ -335,7 +335,7 @@ void mount( IComputerAccess computer ) { synchronized( this ) { - m_computers.put( computer, new MountInfo() ); + computers.put( computer, new MountInfo() ); mountDisk( computer ); } } @@ -345,7 +345,7 @@ void unmount( IComputerAccess computer ) synchronized( this ) { unmountDisk( computer ); - m_computers.remove( computer ); + computers.remove( computer ); } } @@ -354,10 +354,10 @@ void playDiskAudio() synchronized( this ) { IMedia media = getDiskMedia(); - if( media != null && media.getAudioTitle( m_diskStack ) != null ) + if( media != null && media.getAudioTitle( diskStack ) != null ) { - m_recordQueued = true; - m_restartRecord = m_recordPlaying; + recordQueued = true; + restartRecord = recordPlaying; } } } @@ -366,8 +366,8 @@ void stopDiskAudio() { synchronized( this ) { - m_recordQueued = false; - m_restartRecord = false; + recordQueued = false; + restartRecord = false; } } @@ -375,7 +375,7 @@ void ejectDisk() { synchronized( this ) { - m_ejectQueued = true; + ejectQueued = true; } } @@ -383,25 +383,25 @@ void ejectDisk() private synchronized void mountDisk( IComputerAccess computer ) { - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { - MountInfo info = m_computers.get( computer ); + MountInfo info = computers.get( computer ); IMedia contents = getDiskMedia(); if( contents != null ) { - if( m_diskMount == null ) + if( diskMount == null ) { - m_diskMount = contents.createDataMount( m_diskStack, getLevel() ); + diskMount = contents.createDataMount( diskStack, getLevel() ); } - if( m_diskMount != null ) + if( diskMount != null ) { - if( m_diskMount instanceof IWritableMount ) + if( diskMount instanceof IWritableMount ) { // Try mounting at the lowest numbered "disk" name we can int n = 1; while( info.mountPath == null ) { - info.mountPath = computer.mountWritable( n == 1 ? "disk" : "disk" + n, (IWritableMount) m_diskMount ); + info.mountPath = computer.mountWritable( n == 1 ? "disk" : "disk" + n, (IWritableMount) diskMount ); n++; } } @@ -411,7 +411,7 @@ private synchronized void mountDisk( IComputerAccess computer ) int n = 1; while( info.mountPath == null ) { - info.mountPath = computer.mount( n == 1 ? "disk" : "disk" + n, m_diskMount ); + info.mountPath = computer.mount( n == 1 ? "disk" : "disk" + n, diskMount ); n++; } } @@ -427,9 +427,9 @@ private synchronized void mountDisk( IComputerAccess computer ) private synchronized void unmountDisk( IComputerAccess computer ) { - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { - MountInfo info = m_computers.get( computer ); + MountInfo info = computers.get( computer ); assert info != null; if( info.mountPath != null ) { @@ -444,7 +444,7 @@ private void updateBlockState() { if( remove ) return; - if( !m_diskStack.isEmpty() ) + if( !diskStack.isEmpty() ) { IMedia contents = getDiskMedia(); updateBlockState( contents != null ? DiskDriveState.FULL : DiskDriveState.INVALID ); @@ -465,10 +465,10 @@ private void updateBlockState( DiskDriveState state ) private synchronized void ejectContents( boolean destroyed ) { - if( getLevel().isClientSide || m_diskStack.isEmpty() ) return; + if( getLevel().isClientSide || diskStack.isEmpty() ) return; // Remove the disks from the inventory - ItemStack disks = m_diskStack; + ItemStack disks = diskStack; setDiskStack( ItemStack.EMPTY ); // Spawn the item in the world @@ -497,10 +497,10 @@ private synchronized void ejectContents( boolean destroyed ) private void playRecord() { IMedia contents = getDiskMedia(); - SoundEvent record = contents != null ? contents.getAudio( m_diskStack ) : null; + SoundEvent record = contents != null ? contents.getAudio( diskStack ) : null; if( record != null ) { - RecordUtil.playRecord( record, contents.getAudioTitle( m_diskStack ), getLevel(), getBlockPos() ); + RecordUtil.playRecord( record, contents.getAudioTitle( diskStack ), getLevel(), getBlockPos() ); } else { 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 8ef54a91f..5989f3000 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/ModemPeripheral.java @@ -27,32 +27,32 @@ */ public abstract class ModemPeripheral implements IPeripheral, IPacketSender, IPacketReceiver { - private IPacketNetwork m_network; - private final Set m_computers = new HashSet<>( 1 ); - private final ModemState m_state; + private IPacketNetwork network; + private final Set computers = new HashSet<>( 1 ); + private final ModemState state; protected ModemPeripheral( ModemState state ) { - m_state = state; + this.state = state; } public ModemState getModemState() { - return m_state; + return state; } private synchronized void setNetwork( IPacketNetwork network ) { - if( m_network == network ) return; + if( this.network == network ) return; // Leave old network - if( m_network != null ) m_network.removeReceiver( this ); + if( this.network != null ) this.network.removeReceiver( this ); // Set new network - m_network = network; + this.network = network; // Join new network - if( m_network != null ) m_network.addReceiver( this ); + if( this.network != null ) this.network.addReceiver( this ); } public void destroy() @@ -63,11 +63,11 @@ public void destroy() @Override public void receiveSameDimension( @Nonnull Packet packet, double distance ) { - if( packet.getSender() == this || !m_state.isOpen( packet.getChannel() ) ) return; + if( packet.getSender() == this || !state.isOpen( packet.getChannel() ) ) return; - synchronized( m_computers ) + synchronized( computers ) { - for( IComputerAccess computer : m_computers ) + for( IComputerAccess computer : computers ) { computer.queueEvent( "modem_message", computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload(), distance ); @@ -78,11 +78,11 @@ public void receiveSameDimension( @Nonnull Packet packet, double distance ) @Override public void receiveDifferentDimension( @Nonnull Packet packet ) { - if( packet.getSender() == this || !m_state.isOpen( packet.getChannel() ) ) return; + if( packet.getSender() == this || !state.isOpen( packet.getChannel() ) ) return; - synchronized( m_computers ) + synchronized( computers ) { - for( IComputerAccess computer : m_computers ) + for( IComputerAccess computer : computers ) { computer.queueEvent( "modem_message", computer.getAttachmentName(), packet.getChannel(), packet.getReplyChannel(), packet.getPayload() ); @@ -116,7 +116,7 @@ private static int parseChannel( int channel ) throws LuaException @LuaFunction public final void open( int channel ) throws LuaException { - m_state.open( parseChannel( channel ) ); + state.open( parseChannel( channel ) ); } /** @@ -129,7 +129,7 @@ public final void open( int channel ) throws LuaException @LuaFunction public final boolean isOpen( int channel ) throws LuaException { - return m_state.isOpen( parseChannel( channel ) ); + return state.isOpen( parseChannel( channel ) ); } /** @@ -141,7 +141,7 @@ public final boolean isOpen( int channel ) throws LuaException @LuaFunction public final void close( int channel ) throws LuaException { - m_state.close( parseChannel( channel ) ); + state.close( parseChannel( channel ) ); } /** @@ -150,7 +150,7 @@ public final void close( int channel ) throws LuaException @LuaFunction public final void closeAll() { - m_state.closeAll(); + state.closeAll(); } /** @@ -172,7 +172,7 @@ public final void transmit( int channel, int replyChannel, Object payload ) thro World world = getWorld(); Vec3d position = getPosition(); - IPacketNetwork network = m_network; + IPacketNetwork network = this.network; if( world == null || position == null || network == null ) return; @@ -198,16 +198,16 @@ public final void transmit( int channel, int replyChannel, Object payload ) thro @LuaFunction public final boolean isWireless() { - IPacketNetwork network = m_network; + IPacketNetwork network = this.network; return network != null && network.isWireless(); } @Override public synchronized void attach( @Nonnull IComputerAccess computer ) { - synchronized( m_computers ) + synchronized( computers ) { - m_computers.add( computer ); + computers.add( computer ); } setNetwork( getNetwork() ); @@ -217,10 +217,10 @@ public synchronized void attach( @Nonnull IComputerAccess computer ) public synchronized void detach( @Nonnull IComputerAccess computer ) { boolean empty; - synchronized( m_computers ) + synchronized( computers ) { - m_computers.remove( computer ); - empty = m_computers.isEmpty(); + computers.remove( computer ); + empty = computers.isEmpty(); } if( empty ) setNetwork( null ); @@ -230,15 +230,15 @@ public synchronized void detach( @Nonnull IComputerAccess computer ) @Override public String getSenderID() { - synchronized( m_computers ) + synchronized( computers ) { - if( m_computers.size() != 1 ) + if( computers.size() != 1 ) { return "unknown"; } else { - IComputerAccess computer = m_computers.iterator().next(); + IComputerAccess computer = computers.iterator().next(); return computer.getID() + "_" + computer.getAttachmentName(); } } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java index 7c587f7bb..449444664 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java @@ -67,38 +67,38 @@ public Vec3d getPosition() @Override protected void attachPeripheral( String name, IPeripheral peripheral ) { - m_modem.attachPeripheral( name, peripheral ); + modem.attachPeripheral( name, peripheral ); } @Override protected void detachPeripheral( String name ) { - m_modem.detachPeripheral( name ); + modem.detachPeripheral( name ); } } - private boolean m_peripheralAccessAllowed; - private final WiredModemLocalPeripheral m_peripheral = new WiredModemLocalPeripheral( this::refreshPeripheral ); + private boolean peripheralAccessAllowed; + private final WiredModemLocalPeripheral peripheral = new WiredModemLocalPeripheral( this::refreshPeripheral ); - private boolean m_destroyed = false; + private boolean destroyed = false; private Direction modemDirection = Direction.NORTH; private boolean hasModemDirection = false; - private boolean m_connectionsFormed = false; + private boolean connectionsFormed = false; - private final WiredModemElement m_cable = new CableElement(); + private final WiredModemElement cable = new CableElement(); private LazyOptional elementCap; - private final IWiredNode m_node = m_cable.getNode(); - private final WiredModemPeripheral m_modem = new WiredModemPeripheral( + private final IWiredNode node = cable.getNode(); + private final WiredModemPeripheral modem = new WiredModemPeripheral( new ModemState( () -> TickScheduler.schedule( this ) ), - m_cable + cable ) { @Nonnull @Override protected WiredModemLocalPeripheral getLocalPeripheral() { - return m_peripheral; + return peripheral; } @Nonnull @@ -129,18 +129,18 @@ private void onRemove() { if( level == null || !level.isClientSide ) { - m_node.remove(); - m_connectionsFormed = false; + node.remove(); + connectionsFormed = false; } } @Override public void destroy() { - if( !m_destroyed ) + if( !destroyed ) { - m_destroyed = true; - m_modem.destroy(); + destroyed = true; + modem.destroy(); onRemove(); } } @@ -236,7 +236,7 @@ public void onNeighbourChange( @Nonnull BlockPos neighbour ) public void onNeighbourTileEntityChange( @Nonnull BlockPos neighbour ) { super.onNeighbourTileEntityChange( neighbour ); - if( !level.isClientSide && m_peripheralAccessAllowed ) + if( !level.isClientSide && peripheralAccessAllowed ) { Direction facing = getDirection(); if( getBlockPos().relative( facing ).equals( neighbour ) ) refreshPeripheral(); @@ -245,7 +245,7 @@ public void onNeighbourTileEntityChange( @Nonnull BlockPos neighbour ) private void refreshPeripheral() { - if( level != null && !isRemoved() && m_peripheral.attach( level, getBlockPos(), getDirection() ) ) + if( level != null && !isRemoved() && peripheral.attach( level, getBlockPos(), getDirection() ) ) { updateConnectedPeripherals(); } @@ -260,9 +260,9 @@ public ActionResultType onActivate( PlayerEntity player, Hand hand, BlockRayTrac if( getLevel().isClientSide ) return ActionResultType.SUCCESS; - String oldName = m_peripheral.getConnectedName(); + String oldName = peripheral.getConnectedName(); togglePeripheralAccess(); - String newName = m_peripheral.getConnectedName(); + String newName = peripheral.getConnectedName(); if( !Objects.equal( newName, oldName ) ) { if( oldName != null ) @@ -284,16 +284,16 @@ public ActionResultType onActivate( PlayerEntity player, Hand hand, BlockRayTrac public void load( @Nonnull CompoundNBT nbt ) { super.load( nbt ); - m_peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED ); - m_peripheral.read( nbt, "" ); + peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED ); + peripheral.read( nbt, "" ); } @Nonnull @Override public CompoundNBT save( CompoundNBT nbt ) { - nbt.putBoolean( NBT_PERIPHERAL_ENABLED, m_peripheralAccessAllowed ); - m_peripheral.write( nbt, "" ); + nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed ); + peripheral.write( nbt, "" ); return super.save( nbt ); } @@ -302,7 +302,7 @@ private void updateBlockState() BlockState state = getBlockState(); CableModemVariant oldVariant = state.getValue( BlockCable.MODEM ); CableModemVariant newVariant = CableModemVariant - .from( oldVariant.getFacing(), m_modem.getModemState().isOpen(), m_peripheralAccessAllowed ); + .from( oldVariant.getFacing(), modem.getModemState().isOpen(), peripheralAccessAllowed ); if( oldVariant != newVariant ) { @@ -324,16 +324,16 @@ public void blockTick() elementCap = CapabilityUtil.invalidate( elementCap ); } - if( m_modem.getModemState().pollChanged() ) updateBlockState(); + if( modem.getModemState().pollChanged() ) updateBlockState(); - if( !m_connectionsFormed ) + if( !connectionsFormed ) { - m_connectionsFormed = true; + connectionsFormed = true; connectionsChanged(); - if( m_peripheralAccessAllowed ) + if( peripheralAccessAllowed ) { - m_peripheral.attach( level, worldPosition, modemDirection ); + peripheral.attach( level, worldPosition, modemDirection ); updateConnectedPeripherals(); } } @@ -359,12 +359,12 @@ void connectionsChanged() if( BlockCable.canConnectIn( state, facing ) ) { // If we can connect to it then do so - m_node.connectTo( node ); + this.node.connectTo( node ); } - else if( m_node.getNetwork() == node.getNetwork() ) + else if( this.node.getNetwork() == node.getNetwork() ) { // Otherwise if we're on the same network then attempt to void it. - m_node.disconnectFrom( node ); + this.node.disconnectFrom( node ); } } } @@ -378,11 +378,11 @@ void modemChanged() // If we can no longer attach peripherals, then detach any // which may have existed - if( !canAttachPeripheral() && m_peripheralAccessAllowed ) + if( !canAttachPeripheral() && peripheralAccessAllowed ) { - m_peripheralAccessAllowed = false; - m_peripheral.detach(); - m_node.updatePeripherals( Collections.emptyMap() ); + peripheralAccessAllowed = false; + peripheral.detach(); + node.updatePeripherals( Collections.emptyMap() ); setChanged(); updateBlockState(); } @@ -390,20 +390,20 @@ void modemChanged() private void togglePeripheralAccess() { - if( !m_peripheralAccessAllowed ) + if( !peripheralAccessAllowed ) { - m_peripheral.attach( level, getBlockPos(), getDirection() ); - if( !m_peripheral.hasPeripheral() ) return; + peripheral.attach( level, getBlockPos(), getDirection() ); + if( !peripheral.hasPeripheral() ) return; - m_peripheralAccessAllowed = true; - m_node.updatePeripherals( m_peripheral.toMap() ); + peripheralAccessAllowed = true; + node.updatePeripherals( peripheral.toMap() ); } else { - m_peripheral.detach(); + peripheral.detach(); - m_peripheralAccessAllowed = false; - m_node.updatePeripherals( Collections.emptyMap() ); + peripheralAccessAllowed = false; + node.updatePeripherals( Collections.emptyMap() ); } updateBlockState(); @@ -411,15 +411,15 @@ private void togglePeripheralAccess() private void updateConnectedPeripherals() { - Map peripherals = m_peripheral.toMap(); + Map peripherals = peripheral.toMap(); if( peripherals.isEmpty() ) { // If there are no peripherals then disable access and update the display state. - m_peripheralAccessAllowed = false; + peripheralAccessAllowed = false; updateBlockState(); } - m_node.updatePeripherals( peripherals ); + node.updatePeripherals( peripherals ); } @Override @@ -434,8 +434,8 @@ public LazyOptional getCapability( @Nonnull Capability capability, @Nu { if( capability == CAPABILITY_WIRED_ELEMENT ) { - if( m_destroyed || !BlockCable.canConnectIn( getBlockState(), side ) ) return LazyOptional.empty(); - if( elementCap == null ) elementCap = LazyOptional.of( () -> m_cable ); + if( destroyed || !BlockCable.canConnectIn( getBlockState(), side ) ) return LazyOptional.empty(); + if( elementCap == null ) elementCap = LazyOptional.of( () -> cable ); return elementCap.cast(); } @@ -443,7 +443,7 @@ public LazyOptional getCapability( @Nonnull Capability capability, @Nu { refreshDirection(); if( side != null && getMaybeDirection() != side ) return LazyOptional.empty(); - if( modemCap == null ) modemCap = LazyOptional.of( () -> m_modem ); + if( modemCap == null ) modemCap = LazyOptional.of( () -> modem ); return modemCap.cast(); } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java index 98e63377f..74696d132 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java @@ -49,11 +49,11 @@ public class TileWiredModemFull extends TileGeneric private static final class FullElement extends WiredModemElement { - private final TileWiredModemFull m_entity; + private final TileWiredModemFull entity; private FullElement( TileWiredModemFull entity ) { - m_entity = entity; + this.entity = entity; } @Override @@ -61,7 +61,7 @@ protected void attachPeripheral( String name, IPeripheral peripheral ) { for( int i = 0; i < 6; i++ ) { - WiredModemPeripheral modem = m_entity.modems[i]; + WiredModemPeripheral modem = entity.modems[i]; if( modem != null ) modem.attachPeripheral( name, peripheral ); } } @@ -71,7 +71,7 @@ protected void detachPeripheral( String name ) { for( int i = 0; i < 6; i++ ) { - WiredModemPeripheral modem = m_entity.modems[i]; + WiredModemPeripheral modem = entity.modems[i]; if( modem != null ) modem.detachPeripheral( name ); } } @@ -80,14 +80,14 @@ protected void detachPeripheral( String name ) @Override public World getWorld() { - return m_entity.getLevel(); + return entity.getLevel(); } @Nonnull @Override public Vec3d getPosition() { - BlockPos pos = m_entity.getBlockPos(); + BlockPos pos = entity.getBlockPos(); return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ); } } @@ -95,26 +95,26 @@ public Vec3d getPosition() private final WiredModemPeripheral[] modems = new WiredModemPeripheral[6]; private final SidedCaps modemCaps = SidedCaps.ofNonNull( this::getPeripheral ); - private boolean m_peripheralAccessAllowed = false; - private final WiredModemLocalPeripheral[] m_peripherals = new WiredModemLocalPeripheral[6]; + private boolean peripheralAccessAllowed = false; + private final WiredModemLocalPeripheral[] peripherals = new WiredModemLocalPeripheral[6]; - private boolean m_destroyed = false; - private boolean m_connectionsFormed = false; + private boolean destroyed = false; + private boolean connectionsFormed = false; - private final ModemState m_modemState = new ModemState( () -> TickScheduler.schedule( this ) ); - private final WiredModemElement m_element = new FullElement( this ); + private final ModemState modemState = new ModemState( () -> TickScheduler.schedule( this ) ); + private final WiredModemElement element = new FullElement( this ); private LazyOptional elementCap; - private final IWiredNode m_node = m_element.getNode(); + private final IWiredNode node = element.getNode(); private final NonNullConsumer> connectedNodeChanged = x -> connectionsChanged(); public TileWiredModemFull( TileEntityType type ) { super( type ); - for( int i = 0; i < m_peripherals.length; i++ ) + for( int i = 0; i < peripherals.length; i++ ) { Direction facing = Direction.from3DDataValue( i ); - m_peripherals[i] = new WiredModemLocalPeripheral( () -> refreshPeripheral( facing ) ); + peripherals[i] = new WiredModemLocalPeripheral( () -> refreshPeripheral( facing ) ); } } @@ -122,17 +122,17 @@ private void doRemove() { if( level == null || !level.isClientSide ) { - m_node.remove(); - m_connectionsFormed = false; + node.remove(); + connectionsFormed = false; } } @Override public void destroy() { - if( !m_destroyed ) + if( !destroyed ) { - m_destroyed = true; + destroyed = true; doRemove(); } super.destroy(); @@ -169,7 +169,7 @@ public void onNeighbourChange( @Nonnull BlockPos neighbour ) @Override public void onNeighbourTileEntityChange( @Nonnull BlockPos neighbour ) { - if( !level.isClientSide && m_peripheralAccessAllowed ) + if( !level.isClientSide && peripheralAccessAllowed ) { for( Direction facing : DirectionUtil.FACINGS ) { @@ -180,7 +180,7 @@ public void onNeighbourTileEntityChange( @Nonnull BlockPos neighbour ) private void refreshPeripheral( @Nonnull Direction facing ) { - WiredModemLocalPeripheral peripheral = m_peripherals[facing.ordinal()]; + WiredModemLocalPeripheral peripheral = peripherals[facing.ordinal()]; if( level != null && !isRemoved() && peripheral.attach( level, getBlockPos(), facing ) ) { updateConnectedPeripherals(); @@ -228,23 +228,23 @@ private static void sendPeripheralChanges( PlayerEntity player, String kind, Col public void load( @Nonnull CompoundNBT nbt ) { super.load( nbt ); - m_peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED ); - for( int i = 0; i < m_peripherals.length; i++ ) m_peripherals[i].read( nbt, Integer.toString( i ) ); + peripheralAccessAllowed = nbt.getBoolean( NBT_PERIPHERAL_ENABLED ); + for( int i = 0; i < peripherals.length; i++ ) peripherals[i].read( nbt, Integer.toString( i ) ); } @Nonnull @Override public CompoundNBT save( CompoundNBT nbt ) { - nbt.putBoolean( NBT_PERIPHERAL_ENABLED, m_peripheralAccessAllowed ); - for( int i = 0; i < m_peripherals.length; i++ ) m_peripherals[i].write( nbt, Integer.toString( i ) ); + nbt.putBoolean( NBT_PERIPHERAL_ENABLED, peripheralAccessAllowed ); + for( int i = 0; i < peripherals.length; i++ ) peripherals[i].write( nbt, Integer.toString( i ) ); return super.save( nbt ); } private void updateBlockState() { BlockState state = getBlockState(); - boolean modemOn = m_modemState.isOpen(), peripheralOn = m_peripheralAccessAllowed; + boolean modemOn = modemState.isOpen(), peripheralOn = peripheralAccessAllowed; if( state.getValue( MODEM_ON ) == modemOn && state.getValue( PERIPHERAL_ON ) == peripheralOn ) return; getLevel().setBlockAndUpdate( getBlockPos(), state.setValue( MODEM_ON, modemOn ).setValue( PERIPHERAL_ON, peripheralOn ) ); @@ -262,18 +262,18 @@ public void blockTick() { if( getLevel().isClientSide ) return; - if( m_modemState.pollChanged() ) updateBlockState(); + if( modemState.pollChanged() ) updateBlockState(); - if( !m_connectionsFormed ) + if( !connectionsFormed ) { - m_connectionsFormed = true; + connectionsFormed = true; connectionsChanged(); - if( m_peripheralAccessAllowed ) + if( peripheralAccessAllowed ) { for( Direction facing : DirectionUtil.FACINGS ) { - m_peripherals[facing.ordinal()].attach( level, getBlockPos(), facing ); + peripherals[facing.ordinal()].attach( level, getBlockPos(), facing ); } updateConnectedPeripherals(); } @@ -295,33 +295,33 @@ private void connectionsChanged() if( !element.isPresent() ) continue; element.addListener( connectedNodeChanged ); - m_node.connectTo( element.orElseThrow( NullPointerException::new ).getNode() ); + node.connectTo( element.orElseThrow( NullPointerException::new ).getNode() ); } } private void togglePeripheralAccess() { - if( !m_peripheralAccessAllowed ) + if( !peripheralAccessAllowed ) { boolean hasAny = false; for( Direction facing : DirectionUtil.FACINGS ) { - WiredModemLocalPeripheral peripheral = m_peripherals[facing.ordinal()]; + WiredModemLocalPeripheral peripheral = peripherals[facing.ordinal()]; peripheral.attach( level, getBlockPos(), facing ); hasAny |= peripheral.hasPeripheral(); } if( !hasAny ) return; - m_peripheralAccessAllowed = true; - m_node.updatePeripherals( getConnectedPeripherals() ); + peripheralAccessAllowed = true; + node.updatePeripherals( getConnectedPeripherals() ); } else { - m_peripheralAccessAllowed = false; + peripheralAccessAllowed = false; - for( WiredModemLocalPeripheral peripheral : m_peripherals ) peripheral.detach(); - m_node.updatePeripherals( Collections.emptyMap() ); + for( WiredModemLocalPeripheral peripheral : peripherals ) peripheral.detach(); + node.updatePeripherals( Collections.emptyMap() ); } updateBlockState(); @@ -329,10 +329,10 @@ private void togglePeripheralAccess() private Set getConnectedPeripheralNames() { - if( !m_peripheralAccessAllowed ) return Collections.emptySet(); + if( !peripheralAccessAllowed ) return Collections.emptySet(); Set peripherals = new HashSet<>( 6 ); - for( WiredModemLocalPeripheral peripheral : m_peripherals ) + for( WiredModemLocalPeripheral peripheral : this.peripherals ) { String name = peripheral.getConnectedName(); if( name != null ) peripherals.add( name ); @@ -342,10 +342,10 @@ private Set getConnectedPeripheralNames() private Map getConnectedPeripherals() { - if( !m_peripheralAccessAllowed ) return Collections.emptyMap(); + if( !peripheralAccessAllowed ) return Collections.emptyMap(); Map peripherals = new HashMap<>( 6 ); - for( WiredModemLocalPeripheral peripheral : m_peripherals ) peripheral.extendMap( peripherals ); + for( WiredModemLocalPeripheral peripheral : this.peripherals ) peripheral.extendMap( peripherals ); return peripherals; } @@ -355,11 +355,11 @@ private void updateConnectedPeripherals() if( peripherals.isEmpty() ) { // If there are no peripherals then disable access and update the display state. - m_peripheralAccessAllowed = false; + peripheralAccessAllowed = false; updateBlockState(); } - m_node.updatePeripherals( peripherals ); + node.updatePeripherals( peripherals ); } @Nonnull @@ -368,7 +368,7 @@ public LazyOptional getCapability( @Nonnull Capability capability, @Nu { if( capability == CAPABILITY_WIRED_ELEMENT ) { - if( elementCap == null ) elementCap = LazyOptional.of( () -> m_element ); + if( elementCap == null ) elementCap = LazyOptional.of( () -> element ); return elementCap.cast(); } @@ -379,7 +379,7 @@ public LazyOptional getCapability( @Nonnull Capability capability, @Nu public IWiredElement getElement() { - return m_element; + return element; } private WiredModemPeripheral getPeripheral( @Nonnull Direction side ) @@ -387,8 +387,8 @@ private WiredModemPeripheral getPeripheral( @Nonnull Direction side ) WiredModemPeripheral peripheral = modems[side.ordinal()]; if( peripheral != null ) return peripheral; - WiredModemLocalPeripheral localPeripheral = m_peripherals[side.ordinal()]; - return modems[side.ordinal()] = new WiredModemPeripheral( m_modemState, m_element ) + WiredModemLocalPeripheral localPeripheral = peripherals[side.ordinal()]; + return modems[side.ordinal()] = new WiredModemPeripheral( modemState, element ) { @Nonnull @Override diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java index dc2296e8c..32db96cbe 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessModemPeripheral.java @@ -14,24 +14,24 @@ public abstract class WirelessModemPeripheral extends ModemPeripheral { - private final boolean m_advanced; + private final boolean advanced; public WirelessModemPeripheral( ModemState state, boolean advanced ) { super( state ); - m_advanced = advanced; + this.advanced = advanced; } @Override public boolean isInterdimensional() { - return m_advanced; + return advanced; } @Override public double getRange() { - if( m_advanced ) + if( advanced ) { return Integer.MAX_VALUE; } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java index 72adfb42e..a7f4e95da 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/WirelessNetwork.java @@ -18,50 +18,47 @@ public class WirelessNetwork implements IPacketNetwork { - private static WirelessNetwork s_universalNetwork = null; + private static WirelessNetwork universalNetwork = null; public static WirelessNetwork getUniversal() { - if( s_universalNetwork == null ) - { - s_universalNetwork = new WirelessNetwork(); - } - return s_universalNetwork; + if( universalNetwork == null ) universalNetwork = new WirelessNetwork(); + return universalNetwork; } public static void resetNetworks() { - s_universalNetwork = null; + universalNetwork = null; } - private final Set m_receivers = Collections.newSetFromMap( new ConcurrentHashMap<>() ); + private final Set receivers = Collections.newSetFromMap( new ConcurrentHashMap<>() ); @Override public void addReceiver( @Nonnull IPacketReceiver receiver ) { Objects.requireNonNull( receiver, "device cannot be null" ); - m_receivers.add( receiver ); + receivers.add( receiver ); } @Override public void removeReceiver( @Nonnull IPacketReceiver receiver ) { Objects.requireNonNull( receiver, "device cannot be null" ); - m_receivers.remove( receiver ); + receivers.remove( receiver ); } @Override public void transmitSameDimension( @Nonnull Packet packet, double range ) { Objects.requireNonNull( packet, "packet cannot be null" ); - for( IPacketReceiver device : m_receivers ) tryTransmit( device, packet, range, false ); + for( IPacketReceiver device : receivers ) tryTransmit( device, packet, range, false ); } @Override public void transmitInterdimensional( @Nonnull Packet packet ) { Objects.requireNonNull( packet, "packet cannot be null" ); - for( IPacketReceiver device : m_receivers ) tryTransmit( device, packet, 0, true ); + for( IPacketReceiver device : receivers ) tryTransmit( device, packet, 0, true ); } private static void tryTransmit( IPacketReceiver receiver, Packet packet, double range, boolean interdimensional ) 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 7456c7ba0..dabb2feee 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java @@ -49,23 +49,23 @@ public class TileMonitor extends TileGeneric private final boolean advanced; - private ServerMonitor m_serverMonitor; - private ClientMonitor m_clientMonitor; + private ServerMonitor serverMonitor; + private ClientMonitor clientMonitor; private MonitorPeripheral peripheral; private LazyOptional peripheralCap; - private final Set m_computers = new HashSet<>(); + private final Set computers = new HashSet<>(); - private boolean m_destroyed = false; + private boolean destroyed = false; private boolean visiting = false; // MonitorWatcher state. boolean enqueued; TerminalState cached; - private int m_width = 1; - private int m_height = 1; - private int m_xIndex = 0; - private int m_yIndex = 0; + private int width = 1; + private int height = 1; + private int xIndex = 0; + private int yIndex = 0; public TileMonitor( TileEntityType type, boolean advanced ) { @@ -84,8 +84,8 @@ public void onLoad() public void destroy() { // TODO: Call this before using the block - if( m_destroyed ) return; - m_destroyed = true; + if( destroyed ) return; + destroyed = true; if( !getLevel().isClientSide ) contractNeighbours(); } @@ -93,14 +93,14 @@ public void destroy() public void setRemoved() { super.setRemoved(); - if( m_clientMonitor != null && m_xIndex == 0 && m_yIndex == 0 ) m_clientMonitor.destroy(); + if( clientMonitor != null && xIndex == 0 && yIndex == 0 ) clientMonitor.destroy(); } @Override public void onChunkUnloaded() { super.onChunkUnloaded(); - if( m_clientMonitor != null && m_xIndex == 0 && m_yIndex == 0 ) m_clientMonitor.destroy(); + if( clientMonitor != null && xIndex == 0 && yIndex == 0 ) clientMonitor.destroy(); } @Nonnull @@ -127,10 +127,10 @@ public ActionResultType onActivate( PlayerEntity player, Hand hand, BlockRayTrac @Override public CompoundNBT save( CompoundNBT tag ) { - tag.putInt( NBT_X, m_xIndex ); - tag.putInt( NBT_Y, m_yIndex ); - tag.putInt( NBT_WIDTH, m_width ); - tag.putInt( NBT_HEIGHT, m_height ); + tag.putInt( NBT_X, xIndex ); + tag.putInt( NBT_Y, yIndex ); + tag.putInt( NBT_WIDTH, width ); + tag.putInt( NBT_HEIGHT, height ); return super.save( tag ); } @@ -138,29 +138,29 @@ public CompoundNBT save( CompoundNBT tag ) public void load( @Nonnull CompoundNBT tag ) { super.load( tag ); - m_xIndex = tag.getInt( NBT_X ); - m_yIndex = tag.getInt( NBT_Y ); - m_width = tag.getInt( NBT_WIDTH ); - m_height = tag.getInt( NBT_HEIGHT ); + xIndex = tag.getInt( NBT_X ); + yIndex = tag.getInt( NBT_Y ); + width = tag.getInt( NBT_WIDTH ); + height = tag.getInt( NBT_HEIGHT ); } @Override public void blockTick() { - if( m_xIndex != 0 || m_yIndex != 0 || m_serverMonitor == null ) return; + if( xIndex != 0 || yIndex != 0 || serverMonitor == null ) return; - m_serverMonitor.clearChanged(); + serverMonitor.clearChanged(); - if( m_serverMonitor.pollResized() ) + if( serverMonitor.pollResized() ) { - for( int x = 0; x < m_width; x++ ) + for( int x = 0; x < width; x++ ) { - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { TileMonitor monitor = getNeighbour( x, y ); if( monitor == null ) continue; - for( IComputerAccess computer : monitor.m_computers ) + for( IComputerAccess computer : monitor.computers ) { computer.queueEvent( "monitor_resize", computer.getAttachmentName() ); } @@ -168,7 +168,7 @@ public void blockTick() } } - if( m_serverMonitor.pollTerminalChanged() ) MonitorWatcher.enqueue( this ); + if( serverMonitor.pollTerminalChanged() ) MonitorWatcher.enqueue( this ); } @Override @@ -194,62 +194,62 @@ public LazyOptional getCapability( @Nonnull Capability cap, @Nullable public ServerMonitor getCachedServerMonitor() { - return m_serverMonitor; + return serverMonitor; } private ServerMonitor getServerMonitor() { - if( m_serverMonitor != null ) return m_serverMonitor; + if( serverMonitor != null ) return serverMonitor; TileMonitor origin = getOrigin(); if( origin == null ) return null; - return m_serverMonitor = origin.m_serverMonitor; + return serverMonitor = origin.serverMonitor; } private ServerMonitor createServerMonitor() { - if( m_serverMonitor != null ) return m_serverMonitor; + if( serverMonitor != null ) return serverMonitor; - if( m_xIndex == 0 && m_yIndex == 0 ) + if( xIndex == 0 && yIndex == 0 ) { // If we're the origin, set up the new monitor - m_serverMonitor = new ServerMonitor( advanced, this ); - m_serverMonitor.rebuild(); + serverMonitor = new ServerMonitor( advanced, this ); + serverMonitor.rebuild(); // And propagate it to child monitors - for( int x = 0; x < m_width; x++ ) + for( int x = 0; x < width; x++ ) { - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { TileMonitor monitor = getNeighbour( x, y ); - if( monitor != null ) monitor.m_serverMonitor = m_serverMonitor; + if( monitor != null ) monitor.serverMonitor = serverMonitor; } } - return m_serverMonitor; + return serverMonitor; } else { // Otherwise fetch the origin and attempt to get its monitor // Note this may load chunks, but we don't really have a choice here. BlockPos pos = getBlockPos(); - TileEntity te = level.getBlockEntity( pos.relative( getRight(), -m_xIndex ).relative( getDown(), -m_yIndex ) ); + TileEntity te = level.getBlockEntity( pos.relative( getRight(), -xIndex ).relative( getDown(), -yIndex ) ); if( !(te instanceof TileMonitor) ) return null; - return m_serverMonitor = ((TileMonitor) te).createServerMonitor(); + return serverMonitor = ((TileMonitor) te).createServerMonitor(); } } public ClientMonitor getClientMonitor() { - if( m_clientMonitor != null ) return m_clientMonitor; + if( clientMonitor != null ) return clientMonitor; BlockPos pos = getBlockPos(); - TileEntity te = level.getBlockEntity( pos.relative( getRight(), -m_xIndex ).relative( getDown(), -m_yIndex ) ); + TileEntity te = level.getBlockEntity( pos.relative( getRight(), -xIndex ).relative( getDown(), -yIndex ) ); if( !(te instanceof TileMonitor) ) return null; - return m_clientMonitor = ((TileMonitor) te).m_clientMonitor; + return clientMonitor = ((TileMonitor) te).clientMonitor; } // Networking stuff @@ -258,10 +258,10 @@ public ClientMonitor getClientMonitor() protected void writeDescription( @Nonnull CompoundNBT nbt ) { super.writeDescription( nbt ); - nbt.putInt( NBT_X, m_xIndex ); - nbt.putInt( NBT_Y, m_yIndex ); - nbt.putInt( NBT_WIDTH, m_width ); - nbt.putInt( NBT_HEIGHT, m_height ); + nbt.putInt( NBT_X, xIndex ); + nbt.putInt( NBT_Y, yIndex ); + nbt.putInt( NBT_WIDTH, width ); + nbt.putInt( NBT_HEIGHT, height ); } @Override @@ -269,32 +269,32 @@ protected final void readDescription( @Nonnull CompoundNBT nbt ) { super.readDescription( nbt ); - int oldXIndex = m_xIndex; - int oldYIndex = m_yIndex; - int oldWidth = m_width; - int oldHeight = m_height; + int oldXIndex = xIndex; + int oldYIndex = yIndex; + int oldWidth = width; + int oldHeight = height; - m_xIndex = nbt.getInt( NBT_X ); - m_yIndex = nbt.getInt( NBT_Y ); - m_width = nbt.getInt( NBT_WIDTH ); - m_height = nbt.getInt( NBT_HEIGHT ); + xIndex = nbt.getInt( NBT_X ); + yIndex = nbt.getInt( NBT_Y ); + width = nbt.getInt( NBT_WIDTH ); + height = nbt.getInt( NBT_HEIGHT ); - if( oldXIndex != m_xIndex || oldYIndex != m_yIndex ) + if( oldXIndex != xIndex || oldYIndex != yIndex ) { // If our index has changed then it's possible the origin monitor has changed. Thus // we'll clear our cache. If we're the origin then we'll need to remove the glList as well. - if( oldXIndex == 0 && oldYIndex == 0 && m_clientMonitor != null ) m_clientMonitor.destroy(); - m_clientMonitor = null; + if( oldXIndex == 0 && oldYIndex == 0 && clientMonitor != null ) clientMonitor.destroy(); + clientMonitor = null; } - if( m_xIndex == 0 && m_yIndex == 0 ) + if( xIndex == 0 && yIndex == 0 ) { // If we're the origin terminal then create it. - if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( advanced, this ); + if( clientMonitor == null ) clientMonitor = new ClientMonitor( advanced, this ); } - if( oldXIndex != m_xIndex || oldYIndex != m_yIndex || - oldWidth != m_width || oldHeight != m_height ) + if( oldXIndex != xIndex || oldYIndex != yIndex || + oldWidth != width || oldHeight != height ) { // One of our properties has changed, so ensure we redraw the block updateBlock(); @@ -303,14 +303,14 @@ protected final void readDescription( @Nonnull CompoundNBT nbt ) public final void read( TerminalState state ) { - if( m_xIndex != 0 || m_yIndex != 0 ) + if( xIndex != 0 || yIndex != 0 ) { ComputerCraft.log.warn( "Receiving monitor state for non-origin terminal at {}", getBlockPos() ); return; } - if( m_clientMonitor == null ) m_clientMonitor = new ClientMonitor( advanced, this ); - m_clientMonitor.read( state ); + if( clientMonitor == null ) clientMonitor = new ClientMonitor( advanced, this ); + clientMonitor.read( state ); } // Sizing and placement stuff @@ -319,8 +319,8 @@ private void updateBlockState() { getLevel().setBlock( getBlockPos(), getBlockState() .setValue( BlockMonitor.STATE, MonitorEdgeState.fromConnections( - m_yIndex < m_height - 1, m_yIndex > 0, - m_xIndex > 0, m_xIndex < m_width - 1 ) ), 2 ); + yIndex < height - 1, yIndex > 0, + xIndex > 0, xIndex < width - 1 ) ), 2 ); } // region Sizing and placement stuff @@ -358,22 +358,22 @@ public Direction getDown() public int getWidth() { - return m_width; + return width; } public int getHeight() { - return m_height; + return height; } public int getXIndex() { - return m_xIndex; + return xIndex; } public int getYIndex() { - return m_yIndex; + return yIndex; } private TileMonitor getSimilarMonitorAt( BlockPos pos ) @@ -388,7 +388,7 @@ private TileMonitor getSimilarMonitorAt( BlockPos pos ) if( !(tile instanceof TileMonitor) ) return null; TileMonitor monitor = (TileMonitor) tile; - return !monitor.visiting && !monitor.m_destroyed && advanced == monitor.advanced + return !monitor.visiting && !monitor.destroyed && advanced == monitor.advanced && getDirection() == monitor.getDirection() && getOrientation() == monitor.getOrientation() ? monitor : null; } @@ -398,8 +398,8 @@ private TileMonitor getNeighbour( int x, int y ) BlockPos pos = getBlockPos(); Direction right = getRight(); Direction down = getDown(); - int xOffset = -m_xIndex + x; - int yOffset = -m_yIndex + y; + int xOffset = -xIndex + x; + int yOffset = -yIndex + y; return getSimilarMonitorAt( pos.relative( right, xOffset ).relative( down, yOffset ) ); } @@ -411,12 +411,12 @@ private TileMonitor getOrigin() private void resize( int width, int height ) { // If we're not already the origin then we'll need to generate a new terminal. - if( m_xIndex != 0 || m_yIndex != 0 ) m_serverMonitor = null; + if( xIndex != 0 || yIndex != 0 ) serverMonitor = null; - m_xIndex = 0; - m_yIndex = 0; - m_width = width; - m_height = height; + xIndex = 0; + yIndex = 0; + this.width = width; + this.height = height; // Determine if we actually need a monitor. In order to do this, simply check if // any component monitor been wrapped as a peripheral. Whilst this flag may be @@ -439,16 +439,16 @@ private void resize( int width, int height ) // Either delete the current monitor or sync a new one. if( needsTerminal ) { - if( m_serverMonitor == null ) m_serverMonitor = new ServerMonitor( advanced, this ); + if( serverMonitor == null ) serverMonitor = new ServerMonitor( advanced, this ); } else { - m_serverMonitor = null; + serverMonitor = null; } // Update the terminal's width and height and rebuild it. This ensures the monitor // is consistent when syncing it to other monitors. - if( m_serverMonitor != null ) m_serverMonitor.rebuild(); + if( serverMonitor != null ) serverMonitor.rebuild(); // Update the other monitors, setting coordinates, dimensions and the server terminal for( int x = 0; x < width; x++ ) @@ -458,11 +458,11 @@ private void resize( int width, int height ) TileMonitor monitor = getNeighbour( x, y ); if( monitor == null ) continue; - monitor.m_xIndex = x; - monitor.m_yIndex = y; - monitor.m_width = width; - monitor.m_height = height; - monitor.m_serverMonitor = m_serverMonitor; + monitor.xIndex = x; + monitor.yIndex = y; + monitor.width = width; + monitor.height = height; + monitor.serverMonitor = serverMonitor; monitor.updateBlockState(); monitor.updateBlock(); } @@ -472,41 +472,41 @@ private void resize( int width, int height ) private boolean mergeLeft() { TileMonitor left = getNeighbour( -1, 0 ); - if( left == null || left.m_yIndex != 0 || left.m_height != m_height ) return false; + if( left == null || left.yIndex != 0 || left.height != height ) return false; - int width = left.m_width + m_width; + int width = left.width + this.width; if( width > ComputerCraft.monitorWidth ) return false; TileMonitor origin = left.getOrigin(); - if( origin != null ) origin.resize( width, m_height ); + if( origin != null ) origin.resize( width, height ); left.expand(); return true; } private boolean mergeRight() { - TileMonitor right = getNeighbour( m_width, 0 ); - if( right == null || right.m_yIndex != 0 || right.m_height != m_height ) return false; + TileMonitor right = getNeighbour( width, 0 ); + if( right == null || right.yIndex != 0 || right.height != height ) return false; - int width = m_width + right.m_width; + int width = this.width + right.width; if( width > ComputerCraft.monitorWidth ) return false; TileMonitor origin = getOrigin(); - if( origin != null ) origin.resize( width, m_height ); + if( origin != null ) origin.resize( width, height ); expand(); return true; } private boolean mergeUp() { - TileMonitor above = getNeighbour( 0, m_height ); - if( above == null || above.m_xIndex != 0 || above.m_width != m_width ) return false; + TileMonitor above = getNeighbour( 0, height ); + if( above == null || above.xIndex != 0 || above.width != width ) return false; - int height = above.m_height + m_height; + int height = above.height + this.height; if( height > ComputerCraft.monitorHeight ) return false; TileMonitor origin = getOrigin(); - if( origin != null ) origin.resize( m_width, height ); + if( origin != null ) origin.resize( width, height ); expand(); return true; } @@ -514,13 +514,13 @@ private boolean mergeUp() private boolean mergeDown() { TileMonitor below = getNeighbour( 0, -1 ); - if( below == null || below.m_xIndex != 0 || below.m_width != m_width ) return false; + if( below == null || below.xIndex != 0 || below.width != width ) return false; - int height = m_height + below.m_height; + int height = this.height + below.height; if( height > ComputerCraft.monitorHeight ) return false; TileMonitor origin = below.getOrigin(); - if( origin != null ) origin.resize( m_width, height ); + if( origin != null ) origin.resize( width, height ); below.expand(); return true; } @@ -534,24 +534,24 @@ void expand() void contractNeighbours() { visiting = true; - if( m_xIndex > 0 ) + if( xIndex > 0 ) { - TileMonitor left = getNeighbour( m_xIndex - 1, m_yIndex ); + TileMonitor left = getNeighbour( xIndex - 1, yIndex ); if( left != null ) left.contract(); } - if( m_xIndex + 1 < m_width ) + if( xIndex + 1 < width ) { - TileMonitor right = getNeighbour( m_xIndex + 1, m_yIndex ); + TileMonitor right = getNeighbour( xIndex + 1, yIndex ); if( right != null ) right.contract(); } - if( m_yIndex > 0 ) + if( yIndex > 0 ) { - TileMonitor below = getNeighbour( m_xIndex, m_yIndex - 1 ); + TileMonitor below = getNeighbour( xIndex, yIndex - 1 ); if( below != null ) below.contract(); } - if( m_yIndex + 1 < m_height ) + if( yIndex + 1 < height ) { - TileMonitor above = getNeighbour( m_xIndex, m_yIndex + 1 ); + TileMonitor above = getNeighbour( xIndex, yIndex + 1 ); if( above != null ) above.contract(); } visiting = false; @@ -559,8 +559,8 @@ void contractNeighbours() void contract() { - int height = m_height; - int width = m_width; + int height = this.height; + int width = this.width; TileMonitor origin = getOrigin(); if( origin == null ) @@ -624,9 +624,9 @@ private void monitorTouched( float xPos, float yPos, float zPos ) { XYPair pair = XYPair .of( xPos, yPos, zPos, getDirection(), getOrientation() ) - .add( m_xIndex, m_height - m_yIndex - 1 ); + .add( xIndex, height - yIndex - 1 ); - if( pair.x > m_width - RENDER_BORDER || pair.y > m_height - RENDER_BORDER || pair.x < RENDER_BORDER || pair.y < RENDER_BORDER ) + if( pair.x > width - RENDER_BORDER || pair.y > height - RENDER_BORDER || pair.x < RENDER_BORDER || pair.y < RENDER_BORDER ) { return; } @@ -637,20 +637,20 @@ private void monitorTouched( float xPos, float yPos, float zPos ) Terminal originTerminal = serverTerminal.getTerminal(); if( originTerminal == null ) return; - double xCharWidth = (m_width - (RENDER_BORDER + RENDER_MARGIN) * 2.0) / originTerminal.getWidth(); - double yCharHeight = (m_height - (RENDER_BORDER + RENDER_MARGIN) * 2.0) / originTerminal.getHeight(); + double xCharWidth = (width - (RENDER_BORDER + RENDER_MARGIN) * 2.0) / originTerminal.getWidth(); + double yCharHeight = (height - (RENDER_BORDER + RENDER_MARGIN) * 2.0) / originTerminal.getHeight(); int xCharPos = (int) Math.min( originTerminal.getWidth(), Math.max( (pair.x - RENDER_BORDER - RENDER_MARGIN) / xCharWidth + 1.0, 1.0 ) ); int yCharPos = (int) Math.min( originTerminal.getHeight(), Math.max( (pair.y - RENDER_BORDER - RENDER_MARGIN) / yCharHeight + 1.0, 1.0 ) ); - for( int y = 0; y < m_height; y++ ) + for( int y = 0; y < height; y++ ) { - for( int x = 0; x < m_width; x++ ) + for( int x = 0; x < width; x++ ) { TileMonitor monitor = getNeighbour( x, y ); if( monitor == null ) continue; - for( IComputerAccess computer : monitor.m_computers ) + for( IComputerAccess computer : monitor.computers ) { computer.queueEvent( "monitor_touch", computer.getAttachmentName(), xCharPos, yCharPos ); } @@ -661,12 +661,12 @@ private void monitorTouched( float xPos, float yPos, float zPos ) void addComputer( IComputerAccess computer ) { - m_computers.add( computer ); + computers.add( computer ); } void removeComputer( IComputerAccess computer ) { - m_computers.remove( computer ); + computers.remove( computer ); } @Nonnull @@ -674,7 +674,7 @@ void removeComputer( IComputerAccess computer ) public AxisAlignedBB getRenderBoundingBox() { TileMonitor start = getNeighbour( 0, 0 ); - TileMonitor end = getNeighbour( m_width - 1, m_height - 1 ); + TileMonitor end = getNeighbour( width - 1, height - 1 ); if( start != null && end != null ) { BlockPos startPos = start.getBlockPos(); diff --git a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java index 6320a13ff..02d0693c2 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/printer/TilePrinter.java @@ -55,14 +55,14 @@ public final class TilePrinter extends TileGeneric implements DefaultSidedInvent ITextComponent customName; - private final NonNullList m_inventory = NonNullList.withSize( SLOTS, ItemStack.EMPTY ); + private final NonNullList inventory = NonNullList.withSize( SLOTS, ItemStack.EMPTY ); private final SidedCaps itemHandlerCaps = SidedCaps.ofNullable( facing -> facing == null ? new InvWrapper( this ) : new SidedInvWrapper( this, facing ) ); private LazyOptional peripheralCap; - private final Terminal m_page = new Terminal( ItemPrintout.LINE_MAX_LENGTH, ItemPrintout.LINES_PER_PAGE ); - private String m_pageTitle = ""; - private boolean m_printing = false; + private final Terminal page = new Terminal( ItemPrintout.LINE_MAX_LENGTH, ItemPrintout.LINES_PER_PAGE ); + private String pageTitle = ""; + private boolean printing = false; public TilePrinter( TileEntityType type ) { @@ -101,15 +101,15 @@ public void load( @Nonnull CompoundNBT nbt ) customName = nbt.contains( NBT_NAME ) ? ITextComponent.Serializer.fromJson( nbt.getString( NBT_NAME ) ) : null; // Read page - synchronized( m_page ) + synchronized( page ) { - m_printing = nbt.getBoolean( NBT_PRINTING ); - m_pageTitle = nbt.getString( NBT_PAGE_TITLE ); - m_page.readFromNBT( nbt ); + printing = nbt.getBoolean( NBT_PRINTING ); + pageTitle = nbt.getString( NBT_PAGE_TITLE ); + page.readFromNBT( nbt ); } // Read inventory - ItemStackHelper.loadAllItems( nbt, m_inventory ); + ItemStackHelper.loadAllItems( nbt, inventory ); } @Nonnull @@ -119,35 +119,35 @@ public CompoundNBT save( @Nonnull CompoundNBT nbt ) if( customName != null ) nbt.putString( NBT_NAME, ITextComponent.Serializer.toJson( customName ) ); // Write page - synchronized( m_page ) + synchronized( page ) { - nbt.putBoolean( NBT_PRINTING, m_printing ); - nbt.putString( NBT_PAGE_TITLE, m_pageTitle ); - m_page.writeToNBT( nbt ); + nbt.putBoolean( NBT_PRINTING, printing ); + nbt.putString( NBT_PAGE_TITLE, pageTitle ); + page.writeToNBT( nbt ); } // Write inventory - ItemStackHelper.saveAllItems( nbt, m_inventory ); + ItemStackHelper.saveAllItems( nbt, inventory ); return super.save( nbt ); } boolean isPrinting() { - return m_printing; + return printing; } // IInventory implementation @Override public int getContainerSize() { - return m_inventory.size(); + return inventory.size(); } @Override public boolean isEmpty() { - for( ItemStack stack : m_inventory ) + for( ItemStack stack : inventory ) { if( !stack.isEmpty() ) return false; } @@ -158,15 +158,15 @@ public boolean isEmpty() @Override public ItemStack getItem( int slot ) { - return m_inventory.get( slot ); + return inventory.get( slot ); } @Nonnull @Override public ItemStack removeItemNoUpdate( int slot ) { - ItemStack result = m_inventory.get( slot ); - m_inventory.set( slot, ItemStack.EMPTY ); + ItemStack result = inventory.get( slot ); + inventory.set( slot, ItemStack.EMPTY ); setChanged(); updateBlockState(); return result; @@ -176,7 +176,7 @@ public ItemStack removeItemNoUpdate( int slot ) @Override public ItemStack removeItem( int slot, int count ) { - ItemStack stack = m_inventory.get( slot ); + ItemStack stack = inventory.get( slot ); if( stack.isEmpty() ) return ItemStack.EMPTY; if( stack.getCount() <= count ) @@ -186,9 +186,9 @@ public ItemStack removeItem( int slot, int count ) } ItemStack part = stack.split( count ); - if( m_inventory.get( slot ).isEmpty() ) + if( inventory.get( slot ).isEmpty() ) { - m_inventory.set( slot, ItemStack.EMPTY ); + inventory.set( slot, ItemStack.EMPTY ); updateBlockState(); } setChanged(); @@ -198,7 +198,7 @@ public ItemStack removeItem( int slot, int count ) @Override public void setItem( int slot, @Nonnull ItemStack stack ) { - m_inventory.set( slot, stack ); + inventory.set( slot, stack ); setChanged(); updateBlockState(); } @@ -206,7 +206,7 @@ public void setItem( int slot, @Nonnull ItemStack stack ) @Override public void clearContent() { - for( int i = 0; i < m_inventory.size(); i++ ) m_inventory.set( i, ItemStack.EMPTY ); + for( int i = 0; i < inventory.size(); i++ ) inventory.set( i, ItemStack.EMPTY ); setChanged(); updateBlockState(); } @@ -254,33 +254,33 @@ public int[] getSlotsForFace( @Nonnull Direction side ) @Nullable Terminal getCurrentPage() { - synchronized( m_page ) + synchronized( page ) { - return m_printing ? m_page : null; + return printing ? page : null; } } boolean startNewPage() { - synchronized( m_page ) + synchronized( page ) { if( !canInputPage() ) return false; - if( m_printing && !outputPage() ) return false; + if( printing && !outputPage() ) return false; return inputPage(); } } boolean endCurrentPage() { - synchronized( m_page ) + synchronized( page ) { - return m_printing && outputPage(); + return printing && outputPage(); } } int getInkLevel() { - ItemStack inkStack = m_inventory.get( 0 ); + ItemStack inkStack = inventory.get( 0 ); return isInk( inkStack ) ? inkStack.getCount() : 0; } @@ -289,7 +289,7 @@ int getPaperLevel() int count = 0; for( int i = 1; i < 7; i++ ) { - ItemStack paperStack = m_inventory.get( i ); + ItemStack paperStack = inventory.get( i ); if( isPaper( paperStack ) ) count += paperStack.getCount(); } return count; @@ -297,9 +297,9 @@ int getPaperLevel() void setPageTitle( String title ) { - synchronized( m_page ) + synchronized( page ) { - if( m_printing ) m_pageTitle = title; + if( printing ) pageTitle = title; } } @@ -317,55 +317,55 @@ private static boolean isPaper( @Nonnull ItemStack stack ) private boolean canInputPage() { - ItemStack inkStack = m_inventory.get( 0 ); + ItemStack inkStack = inventory.get( 0 ); return !inkStack.isEmpty() && isInk( inkStack ) && getPaperLevel() > 0; } private boolean inputPage() { - ItemStack inkStack = m_inventory.get( 0 ); + ItemStack inkStack = inventory.get( 0 ); DyeColor dye = ColourUtils.getStackColour( inkStack ); if( dye == null ) return false; for( int i = 1; i < 7; i++ ) { - ItemStack paperStack = m_inventory.get( i ); + ItemStack paperStack = inventory.get( i ); if( paperStack.isEmpty() || !isPaper( paperStack ) ) continue; // Setup the new page - m_page.setTextColour( dye.getId() ); + page.setTextColour( dye.getId() ); - m_page.clear(); + page.clear(); if( paperStack.getItem() instanceof ItemPrintout ) { - m_pageTitle = ItemPrintout.getTitle( paperStack ); + pageTitle = ItemPrintout.getTitle( paperStack ); String[] text = ItemPrintout.getText( paperStack ); String[] textColour = ItemPrintout.getColours( paperStack ); - for( int y = 0; y < m_page.getHeight(); y++ ) + for( int y = 0; y < page.getHeight(); y++ ) { - m_page.setLine( y, text[y], textColour[y], "" ); + page.setLine( y, text[y], textColour[y], "" ); } } else { - m_pageTitle = ""; + pageTitle = ""; } - m_page.setCursorPos( 0, 0 ); + page.setCursorPos( 0, 0 ); // Decrement ink inkStack.shrink( 1 ); - if( inkStack.isEmpty() ) m_inventory.set( 0, ItemStack.EMPTY ); + if( inkStack.isEmpty() ) inventory.set( 0, ItemStack.EMPTY ); // Decrement paper paperStack.shrink( 1 ); if( paperStack.isEmpty() ) { - m_inventory.set( i, ItemStack.EMPTY ); + inventory.set( i, ItemStack.EMPTY ); updateBlockState(); } setChanged(); - m_printing = true; + printing = true; return true; } return false; @@ -373,22 +373,22 @@ private boolean inputPage() private boolean outputPage() { - int height = m_page.getHeight(); + int height = page.getHeight(); String[] lines = new String[height]; String[] colours = new String[height]; for( int i = 0; i < height; i++ ) { - lines[i] = m_page.getLine( i ).toString(); - colours[i] = m_page.getTextColourLine( i ).toString(); + lines[i] = page.getLine( i ).toString(); + colours[i] = page.getTextColourLine( i ).toString(); } - ItemStack stack = ItemPrintout.createSingleFromTitleAndText( m_pageTitle, lines, colours ); + ItemStack stack = ItemPrintout.createSingleFromTitleAndText( pageTitle, lines, colours ); for( int slot : BOTTOM_SLOTS ) { - if( m_inventory.get( slot ).isEmpty() ) + if( inventory.get( slot ).isEmpty() ) { setItem( slot, stack ); - m_printing = false; + printing = false; return true; } } @@ -399,7 +399,7 @@ private void ejectContents() { for( int i = 0; i < 13; i++ ) { - ItemStack stack = m_inventory.get( i ); + ItemStack stack = inventory.get( i ); if( !stack.isEmpty() ) { // Remove the stack from the inventory @@ -416,7 +416,7 @@ private void updateBlockState() boolean top = false, bottom = false; for( int i = 1; i < 7; i++ ) { - ItemStack stack = m_inventory.get( i ); + ItemStack stack = inventory.get( i ); if( !stack.isEmpty() && isPaper( stack ) ) { top = true; @@ -425,7 +425,7 @@ private void updateBlockState() } for( int i = 7; i < 13; i++ ) { - ItemStack stack = m_inventory.get( i ); + ItemStack stack = inventory.get( i ); if( !stack.isEmpty() && isPaper( stack ) ) { bottom = true; 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 00492d4e9..ce7a3710f 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/speaker/SpeakerPeripheral.java @@ -32,14 +32,14 @@ */ public abstract class SpeakerPeripheral implements IPeripheral { - private long m_clock = 0; - private long m_lastPlayTime = 0; - private final AtomicInteger m_notesThisTick = new AtomicInteger(); + private long clock = 0; + private long lastPlayTime = 0; + private final AtomicInteger notesThisTick = new AtomicInteger(); public void update() { - m_clock++; - m_notesThisTick.set( 0 ); + clock++; + notesThisTick.set( 0 ); } public abstract World getWorld(); @@ -48,7 +48,7 @@ public void update() public boolean madeSound( long ticks ) { - return m_clock - m_lastPlayTime <= ticks; + return clock - lastPlayTime <= ticks; } @Nonnull @@ -129,14 +129,14 @@ public final synchronized boolean playNote( ILuaContext context, String name, Op // If the resource location for note block notes changes, this method call will need to be updated boolean success = playSound( context, instrument.getSoundEvent().getRegistryName(), volume, (float) Math.pow( 2.0, (pitch - 12.0) / 12.0 ), true ); - if( success ) m_notesThisTick.incrementAndGet(); + if( success ) notesThisTick.incrementAndGet(); return success; } private synchronized boolean playSound( ILuaContext context, ResourceLocation name, float volume, float pitch, boolean isNote ) throws LuaException { - if( m_clock - m_lastPlayTime < TileSpeaker.MIN_TICKS_BETWEEN_SOUNDS && - (!isNote || m_clock - m_lastPlayTime != 0 || m_notesThisTick.get() >= ComputerCraft.maxNotesPerTick) ) + if( clock - lastPlayTime < TileSpeaker.MIN_TICKS_BETWEEN_SOUNDS && + (!isNote || clock - lastPlayTime != 0 || notesThisTick.get() >= ComputerCraft.maxNotesPerTick) ) { // Rate limiting occurs when we've already played a sound within the last tick, or we've // played more notes than allowable within the current tick. @@ -158,7 +158,7 @@ private synchronized boolean playSound( ILuaContext context, ResourceLocation na return null; } ); - m_lastPlayTime = m_clock; + lastPlayTime = clock; return true; } } diff --git a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java index c098c0cd9..45df5ce0e 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/core/PocketServerComputer.java @@ -35,9 +35,9 @@ public class PocketServerComputer extends ServerComputer implements IPocketAccess { - private IPocketUpgrade m_upgrade; - private Entity m_entity; - private ItemStack m_stack; + private IPocketUpgrade upgrade; + private Entity entity; + private ItemStack stack; public PocketServerComputer( World world, int computerID, String label, int instanceID, ComputerFamily family ) { @@ -48,18 +48,18 @@ public PocketServerComputer( World world, int computerID, String label, int inst @Override public Entity getEntity() { - Entity entity = m_entity; - if( entity == null || m_stack == null || !entity.isAlive() ) return null; + Entity entity = this.entity; + if( entity == null || stack == null || !entity.isAlive() ) return null; if( entity instanceof PlayerEntity ) { PlayerInventory inventory = ((PlayerEntity) entity).inventory; - return inventory.items.contains( m_stack ) || inventory.offhand.contains( m_stack ) ? entity : null; + return inventory.items.contains( stack ) || inventory.offhand.contains( stack ) ? entity : null; } else if( entity instanceof LivingEntity ) { LivingEntity living = (LivingEntity) entity; - return living.getMainHandItem() == m_stack || living.getOffhandItem() == m_stack ? entity : null; + return living.getMainHandItem() == stack || living.getOffhandItem() == stack ? entity : null; } else { @@ -70,13 +70,13 @@ else if( entity instanceof LivingEntity ) @Override public int getColour() { - return IColouredItem.getColourBasic( m_stack ); + return IColouredItem.getColourBasic( stack ); } @Override public void setColour( int colour ) { - IColouredItem.setColourBasic( m_stack, colour ); + IColouredItem.setColourBasic( stack, colour ); updateUpgradeNBTData(); } @@ -110,19 +110,19 @@ else if( tag.contains( NBT_LIGHT, Constants.NBT.TAG_ANY_NUMERIC ) ) @Override public CompoundNBT getUpgradeNBTData() { - return ItemPocketComputer.getUpgradeInfo( m_stack ); + return ItemPocketComputer.getUpgradeInfo( stack ); } @Override public void updateUpgradeNBTData() { - if( m_entity instanceof PlayerEntity ) ((PlayerEntity) m_entity).inventory.setChanged(); + if( entity instanceof PlayerEntity ) ((PlayerEntity) entity).inventory.setChanged(); } @Override public void invalidatePeripheral() { - IPeripheral peripheral = m_upgrade == null ? null : m_upgrade.createPeripheral( this ); + IPeripheral peripheral = upgrade == null ? null : upgrade.createPeripheral( this ); setPeripheral( ComputerSide.BACK, peripheral ); } @@ -130,12 +130,12 @@ public void invalidatePeripheral() @Override public Map getUpgrades() { - return m_upgrade == null ? Collections.emptyMap() : Collections.singletonMap( m_upgrade.getUpgradeID(), getPeripheral( ComputerSide.BACK ) ); + return upgrade == null ? Collections.emptyMap() : Collections.singletonMap( upgrade.getUpgradeID(), getPeripheral( ComputerSide.BACK ) ); } public IPocketUpgrade getUpgrade() { - return m_upgrade; + return upgrade; } /** @@ -147,13 +147,13 @@ public IPocketUpgrade getUpgrade() */ public void setUpgrade( IPocketUpgrade upgrade ) { - if( m_upgrade == upgrade ) return; + if( this.upgrade == upgrade ) return; synchronized( this ) { - ItemPocketComputer.setUpgrade( m_stack, upgrade ); + ItemPocketComputer.setUpgrade( stack, upgrade ); updateUpgradeNBTData(); - m_upgrade = upgrade; + this.upgrade = upgrade; invalidatePeripheral(); } } @@ -167,14 +167,14 @@ public synchronized void updateValues( Entity entity, @Nonnull ItemStack stack, } // If a new entity has picked it up then rebroadcast the terminal to them - if( entity != m_entity && entity instanceof ServerPlayerEntity ) markTerminalChanged(); + if( entity != this.entity && entity instanceof ServerPlayerEntity ) markTerminalChanged(); - m_entity = entity; - m_stack = stack; + this.entity = entity; + this.stack = stack; - if( m_upgrade != upgrade ) + if( this.upgrade != upgrade ) { - m_upgrade = upgrade; + this.upgrade = upgrade; invalidatePeripheral(); } } @@ -184,10 +184,10 @@ public void broadcastState( boolean force ) { super.broadcastState( force ); - if( (hasTerminalChanged() || force) && m_entity instanceof ServerPlayerEntity ) + if( (hasTerminalChanged() || force) && entity instanceof ServerPlayerEntity ) { // Broadcast the state to the current entity if they're not already interacting with it. - ServerPlayerEntity player = (ServerPlayerEntity) m_entity; + ServerPlayerEntity player = (ServerPlayerEntity) entity; if( player.connection != null && !isInteracting( player ) ) { NetworkHandler.sendToPlayer( player, createTerminalPacket() ); diff --git a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java index 561743557..f3c47e573 100644 --- a/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java +++ b/src/main/java/dan200/computercraft/shared/pocket/items/ItemPocketComputer.java @@ -38,8 +38,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -361,14 +359,12 @@ private static void setSessionID( @Nonnull ItemStack stack, int sessionID ) stack.getOrCreateTag().putInt( NBT_SESSION, sessionID ); } - @OnlyIn( Dist.CLIENT ) public static ComputerState getState( @Nonnull ItemStack stack ) { ClientComputer computer = getClientComputer( stack ); return computer == null ? ComputerState.OFF : computer.getState(); } - @OnlyIn( Dist.CLIENT ) public static int getLightState( @Nonnull ItemStack stack ) { ClientComputer computer = getClientComputer( stack ); diff --git a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java index 46b5fef4c..5b6ed3ec8 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java +++ b/src/main/java/dan200/computercraft/shared/turtle/blocks/TileTurtle.java @@ -63,13 +63,13 @@ enum MoveState MOVED } - private final NonNullList m_inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); - private final NonNullList m_previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); - private final IItemHandlerModifiable m_itemHandler = new InvWrapper( this ); + private final NonNullList inventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); + private final NonNullList previousInventory = NonNullList.withSize( INVENTORY_SIZE, ItemStack.EMPTY ); + private final IItemHandlerModifiable itemHandler = new InvWrapper( this ); private LazyOptional itemHandlerCap; - private boolean m_inventoryChanged = false; - private TurtleBrain m_brain = new TurtleBrain( this ); - private MoveState m_moveState = MoveState.NOT_MOVED; + private boolean inventoryChanged = false; + private TurtleBrain brain = new TurtleBrain( this ); + private MoveState moveState = MoveState.NOT_MOVED; private LazyOptional peripheral; public TileTurtle( TileEntityType type, ComputerFamily family ) @@ -79,7 +79,7 @@ public TileTurtle( TileEntityType type, ComputerFamily fa private boolean hasMoved() { - return m_moveState == MoveState.MOVED; + return moveState == MoveState.MOVED; } @Override @@ -91,13 +91,13 @@ protected ServerComputer createComputer( int instanceID, int id ) ); computer.setPosition( getBlockPos() ); computer.addAPI( new TurtleAPI( computer.getAPIEnvironment(), getAccess() ) ); - m_brain.setupComputer( computer ); + brain.setupComputer( computer ); return computer; } public ComputerProxy createProxy() { - return m_brain.getProxy(); + return brain.getProxy(); } @Override @@ -163,9 +163,9 @@ public ActionResultType onActivate( PlayerEntity player, Hand hand, BlockRayTrac if( !getLevel().isClientSide ) { DyeColor dye = ((DyeItem) currentItem.getItem()).getDyeColor(); - if( m_brain.getDyeColour() != dye ) + if( brain.getDyeColour() != dye ) { - m_brain.setDyeColour( dye ); + brain.setDyeColour( dye ); if( !player.isCreative() ) { currentItem.shrink( 1 ); @@ -174,14 +174,14 @@ public ActionResultType onActivate( PlayerEntity player, Hand hand, BlockRayTrac } return ActionResultType.SUCCESS; } - else if( currentItem.getItem() == Items.WATER_BUCKET && m_brain.getColour() != -1 ) + else if( currentItem.getItem() == Items.WATER_BUCKET && brain.getColour() != -1 ) { // Water to remove turtle colour if( !getLevel().isClientSide ) { - if( m_brain.getColour() != -1 ) + if( brain.getColour() != -1 ) { - m_brain.setColour( -1 ); + brain.setColour( -1 ); if( !player.isCreative() ) { player.setItemInHand( hand, new ItemStack( Items.BUCKET ) ); @@ -213,16 +213,16 @@ protected double getInteractRange( PlayerEntity player ) public void tick() { super.tick(); - m_brain.update(); - if( !getLevel().isClientSide && m_inventoryChanged ) + brain.update(); + if( !getLevel().isClientSide && inventoryChanged ) { ServerComputer computer = getServerComputer(); if( computer != null ) computer.queueEvent( "turtle_inventory" ); - m_inventoryChanged = false; + inventoryChanged = false; for( int n = 0; n < getContainerSize(); n++ ) { - m_previousInventory.set( n, getItem( n ).copy() ); + previousInventory.set( n, getItem( n ).copy() ); } } } @@ -235,24 +235,24 @@ protected void updateBlockState( ComputerState newState ) @Override public void onNeighbourChange( @Nonnull BlockPos neighbour ) { - if( m_moveState == MoveState.NOT_MOVED ) super.onNeighbourChange( neighbour ); + if( moveState == MoveState.NOT_MOVED ) super.onNeighbourChange( neighbour ); } @Override public void onNeighbourTileEntityChange( @Nonnull BlockPos neighbour ) { - if( m_moveState == MoveState.NOT_MOVED ) super.onNeighbourTileEntityChange( neighbour ); + if( moveState == MoveState.NOT_MOVED ) super.onNeighbourTileEntityChange( neighbour ); } public void notifyMoveStart() { - if( m_moveState == MoveState.NOT_MOVED ) m_moveState = MoveState.IN_PROGRESS; + if( moveState == MoveState.NOT_MOVED ) moveState = MoveState.IN_PROGRESS; } public void notifyMoveEnd() { // MoveState.MOVED is final - if( m_moveState == MoveState.IN_PROGRESS ) m_moveState = MoveState.NOT_MOVED; + if( moveState == MoveState.IN_PROGRESS ) moveState = MoveState.NOT_MOVED; } @Override @@ -262,21 +262,21 @@ public void load( @Nonnull CompoundNBT nbt ) // Read inventory ListNBT nbttaglist = nbt.getList( "Items", Constants.NBT.TAG_COMPOUND ); - m_inventory.clear(); - m_previousInventory.clear(); + inventory.clear(); + previousInventory.clear(); for( int i = 0; i < nbttaglist.size(); i++ ) { CompoundNBT tag = nbttaglist.getCompound( i ); int slot = tag.getByte( "Slot" ) & 0xff; if( slot < getContainerSize() ) { - m_inventory.set( slot, ItemStack.of( tag ) ); - m_previousInventory.set( slot, m_inventory.get( slot ).copy() ); + inventory.set( slot, ItemStack.of( tag ) ); + previousInventory.set( slot, inventory.get( slot ).copy() ); } } // Read state - m_brain.readFromNBT( nbt ); + brain.readFromNBT( nbt ); } @Nonnull @@ -287,18 +287,18 @@ public CompoundNBT save( @Nonnull CompoundNBT nbt ) ListNBT nbttaglist = new ListNBT(); for( int i = 0; i < INVENTORY_SIZE; i++ ) { - if( !m_inventory.get( i ).isEmpty() ) + if( !inventory.get( i ).isEmpty() ) { CompoundNBT tag = new CompoundNBT(); tag.putByte( "Slot", (byte) i ); - m_inventory.get( i ).save( tag ); + inventory.get( i ).save( tag ); nbttaglist.add( tag ); } } nbt.put( "Items", nbttaglist ); // Write brain - nbt = m_brain.writeToNBT( nbt ); + nbt = brain.writeToNBT( nbt ); return super.save( nbt ); } @@ -331,48 +331,48 @@ public void setDirection( Direction dir ) @Override public ITurtleUpgrade getUpgrade( TurtleSide side ) { - return m_brain.getUpgrade( side ); + return brain.getUpgrade( side ); } @Override public int getColour() { - return m_brain.getColour(); + return brain.getColour(); } @Override public ResourceLocation getOverlay() { - return m_brain.getOverlay(); + return brain.getOverlay(); } @Override public ITurtleAccess getAccess() { - return m_brain; + return brain; } @Override public Vec3d getRenderOffset( float f ) { - return m_brain.getRenderOffset( f ); + return brain.getRenderOffset( f ); } @Override public float getRenderYaw( float f ) { - return m_brain.getVisualYaw( f ); + return brain.getVisualYaw( f ); } @Override public float getToolRenderAngle( TurtleSide side, float f ) { - return m_brain.getToolRenderAngle( side, f ); + return brain.getToolRenderAngle( side, f ); } void setOwningPlayer( GameProfile player ) { - m_brain.setOwningPlayer( player ); + brain.setOwningPlayer( player ); setChanged(); } @@ -387,7 +387,7 @@ public int getContainerSize() @Override public boolean isEmpty() { - for( ItemStack stack : m_inventory ) + for( ItemStack stack : inventory ) { if( !stack.isEmpty() ) return false; } @@ -398,7 +398,7 @@ public boolean isEmpty() @Override public ItemStack getItem( int slot ) { - return slot >= 0 && slot < INVENTORY_SIZE ? m_inventory.get( slot ) : ItemStack.EMPTY; + return slot >= 0 && slot < INVENTORY_SIZE ? inventory.get( slot ) : ItemStack.EMPTY; } @Nonnull @@ -433,9 +433,9 @@ public ItemStack removeItem( int slot, int count ) @Override public void setItem( int i, @Nonnull ItemStack stack ) { - if( i >= 0 && i < INVENTORY_SIZE && !InventoryUtil.areItemsEqual( stack, m_inventory.get( i ) ) ) + if( i >= 0 && i < INVENTORY_SIZE && !InventoryUtil.areItemsEqual( stack, inventory.get( i ) ) ) { - m_inventory.set( i, stack ); + inventory.set( i, stack ); onInventoryDefinitelyChanged(); } } @@ -446,9 +446,9 @@ public void clearContent() boolean changed = false; for( int i = 0; i < INVENTORY_SIZE; i++ ) { - if( !m_inventory.get( i ).isEmpty() ) + if( !inventory.get( i ).isEmpty() ) { - m_inventory.set( i, ItemStack.EMPTY ); + inventory.set( i, ItemStack.EMPTY ); changed = true; } } @@ -460,13 +460,13 @@ public void clearContent() public void setChanged() { super.setChanged(); - if( !m_inventoryChanged ) + if( !inventoryChanged ) { for( int n = 0; n < getContainerSize(); n++ ) { - if( !ItemStack.matches( getItem( n ), m_previousInventory.get( n ) ) ) + if( !ItemStack.matches( getItem( n ), previousInventory.get( n ) ) ) { - m_inventoryChanged = true; + inventoryChanged = true; break; } } @@ -482,7 +482,7 @@ public boolean stillValid( @Nonnull PlayerEntity player ) private void onInventoryDefinitelyChanged() { super.setChanged(); - m_inventoryChanged = true; + inventoryChanged = true; } public void onTileEntityChange() @@ -496,14 +496,14 @@ public void onTileEntityChange() protected void writeDescription( @Nonnull CompoundNBT nbt ) { super.writeDescription( nbt ); - m_brain.writeDescription( nbt ); + brain.writeDescription( nbt ); } @Override protected void readDescription( @Nonnull CompoundNBT nbt ) { super.readDescription( nbt ); - m_brain.readDescription( nbt ); + brain.readDescription( nbt ); } // Privates @@ -528,20 +528,20 @@ private boolean hasPeripheralUpgradeOnSide( ComputerSide side ) public void transferStateFrom( TileTurtle copy ) { super.transferStateFrom( copy ); - Collections.copy( m_inventory, copy.m_inventory ); - Collections.copy( m_previousInventory, copy.m_previousInventory ); - m_inventoryChanged = copy.m_inventoryChanged; - m_brain = copy.m_brain; - m_brain.setOwner( this ); + Collections.copy( inventory, copy.inventory ); + Collections.copy( previousInventory, copy.previousInventory ); + inventoryChanged = copy.inventoryChanged; + brain = copy.brain; + brain.setOwner( this ); // Mark the other turtle as having moved, and so its peripheral is dead. - copy.m_moveState = MoveState.MOVED; + copy.moveState = MoveState.MOVED; copy.peripheral = CapabilityUtil.invalidate( copy.peripheral ); } public IItemHandlerModifiable getItemHandler() { - return m_itemHandler; + return itemHandler; } @Nonnull @@ -571,6 +571,6 @@ public LazyOptional getCapability( @Nonnull Capability cap, @Nullable @Override public Container createMenu( int id, @Nonnull PlayerInventory inventory, @Nonnull PlayerEntity player ) { - return new ContainerTurtle( id, inventory, m_brain ); + return new ContainerTurtle( id, inventory, brain ); } } 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 9ba2d1456..5efd001ea 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleBrain.java @@ -65,55 +65,55 @@ public class TurtleBrain implements ITurtleAccess private static final int ANIM_DURATION = 8; - private TileTurtle m_owner; - private ComputerProxy m_proxy; - private GameProfile m_owningPlayer; + private TileTurtle owner; + private ComputerProxy proxy; + private GameProfile owningPlayer; - private final IInventory m_inventory = (InventoryDelegate) () -> m_owner; - private final IItemHandlerModifiable m_inventoryWrapper = new InvWrapper( m_inventory ); + private final IInventory inventory = (InventoryDelegate) () -> owner; + private final IItemHandlerModifiable inventoryWrapper = new InvWrapper( inventory ); - private final Queue m_commandQueue = new ArrayDeque<>(); - private int m_commandsIssued = 0; + private final Queue commandQueue = new ArrayDeque<>(); + private int commandsIssued = 0; - private final Map m_upgrades = new EnumMap<>( TurtleSide.class ); + private final Map upgrades = new EnumMap<>( TurtleSide.class ); private final Map peripherals = new EnumMap<>( TurtleSide.class ); - private final Map m_upgradeNBTData = new EnumMap<>( TurtleSide.class ); + private final Map upgradeNBTData = new EnumMap<>( TurtleSide.class ); - private int m_selectedSlot = 0; - private int m_fuelLevel = 0; - private int m_colourHex = -1; - private ResourceLocation m_overlay = null; + private int selectedSlot = 0; + private int fuelLevel = 0; + private int colourHex = -1; + private ResourceLocation overlay = null; - private TurtleAnimation m_animation = TurtleAnimation.NONE; - private int m_animationProgress = 0; - private int m_lastAnimationProgress = 0; + private TurtleAnimation animation = TurtleAnimation.NONE; + private int animationProgress = 0; + private int lastAnimationProgress = 0; - TurtlePlayer m_cachedPlayer; + TurtlePlayer cachedPlayer; public TurtleBrain( TileTurtle turtle ) { - m_owner = turtle; + owner = turtle; } public void setOwner( TileTurtle owner ) { - m_owner = owner; + this.owner = owner; } public TileTurtle getOwner() { - return m_owner; + return owner; } public ComputerProxy getProxy() { - if( m_proxy == null ) m_proxy = new ComputerProxy( () -> m_owner ); - return m_proxy; + if( proxy == null ) proxy = new ComputerProxy( () -> owner ); + return proxy; } public ComputerFamily getFamily() { - return m_owner.getFamily(); + return owner.getFamily(); } public void setupComputer( ServerComputer computer ) @@ -131,16 +131,16 @@ public void update() // The block may have been broken while the command was executing (for instance, if a block explodes // when being mined). If so, abort. - if( m_owner.isRemoved() ) return; + if( owner.isRemoved() ) return; } // Advance animation updateAnimation(); // Advance upgrades - if( !m_upgrades.isEmpty() ) + if( !upgrades.isEmpty() ) { - for( Map.Entry entry : m_upgrades.entrySet() ) + for( Map.Entry entry : upgrades.entrySet() ) { entry.getValue().update( this, entry.getKey() ); } @@ -155,31 +155,31 @@ public void update() private void readCommon( CompoundNBT nbt ) { // Read fields - m_colourHex = nbt.contains( NBT_COLOUR ) ? nbt.getInt( NBT_COLOUR ) : -1; - m_fuelLevel = nbt.contains( NBT_FUEL ) ? nbt.getInt( NBT_FUEL ) : 0; - m_overlay = nbt.contains( NBT_OVERLAY ) ? new ResourceLocation( nbt.getString( NBT_OVERLAY ) ) : null; + colourHex = nbt.contains( NBT_COLOUR ) ? nbt.getInt( NBT_COLOUR ) : -1; + fuelLevel = nbt.contains( NBT_FUEL ) ? nbt.getInt( NBT_FUEL ) : 0; + overlay = nbt.contains( NBT_OVERLAY ) ? new ResourceLocation( nbt.getString( NBT_OVERLAY ) ) : null; // Read upgrades setUpgrade( TurtleSide.LEFT, nbt.contains( NBT_LEFT_UPGRADE ) ? TurtleUpgrades.get( nbt.getString( NBT_LEFT_UPGRADE ) ) : null ); setUpgrade( TurtleSide.RIGHT, nbt.contains( NBT_RIGHT_UPGRADE ) ? TurtleUpgrades.get( nbt.getString( NBT_RIGHT_UPGRADE ) ) : null ); // NBT - m_upgradeNBTData.clear(); + upgradeNBTData.clear(); if( nbt.contains( NBT_LEFT_UPGRADE_DATA ) ) { - m_upgradeNBTData.put( TurtleSide.LEFT, nbt.getCompound( NBT_LEFT_UPGRADE_DATA ).copy() ); + upgradeNBTData.put( TurtleSide.LEFT, nbt.getCompound( NBT_LEFT_UPGRADE_DATA ).copy() ); } if( nbt.contains( NBT_RIGHT_UPGRADE_DATA ) ) { - m_upgradeNBTData.put( TurtleSide.RIGHT, nbt.getCompound( NBT_RIGHT_UPGRADE_DATA ).copy() ); + upgradeNBTData.put( TurtleSide.RIGHT, nbt.getCompound( NBT_RIGHT_UPGRADE_DATA ).copy() ); } } private void writeCommon( CompoundNBT nbt ) { - nbt.putInt( NBT_FUEL, m_fuelLevel ); - if( m_colourHex != -1 ) nbt.putInt( NBT_COLOUR, m_colourHex ); - if( m_overlay != null ) nbt.putString( NBT_OVERLAY, m_overlay.toString() ); + nbt.putInt( NBT_FUEL, fuelLevel ); + if( colourHex != -1 ) nbt.putInt( NBT_COLOUR, colourHex ); + if( overlay != null ) nbt.putString( NBT_OVERLAY, overlay.toString() ); // Write upgrades String leftUpgradeId = getUpgradeId( getUpgrade( TurtleSide.LEFT ) ); @@ -188,11 +188,11 @@ private void writeCommon( CompoundNBT nbt ) if( rightUpgradeId != null ) nbt.putString( NBT_RIGHT_UPGRADE, rightUpgradeId ); // Write upgrade NBT - if( m_upgradeNBTData.containsKey( TurtleSide.LEFT ) ) + if( upgradeNBTData.containsKey( TurtleSide.LEFT ) ) { nbt.put( NBT_LEFT_UPGRADE_DATA, getUpgradeNBTData( TurtleSide.LEFT ).copy() ); } - if( m_upgradeNBTData.containsKey( TurtleSide.RIGHT ) ) + if( upgradeNBTData.containsKey( TurtleSide.RIGHT ) ) { nbt.put( NBT_RIGHT_UPGRADE_DATA, getUpgradeNBTData( TurtleSide.RIGHT ).copy() ); } @@ -203,20 +203,20 @@ public void readFromNBT( CompoundNBT nbt ) readCommon( nbt ); // Read state - m_selectedSlot = nbt.getInt( NBT_SLOT ); + selectedSlot = nbt.getInt( NBT_SLOT ); // Read owner if( nbt.contains( "Owner", Constants.NBT.TAG_COMPOUND ) ) { CompoundNBT owner = nbt.getCompound( "Owner" ); - m_owningPlayer = new GameProfile( + owningPlayer = new GameProfile( new UUID( owner.getLong( "UpperId" ), owner.getLong( "LowerId" ) ), owner.getString( "Name" ) ); } else { - m_owningPlayer = null; + owningPlayer = null; } } @@ -225,17 +225,17 @@ public CompoundNBT writeToNBT( CompoundNBT nbt ) writeCommon( nbt ); // Write state - nbt.putInt( NBT_SLOT, m_selectedSlot ); + nbt.putInt( NBT_SLOT, selectedSlot ); // Write owner - if( m_owningPlayer != null ) + if( owningPlayer != null ) { CompoundNBT owner = new CompoundNBT(); nbt.put( "Owner", owner ); - owner.putLong( "UpperId", m_owningPlayer.getId().getMostSignificantBits() ); - owner.putLong( "LowerId", m_owningPlayer.getId().getLeastSignificantBits() ); - owner.putString( "Name", m_owningPlayer.getName() ); + owner.putLong( "UpperId", owningPlayer.getId().getMostSignificantBits() ); + owner.putLong( "LowerId", owningPlayer.getId().getLeastSignificantBits() ); + owner.putString( "Name", owningPlayer.getName() ); } return nbt; @@ -252,35 +252,35 @@ public void readDescription( CompoundNBT nbt ) // Animation TurtleAnimation anim = TurtleAnimation.values()[nbt.getInt( "Animation" )]; - if( anim != m_animation && + if( anim != animation && anim != TurtleAnimation.WAIT && anim != TurtleAnimation.SHORT_WAIT && anim != TurtleAnimation.NONE ) { - m_animation = anim; - m_animationProgress = 0; - m_lastAnimationProgress = 0; + animation = anim; + animationProgress = 0; + lastAnimationProgress = 0; } } public void writeDescription( CompoundNBT nbt ) { writeCommon( nbt ); - nbt.putInt( "Animation", m_animation.ordinal() ); + nbt.putInt( "Animation", animation.ordinal() ); } @Nonnull @Override public World getWorld() { - return m_owner.getLevel(); + return owner.getLevel(); } @Nonnull @Override public BlockPos getPosition() { - return m_owner.getBlockPos(); + return owner.getBlockPos(); } @Override @@ -293,9 +293,9 @@ public boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos ) // Cache info about the old turtle (so we don't access this after we delete ourselves) World oldWorld = getWorld(); - TileTurtle oldOwner = m_owner; - BlockPos oldPos = m_owner.getBlockPos(); - BlockState oldBlock = m_owner.getBlockState(); + TileTurtle oldOwner = owner; + BlockPos oldPos = owner.getBlockPos(); + BlockState oldBlock = owner.getBlockState(); if( oldWorld == world && oldPos.equals( pos ) ) { @@ -365,7 +365,7 @@ public boolean teleportTo( @Nonnull World world, @Nonnull BlockPos pos ) public Vec3d getVisualPosition( float f ) { Vec3d offset = getRenderOffset( f ); - BlockPos pos = m_owner.getBlockPos(); + BlockPos pos = owner.getBlockPos(); return new Vec3d( pos.getX() + 0.5 + offset.x, pos.getY() + 0.5 + offset.y, @@ -377,7 +377,7 @@ public Vec3d getVisualPosition( float f ) public float getVisualYaw( float f ) { float yaw = getDirection().toYRot(); - switch( m_animation ) + switch( animation ) { case TURN_LEFT: { @@ -405,19 +405,19 @@ public float getVisualYaw( float f ) @Override public Direction getDirection() { - return m_owner.getDirection(); + return owner.getDirection(); } @Override public void setDirection( @Nonnull Direction dir ) { - m_owner.setDirection( dir ); + owner.setDirection( dir ); } @Override public int getSelectedSlot() { - return m_selectedSlot; + return selectedSlot; } @Override @@ -425,10 +425,10 @@ public void setSelectedSlot( int slot ) { if( getWorld().isClientSide ) throw new UnsupportedOperationException( "Cannot set the slot on the client" ); - if( slot >= 0 && slot < m_owner.getContainerSize() ) + if( slot >= 0 && slot < owner.getContainerSize() ) { - m_selectedSlot = slot; - m_owner.onTileEntityChange(); + selectedSlot = slot; + owner.onTileEntityChange(); } } @@ -436,14 +436,14 @@ public void setSelectedSlot( int slot ) @Override public IInventory getInventory() { - return m_inventory; + return inventory; } @Nonnull @Override public IItemHandlerModifiable getItemHandler() { - return m_inventoryWrapper; + return inventoryWrapper; } @Override @@ -455,20 +455,20 @@ public boolean isFuelNeeded() @Override public int getFuelLevel() { - return Math.min( m_fuelLevel, getFuelLimit() ); + return Math.min( fuelLevel, getFuelLimit() ); } @Override public void setFuelLevel( int level ) { - m_fuelLevel = Math.min( level, getFuelLimit() ); - m_owner.onTileEntityChange(); + fuelLevel = Math.min( level, getFuelLimit() ); + owner.onTileEntityChange(); } @Override public int getFuelLimit() { - if( m_owner.getFamily() == ComputerFamily.ADVANCED ) + if( owner.getFamily() == ComputerFamily.ADVANCED ) { return ComputerCraft.advancedTurtleFuelLimit; } @@ -505,8 +505,8 @@ public void addFuel( int fuel ) private int issueCommand( ITurtleCommand command ) { - m_commandQueue.offer( new TurtleCommandQueueEntry( ++m_commandsIssued, command ) ); - return m_commandsIssued; + commandQueue.offer( new TurtleCommandQueueEntry( ++commandsIssued, command ) ); + return commandsIssued; } @Nonnull @@ -525,38 +525,38 @@ public void playAnimation( @Nonnull TurtleAnimation animation ) { if( getWorld().isClientSide ) throw new UnsupportedOperationException( "Cannot play animations on the client" ); - m_animation = animation; - if( m_animation == TurtleAnimation.SHORT_WAIT ) + this.animation = animation; + if( this.animation == TurtleAnimation.SHORT_WAIT ) { - m_animationProgress = ANIM_DURATION / 2; - m_lastAnimationProgress = ANIM_DURATION / 2; + animationProgress = ANIM_DURATION / 2; + lastAnimationProgress = ANIM_DURATION / 2; } else { - m_animationProgress = 0; - m_lastAnimationProgress = 0; + animationProgress = 0; + lastAnimationProgress = 0; } - m_owner.updateBlock(); + owner.updateBlock(); } public ResourceLocation getOverlay() { - return m_overlay; + return overlay; } public void setOverlay( ResourceLocation overlay ) { - if( !Objects.equal( m_overlay, overlay ) ) + if( !Objects.equal( this.overlay, overlay ) ) { - m_overlay = overlay; - m_owner.updateBlock(); + this.overlay = overlay; + owner.updateBlock(); } } public DyeColor getDyeColour() { - if( m_colourHex == -1 ) return null; - Colour colour = Colour.fromHex( m_colourHex ); + if( colourHex == -1 ) return null; + Colour colour = Colour.fromHex( colourHex ); return colour == null ? null : DyeColor.byId( 15 - colour.ordinal() ); } @@ -567,10 +567,10 @@ public void setDyeColour( DyeColor dyeColour ) { newColour = Colour.values()[15 - dyeColour.getId()].getHex(); } - if( m_colourHex != newColour ) + if( colourHex != newColour ) { - m_colourHex = newColour; - m_owner.updateBlock(); + colourHex = newColour; + owner.updateBlock(); } } @@ -579,67 +579,67 @@ public void setColour( int colour ) { if( colour >= 0 && colour <= 0xFFFFFF ) { - if( m_colourHex != colour ) + if( colourHex != colour ) { - m_colourHex = colour; - m_owner.updateBlock(); + colourHex = colour; + owner.updateBlock(); } } - else if( m_colourHex != -1 ) + else if( colourHex != -1 ) { - m_colourHex = -1; - m_owner.updateBlock(); + colourHex = -1; + owner.updateBlock(); } } @Override public int getColour() { - return m_colourHex; + return colourHex; } public void setOwningPlayer( GameProfile profile ) { - m_owningPlayer = profile; + owningPlayer = profile; } @Nullable @Override public GameProfile getOwningPlayer() { - return m_owningPlayer; + return owningPlayer; } @Override public ITurtleUpgrade getUpgrade( @Nonnull TurtleSide side ) { - return m_upgrades.get( side ); + return upgrades.get( side ); } @Override public void setUpgrade( @Nonnull TurtleSide side, ITurtleUpgrade upgrade ) { // Remove old upgrade - if( m_upgrades.containsKey( side ) ) + if( upgrades.containsKey( side ) ) { - if( m_upgrades.get( side ) == upgrade ) return; - m_upgrades.remove( side ); + if( upgrades.get( side ) == upgrade ) return; + upgrades.remove( side ); } else { if( upgrade == null ) return; } - m_upgradeNBTData.remove( side ); + upgradeNBTData.remove( side ); // Set new upgrade - if( upgrade != null ) m_upgrades.put( side, upgrade ); + if( upgrade != null ) upgrades.put( side, upgrade ); // Notify clients and create peripherals - if( m_owner.getLevel() != null ) + if( owner.getLevel() != null ) { - updatePeripherals( m_owner.createServerComputer() ); - m_owner.updateBlock(); + updatePeripherals( owner.createServerComputer() ); + owner.updateBlock(); } } @@ -653,20 +653,20 @@ public IPeripheral getPeripheral( @Nonnull TurtleSide side ) @Override public CompoundNBT getUpgradeNBTData( TurtleSide side ) { - CompoundNBT nbt = m_upgradeNBTData.get( side ); - if( nbt == null ) m_upgradeNBTData.put( side, nbt = new CompoundNBT() ); + CompoundNBT nbt = upgradeNBTData.get( side ); + if( nbt == null ) upgradeNBTData.put( side, nbt = new CompoundNBT() ); return nbt; } @Override public void updateUpgradeNBTData( @Nonnull TurtleSide side ) { - m_owner.updateBlock(); + owner.updateBlock(); } public Vec3d getRenderOffset( float f ) { - switch( m_animation ) + switch( animation ) { case MOVE_FORWARD: case MOVE_BACK: @@ -675,7 +675,7 @@ public Vec3d getRenderOffset( float f ) { // Get direction Direction dir; - switch( m_animation ) + switch( animation ) { case MOVE_FORWARD: default: @@ -708,8 +708,8 @@ public Vec3d getRenderOffset( float f ) public float getToolRenderAngle( TurtleSide side, float f ) { - return (side == TurtleSide.LEFT && m_animation == TurtleAnimation.SWING_LEFT_TOOL) || - (side == TurtleSide.RIGHT && m_animation == TurtleAnimation.SWING_RIGHT_TOOL) + return (side == TurtleSide.LEFT && animation == TurtleAnimation.SWING_LEFT_TOOL) || + (side == TurtleSide.RIGHT && animation == TurtleAnimation.SWING_RIGHT_TOOL) ? 45.0f * (float) Math.sin( getAnimationFraction( f ) * Math.PI ) : 0.0f; } @@ -759,14 +759,14 @@ private void updatePeripherals( ServerComputer serverComputer ) private void updateCommands() { - if( m_animation != TurtleAnimation.NONE || m_commandQueue.isEmpty() ) return; + if( animation != TurtleAnimation.NONE || commandQueue.isEmpty() ) return; // If we've got a computer, ensure that we're allowed to perform work. - ServerComputer computer = m_owner.getServerComputer(); + ServerComputer computer = owner.getServerComputer(); if( computer != null && !computer.getComputer().getMainThreadMonitor().canWork() ) return; // Pull a new command - TurtleCommandQueueEntry nextCommand = m_commandQueue.poll(); + TurtleCommandQueueEntry nextCommand = commandQueue.poll(); if( nextCommand == null ) return; // Execute the command @@ -808,21 +808,21 @@ private void updateCommands() private void updateAnimation() { - if( m_animation != TurtleAnimation.NONE ) + if( animation != TurtleAnimation.NONE ) { World world = getWorld(); if( ComputerCraft.turtlesCanPush ) { // Advance entity pushing - if( m_animation == TurtleAnimation.MOVE_FORWARD || - m_animation == TurtleAnimation.MOVE_BACK || - m_animation == TurtleAnimation.MOVE_UP || - m_animation == TurtleAnimation.MOVE_DOWN ) + if( animation == TurtleAnimation.MOVE_FORWARD || + animation == TurtleAnimation.MOVE_BACK || + animation == TurtleAnimation.MOVE_UP || + animation == TurtleAnimation.MOVE_DOWN ) { BlockPos pos = getPosition(); Direction moveDir; - switch( m_animation ) + switch( animation ) { case MOVE_FORWARD: default: @@ -846,7 +846,7 @@ private void updateAnimation() double maxY = minY + 1.0; double maxZ = minZ + 1.0; - float pushFrac = 1.0f - (float) (m_animationProgress + 1) / ANIM_DURATION; + float pushFrac = 1.0f - (float) (animationProgress + 1) / ANIM_DURATION; float push = Math.max( pushFrac + 0.0125f, 0.0f ); if( moveDir.getStepX() < 0 ) { @@ -892,7 +892,7 @@ private void updateAnimation() } // Advance valentines day easter egg - if( world.isClientSide && m_animation == TurtleAnimation.MOVE_FORWARD && m_animationProgress == 4 ) + if( world.isClientSide && animation == TurtleAnimation.MOVE_FORWARD && animationProgress == 4 ) { // Spawn love pfx if valentines day Holiday currentHoliday = HolidayUtil.getCurrentHoliday(); @@ -915,20 +915,20 @@ private void updateAnimation() } // Wait for anim completion - m_lastAnimationProgress = m_animationProgress; - if( ++m_animationProgress >= ANIM_DURATION ) + lastAnimationProgress = animationProgress; + if( ++animationProgress >= ANIM_DURATION ) { - m_animation = TurtleAnimation.NONE; - m_animationProgress = 0; - m_lastAnimationProgress = 0; + animation = TurtleAnimation.NONE; + animationProgress = 0; + lastAnimationProgress = 0; } } } private float getAnimationFraction( float f ) { - float next = (float) m_animationProgress / ANIM_DURATION; - float previous = (float) m_lastAnimationProgress / ANIM_DURATION; + float next = (float) animationProgress / ANIM_DURATION; + float previous = (float) lastAnimationProgress / ANIM_DURATION; return previous + (next - previous) * f; } diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java index 9c018ce25..ab5f895ef 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareCommand.java @@ -23,11 +23,11 @@ public class TurtleCompareCommand implements ITurtleCommand { - private final InteractDirection m_direction; + private final InteractDirection direction; public TurtleCompareCommand( InteractDirection direction ) { - m_direction = direction; + this.direction = direction; } @Nonnull @@ -35,7 +35,7 @@ public TurtleCompareCommand( InteractDirection direction ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Get world direction from direction - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); // Get currently selected stack ItemStack selectedStack = turtle.getInventory().getItem( turtle.getSelectedSlot() ); diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareToCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareToCommand.java index 74cc04b1e..494370efe 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareToCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleCompareToCommand.java @@ -15,11 +15,11 @@ public class TurtleCompareToCommand implements ITurtleCommand { - private final int m_slot; + private final int slot; public TurtleCompareToCommand( int slot ) { - m_slot = slot; + this.slot = slot; } @Nonnull @@ -27,14 +27,9 @@ public TurtleCompareToCommand( int slot ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { ItemStack selectedStack = turtle.getInventory().getItem( turtle.getSelectedSlot() ); - ItemStack stack = turtle.getInventory().getItem( m_slot ); - if( InventoryUtil.areItemsStackable( selectedStack, stack ) ) - { - return TurtleCommandResult.success(); - } - else - { - return TurtleCommandResult.failure(); - } + ItemStack stack = turtle.getInventory().getItem( slot ); + return InventoryUtil.areItemsStackable( selectedStack, stack ) + ? TurtleCommandResult.success() + : TurtleCommandResult.failure(); } } diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDetectCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDetectCommand.java index df3c79dc7..9600b8591 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDetectCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDetectCommand.java @@ -17,11 +17,11 @@ public class TurtleDetectCommand implements ITurtleCommand { - private final InteractDirection m_direction; + private final InteractDirection direction; public TurtleDetectCommand( InteractDirection direction ) { - m_direction = direction; + this.direction = direction; } @Nonnull @@ -29,7 +29,7 @@ public TurtleDetectCommand( InteractDirection direction ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Get world direction from direction - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); // Check if thing in front is air or not World world = turtle.getWorld(); diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDropCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDropCommand.java index 21d5f2a4d..3283108f1 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDropCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleDropCommand.java @@ -23,13 +23,13 @@ public class TurtleDropCommand implements ITurtleCommand { - private final InteractDirection m_direction; - private final int m_quantity; + private final InteractDirection direction; + private final int quantity; public TurtleDropCommand( InteractDirection direction, int quantity ) { - m_direction = direction; - m_quantity = quantity; + this.direction = direction; + this.quantity = quantity; } @Nonnull @@ -37,17 +37,17 @@ public TurtleDropCommand( InteractDirection direction, int quantity ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Dropping nothing is easy - if( m_quantity == 0 ) + if( quantity == 0 ) { turtle.playAnimation( TurtleAnimation.WAIT ); return TurtleCommandResult.success(); } // Get world direction from direction - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); // Get things to drop - ItemStack stack = InventoryUtil.takeItems( m_quantity, turtle.getItemHandler(), turtle.getSelectedSlot(), 1, turtle.getSelectedSlot() ); + ItemStack stack = InventoryUtil.takeItems( quantity, turtle.getItemHandler(), turtle.getSelectedSlot(), 1, turtle.getSelectedSlot() ); if( stack.isEmpty() ) { return TurtleCommandResult.failure( "No items to drop" ); diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleEquipCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleEquipCommand.java index b11ee4ff2..302be5a31 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleEquipCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleEquipCommand.java @@ -20,11 +20,11 @@ public class TurtleEquipCommand implements ITurtleCommand { - private final TurtleSide m_side; + private final TurtleSide side; public TurtleEquipCommand( TurtleSide side ) { - m_side = side; + this.side = side; } @Nonnull @@ -53,7 +53,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) // Determine the upgrade to replace ItemStack oldUpgradeStack; - ITurtleUpgrade oldUpgrade = turtle.getUpgrade( m_side ); + ITurtleUpgrade oldUpgrade = turtle.getUpgrade( side ); if( oldUpgrade != null ) { ItemStack craftingItem = oldUpgrade.getCraftingItem(); @@ -87,7 +87,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) WorldUtil.dropItemStack( remainder, turtle.getWorld(), position, turtle.getDirection() ); } } - turtle.setUpgrade( m_side, newUpgrade ); + turtle.setUpgrade( side, newUpgrade ); // Animate if( newUpgrade != null || oldUpgrade != null ) diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java index 4f4c37585..d90fe2cd4 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java @@ -28,11 +28,11 @@ public class TurtleMoveCommand implements ITurtleCommand { - private final MoveDirection m_direction; + private final MoveDirection direction; public TurtleMoveCommand( MoveDirection direction ) { - m_direction = direction; + this.direction = direction; } @Nonnull @@ -40,7 +40,7 @@ public TurtleMoveCommand( MoveDirection direction ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Get world direction from direction - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); // Check if we can move World oldWorld = turtle.getWorld(); @@ -72,7 +72,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) if( !oldWorld.isUnobstructed( null, collision ) ) { - if( !ComputerCraft.turtlesCanPush || m_direction == MoveDirection.UP || m_direction == MoveDirection.DOWN ) + if( !ComputerCraft.turtlesCanPush || this.direction == MoveDirection.UP || this.direction == MoveDirection.DOWN ) { return TurtleCommandResult.failure( "Movement obstructed" ); } @@ -112,7 +112,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) turtle.consumeFuel( 1 ); // Animate - switch( m_direction ) + switch( this.direction ) { case FORWARD: default: diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java index cbdc4991f..f669b1a0f 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlaceCommand.java @@ -42,13 +42,13 @@ public class TurtlePlaceCommand implements ITurtleCommand { - private final InteractDirection m_direction; - private final Object[] m_extraArguments; + private final InteractDirection direction; + private final Object[] extraArguments; public TurtlePlaceCommand( InteractDirection direction, Object[] arguments ) { - m_direction = direction; - m_extraArguments = arguments; + this.direction = direction; + extraArguments = arguments; } @Nonnull @@ -63,7 +63,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) } // Remember old block - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); BlockPos coordinates = turtle.getPosition().relative( direction ); // Create a fake player, and orient it appropriately @@ -78,7 +78,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) // Do the deploying String[] errorMessage = new String[1]; - ItemStack remainder = deploy( stack, turtle, turtlePlayer, direction, m_extraArguments, errorMessage ); + ItemStack remainder = deploy( stack, turtle, turtlePlayer, direction, extraArguments, errorMessage ); if( remainder != stack ) { // Put the remaining items back diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java index 5da920cf8..a7a167048 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtlePlayer.java @@ -95,11 +95,11 @@ public static TurtlePlayer get( ITurtleAccess access ) if( !(access instanceof TurtleBrain) ) return create( access ); TurtleBrain brain = (TurtleBrain) access; - TurtlePlayer player = brain.m_cachedPlayer; + TurtlePlayer player = brain.cachedPlayer; if( player == null || player.getGameProfile() != getProfile( access.getOwningPlayer() ) || player.getCommandSenderWorld() != access.getWorld() ) { - player = brain.m_cachedPlayer = create( brain ); + player = brain.cachedPlayer = create( brain ); } else { diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java index 776394792..1dc5bb475 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleSuckCommand.java @@ -26,13 +26,13 @@ public class TurtleSuckCommand implements ITurtleCommand { - private final InteractDirection m_direction; - private final int m_quantity; + private final InteractDirection direction; + private final int quantity; public TurtleSuckCommand( InteractDirection direction, int quantity ) { - m_direction = direction; - m_quantity = quantity; + this.direction = direction; + this.quantity = quantity; } @Nonnull @@ -40,14 +40,14 @@ public TurtleSuckCommand( InteractDirection direction, int quantity ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Sucking nothing is easy - if( m_quantity == 0 ) + if( quantity == 0 ) { turtle.playAnimation( TurtleAnimation.WAIT ); return TurtleCommandResult.success(); } // Get world direction from direction - Direction direction = m_direction.toWorldDir( turtle ); + Direction direction = this.direction.toWorldDir( turtle ); // Get inventory for thing in front World world = turtle.getWorld(); @@ -68,7 +68,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) if( inventory != null ) { // Take from inventory of thing in front - ItemStack stack = InventoryUtil.takeItems( m_quantity, inventory ); + ItemStack stack = InventoryUtil.takeItems( quantity, inventory ); if( stack.isEmpty() ) return TurtleCommandResult.failure( "No items to take" ); // Try to place into the turtle @@ -107,9 +107,9 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) ItemStack storeStack; ItemStack leaveStack; - if( stack.getCount() > m_quantity ) + if( stack.getCount() > quantity ) { - storeStack = stack.split( m_quantity ); + storeStack = stack.split( quantity ); leaveStack = stack; } else diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java index 82b2417be..d024e6e91 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTransferToCommand.java @@ -16,13 +16,13 @@ public class TurtleTransferToCommand implements ITurtleCommand { - private final int m_slot; - private final int m_quantity; + private final int slot; + private final int quantity; public TurtleTransferToCommand( int slot, int limit ) { - m_slot = slot; - m_quantity = limit; + this.slot = slot; + quantity = limit; } @Nonnull @@ -30,7 +30,7 @@ public TurtleTransferToCommand( int slot, int limit ) public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) { // Take stack - ItemStack stack = InventoryUtil.takeItems( m_quantity, turtle.getItemHandler(), turtle.getSelectedSlot(), 1, turtle.getSelectedSlot() ); + ItemStack stack = InventoryUtil.takeItems( quantity, turtle.getItemHandler(), turtle.getSelectedSlot(), 1, turtle.getSelectedSlot() ); if( stack.isEmpty() ) { turtle.playAnimation( TurtleAnimation.WAIT ); @@ -38,7 +38,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) } // Store stack - ItemStack remainder = InventoryUtil.storeItems( stack, turtle.getItemHandler(), m_slot, 1, m_slot ); + ItemStack remainder = InventoryUtil.storeItems( stack, turtle.getItemHandler(), slot, 1, slot ); if( !remainder.isEmpty() ) { // Put the remainder back diff --git a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTurnCommand.java b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTurnCommand.java index 63a3375b2..4011a0f7c 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTurnCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleTurnCommand.java @@ -17,11 +17,11 @@ public class TurtleTurnCommand implements ITurtleCommand { - private final TurnDirection m_direction; + private final TurnDirection direction; public TurtleTurnCommand( TurnDirection direction ) { - m_direction = direction; + this.direction = direction; } @Nonnull @@ -34,7 +34,7 @@ public TurtleCommandResult execute( @Nonnull ITurtleAccess turtle ) return TurtleCommandResult.failure( event.getFailureMessage() ); } - switch( m_direction ) + switch( direction ) { case LEFT: { diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java index 6ef00ad4b..9c82040b2 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleCraftingTable.java @@ -21,11 +21,8 @@ public class TurtleCraftingTable extends AbstractTurtleUpgrade { - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_leftModel; - - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_rightModel; + private static final ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_left", "inventory" ); + private static final ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_right", "inventory" ); public TurtleCraftingTable( ResourceLocation id ) { @@ -38,22 +35,11 @@ public IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull Tur return new CraftingTablePeripheral( turtle ); } - @OnlyIn( Dist.CLIENT ) - private void loadModelLocations() - { - if( m_leftModel == null ) - { - m_leftModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_left", "inventory" ); - m_rightModel = new ModelResourceLocation( "computercraft:turtle_crafting_table_right", "inventory" ); - } - } - @Nonnull @Override @OnlyIn( Dist.CLIENT ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) { - loadModelLocations(); - return TransformedModel.of( side == TurtleSide.LEFT ? m_leftModel : m_rightModel ); + return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel ); } } diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java index bba1393c9..bb361c260 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleInventoryCrafting.java @@ -27,9 +27,9 @@ public class TurtleInventoryCrafting extends CraftingInventory { - private ITurtleAccess m_turtle; - private int m_xStart; - private int m_yStart; + private final ITurtleAccess turtle; + private int xStart = 0; + private int yStart = 0; @SuppressWarnings( "ConstantConditions" ) public TurtleInventoryCrafting( ITurtleAccess turtle ) @@ -37,26 +37,24 @@ public TurtleInventoryCrafting( ITurtleAccess turtle ) // Passing null in here is evil, but we don't have a container present. We override most methods in order to // avoid throwing any NPEs. super( null, 0, 0 ); - m_turtle = turtle; - m_xStart = 0; - m_yStart = 0; + this.turtle = turtle; } @Nullable private IRecipe tryCrafting( int xStart, int yStart ) { - m_xStart = xStart; - m_yStart = yStart; + this.xStart = xStart; + this.yStart = yStart; // Check the non-relevant parts of the inventory are empty for( int x = 0; x < TileTurtle.INVENTORY_WIDTH; x++ ) { for( int y = 0; y < TileTurtle.INVENTORY_HEIGHT; y++ ) { - if( x < m_xStart || x >= m_xStart + 3 || - y < m_yStart || y >= m_yStart + 3 ) + if( x < this.xStart || x >= this.xStart + 3 || + y < this.yStart || y >= this.yStart + 3 ) { - if( !m_turtle.getInventory().getItem( x + y * TileTurtle.INVENTORY_WIDTH ).isEmpty() ) + if( !turtle.getInventory().getItem( x + y * TileTurtle.INVENTORY_WIDTH ).isEmpty() ) { return null; } @@ -65,7 +63,7 @@ private IRecipe tryCrafting( int xStart, int yStart ) } // Check the actual crafting - return m_turtle.getWorld().getRecipeManager().getRecipeFor( IRecipeType.CRAFTING, this, m_turtle.getWorld() ).orElse( null ); + return turtle.getWorld().getRecipeManager().getRecipeFor( IRecipeType.CRAFTING, this, turtle.getWorld() ).orElse( null ); } @Nullable @@ -83,7 +81,7 @@ public List doCrafting( World world, int maxCount ) // Special case: craft(0) just returns an empty list if crafting was possible if( maxCount == 0 ) return Collections.emptyList(); - TurtlePlayer player = TurtlePlayer.get( m_turtle ); + TurtlePlayer player = TurtlePlayer.get( turtle ); ArrayList results = new ArrayList<>(); for( int i = 0; i < maxCount && recipe.matches( this, world ); i++ ) @@ -147,8 +145,8 @@ public int getHeight() private int modifyIndex( int index ) { - int x = m_xStart + index % getWidth(); - int y = m_yStart + index / getHeight(); + int x = xStart + index % getWidth(); + int y = yStart + index / getHeight(); return x >= 0 && x < TileTurtle.INVENTORY_WIDTH && y >= 0 && y < TileTurtle.INVENTORY_HEIGHT ? x + y * TileTurtle.INVENTORY_WIDTH : -1; @@ -167,7 +165,7 @@ public int getContainerSize() public ItemStack getItem( int i ) { i = modifyIndex( i ); - return m_turtle.getInventory().getItem( i ); + return turtle.getInventory().getItem( i ); } @Nonnull @@ -175,7 +173,7 @@ public ItemStack getItem( int i ) public ItemStack removeItemNoUpdate( int i ) { i = modifyIndex( i ); - return m_turtle.getInventory().removeItemNoUpdate( i ); + return turtle.getInventory().removeItemNoUpdate( i ); } @Nonnull @@ -183,26 +181,26 @@ public ItemStack removeItemNoUpdate( int i ) public ItemStack removeItem( int i, int size ) { i = modifyIndex( i ); - return m_turtle.getInventory().removeItem( i, size ); + return turtle.getInventory().removeItem( i, size ); } @Override public void setItem( int i, @Nonnull ItemStack stack ) { i = modifyIndex( i ); - m_turtle.getInventory().setItem( i, stack ); + turtle.getInventory().setItem( i, stack ); } @Override public int getMaxStackSize() { - return m_turtle.getInventory().getMaxStackSize(); + return turtle.getInventory().getMaxStackSize(); } @Override public void setChanged() { - m_turtle.getInventory().setChanged(); + turtle.getInventory().setChanged(); } @Override @@ -215,7 +213,7 @@ public boolean stillValid( @Nonnull PlayerEntity player ) public boolean canPlaceItem( int i, @Nonnull ItemStack stack ) { i = modifyIndex( i ); - return m_turtle.getInventory().canPlaceItem( i, stack ); + return turtle.getInventory().canPlaceItem( i, stack ); } @Override @@ -224,7 +222,7 @@ public void clearContent() for( int i = 0; i < getContainerSize(); i++ ) { int j = modifyIndex( i ); - m_turtle.getInventory().setItem( j, ItemStack.EMPTY ); + turtle.getInventory().setItem( j, ItemStack.EMPTY ); } } } diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java index 4fe11b97b..5ff686042 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java @@ -63,17 +63,10 @@ public boolean equals( IPeripheral other ) private final boolean advanced; - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_leftOffModel; - - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_rightOffModel; - - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_leftOnModel; - - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_rightOnModel; + private final ModelResourceLocation leftOffModel; + private final ModelResourceLocation rightOffModel; + private final ModelResourceLocation leftOnModel; + private final ModelResourceLocation rightOnModel; public TurtleModem( boolean advanced, ResourceLocation id ) { @@ -84,6 +77,21 @@ public TurtleModem( boolean advanced, ResourceLocation id ) : Registry.ModBlocks.WIRELESS_MODEM_NORMAL ); this.advanced = advanced; + + if( advanced ) + { + leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_left", "inventory" ); + rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_right", "inventory" ); + leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_left", "inventory" ); + rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_right", "inventory" ); + } + else + { + leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_left", "inventory" ); + rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_right", "inventory" ); + leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_left", "inventory" ); + rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_right", "inventory" ); + } } @Override @@ -99,35 +107,11 @@ public TurtleCommandResult useTool( @Nonnull ITurtleAccess turtle, @Nonnull Turt return TurtleCommandResult.failure(); } - @OnlyIn( Dist.CLIENT ) - private void loadModelLocations() - { - if( m_leftOffModel == null ) - { - if( advanced ) - { - m_leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_left", "inventory" ); - m_rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_off_right", "inventory" ); - m_leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_left", "inventory" ); - m_rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_advanced_on_right", "inventory" ); - } - else - { - m_leftOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_left", "inventory" ); - m_rightOffModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_off_right", "inventory" ); - m_leftOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_left", "inventory" ); - m_rightOnModel = new ModelResourceLocation( "computercraft:turtle_modem_normal_on_right", "inventory" ); - } - } - } - @Nonnull @Override @OnlyIn( Dist.CLIENT ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) { - loadModelLocations(); - boolean active = false; if( turtle != null ) { @@ -136,8 +120,8 @@ public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side } return side == TurtleSide.LEFT - ? TransformedModel.of( active ? m_leftOnModel : m_leftOffModel ) - : TransformedModel.of( active ? m_rightOnModel : m_rightOffModel ); + ? TransformedModel.of( active ? leftOnModel : leftOffModel ) + : TransformedModel.of( active ? rightOnModel : rightOffModel ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java index d11d5b4e4..d4f682766 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleSpeaker.java @@ -25,6 +25,9 @@ public class TurtleSpeaker extends AbstractTurtleUpgrade { + private static final ModelResourceLocation leftModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_left", "inventory" ); + private static final ModelResourceLocation rightModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_right", "inventory" ); + private static class Peripheral extends SpeakerPeripheral { ITurtleAccess turtle; @@ -54,12 +57,6 @@ public boolean equals( IPeripheral other ) } } - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_leftModel; - - @OnlyIn( Dist.CLIENT ) - private ModelResourceLocation m_rightModel; - public TurtleSpeaker( ResourceLocation id ) { super( id, TurtleUpgradeType.PERIPHERAL, Registry.ModBlocks.SPEAKER ); @@ -71,33 +68,18 @@ public IPeripheral createPeripheral( @Nonnull ITurtleAccess turtle, @Nonnull Tur return new TurtleSpeaker.Peripheral( turtle ); } - @OnlyIn( Dist.CLIENT ) - private void loadModelLocations() - { - if( m_leftModel == null ) - { - m_leftModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_left", "inventory" ); - m_rightModel = new ModelResourceLocation( "computercraft:turtle_speaker_upgrade_right", "inventory" ); - } - } - @Nonnull @Override @OnlyIn( Dist.CLIENT ) public TransformedModel getModel( ITurtleAccess turtle, @Nonnull TurtleSide side ) { - loadModelLocations(); - return TransformedModel.of( side == TurtleSide.LEFT ? m_leftModel : m_rightModel ); + return TransformedModel.of( side == TurtleSide.LEFT ? leftModel : rightModel ); } @Override public void update( @Nonnull ITurtleAccess turtle, @Nonnull TurtleSide turtleSide ) { IPeripheral turtlePeripheral = turtle.getPeripheral( turtleSide ); - if( turtlePeripheral instanceof Peripheral ) - { - Peripheral peripheral = (Peripheral) turtlePeripheral; - peripheral.update(); - } + if( turtlePeripheral instanceof Peripheral ) ((Peripheral) turtlePeripheral).update(); } } diff --git a/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java b/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java index d446d5782..3694cf791 100644 --- a/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java +++ b/src/main/java/dan200/computercraft/shared/util/CreativeTabMain.java @@ -9,8 +9,6 @@ import dan200.computercraft.shared.Registry; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nonnull; @@ -23,7 +21,6 @@ public CreativeTabMain() @Nonnull @Override - @OnlyIn( Dist.CLIENT ) public ItemStack makeIcon() { return new ItemStack( Registry.ModBlocks.COMPUTER_NORMAL.get() );