keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Fixed missed metadata offset, and now cache return values of getOres for speed.

Browse source
This commit is contained in:
Lex Manos 2014-06-11 10:27:28 -07:00
parent a08357a845
commit dd5b51aac1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/minecraftforge/oredict/OreDictionary.java
View file

@ -36,7 +36,9 @@ public class OreDictionary
private static List<String> idToName = new ArrayList<String>(); private static List<String> idToName = new ArrayList<String>();
private static Map<String, Integer> nameToId = new HashMap<String, Integer>(); private static Map<String, Integer> nameToId = new HashMap<String, Integer>();
private static List<ArrayList<ItemStack>> idToStack = Lists.newArrayList(); //ToDo: Unqualify to List when possible {1.8} private static List<ArrayList<ItemStack>> idToStack = Lists.newArrayList(); //ToDo: Unqualify to List when possible {1.8}
private static List<ArrayList<ItemStack>> idToStackUn = Lists.newArrayList(); //ToDo: Unqualify to List when possible {1.8}
private static Map<Integer, List<Integer>> stackToId = Maps.newHashMap(); private static Map<Integer, List<Integer>> stackToId = Maps.newHashMap();
public static final ArrayList<ItemStack> EMPTY_LIST = new UnmodifiableArrayList(Lists.newArrayList()); //ToDo: Unqualify to List when possible {1.8}
/** /**
* Minecraft changed from -1 to Short.MAX_VALUE in 1.5 release for the "block wildcard". Use this in case it * Minecraft changed from -1 to Short.MAX_VALUE in 1.5 release for the "block wildcard". Use this in case it
@ -267,6 +269,7 @@ public class OreDictionary
val = idToName.size() - 1; //0 indexed val = idToName.size() - 1; //0 indexed
nameToId.put(name, val); nameToId.put(name, val);
idToStack.add(new ArrayList<ItemStack>()); idToStack.add(new ArrayList<ItemStack>());
idToStackUn.add(new UnmodifiableArrayList(idToStack.get(val)));
} }
return val; return val;
} }
@ -319,7 +322,7 @@ public class OreDictionary
int id = Item.getIdFromItem(stack.getItem()); int id = Item.getIdFromItem(stack.getItem());
List<Integer> ids = stackToId.get(id); List<Integer> ids = stackToId.get(id);
if (ids != null) set.addAll(ids); if (ids != null) set.addAll(ids);
ids = stackToId.get(id | (stack.getItemDamage() << 16)); ids = stackToId.get(id | ((stack.getItemDamage() + 1) << 16));
if (ids != null) set.addAll(ids); if (ids != null) set.addAll(ids);
Integer[] tmp = set.toArray(new Integer[set.size()]); Integer[] tmp = set.toArray(new Integer[set.size()]);
@ -379,8 +382,9 @@ public class OreDictionary
idToName.add(name); idToName.add(name);
nameToId.put(name, idToName.size() - 1); //0 indexed nameToId.put(name, idToName.size() - 1); //0 indexed
idToStack.add(null); idToStack.add(null);
idToStackUn.add(EMPTY_LIST);
} }
return new UnmodifiableArrayList(idToStack.size() > id ? idToStack.get(id) : new ArrayList<ItemStack>()); return idToStackUn.size() > id ? idToStackUn.get(id) : EMPTY_LIST;
} }
private static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets) private static boolean containsMatch(boolean strict, ItemStack[] inputs, ItemStack... targets)