tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Improved AEItemStack.compareTo performance.

Browse source
This commit is contained in:
yueh 2015-03-08 15:27:27 +01:00
parent b8e2d73aa0
commit 53f448e578
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/appeng/util/item/AEItemDef.java
View file

@ -37,7 +37,7 @@ public class AEItemDef
public int def;
private final int itemID;
public final int itemID;
public final Item item;
public int damageValue;
@ -62,7 +62,7 @@ public class AEItemDef
public AEItemDef(Item it) {
this.item = it;
this.itemID = System.identityHashCode( this.item );
this.itemID = Item.getIdFromItem( it );
}
public AEItemDef copy()

20
src/main/java/appeng/util/item/AEItemStack.java
View file

@ -261,11 +261,19 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
@Override
public int compareTo(AEItemStack b)
{
int id = this.compare( this.def.item.hashCode(), b.def.item.hashCode() );
int damageValue = this.compare( this.def.damageValue, b.def.damageValue );
int displayDamage = this.compare( this.def.displayDamage, b.def.displayDamage );
// AELog.info( "NBT: " + nbt );
return id == 0 ? (damageValue == 0 ? (displayDamage == 0 ? this.compareNBT( b.def ) : displayDamage) : damageValue) : id;
int id = this.def.itemID - b.def.itemID;
if (id != 0)
return id;
int damageValue = this.def.damageValue - b.def.damageValue ;
if (damageValue != 0)
return damageValue;
int displayDamage = this.def.displayDamage - b.def.displayDamage;
if (displayDamage != 0)
return displayDamage;
return (this.def.tagCompound == b.def.tagCompound) ? 0 : this.compareNBT( b.def );
}
private int compareNBT(AEItemDef b)
@ -276,7 +284,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return nbt;
}
private int compare(int l, long m)
private int compare(int l, int m)
{
return l < m ? -1 : (l > m ? 1 : 0);
}