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 0001b425f1..c943fc7596 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java @@ -168,6 +168,32 @@ public class PersistentRegistryManager forAllRegistries(PersistentRegistry.ACTIVE, DumpRegistryFunction.OPERATION); forAllRegistries(PersistentRegistry.ACTIVE, ResetDelegatesFunction.OPERATION); + List missingRegs = Lists.newArrayList(); + for (ResourceLocation name : snapshot.entries.keySet()) + { + name = getFixedName(name); + if (PersistentRegistry.ACTIVE.getRegistry(name, null) == null) + { + missingRegs.add(name); + } + } + + if (missingRegs.size() > 0) + { + String text = "Forge Mod Loader detected missing/unknown registrie(s).\n\n" + + "There are " + missingRegs.size() + " missing registries in this save.\n" + + "If you continue the missing registries will get removed.\n" + + "This may cause issues, it is advised that you create a world backup before continuing.\n\n" + + "Missing Registries:\n"; + + for (ResourceLocation s : missingRegs) + text += s.toString() + "\n"; + + boolean confirmed = StartupQuery.confirm(text); + if (!confirmed) + StartupQuery.abort(); + } + // Load the snapshot into the "STAGING" registry for (Map.Entry snapshotEntry : snapshot.entries.entrySet()) { @@ -316,21 +342,25 @@ public class PersistentRegistryManager newRegistry.loadIds(frozenRegistry.getEntriesNotIn(newRegistry), Maps.newLinkedHashMap(), remaps.get(registryName), frozenRegistry, registryName); } - private static > void loadPersistentDataToStagingRegistry(boolean injectFrozenData, Map> remaps, LinkedHashMap> missing, Map.Entry snapEntry, Class regType) + // TODO: Remove when we don't care about loading 1.7.10(?) worlds? + private static ResourceLocation getFixedName(ResourceLocation registryName) { - ResourceLocation registryName = snapEntry.getKey(); - //Translate old names if ("fml:blocks".equals(registryName.toString())) registryName = PersistentRegistryManager.BLOCKS; else if ("fml:items".equals(registryName.toString())) registryName = PersistentRegistryManager.ITEMS; else if ("fmlgr:villagerprofessions".equals(registryName.toString())) registryName = VillagerRegistry.PROFESSIONS; + return registryName; + } + + private static > void loadPersistentDataToStagingRegistry(boolean injectFrozenData, Map> remaps, LinkedHashMap> missing, Map.Entry snapEntry, Class regType) + { + ResourceLocation registryName = getFixedName(snapEntry.getKey()); + FMLControlledNamespacedRegistry currentRegistry = PersistentRegistry.ACTIVE.getRegistry(registryName, regType); if (currentRegistry == null) { - FMLLog.severe("An unknown persistent registry type \"%s\" has been encountered. This Forge instance cannot understand it.", registryName); - StartupQuery.abort(); - return; // fake exit to shut up null analysis + return; // We've already asked the user if they wish to continue. So if the reg isnt found just assume the user knows and accepted it. } FMLControlledNamespacedRegistry newRegistry = PersistentRegistry.STAGING.getOrShallowCopyRegistry(registryName, regType, currentRegistry); // Copy the persistent substitution set from the currently active one into the new registry