diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.java.patch b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch new file mode 100644 index 0000000000..21ca820f97 --- /dev/null +++ b/patches/minecraft/net/minecraft/init/Bootstrap.java.patch @@ -0,0 +1,10 @@ +--- ../src-base/minecraft/net/minecraft/init/Bootstrap.java ++++ ../src-work/minecraft/net/minecraft/init/Bootstrap.java +@@ -541,6 +541,7 @@ + StatList.func_151178_a(); + BiomeGenBase.func_185358_q(); + func_151353_a(); ++ net.minecraftforge.fml.common.registry.GameData.vanillaSnapshot(); + } + } + 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 5aad048029..a59082f183 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/GameData.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/GameData.java @@ -244,6 +244,11 @@ public class GameData return (ObjectIntIdentityMap)getMain().iBlockRegistry.getSlaveMap(BLOCKSTATE_TO_ID, ObjectIntIdentityMap.class); } + public static void vanillaSnapshot() + { + PersistentRegistryManager.freezeVanilla(); + } + //Lets us clear the map so we can rebuild it. static class ClearableObjectIntIdentityMap extends ObjectIntIdentityMap { diff --git a/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java index 17147cb190..eb00d5b571 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/IForgeRegistry.java @@ -12,7 +12,7 @@ import net.minecraft.util.ResourceLocation; * * @param The top level type for the registry */ -@SuppressWarnings("WeakerAccess") +@SuppressWarnings({"WeakerAccess", "unused"}) public interface IForgeRegistry> extends Iterable { public Class getRegistrySuperType(); 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 04781af814..4fd8232ca5 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java @@ -388,6 +388,19 @@ public class PersistentRegistryManager forAllRegistries(PersistentRegistry.FROZEN, ValidateRegistryFunction.OPERATION); } + public static void freezeVanilla() + { + FMLLog.fine("Creating vanilla freeze snapshot"); + for (Map.Entry> r : PersistentRegistry.ACTIVE.registries.entrySet()) + { + // This has to be performed prior to invoking the method so the compiler can precompute the type bounds for the method + final Class registrySuperType = PersistentRegistry.ACTIVE.getRegistrySuperType(r.getKey()); + loadRegistry(r.getKey(), PersistentRegistry.ACTIVE, PersistentRegistry.VANILLA, registrySuperType); + } + forAllRegistries(PersistentRegistry.VANILLA, ValidateRegistryFunction.OPERATION); + FMLLog.fine("Vanilla freeze snapshot created"); + } + public static List processIdRematches(Iterable missedMappings, boolean isLocalWorld, Map missingBlocks, Map missingItems, Map remapBlocks, Map remapItems) { List failed = Lists.newArrayList();