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

@ObjectHolder will now inject null for dummied objects. Closes #3301

Browse source
This commit is contained in:
LexManos 2016-10-09 15:57:18 -07:00
parent d3da111c08
commit 6e8c05343c
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java
View file

@ -412,6 +412,7 @@ public class FMLControlledNamespacedRegistry<I extends IForgeRegistryEntry<I>> e
}
public void serializeDummied(Set<ResourceLocation> set) { set.addAll(this.dummiedLocations); }
public boolean isDummied(ResourceLocation key){ return this.dummiedLocations.contains(key); }
/**

22
src/main/java/net/minecraftforge/fml/common/registry/ObjectHolderRef.java
View file

@ -31,6 +31,7 @@ import com.google.common.base.Throwables;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
import net.minecraftforge.fml.common.registry.PersistentRegistryManager.PersistentRegistry;
/**
@ -39,14 +40,15 @@ import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder;
* @author cpw
*
*/
@SuppressWarnings("rawtypes")
class ObjectHolderRef {
private Field field;
private ResourceLocation injectedObject;
private boolean isValid;
private IForgeRegistry registry;
private FMLControlledNamespacedRegistry registry;
ObjectHolderRef(Field field, ResourceLocation injectedObject, boolean extractFromExistingValues)
@SuppressWarnings("unchecked")
ObjectHolderRef(Field field, ResourceLocation injectedObject, boolean extractFromExistingValues)
{
registry = getRegistryForType(field);
@ -58,7 +60,7 @@ class ObjectHolderRef {
{
Object existing = field.get(null);
// nothing is ever allowed to replace AIR
if (existing == null || existing == GameData.getBlockRegistry().getDefaultValue())
if (existing == null || existing == registry.getDefaultValue())
{
this.injectedObject = null;
this.field = null;
@ -97,17 +99,19 @@ class ObjectHolderRef {
}
}
private IForgeRegistry getRegistryForType(Field field)
@SuppressWarnings("unchecked")
private FMLControlledNamespacedRegistry<?> getRegistryForType(Field field)
{
Queue<Class<?>> typesToExamine = new LinkedList<Class<?>>();
typesToExamine.add(field.getType());
IForgeRegistry registry = null;
while (!typesToExamine.isEmpty() && registry == null) {
FMLControlledNamespacedRegistry<?> registry = null;
while (!typesToExamine.isEmpty() && registry == null)
{
Class<?> type = typesToExamine.remove();
Collections.addAll(typesToExamine, type.getInterfaces());
if (IForgeRegistryEntry.class.isAssignableFrom(type))
{
registry = PersistentRegistryManager.findRegistryByType((Class<IForgeRegistryEntry>) type);
registry = PersistentRegistry.ACTIVE.getRegistry((Class<IForgeRegistryEntry>) type);
final Class<?> parentType = type.getSuperclass();
if (parentType != null)
{
@ -125,7 +129,7 @@ class ObjectHolderRef {
public void apply()
{
Object thing;
if (isValid && registry.containsKey(injectedObject))
if (isValid && registry.containsKey(injectedObject) && !registry.isDummied(injectedObject))
{
thing = registry.getValue(injectedObject);
}