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

Registry: Complain about bogus registrations

This commit is contained in:
Player 2014-04-01 14:40:24 +02:00
parent 11ab034638
commit 3eaa002091
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fml/src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
View File

@ -210,6 +210,8 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespaced {
int add(int id, String name, I thing, BitSet availabilityMap)
{
if (name == null) throw new NullPointerException("Can't use a null-name for the registry.");
if (name.isEmpty()) throw new IllegalArgumentException("Can't use an empty name for the registry.");
if (thing == null) throw new NullPointerException("Can't add null-object to the registry.");
if (name.equals(optionalDefaultName))
{
@ -232,6 +234,20 @@ public class FMLControlledNamespacedRegistry<I> extends RegistryNamespaced {
String prefix = mc.getModId();
name = prefix + ":"+ name;
}
if (getRaw(name) != null)
{
FMLLog.warning("****************************************");
FMLLog.warning("* The name %s has been registered twice, for %s and %s.", name, getRaw(name), thing);
FMLLog.warning("****************************************");
}
if (getId(thing) >= 0)
{
FMLLog.warning("****************************************");
FMLLog.warning("* The object %s has been registered twice, using the names %s and %s.", thing, getNameForObject(thing), name);
FMLLog.warning("****************************************");
}
super.addObject(idToUse, name, thing);
FMLLog.finer("Add : %s %d %s", name, idToUse, thing);
return idToUse;