mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-31 13:42:59 +00:00
Code Issues Releases Wiki Activity

Merge pull request #463 from josephcsible/ComputerCraft/notnull

Browse Source 
Remove some unnecessary null checks
This commit is contained in:
SquidDev
2017-11-14 22:58:36 +00:00
parent 11d8253d9c 9e4ae3a494
commit 5253ab3e58
1 changed files with 8 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/dan200/computercraft/client/render/TileEntityTurtleRenderer.java
View File

@@ -116,20 +116,12 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
// Setup the transform // Setup the transform
Vec3d offset; Vec3d offset;
float yaw; float yaw;
if( turtle != null ) offset = turtle.getRenderOffset( f );
{ yaw = turtle.getRenderYaw( f );
offset = turtle.getRenderOffset( f );
yaw = turtle.getRenderYaw( f );
}
else
{
offset = new Vec3d( 0.0, 0.0, 0.0 );
yaw = 0.0f;
}
GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z ); GlStateManager.translate( posX + offset.x, posY + offset.y, posZ + offset.z );
// Render the label // Render the label
IComputer computer = (turtle != null) ? turtle.getComputer() : null; IComputer computer = turtle.getComputer();
String label = (computer != null) ? computer.getLabel() : null; String label = (computer != null) ? computer.getLabel() : null;
if( label != null ) if( label != null )
{ {
@@ -145,18 +137,9 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
int colour; int colour;
ComputerFamily family; ComputerFamily family;
ResourceLocation overlay; ResourceLocation overlay;
if( turtle != null ) colour = turtle.getColour();
{ family = turtle.getFamily();
colour = turtle.getColour(); overlay = turtle.getOverlay();
family = turtle.getFamily();
overlay = turtle.getOverlay();
}
else
{
colour = -1;
family = ComputerFamily.Normal;
overlay = null;
}
renderModel( state, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } ); renderModel( state, getTurtleModel( family, colour != -1 ), colour == -1 ? null : new int[] { colour } );
@@ -183,11 +166,8 @@ public class TileEntityTurtleRenderer extends TileEntitySpecialRenderer<TileTurt
} }
// Render the upgrades // Render the upgrades
if( turtle != null ) renderUpgrade( state, turtle, TurtleSide.Left, f );
{ renderUpgrade( state, turtle, TurtleSide.Right, f );
renderUpgrade( state, turtle, TurtleSide.Left, f );
renderUpgrade( state, turtle, TurtleSide.Right, f );
}
} }
finally finally
{ {