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

Remove redundant local variables

Browse Source
This commit is contained in:
thatsIch
2014-10-01 11:34:27 +02:00
parent e1627734b1
commit cd064ec05c
21 changed files with 59 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/NEIHelpers/NEICraftingHandler.java
+2 -3
View File
@@ -65,8 +65,7 @@ public class NEICraftingHandler implements IOverlayHandler
{
if ( slot instanceof SlotCraftingMatrix || slot instanceof SlotFakeCraftingMatrix )
{
Slot ctSlot = slot;
if ( ctSlot.getSlotIndex() == col + row * 3 )
if ( slot.getSlotIndex() == col + row * 3 )
{
NBTTagList tags = new NBTTagList();
List<ItemStack> list = new LinkedList<ItemStack>();
@@ -91,7 +90,7 @@ public class NEICraftingHandler implements IOverlayHandler
tags.appendTag( tag );
}
recipe.setTag( "#" + ctSlot.getSlotIndex(), tags );
recipe.setTag( "#" + slot.getSlotIndex(), tags );
break;
}
}
src/main/java/appeng/integration/modules/NEIHelpers/NEIGrinderRecipeHandler.java
+1 -2
View File
@@ -136,8 +136,7 @@ public class NEIGrinderRecipeHandler extends TemplateRecipeHandler
public String getGuiTexture()
{
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/guis/grinder.png" );
String f = loc.toString();
return f;
return loc.toString();
}
@Override
src/main/java/appeng/integration/modules/NEIHelpers/NEIInscriberRecipeHandler.java
+1 -2
View File
@@ -108,8 +108,7 @@ public class NEIInscriberRecipeHandler extends TemplateRecipeHandler
public String getGuiTexture()
{
ResourceLocation loc = new ResourceLocation( "appliedenergistics2", "textures/guis/inscriber.png" );
String f = loc.toString();
return f;
return loc.toString();
}
@Override
src/main/java/appeng/integration/modules/Waila.java
+6 -10
View File
@@ -122,13 +122,11 @@ public class Waila extends BaseModule implements IWailaDataProvider, IWailaFMPPr
SelectedPart sp = ((IPartHost) te).selectPart( Pos );
if ( sp.facade != null )
{
IFacadePart fp = sp.facade;
ThingOfInterest = fp;
ThingOfInterest = sp.facade;
}
else if ( sp.part != null )
{
IPart part = sp.part;
ThingOfInterest = part;
ThingOfInterest = sp.part;
}
}
@@ -136,10 +134,9 @@ public class Waila extends BaseModule implements IWailaDataProvider, IWailaFMPPr
{
if ( ThingOfInterest instanceof PartCableSmart || ThingOfInterest instanceof PartDenseCable )
{
NBTTagCompound c = nbt;
if ( c != null && c.hasKey( "extra:6" ) )
if ( nbt != null && nbt.hasKey( "extra:6" ) )
{
NBTTagCompound ic = c.getCompoundTag( "extra:6" );
NBTTagCompound ic = nbt.getCompoundTag( "extra:6" );
if ( ic != null && ic.hasKey( "usedChannels" ) )
{
int channels = ic.getByte( "usedChannels" );
@@ -151,11 +148,10 @@ public class Waila extends BaseModule implements IWailaDataProvider, IWailaFMPPr
if ( ThingOfInterest instanceof TileEnergyCell )
{
NBTTagCompound c = nbt;
if ( c != null && c.hasKey( "internalCurrentPower" ) )
if ( nbt != null && nbt.hasKey( "internalCurrentPower" ) )
{
TileEnergyCell tec = (TileEnergyCell) ThingOfInterest;
long power = (long) (100 * c.getDouble( "internalCurrentPower" ));
long power = (long) (100 * nbt.getDouble( "internalCurrentPower" ));
currentToolTip.add( WailaText.Contains + ": " + Platform.formatPowerLong( power, false ) + " / "
+ Platform.formatPowerLong( (long) (100 * tec.getAEMaxPower()), false ) );
}