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

Merge pull request #218 from thatsIch/localvars

Browse Source 
Remove redundant local variables
This commit is contained in:
Chris
2014-10-01 20:23:56 -07:00
parent 67d8a43ea1 cd064ec05c
commit c2fba2de55
21 changed files with 58 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/inv/WrapperInvSlot.java
+1 -2
View File
@@ -105,8 +105,7 @@ public class WrapperInvSlot
public IInventory getWrapper(int slot)
{
InternalInterfaceWrapper wrapper = new InternalInterfaceWrapper( inv, slot );
return wrapper;
return new InternalInterfaceWrapper( inv, slot );
}
protected boolean isItemValid(ItemStack itemstack)
src/main/java/appeng/util/item/AEItemStack.java
+4 -5
View File
@@ -454,7 +454,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
if ( def.item.isDamageable() )
{
ItemStack a = getItemStack();
ItemStack b = o;
try
{
@@ -464,12 +463,12 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else if ( Mode == FuzzyMode.PERCENT_99 )
{
return (a.getItemDamageForDisplay() > 1) == (b.getItemDamageForDisplay() > 1);
return (a.getItemDamageForDisplay() > 1) == (o.getItemDamageForDisplay() > 1);
}
else
{
float APercentDamaged = 1.0f - (float) a.getItemDamageForDisplay() / (float) a.getMaxDamage();
float BPercentDamaged = 1.0f - (float) b.getItemDamageForDisplay() / (float) b.getMaxDamage();
float BPercentDamaged = 1.0f - (float) o.getItemDamageForDisplay() / (float) o.getMaxDamage();
return (APercentDamaged > Mode.breakPoint) == (BPercentDamaged > Mode.breakPoint);
}
@@ -482,12 +481,12 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
}
else if ( Mode == FuzzyMode.PERCENT_99 )
{
return (a.getItemDamage() > 1) == (b.getItemDamage() > 1);
return (a.getItemDamage() > 1) == (o.getItemDamage() > 1);
}
else
{
float APercentDamaged = (float) a.getItemDamage() / (float) a.getMaxDamage();
float BPercentDamaged = (float) b.getItemDamage() / (float) b.getMaxDamage();
float BPercentDamaged = (float) o.getItemDamage() / (float) o.getMaxDamage();
return (APercentDamaged > Mode.breakPoint) == (BPercentDamaged > Mode.breakPoint);
}