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

Add legacy support for signature change of AddCallback.

Browse source
This commit is contained in:
LexManos 2016-08-20 17:09:58 -07:00
parent 3222a9a771
commit d6d9a45100
1 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
View file

@ -166,7 +166,7 @@ public class PersistentRegistryManager
IForgeRegistry.CreateCallback<T> createCallback) IForgeRegistry.CreateCallback<T> createCallback)
{ {
return PersistentRegistry.ACTIVE.createRegistry(registryName, registryType, optionalDefaultKey, minId, maxId, return PersistentRegistry.ACTIVE.createRegistry(registryName, registryType, optionalDefaultKey, minId, maxId,
addCallback, getLegacyClear(clearCallback), getLegacyCreate(createCallback), null); getLegacyAdd(addCallback), getLegacyClear(clearCallback), getLegacyCreate(createCallback), null);
} }
@Deprecated //Use RegistryBuilder TODO: Remove in 1.11 {Make package private so only builder can use it} @Deprecated //Use RegistryBuilder TODO: Remove in 1.11 {Make package private so only builder can use it}
public static <T extends IForgeRegistryEntry<T>> FMLControlledNamespacedRegistry<T> createRegistry( public static <T extends IForgeRegistryEntry<T>> FMLControlledNamespacedRegistry<T> createRegistry(
@ -789,4 +789,34 @@ public class PersistentRegistryManager
} }
return null; //Will never get here unless things go wonkey... return null; //Will never get here unless things go wonkey...
} }
//TODO: Remove in 1.11, creates wrappers for API breakage cpw did in registry re-work.
private static <T extends IForgeRegistryEntry<T>> IForgeRegistry.AddCallback<T> getLegacyAdd(final IForgeRegistry.AddCallback<T> cb)
{
if (cb == null)
return null;
try {
final Method mtd = cb.getClass().getMethod("onAdd", Object.class, int.class, Map.class);
return new IForgeRegistry.AddCallback<T>()
{
@Override
public void onAdd(T obj, int id, Map<ResourceLocation, ?> slaveset)
{
try {
mtd.invoke(cb, obj, id, slaveset);
} catch (Exception e) {
e.printStackTrace( );
Throwables.propagate(e);
}
}
};
} catch (NoSuchMethodException e) {
e.printStackTrace();
return cb; //Assume they are ussing modern API
} catch (SecurityException e) {
e.printStackTrace();
Throwables.propagate(e);
}
return null; //Will never get here unless things go wonkey...
}
} }