Working on id missing handling

src/main/java/cpw/mods/fml/common/FMLCommonHandler.java

@@ -324,7 +324,7 @@ public class FMLCommonHandler
 
     public void onPlayerPostTick(EntityPlayer player)
     {
-        bus().post(new TickEvent.PlayerTickEvent(Phase.START, player));
+        bus().post(new TickEvent.PlayerTickEvent(Phase.END, player));
     }
 
     public void registerCrashCallable(ICrashCallable callable)

src/main/java/cpw/mods/fml/common/Loader.java

@@ -53,6 +53,8 @@ import cpw.mods.fml.common.ModContainer.Disableable;
 import cpw.mods.fml.common.discovery.ModDiscoverer;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadEvent;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
 import cpw.mods.fml.common.event.FMLModIdMappingEvent;
 import cpw.mods.fml.common.functions.ArtifactVersionNameFunction;
 import cpw.mods.fml.common.functions.ModIdFunction;
@@ -840,6 +842,28 @@ public class Loader
         return true;
     }
 
+    public void fireMissingMappingEvent(ArrayListMultimap<String,String> missing)
+    {
+        if (!missing.isEmpty())
+        {
+            FMLLog.fine("There are %d mappings missing - attempting a mod remap", missing.size());
+            ArrayListMultimap<String,MissingMapping> missingMappings = ArrayListMultimap.create();
+            List<MissingMapping> remaps = Lists.newArrayList();
+            for (Map.Entry<String, String> mapping : missing.entries())
+            {
+                MissingMapping m = new MissingMapping(mapping.getValue(), remaps);
+                missingMappings.put(mapping.getKey(), m);
+            }
+            FMLMissingMappingsEvent missingEvent = new FMLMissingMappingsEvent(missingMappings);
+            modController.propogateStateMessage(missingEvent);
+            if (!missingMappings.isEmpty())
+            {
+                FMLLog.severe("There are unidentified mappings in this world - it cannot be loaded");
+                throw new RuntimeException("Mod IDs are missing");
+            }
+            GameData.processIdRematches(remaps);
+        }
+    }
     public void fireRemapEvent(Map<String, Integer[]> remaps)
     {
         if (remaps.isEmpty())

src/main/java/cpw/mods/fml/common/event/FMLMissingMappingsEvent.java

@@ -0,0 +1,70 @@
+package cpw.mods.fml.common.event;
+
+import java.util.List;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ListMultimap;
+
+import cpw.mods.fml.common.ModContainer;
+
+/**
+ * This event is fired if a world is loaded that has block and item mappings referring the mod that are not
+ * in existence.
+ * These can be remapped to other existing objects, or simply discarded.
+ *
+ * @author cpw
+ *
+ */
+public class FMLMissingMappingsEvent extends FMLEvent {
+    public static enum Type { BLOCK, ITEM }
+    public static class MissingMapping {
+        public final Type type;
+        public final String name;
+        private String remapTarget;
+        private List<MissingMapping> remaps;
+        public MissingMapping(String name, List<MissingMapping> remaps)
+        {
+            this.type = name.charAt(0) == '\u0001' ? Type.BLOCK : Type.ITEM;
+            this.name = name;
+            this.remaps = remaps;
+        }
+        public void remapTo(String target)
+        {
+            this.remapTarget = target;
+            remaps.add(this);
+        }
+
+        public String getRemapTarget()
+        {
+            return this.remapTarget;
+        }
+    }
+    private ListMultimap<String,MissingMapping> missing;
+    private ModContainer activeContainer;
+    private List<MissingMapping> currentList;
+
+    public FMLMissingMappingsEvent(ListMultimap<String,MissingMapping> missingMappings)
+    {
+        this.missing = missingMappings;
+    }
+    @Override
+    public void applyModContainer(ModContainer activeContainer)
+    {
+        super.applyModContainer(activeContainer);
+        this.activeContainer = activeContainer;
+        this.currentList = null;
+    }
+
+    /**
+     * Get the list of missing mappings for the active mod.
+     * @return
+     */
+    public List<MissingMapping> get()
+    {
+        if (currentList == null)
+        {
+            currentList = ImmutableList.copyOf(missing.removeAll(activeContainer.getModId()));
+        }
+        return currentList;
+    }
+}

src/main/java/cpw/mods/fml/common/registry/GameData.java

@@ -14,6 +14,7 @@ package cpw.mods.fml.common.registry;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.logging.log4j.Level;
@@ -35,6 +36,7 @@ import com.google.common.io.Files;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
+import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping;
 import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
 
 public class GameData {
@@ -212,6 +214,7 @@ public class GameData {
     public static void injectWorldIDMap(Map<String, Integer> dataList)
     {
         Map<String, Integer[]> remaps = Maps.newHashMap();
+        Map<String,String> missing = Maps.newHashMap();
         blockRegistry.beginIdSwap();
         itemRegistry.beginIdSwap();
         for (Entry<String, Integer> entry : dataList.entrySet())
@@ -231,7 +234,12 @@ public class GameData {
                 currId = itemRegistry.getId(itemName);
             }
 
-            if (currId != newId)
+            if (currId == -1)
+            {
+                FMLLog.info("Found a missing id from the world %s", itemName);
+                missing.put(itemName.substring(0, itemName.indexOf(':')), itemName);
+            }
+            else if (currId != newId)
             {
                 FMLLog.info("Found %s id mismatch %s : %d %d", isBlock ? "block" : "item", itemName, currId, newId);
                 remaps.put(itemName, new Integer[] { currId, newId });
@@ -251,4 +259,12 @@ public class GameData {
         itemRegistry.completeIdSwap();
         Loader.instance().fireRemapEvent(remaps);
     }
+    public static void processIdRematches(List<MissingMapping> remaps)
+    {
+        for (MissingMapping remap : remaps)
+        {
+            // what to do here
+            remap.getRemapTarget();
+        }
+    }
 }

src/main/java/cpw/mods/fml/common/registry/GameRegistry.java

@@ -383,4 +383,5 @@ public class GameRegistry
     {
         return GameData.getUniqueName(item);
     }
+
 }