From 80ec54eaf6a74586ce36775547fe1abf5c890921 Mon Sep 17 00:00:00 2001 From: "Joseph C. Sible" Date: Sun, 24 Sep 2017 01:18:20 -0400 Subject: [PATCH] Remove unnecessary code - Remove unnecessary casts - Use the diamond operator where possible - Remove "throws" declarations that aren't actually thrown - Remove unused local variables - Remove unused imports - Remove redundant superinterfaces --- .../client/gui/FixedWidthFontRenderer.java | 4 +-- .../client/gui/widgets/Widget.java | 8 ++--- .../render/TileEntityMonitorRenderer.java | 12 ++++---- .../render/TileEntityTurtleRenderer.java | 8 ++--- .../core/apis/AddressPredicate.java | 4 +-- .../dan200/computercraft/core/apis/OSAPI.java | 14 ++++----- .../core/apis/http/HTTPRequest.java | 2 +- .../computercraft/core/computer/Computer.java | 2 +- .../core/filesystem/EmptyMount.java | 11 ++++--- .../core/filesystem/FileMount.java | 6 ++-- .../core/filesystem/FileSystem.java | 4 +-- .../core/filesystem/JarMount.java | 4 +-- .../shared/common/TileGeneric.java | 2 +- .../computer/blocks/ComputerPeripheral.java | 3 +- .../shared/computer/blocks/TileComputer.java | 1 - .../shared/computer/core/ServerComputer.java | 2 +- .../peripheral/common/TilePeripheralBase.java | 3 +- .../peripheral/diskdrive/TileDiskDrive.java | 13 ++++---- .../peripheral/modem/TileAdvancedModem.java | 2 +- .../shared/peripheral/modem/TileCable.java | 6 ++-- .../peripheral/modem/TileWirelessModem.java | 2 +- .../modem/WirelessModemPeripheral.java | 10 +++---- .../peripheral/monitor/TileMonitor.java | 14 ++++----- .../peripheral/printer/TilePrinter.java | 9 +++--- .../peripheral/speaker/SpeakerPeripheral.java | 2 +- .../shared/turtle/blocks/TileTurtle.java | 2 +- .../shared/turtle/core/TurtleBrain.java | 30 +++++++++---------- .../shared/turtle/core/TurtleMoveCommand.java | 6 ++-- .../shared/turtle/items/ItemTurtleNormal.java | 3 +- .../shared/turtle/upgrades/TurtleModem.java | 7 ++--- .../computercraft/shared/util/Colour.java | 6 ++-- .../shared/util/ColourTracker.java | 2 +- .../computercraft/shared/util/WorldUtil.java | 6 ++-- 33 files changed, 101 insertions(+), 109 deletions(-) diff --git a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java index cb0c7684d..ad1dc534b 100644 --- a/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java +++ b/src/main/java/dan200/computercraft/client/gui/FixedWidthFontRenderer.java @@ -141,10 +141,10 @@ public class FixedWidthFontRenderer } // Draw char - int index = (int)s.charAt( i ); + int index = s.charAt( i ); if( index < 0 || index > 255 ) { - index = (int)'?'; + index = '?'; } drawChar( renderer, x + i * FONT_WIDTH, y, index, colour, p, greyScale ); } diff --git a/src/main/java/dan200/computercraft/client/gui/widgets/Widget.java b/src/main/java/dan200/computercraft/client/gui/widgets/Widget.java index 75ca19529..ba99a9fda 100644 --- a/src/main/java/dan200/computercraft/client/gui/widgets/Widget.java +++ b/src/main/java/dan200/computercraft/client/gui/widgets/Widget.java @@ -175,10 +175,10 @@ public abstract class Widget extends Gui { Tessellator tessellator = Tessellator.getInstance(); tessellator.getBuffer().begin( GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX ); - tessellator.getBuffer().pos( (double) ( x + 0 ), (double) ( y + h ), (double) this.zLevel ).tex( 0.0, 1.0 ).endVertex(); - tessellator.getBuffer().pos( (double) ( x + w ), (double) ( y + h ), (double) this.zLevel ).tex( 1.0, 1.0 ).endVertex(); - tessellator.getBuffer().pos( (double) ( x + w ), (double) ( y + 0 ), (double) this.zLevel ).tex( 1.0, 0.0 ).endVertex(); - tessellator.getBuffer().pos( (double) ( x + 0 ), (double) ( y + 0 ), (double) this.zLevel ).tex( 0.0, 0.0 ).endVertex(); + tessellator.getBuffer().pos( x + 0, y + h, this.zLevel ).tex( 0.0, 1.0 ).endVertex(); + tessellator.getBuffer().pos( x + w, y + h, this.zLevel ).tex( 1.0, 1.0 ).endVertex(); + tessellator.getBuffer().pos( x + w, y + 0, this.zLevel ).tex( 1.0, 0.0 ).endVertex(); + tessellator.getBuffer().pos( x + 0, y + 0, this.zLevel ).tex( 0.0, 0.0 ).endVertex(); tessellator.draw(); } diff --git a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java index 54d3cc385..0b3111355 100644 --- a/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java +++ b/src/main/java/dan200/computercraft/client/render/TileEntityMonitorRenderer.java @@ -82,11 +82,11 @@ public class TileEntityMonitorRenderer extends TileEntitySpecialRenderer wildcards = this.wildcards = new ArrayList(); - List ranges = this.ranges = new ArrayList(); + List wildcards = this.wildcards = new ArrayList<>(); + List ranges = this.ranges = new ArrayList<>(); for( String filter : filters ) { diff --git a/src/main/java/dan200/computercraft/core/apis/OSAPI.java b/src/main/java/dan200/computercraft/core/apis/OSAPI.java index 7ec4b6878..f67010470 100644 --- a/src/main/java/dan200/computercraft/core/apis/OSAPI.java +++ b/src/main/java/dan200/computercraft/core/apis/OSAPI.java @@ -52,8 +52,8 @@ public class OSAPI implements ILuaAPI @Override public int compareTo( @Nonnull Alarm o ) { - double t = (double)m_day * 24.0 + m_time; - double ot = (double)m_day * 24.0 + m_time; + double t = m_day * 24.0 + m_time; + double ot = m_day * 24.0 + m_time; if( t < ot ) { return -1; } else if( t > ot ) { @@ -135,13 +135,13 @@ public class OSAPI implements ILuaAPI if( time > previousTime || day > previousDay ) { - double now = (double)m_day * 24.0 + m_time; + double now = m_day * 24.0 + m_time; Iterator> it = m_alarms.entrySet().iterator(); while( it.hasNext() ) { Map.Entry entry = it.next(); Alarm alarm = entry.getValue(); - double t = (double)alarm.m_day * 24.0 + alarm.m_time; + double t = alarm.m_day * 24.0 + alarm.m_time; if( now >= t ) { queueLuaEvent( "alarm", new Object[]{ entry.getKey() } ); @@ -196,8 +196,8 @@ public class OSAPI implements ILuaAPI private float getTimeForCalendar(Calendar c) { float time = c.get(Calendar.HOUR_OF_DAY); - time += (float)c.get(Calendar.MINUTE) / 60.0f; - time += (float)c.get(Calendar.SECOND) / (60.0f * 60.0f); + time += c.get(Calendar.MINUTE) / 60.0f; + time += c.get(Calendar.SECOND) / (60.0f * 60.0f); return time; } @@ -296,7 +296,7 @@ public class OSAPI implements ILuaAPI // clock synchronized( m_timers ) { - return new Object[] { (double)m_clock * 0.05 }; + return new Object[] { m_clock * 0.05 }; } } case 11: diff --git a/src/main/java/dan200/computercraft/core/apis/http/HTTPRequest.java b/src/main/java/dan200/computercraft/core/apis/http/HTTPRequest.java index ff106af4b..d50df523c 100644 --- a/src/main/java/dan200/computercraft/core/apis/http/HTTPRequest.java +++ b/src/main/java/dan200/computercraft/core/apis/http/HTTPRequest.java @@ -193,7 +193,7 @@ public class HTTPRequest implements HTTPTask.IHTTPTask m_encoding = connection.getContentEncoding(); Joiner joiner = Joiner.on( ',' ); - Map headers = m_responseHeaders = new HashMap(); + Map headers = m_responseHeaders = new HashMap<>(); for( Map.Entry> header : connection.getHeaderFields().entrySet() ) { headers.put( header.getKey(), joiner.join( header.getValue() ) ); diff --git a/src/main/java/dan200/computercraft/core/computer/Computer.java b/src/main/java/dan200/computercraft/core/computer/Computer.java index 18e3751f8..1aa61210a 100644 --- a/src/main/java/dan200/computercraft/core/computer/Computer.java +++ b/src/main/java/dan200/computercraft/core/computer/Computer.java @@ -452,7 +452,7 @@ public class Computer private boolean initFileSystem() { // Create the file system - int id = assignID(); + assignID(); try { m_fileSystem = new FileSystem( "hdd", getRootMount() ); diff --git a/src/main/java/dan200/computercraft/core/filesystem/EmptyMount.java b/src/main/java/dan200/computercraft/core/filesystem/EmptyMount.java index c10d17fde..6c0203054 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/EmptyMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/EmptyMount.java @@ -9,7 +9,6 @@ package dan200.computercraft.core.filesystem; import dan200.computercraft.api.filesystem.IMount; import javax.annotation.Nonnull; -import java.io.IOException; import java.io.InputStream; import java.util.List; @@ -22,31 +21,31 @@ public class EmptyMount implements IMount // IMount implementation @Override - public boolean exists( @Nonnull String path ) throws IOException + public boolean exists( @Nonnull String path ) { return path.isEmpty(); } @Override - public boolean isDirectory( @Nonnull String path ) throws IOException + public boolean isDirectory( @Nonnull String path ) { return path.isEmpty(); } @Override - public void list( @Nonnull String path, @Nonnull List contents ) throws IOException + public void list( @Nonnull String path, @Nonnull List contents ) { } @Override - public long getSize( @Nonnull String path ) throws IOException + public long getSize( @Nonnull String path ) { return 0; } @Nonnull @Override - public InputStream openForRead( @Nonnull String path ) throws IOException + public InputStream openForRead( @Nonnull String path ) { return null; } diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileMount.java b/src/main/java/dan200/computercraft/core/filesystem/FileMount.java index 968a2232d..ae57739b6 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileMount.java @@ -95,7 +95,7 @@ public class FileMount implements IWritableMount // IMount implementation @Override - public boolean exists( @Nonnull String path ) throws IOException + public boolean exists( @Nonnull String path ) { if( !created() ) { @@ -109,7 +109,7 @@ public class FileMount implements IWritableMount } @Override - public boolean isDirectory( @Nonnull String path ) throws IOException + public boolean isDirectory( @Nonnull String path ) { if( !created() ) { @@ -339,7 +339,7 @@ public class FileMount implements IWritableMount } @Override - public long getRemainingSpace() throws IOException + public long getRemainingSpace() { return Math.max( m_capacity - m_usedSpace, 0 ); } diff --git a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java index 0662ab4c8..383f8f86a 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java +++ b/src/main/java/dan200/computercraft/core/filesystem/FileSystem.java @@ -65,7 +65,7 @@ public class FileSystem } } - public boolean isReadOnly( String path ) throws FileSystemException + public boolean isReadOnly( String path ) { return (m_writableMount == null); } @@ -347,7 +347,7 @@ public class FileSystem mount( new MountWrapper( label, location, mount ) ); } - private synchronized void mount( MountWrapper wrapper ) throws FileSystemException + private synchronized void mount( MountWrapper wrapper ) { String location = wrapper.getLocation(); if( m_mounts.containsKey( location ) ) diff --git a/src/main/java/dan200/computercraft/core/filesystem/JarMount.java b/src/main/java/dan200/computercraft/core/filesystem/JarMount.java index 9d185dea7..a2a66ae73 100644 --- a/src/main/java/dan200/computercraft/core/filesystem/JarMount.java +++ b/src/main/java/dan200/computercraft/core/filesystem/JarMount.java @@ -176,14 +176,14 @@ public class JarMount implements IMount // IMount implementation @Override - public boolean exists( @Nonnull String path ) throws IOException + public boolean exists( @Nonnull String path ) { FileInZip file = m_root.getFile( path ); return file != null; } @Override - public boolean isDirectory( @Nonnull String path ) throws IOException + public boolean isDirectory( @Nonnull String path ) { FileInZip file = m_root.getFile( path ); if( file != null ) diff --git a/src/main/java/dan200/computercraft/shared/common/TileGeneric.java b/src/main/java/dan200/computercraft/shared/common/TileGeneric.java index 943f304a9..87fc1a7e3 100644 --- a/src/main/java/dan200/computercraft/shared/common/TileGeneric.java +++ b/src/main/java/dan200/computercraft/shared/common/TileGeneric.java @@ -159,7 +159,7 @@ public abstract class TileGeneric extends TileEntity double range = getInteractRange( player ); BlockPos pos = getPos(); return player.getEntityWorld() == getWorld() && - player.getDistanceSq( (double)pos.getX() + 0.5, (double)pos.getY() + 0.5, (double)pos.getZ() + 0.5 ) <= ( range * range ); + player.getDistanceSq( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ) <= ( range * range ); } return true; } diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java b/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java index 321889c3d..c48c280dc 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/ComputerPeripheral.java @@ -7,7 +7,6 @@ package dan200.computercraft.shared.computer.blocks; import dan200.computercraft.api.lua.ILuaContext; -import dan200.computercraft.api.lua.LuaException; import dan200.computercraft.api.peripheral.IComputerAccess; import dan200.computercraft.api.peripheral.IPeripheral; import dan200.computercraft.shared.computer.core.ServerComputer; @@ -50,7 +49,7 @@ public class ComputerPeripheral } @Override - public Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) throws LuaException + public Object[] callMethod( @Nonnull IComputerAccess computer, @Nonnull ILuaContext context, int method, @Nonnull Object[] arguments ) { switch( method ) { diff --git a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java index 180129a51..e8f61c79b 100644 --- a/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/blocks/TileComputer.java @@ -19,7 +19,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.NonNullList; import javax.annotation.Nonnull; -import java.util.List; public class TileComputer extends TileComputerBase { 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 4d7c3ed55..da943c975 100644 --- a/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java +++ b/src/main/java/dan200/computercraft/shared/computer/core/ServerComputer.java @@ -290,7 +290,7 @@ public class ServerComputer extends ServerTerminal @Override public double getTimeOfDay() { - return (double)((m_world.getWorldTime() + 6000) % 24000) / 1000.0; + return (m_world.getWorldTime() + 6000) % 24000 / 1000.0; } @Override diff --git a/src/main/java/dan200/computercraft/shared/peripheral/common/TilePeripheralBase.java b/src/main/java/dan200/computercraft/shared/peripheral/common/TilePeripheralBase.java index 6adb0fee3..0a574704c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/common/TilePeripheralBase.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/common/TilePeripheralBase.java @@ -7,7 +7,6 @@ package dan200.computercraft.shared.peripheral.common; import dan200.computercraft.api.peripheral.IPeripheral; -import dan200.computercraft.shared.common.IDirectionalTile; import dan200.computercraft.shared.common.TileGeneric; import dan200.computercraft.shared.peripheral.PeripheralType; import net.minecraft.item.ItemStack; @@ -20,7 +19,7 @@ import javax.annotation.Nonnull; import java.util.List; public abstract class TilePeripheralBase extends TileGeneric - implements IPeripheralTile, IDirectionalTile, ITickable + implements IPeripheralTile, ITickable { // Statics 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 040556f77..e9983216c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/diskdrive/TileDiskDrive.java @@ -24,7 +24,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; -import net.minecraft.util.ITickable; import net.minecraft.util.SoundEvent; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; @@ -44,7 +43,7 @@ import java.util.Set; import static net.minecraftforge.items.CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; public class TileDiskDrive extends TilePeripheralBase - implements IInventory, ITickable + implements IInventory { // Statics @@ -615,13 +614,13 @@ public class TileDiskDrive extends TilePeripheralBase } BlockPos pos = getPos(); - double x = (double)pos.getX() + 0.5 + ((double)xOff * 0.5); - double y = (double)pos.getY() + 0.75; - double z = (double)pos.getZ() + 0.5 + ((double)zOff * 0.5); + double x = pos.getX() + 0.5 + (xOff * 0.5); + double y = pos.getY() + 0.75; + double z = pos.getZ() + 0.5 + (zOff * 0.5); EntityItem entityitem = new EntityItem( getWorld(), x, y, z, disks ); - entityitem.motionX = (double)xOff * 0.15; + entityitem.motionX = xOff * 0.15; entityitem.motionY = 0.0; - entityitem.motionZ = (double)zOff * 0.15; + entityitem.motionZ = zOff * 0.15; getWorld().spawnEntity(entityitem); if( !destroyed ) diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java index 1ce820cb9..36127dd66 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileAdvancedModem.java @@ -41,7 +41,7 @@ public class TileAdvancedModem extends TileModemBase public Vec3d getPosition() { BlockPos pos = m_entity.getPos().offset( m_entity.getDirection() ); - return new Vec3d( (double)pos.getX(), (double)pos.getY(), (double)pos.getZ() ); + return new Vec3d( pos.getX(), pos.getY(), pos.getZ() ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java index b463a0c25..c86543483 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileCable.java @@ -101,7 +101,7 @@ public class TileCable extends TileModemBase { EnumFacing direction = m_entity.getDirection(); BlockPos pos = m_entity.getPos().offset( direction ); - return new Vec3d( (double)pos.getX() + 0.5, (double)pos.getY() + 0.5, (double)pos.getZ() + 0.5 ); + return new Vec3d( pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5 ); } @Nonnull @@ -1032,12 +1032,12 @@ public class TileCable extends TileModemBase Queue queue = new LinkedList<>(); enqueue( queue, getWorld(), getPos(), 1 ); - int visited = 0; + //int visited = 0; while( queue.peek() != null ) { SearchLoc loc = queue.remove(); visitBlock( queue, loc, searchID, visitor ); - visited++; + //visited++; } //System.out.println( "Visited "+visited+" common" ); } diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java index 4f4ca12a3..6f02bb24c 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/TileWirelessModem.java @@ -45,7 +45,7 @@ public class TileWirelessModem extends TileModemBase public Vec3d getPosition() { BlockPos pos = m_entity.getPos().offset( m_entity.getDirection() ); - return new Vec3d( (double)pos.getX(), (double)pos.getY(), (double)pos.getZ() ); + return new Vec3d( pos.getX(), pos.getY(), pos.getZ() ); } @Override diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java index 627eafc2a..71d574515 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/WirelessModemPeripheral.java @@ -31,7 +31,7 @@ public abstract class WirelessModemPeripheral extends ModemPeripheral { if( m_advanced ) { - return (double)Integer.MAX_VALUE; + return Integer.MAX_VALUE; } else { @@ -39,12 +39,12 @@ public abstract class WirelessModemPeripheral extends ModemPeripheral if( world != null ) { Vec3d position = getPosition(); - double minRange = (double) ComputerCraft.modem_range; - double maxRange = (double) ComputerCraft.modem_highAltitudeRange; + double minRange = ComputerCraft.modem_range; + double maxRange = ComputerCraft.modem_highAltitudeRange; if( world.isRaining() && world.isThundering() ) { - minRange = (double) ComputerCraft.modem_rangeDuringStorm; - maxRange = (double) ComputerCraft.modem_highAltitudeRangeDuringStorm; + minRange = ComputerCraft.modem_rangeDuringStorm; + maxRange = ComputerCraft.modem_highAltitudeRangeDuringStorm; } if( position.y > 96.0 && maxRange > minRange ) { 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 592c8ddb6..28efe31b7 100644 --- a/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java +++ b/src/main/java/dan200/computercraft/shared/peripheral/monitor/TileMonitor.java @@ -290,7 +290,7 @@ public class TileMonitor extends TilePeripheralBase public double getTextScale() { - return (double)m_textScale * 0.5; + return m_textScale * 0.5; } private void rebuildTerminal() @@ -301,11 +301,11 @@ public class TileMonitor extends TilePeripheralBase double textScale = getTextScale(); int termWidth = (int)Math.max( - Math.round( ((double)m_width - 2.0 * ( TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN )) / (textScale * 6.0 * TileMonitor.RENDER_PIXEL_SCALE) ), + Math.round( (m_width - 2.0 * ( TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN )) / (textScale * 6.0 * TileMonitor.RENDER_PIXEL_SCALE) ), 1.0 ); int termHeight = (int)Math.max( - Math.round( ((double)m_height - 2.0 * ( TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN )) / (textScale * 9.0 * TileMonitor.RENDER_PIXEL_SCALE) ), + Math.round( (m_height - 2.0 * ( TileMonitor.RENDER_BORDER + TileMonitor.RENDER_MARGIN )) / (textScale * 9.0 * TileMonitor.RENDER_PIXEL_SCALE) ), 1.0 ); ((ServerTerminal)getLocalTerminal()).resize( termWidth, termHeight ); @@ -709,11 +709,11 @@ public class TileMonitor extends TilePeripheralBase return; } - double xCharWidth = ((double)m_width - ((RENDER_BORDER + RENDER_MARGIN) * 2.0)) / ((double)originTerminal.getWidth()); - double yCharHeight = ((double)m_height - ((RENDER_BORDER + RENDER_MARGIN) * 2.0)) / ((double)originTerminal.getHeight()); + double xCharWidth = (m_width - ((RENDER_BORDER + RENDER_MARGIN) * 2.0)) / (originTerminal.getWidth()); + double yCharHeight = (m_height - ((RENDER_BORDER + RENDER_MARGIN) * 2.0)) / (originTerminal.getHeight()); - int xCharPos = (int)Math.min((double)originTerminal.getWidth(), Math.max(((pair.x - RENDER_BORDER - RENDER_MARGIN) / xCharWidth) + 1.0, 1.0)); - int yCharPos = (int)Math.min((double)originTerminal.getHeight(), Math.max(((pair.y - RENDER_BORDER - RENDER_MARGIN) / yCharHeight) + 1.0, 1.0)); + 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 list = world.getEntitiesWithinAABBExcludingEntity( null, aabb ); if( !list.isEmpty() ) { - double pushStep = 1.0f / (float) ANIM_DURATION; - double pushStepX = (double) moveDir.getFrontOffsetX() * pushStep; - double pushStepY = (double) moveDir.getFrontOffsetY() * pushStep; - double pushStepZ = (double) moveDir.getFrontOffsetZ() * pushStep; + double pushStep = 1.0f / ANIM_DURATION; + double pushStepX = moveDir.getFrontOffsetX() * pushStep; + double pushStepY = moveDir.getFrontOffsetY() * pushStep; + double pushStepZ = moveDir.getFrontOffsetZ() * pushStep; for (Entity entity : list) { entity.move( MoverType.PISTON, pushStepX, pushStepY, pushStepZ ); 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 cadc8b73e..7d0815d36 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java +++ b/src/main/java/dan200/computercraft/shared/turtle/core/TurtleMoveCommand.java @@ -85,9 +85,9 @@ public class TurtleMoveCommand implements ITurtleCommand if( entityBB != null ) { AxisAlignedBB pushedBB = entityBB.offset( - (double) direction.getFrontOffsetX(), - (double) direction.getFrontOffsetY(), - (double) direction.getFrontOffsetZ() + direction.getFrontOffsetX(), + direction.getFrontOffsetY(), + direction.getFrontOffsetZ() ); if( !oldWorld.getCollisionBoxes( null, pushedBB ).isEmpty() ) { diff --git a/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleNormal.java b/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleNormal.java index 546cda014..3b8802aa5 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleNormal.java +++ b/src/main/java/dan200/computercraft/shared/turtle/items/ItemTurtleNormal.java @@ -9,7 +9,6 @@ package dan200.computercraft.shared.turtle.items; import dan200.computercraft.ComputerCraft; import dan200.computercraft.api.turtle.ITurtleUpgrade; import dan200.computercraft.api.turtle.TurtleSide; -import dan200.computercraft.shared.common.IColouredItem; import dan200.computercraft.shared.computer.core.ComputerFamily; import dan200.computercraft.shared.util.ColourUtils; import net.minecraft.block.Block; @@ -20,7 +19,7 @@ import net.minecraftforge.common.util.Constants; import javax.annotation.Nonnull; -public class ItemTurtleNormal extends ItemTurtleBase implements IColouredItem +public class ItemTurtleNormal extends ItemTurtleBase { public ItemTurtleNormal( Block block ) { 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 05a7e364f..22a4e431f 100644 --- a/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java +++ b/src/main/java/dan200/computercraft/shared/turtle/upgrades/TurtleModem.java @@ -32,7 +32,6 @@ import javax.vecmath.Matrix4f; public class TurtleModem implements ITurtleUpgrade { private static class Peripheral extends WirelessModemPeripheral - implements IPeripheral { private final ITurtleAccess m_turtle; @@ -55,9 +54,9 @@ public class TurtleModem implements ITurtleUpgrade { BlockPos turtlePos = m_turtle.getPosition(); return new Vec3d( - (double)turtlePos.getX(), - (double)turtlePos.getY(), - (double)turtlePos.getZ() + turtlePos.getX(), + turtlePos.getY(), + turtlePos.getZ() ); } diff --git a/src/main/java/dan200/computercraft/shared/util/Colour.java b/src/main/java/dan200/computercraft/shared/util/Colour.java index 069617714..7010870e5 100644 --- a/src/main/java/dan200/computercraft/shared/util/Colour.java +++ b/src/main/java/dan200/computercraft/shared/util/Colour.java @@ -52,9 +52,9 @@ public enum Colour { m_hex = hex; m_rgb = new float[] { - (float)((hex >> 16) & 0xFF) / 255.0f, - (float)((hex >> 8 ) & 0xFF) / 255.0f, - (float)((hex ) & 0xFF) / 255.0f, + ((hex >> 16) & 0xFF) / 255.0f, + ((hex >> 8 ) & 0xFF) / 255.0f, + ((hex ) & 0xFF) / 255.0f, }; } diff --git a/src/main/java/dan200/computercraft/shared/util/ColourTracker.java b/src/main/java/dan200/computercraft/shared/util/ColourTracker.java index 7be0ad300..06a3cd51d 100644 --- a/src/main/java/dan200/computercraft/shared/util/ColourTracker.java +++ b/src/main/java/dan200/computercraft/shared/util/ColourTracker.java @@ -38,7 +38,7 @@ public class ColourTracker int avgB = totalB / count; float avgTotal = (float) total / (float) count; - float avgMax = (float) Math.max( avgR, Math.max( avgG, avgB ) ); + float avgMax = Math.max( avgR, Math.max( avgG, avgB ) ); avgR = (int) (avgR * avgTotal / avgMax); avgG = (int) (avgG * avgTotal / avgMax); avgB = (int) (avgB * avgTotal / avgMax); diff --git a/src/main/java/dan200/computercraft/shared/util/WorldUtil.java b/src/main/java/dan200/computercraft/shared/util/WorldUtil.java index ff7289a4d..f29a565fb 100644 --- a/src/main/java/dan200/computercraft/shared/util/WorldUtil.java +++ b/src/main/java/dan200/computercraft/shared/util/WorldUtil.java @@ -125,9 +125,9 @@ public class WorldUtil double zDir; if( direction != null ) { - xDir = (double)direction.getFrontOffsetX(); - yDir = (double)direction.getFrontOffsetY(); - zDir = (double)direction.getFrontOffsetZ(); + xDir = direction.getFrontOffsetX(); + yDir = direction.getFrontOffsetY(); + zDir = direction.getFrontOffsetZ(); } else {