From 5562c14c45de47a5747087572f3b75be5e52c6d6 Mon Sep 17 00:00:00 2001 From: cpw Date: Wed, 23 Dec 2015 10:37:11 -0500 Subject: [PATCH] Fix up persistent substitution. Should close #2259 --- .../fml/common/registry/FMLControlledNamespacedRegistry.java | 4 +++- .../java/net/minecraftforge/fml/common/registry/GameData.java | 2 +- .../fml/common/registry/PersistentRegistryManager.java | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java index 073f07a609..0789301b50 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/FMLControlledNamespacedRegistry.java @@ -160,6 +160,8 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul this.minId = otherRegistry.minId; this.aliases.clear(); this.aliases.putAll(otherRegistry.aliases); + this.persistentSubstitutions.clear(); + this.persistentSubstitutions.putAll(otherRegistry.getPersistentSubstitutions()); this.activeSubstitutions.clear(); underlyingIntegerMap = new ObjectIntIdentityMap(); @@ -599,7 +601,7 @@ public class FMLControlledNamespacedRegistry extends RegistryNamespacedDefaul getPersistentSubstitutions().put(nameToReplace, replacement); } - private BiMap getPersistentSubstitutions() + BiMap getPersistentSubstitutions() { return persistentSubstitutions; } diff --git a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java index 8833d69d07..e094bd6b3c 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -185,7 +185,7 @@ public class GameData void registerSubstitutionAlias(String name, GameRegistry.Type type, Object toReplace) throws ExistingSubstitutionException { - ResourceLocation nameToSubstitute = new ResourceLocation(Loader.instance().activeModContainer().getModId(), name); + ResourceLocation nameToSubstitute = new ResourceLocation(name); if (type == GameRegistry.Type.BLOCK) { iBlockRegistry.addSubstitutionAlias(Loader.instance().activeModContainer().getModId(), nameToSubstitute, (Block)toReplace); diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java index 955c6b41ff..2940832a3f 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java @@ -269,6 +269,8 @@ public class PersistentRegistryManager StartupQuery.abort(); } FMLControlledNamespacedRegistry newRegistry = PersistentRegistry.STAGING.getOrShallowCopyRegistry(registryName, regType, currentRegistry); + // Copy the persistent substitution set from the currently active one into the new registry + newRegistry.getPersistentSubstitutions().putAll(currentRegistry.getPersistentSubstitutions()); GameDataSnapshot.Entry snapshotEntry = snapEntry.getValue(); Set substitutions = snapshotEntry.substitutions; if (injectFrozenData)