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

Make ForgeRegistry iterator sorted. Closes #4058 (#4059)

This commit is contained in:
tterrag 2017-06-24 00:52:27 -04:00 committed by LexManos
parent dd42f84a47
commit b71ab7e444
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraftforge/registries/ForgeRegistry.java
View File

@ -91,17 +91,25 @@ public class ForgeRegistry<V extends IForgeRegistryEntry<V>> implements IForgeRe
public Iterator<V> iterator() {
return new Iterator<V>()
{
Iterator<V> itr = names.values().iterator();
int cur = -1;
V next = null;
{ next(); }
@Override
public boolean hasNext()
{
return itr.hasNext();
return next != null;
}
@Override
public V next()
{
return itr.next();
V ret = next;
do {
cur = availabilityMap.nextSetBit(cur + 1);
next = ids.get(cur);
} while (next == null && cur != -1); // nextSetBit returns -1 when none is found
return ret;
}
//TODO add remove support?
};