Refactoring

Type-safety

Minor performance improvements
This commit is contained in:
thatsIch
2014-11-28 04:36:46 +01:00
parent 9fae9d1ec0
commit 2243c5a188
87 changed files with 899 additions and 730 deletions
@@ -18,6 +18,7 @@
package appeng.helpers;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -31,6 +32,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.networking.crafting.ICraftingPatternDetails;
import appeng.api.storage.data.IAEItemStack;
@@ -88,8 +90,19 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
@Override
public boolean equals(Object obj)
{
TestLookup b = (TestLookup) obj;
return b.slot == slot && b.ref == ref;
final boolean equality;
if ( obj instanceof TestLookup )
{
TestLookup b = (TestLookup) obj;
equality = b.slot == slot && b.ref == ref;
}
else
{
equality = false;
}
return equality;
}
}
@@ -248,9 +261,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
break;
}
if ( !isCrafting )
return false;
for (int x = 0; x < crafting.getSizeInventory(); x++)
testFrame.setInventorySlotContents( x, crafting.getStackInSlot( x ) );
@@ -304,7 +314,6 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
@Override
public boolean canSubstitute()
{
// TODO Auto-generated method stub
return false;
}