Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix a goof where a lot of ItemStack comparator usage got pointed to the slower displayNameComparator (as opposed to the faster baseComparator)

Browse source
This commit is contained in:
pahimar 2015-02-10 00:38:29 -05:00
parent 334a92e54c
commit 9f59f238dd
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/com/pahimar/ee3/knowledge/TransmutationKnowledge.java
View file

@ -25,7 +25,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
public TransmutationKnowledge()
{
this(new TreeSet<ItemStack>(ItemHelper.displayNameComparator));
this(new TreeSet<ItemStack>(ItemHelper.baseComparator));
}
public TransmutationKnowledge(Collection<ItemStack> knownTransmutations)
@ -36,7 +36,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
public TransmutationKnowledge(Collection<ItemStack> knownTransmutations, boolean canTransmuteEverything)
{
this.canTransmuteEverything = canTransmuteEverything;
this.knownTransmutations = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
this.knownTransmutations = new TreeSet<ItemStack>(ItemHelper.baseComparator);
this.knownTransmutations.addAll(knownTransmutations);
hasBeenModified = false;
}
@ -49,7 +49,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
public TransmutationKnowledge(NBTTagCompound nbtTagCompound)
{
canTransmuteEverything = false;
this.knownTransmutations = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
this.knownTransmutations = new TreeSet<ItemStack>(ItemHelper.baseComparator);
this.readFromNBT(nbtTagCompound);
hasBeenModified = false;
}
@ -142,7 +142,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
if (nbtTagCompound.hasKey(Names.NBT.ITEM_TRANSMUTATION_KNOWLEDGE))
{
NBTTagList tagList = nbtTagCompound.getTagList(Names.NBT.ITEM_TRANSMUTATION_KNOWLEDGE, 10);
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.baseComparator);
for (int i = 0; i < tagList.tagCount(); ++i)
{
NBTTagCompound tagCompound = tagList.getCompoundTagAt(i);
@ -152,7 +152,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
}
else
{
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.baseComparator);
}
if (nbtTagCompound.hasKey(Names.NBT.CAN_TRANSMUTE_ANYTHING))
@ -166,7 +166,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
}
else
{
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
knownTransmutations = new TreeSet<ItemStack>(ItemHelper.baseComparator);
canTransmuteEverything = false;
}
}
@ -237,7 +237,7 @@ public class TransmutationKnowledge implements INBTTaggable, JsonSerializer<Tran
JsonObject jsonObject = (JsonObject) json;
boolean canTransmuteEverything;
Set<ItemStack> itemStacks = new TreeSet<ItemStack>(ItemHelper.displayNameComparator);
Set<ItemStack> itemStacks = new TreeSet<ItemStack>(ItemHelper.baseComparator);
if (jsonObject.has("canTransmuteEverything") && jsonObject.get("canTransmuteEverything").isJsonPrimitive())
{

4
src/main/java/com/pahimar/ee3/util/ItemHelper.java
View file

@ -180,7 +180,7 @@ public class ItemHelper
*/
public static boolean equals(ItemStack first, ItemStack second)
{
return (displayNameComparator.compare(first, second) == 0);
return (baseComparator.compare(first, second) == 0);
}
public static boolean equalsIgnoreStackSize(ItemStack itemStack1, ItemStack itemStack2)
@ -219,7 +219,7 @@ public class ItemHelper
public static int compare(ItemStack itemStack1, ItemStack itemStack2)
{
return displayNameComparator.compare(itemStack1, itemStack2);
return baseComparator.compare(itemStack1, itemStack2);
}
public static String toString(ItemStack itemStack)