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

Registry: Treat all 1.6 entries as items.

Browse source
This commit is contained in:
Player 2014-04-26 21:55:04 +02:00
parent dfa9f2d1a2
commit 2d3cd66680
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
fml/src/main/java/cpw/mods/fml/common/FMLContainer.java
View file

@ -185,23 +185,8 @@ public class FMLContainer extends DummyModContainer implements WorldAccessContai
}
else
{
boolean isItem;
try {
Class<?> clazz = Class.forName(itemType);
clazz.asSubclass(Item.class);
isItem = true;
}
catch (ClassNotFoundException cnfs)
{
FMLLog.warning("The old item %s is not present in this game, it's type cannot be inferred - it will be skipped", itemType);
// MISSING, skip
continue;
}
catch (ClassCastException ccs)
{
isItem = false;
}
String itemLabel = String.format("%c%s:%s", isItem ? '\u0002' : '\u0001', forcedModId != null ? forcedModId : modId, forcedName);
// all entries are Items, blocks were only saved through their ItemBlock
String itemLabel = String.format("%c%s:%s", '\u0002', forcedModId != null ? forcedModId : modId, forcedName);
dataList.put(itemLabel, itemId);
}
}