fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deleted unnecessary casts with Eclipse

Browse Source
This commit is contained in:
Andrew
2014-09-28 11:56:16 -07:00
parent 94d5319038
commit da63aca95c
89 changed files with 348 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/CableBusContainer.java
+2 -2
View File
@@ -251,7 +251,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{
try
{
new GridConnection( (IGridNode) cn, (IGridNode) sn, ForgeDirection.UNKNOWN );
new GridConnection( cn, sn, ForgeDirection.UNKNOWN );
}
catch (FailedConnection e)
{
@@ -296,7 +296,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
{
try
{
new GridConnection( (IGridNode) cn, (IGridNode) sn, ForgeDirection.UNKNOWN );
new GridConnection( cn, sn, ForgeDirection.UNKNOWN );
}
catch (FailedConnection e)
{
src/main/java/appeng/parts/PartPlacement.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class PartPlacement
Minecraft mc = Minecraft.getMinecraft();
float f = 1.0F;
double d0 = (double) mc.playerController.getBlockReachDistance();
double d0 = mc.playerController.getBlockReachDistance();
Vec3 vec3 = mc.renderViewEntity.getPosition( f );
if ( mop != null && mop.hitVec.distanceTo( vec3 ) < d0 )
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+4 -4
View File
@@ -247,8 +247,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
Block blk = w.getBlock( x, y, z );
IStorageGrid storage = (IStorageGrid) proxy.getStorage();
IEnergyGrid energy = (IEnergyGrid) proxy.getEnergy();
IStorageGrid storage = proxy.getStorage();
IEnergyGrid energy = proxy.getEnergy();
Material mat = blk.getMaterial();
boolean ignore = mat == Material.air || mat == Material.lava || mat == Material.water || mat.isLiquid() || blk == Blocks.bedrock
@@ -430,8 +430,8 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
{
try
{
IStorageGrid storage = (IStorageGrid) proxy.getStorage();
IEnergyGrid energy = (IEnergyGrid) proxy.getEnergy();
IStorageGrid storage = proxy.getStorage();
IEnergyGrid energy = proxy.getEnergy();
while (!Buffer.isEmpty())
{
src/main/java/appeng/parts/automation/PartFormationPlane.java
+3 -3
View File
@@ -463,9 +463,9 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
is.stackSize = (int) maxStorage;
EntityItem ei = new EntityItem( w, // w
((side.offsetX != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetX * -0.3 + (double) x, // spawn
((side.offsetY != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetY * -0.3 + (double) y, // spawn
((side.offsetZ != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetZ * -0.3 + (double) z, // spawn
((side.offsetX != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetX * -0.3 + x, // spawn
((side.offsetY != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetY * -0.3 + y, // spawn
((side.offsetZ != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetZ * -0.3 + z, // spawn
is.copy() );
Entity result = ei;
src/main/java/appeng/parts/automation/PartLevelEmitter.java
+31 -31
View File
@@ -428,9 +428,9 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
{
ForgeDirection d = side;
double d0 = (double) ((float) d.offsetX * 0.45F) + (double) (r.nextFloat() - 0.5F) * 0.2D;
double d1 = (double) ((float) d.offsetY * 0.45F) + (double) (r.nextFloat() - 0.5F) * 0.2D;
double d2 = (double) ((float) d.offsetZ * 0.45F) + (double) (r.nextFloat() - 0.5F) * 0.2D;
double d0 = d.offsetX * 0.45F + (r.nextFloat() - 0.5F) * 0.2D;
double d1 = d.offsetY * 0.45F + (r.nextFloat() - 0.5F) * 0.2D;
double d2 = d.offsetZ * 0.45F + (r.nextFloat() - 0.5F) * 0.2D;
world.spawnParticle( "reddust", 0.5 + x + d0, 0.5 + y + d1, 0.5 + z + d2, 0.0D, 0.0D, 0.0D );
}
@@ -469,20 +469,20 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
* float var16 = (float)var14 / 256.0F; float var17 = ((float)var14 + 15.99F) / 256.0F; float var18 =
* (float)var15 / 256.0F; float var19 = ((float)var15 + 15.99F) / 256.0F;
*/
double var20b = (double) offTexture.getInterpolatedU( 7.0D );
double var24b = (double) offTexture.getInterpolatedU( 9.0D );
double var20b = offTexture.getInterpolatedU( 7.0D );
double var24b = offTexture.getInterpolatedU( 9.0D );
double var20 = (double) IIcon.getInterpolatedU( 7.0D );
double var24 = (double) IIcon.getInterpolatedU( 9.0D );
double var22 = (double) IIcon.getInterpolatedV( 6.0D + (isOn ? 0 : 1.0D) );
double var26 = (double) IIcon.getInterpolatedV( 8.0D + (isOn ? 0 : 1.0D) );
double var28 = (double) IIcon.getInterpolatedU( 7.0D );
double var30 = (double) IIcon.getInterpolatedV( 13.0D );
double var32 = (double) IIcon.getInterpolatedU( 9.0D );
double var34 = (double) IIcon.getInterpolatedV( 15.0D );
double var20 = IIcon.getInterpolatedU( 7.0D );
double var24 = IIcon.getInterpolatedU( 9.0D );
double var22 = IIcon.getInterpolatedV( 6.0D + (isOn ? 0 : 1.0D) );
double var26 = IIcon.getInterpolatedV( 8.0D + (isOn ? 0 : 1.0D) );
double var28 = IIcon.getInterpolatedU( 7.0D );
double var30 = IIcon.getInterpolatedV( 13.0D );
double var32 = IIcon.getInterpolatedU( 9.0D );
double var34 = IIcon.getInterpolatedV( 15.0D );
double var22b = (double) IIcon.getInterpolatedV( 9.0D );
double var26b = (double) IIcon.getInterpolatedV( 11.0D );
double var22b = IIcon.getInterpolatedV( 9.0D );
double var26b = IIcon.getInterpolatedV( 11.0D );
baseX += 0.5D;
baseZ += 0.5D;
@@ -523,25 +523,25 @@ public class PartLevelEmitter extends PartUpgradeable implements IEnergyWatcherH
this.addVertexWithUV( baseX - var44 + Zero, baseY, baseZ + var44 + par10, var28, var34 );
this.addVertexWithUV( baseX - var44 + Zero, baseY, baseZ - var44 + par10, var28, var30 );
this.addVertexWithUV( baseX - var44, baseY + 1.0D, var40, (double) var16, (double) var18 );
this.addVertexWithUV( baseX - var44 + Zero, baseY + 0.0D, var40 + par10, (double) var16, (double) var19 );
this.addVertexWithUV( baseX - var44 + Zero, baseY + 0.0D, var42 + par10, (double) var17, (double) var19 );
this.addVertexWithUV( baseX - var44, baseY + 1.0D, var42, (double) var17, (double) var18 );
this.addVertexWithUV( baseX - var44, baseY + 1.0D, var40, var16, var18 );
this.addVertexWithUV( baseX - var44 + Zero, baseY + 0.0D, var40 + par10, var16, var19 );
this.addVertexWithUV( baseX - var44 + Zero, baseY + 0.0D, var42 + par10, var17, var19 );
this.addVertexWithUV( baseX - var44, baseY + 1.0D, var42, var17, var18 );
this.addVertexWithUV( baseX + var44, baseY + 1.0D, var42, (double) var16, (double) var18 );
this.addVertexWithUV( baseX + Zero + var44, baseY + 0.0D, var42 + par10, (double) var16, (double) var19 );
this.addVertexWithUV( baseX + Zero + var44, baseY + 0.0D, var40 + par10, (double) var17, (double) var19 );
this.addVertexWithUV( baseX + var44, baseY + 1.0D, var40, (double) var17, (double) var18 );
this.addVertexWithUV( baseX + var44, baseY + 1.0D, var42, var16, var18 );
this.addVertexWithUV( baseX + Zero + var44, baseY + 0.0D, var42 + par10, var16, var19 );
this.addVertexWithUV( baseX + Zero + var44, baseY + 0.0D, var40 + par10, var17, var19 );
this.addVertexWithUV( baseX + var44, baseY + 1.0D, var40, var17, var18 );
this.addVertexWithUV( var36, baseY + 1.0D, baseZ + var44, (double) var16, (double) var18 );
this.addVertexWithUV( var36 + Zero, baseY + 0.0D, baseZ + var44 + par10, (double) var16, (double) var19 );
this.addVertexWithUV( var38 + Zero, baseY + 0.0D, baseZ + var44 + par10, (double) var17, (double) var19 );
this.addVertexWithUV( var38, baseY + 1.0D, baseZ + var44, (double) var17, (double) var18 );
this.addVertexWithUV( var36, baseY + 1.0D, baseZ + var44, var16, var18 );
this.addVertexWithUV( var36 + Zero, baseY + 0.0D, baseZ + var44 + par10, var16, var19 );
this.addVertexWithUV( var38 + Zero, baseY + 0.0D, baseZ + var44 + par10, var17, var19 );
this.addVertexWithUV( var38, baseY + 1.0D, baseZ + var44, var17, var18 );
this.addVertexWithUV( var38, baseY + 1.0D, baseZ - var44, (double) var16, (double) var18 );
this.addVertexWithUV( var38 + Zero, baseY + 0.0D, baseZ - var44 + par10, (double) var16, (double) var19 );
this.addVertexWithUV( var36 + Zero, baseY + 0.0D, baseZ - var44 + par10, (double) var17, (double) var19 );
this.addVertexWithUV( var36, baseY + 1.0D, baseZ - var44, (double) var17, (double) var18 );
this.addVertexWithUV( var38, baseY + 1.0D, baseZ - var44, var16, var18 );
this.addVertexWithUV( var38 + Zero, baseY + 0.0D, baseZ - var44 + par10, var16, var19 );
this.addVertexWithUV( var36 + Zero, baseY + 0.0D, baseZ - var44 + par10, var17, var19 );
this.addVertexWithUV( var36, baseY + 1.0D, baseZ - var44, var17, var18 );
}
boolean status = false;
src/main/java/appeng/parts/misc/PartInterface.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class PartInterface extends PartBasicState implements IGridTickable, ISeg
@Override
public TileEntity getTileEntity()
{
return (TileEntity) super.getHost().getTile();
return super.getHost().getTile();
}
@Override
src/main/java/appeng/parts/p2p/PartP2PBCPower.java
+1 -1
View File
@@ -206,7 +206,7 @@ public class PartP2PBCPower extends PartP2PTunnel<PartP2PBCPower> implements IPo
public PowerReceiver getPowerReceiver(ForgeDirection side)
{
if ( side.equals( side ) )
return ((BaseMJPerdition) pp).getPowerReceiver();
return pp.getPowerReceiver();
return null;
}
src/main/java/appeng/parts/p2p/PartP2PIC2Power.java
+1 -1
View File
@@ -169,7 +169,7 @@ public class PartP2PIC2Power extends PartP2PTunnel<PartP2PIC2Power> implements i
if ( Options.isEmpty() )
return amount;
PartP2PIC2Power x = (PartP2PIC2Power) Platform.pickRandom( Options );
PartP2PIC2Power x = Platform.pickRandom( Options );
if ( x != null && x.OutputEnergyA <= 0.001 )
{
src/main/java/appeng/parts/p2p/PartP2PRedstone.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class PartP2PRedstone extends PartP2PTunnel<PartP2PRedstone>
{
PartP2PRedstone in = getInput();
if ( in != null )
putInput( ((PartP2PRedstone) in).power );
putInput( in.power );
}
}
src/main/java/appeng/parts/reporting/PartMonitor.java
+2 -2
View File
@@ -51,7 +51,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
{
super.onPlacement( player, held, side );
byte rotation = (byte) (MathHelper.floor_double( (double) ((player.rotationYaw * 4F) / 360F) + 2.5D ) & 3);
byte rotation = (byte) (MathHelper.floor_double( (player.rotationYaw * 4F) / 360F + 2.5D ) & 3);
if ( side == ForgeDirection.UP )
spin = rotation;
else if ( side == ForgeDirection.DOWN )
@@ -63,7 +63,7 @@ public class PartMonitor extends AEBasePart implements IPartMonitor, IPowerChann
{
super.writeToNBT( data );
data.setFloat( "opacity", opacity );
data.setByte( "spin", (byte) spin );
data.setByte( "spin", spin );
}
@Override
src/main/java/appeng/parts/reporting/PartStorageMonitor.java
+2 -2
View File
@@ -216,14 +216,14 @@ public class PartStorageMonitor extends PartMonitor implements IPartStorageMonit
{
GL11.glScalef( 1.0f, -1.0f, 1.0f );
GL11.glRotatef( 90.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( (float) spin * 90.0F, 0, 0, 1 );
GL11.glRotatef( spin * 90.0F, 0, 0, 1 );
}
if ( d == ForgeDirection.DOWN )
{
GL11.glScalef( 1.0f, -1.0f, 1.0f );
GL11.glRotatef( -90.0f, 1.0f, 0.0f, 0.0f );
GL11.glRotatef( (float) spin * -90.0F, 0, 0, 1 );
GL11.glRotatef( spin * -90.0F, 0, 0, 1 );
}
if ( d == ForgeDirection.EAST )