Tidy up some more todos

src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java

@@ -109,7 +109,9 @@ public interface IModGuiFactory {
      *
      * @author cpw
      *
+     * TODO remove in 1.11 - this was never fully implemented and will be removed
      */
+    @Deprecated
     public interface RuntimeOptionGuiHandler {
         /**
          * Called to add widgets to the screen, such as buttons.

src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java

@@ -69,6 +69,7 @@ import net.minecraftforge.fml.relauncher.Side;
 
 import org.apache.logging.log4j.Level;
 
+// TODO build test suites to validate the behaviour of this stuff and make it less annoyingly magical
 public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet<?>> implements ChannelOutboundHandler {
     private static boolean DEBUG_HANDSHAKE = Boolean.parseBoolean(System.getProperty("fml.debugNetworkHandshake", "false"));
     private static enum ConnectionState {

src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java

@@ -364,7 +364,7 @@ public class PersistentRegistryManager
         newRegistry.loadIds(frozenRegistry.getEntriesNotIn(newRegistry), Maps.<ResourceLocation, Integer>newLinkedHashMap(), remaps.get(registryName), frozenRegistry, registryName);
     }
 
-    // TODO: Remove when we don't care about loading 1.7.10(?) worlds?
+    // TODO: Remove in 1.11 when we don't care about loading 1.8 worlds and below
     private static ResourceLocation getFixedName(ResourceLocation registryName)
     {
         //Translate old names

src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java

@@ -57,7 +57,8 @@ public interface IFMLLoadingPlugin
      * main thread, to perform any additional setup this coremod may require. It will be
      * run <strong>prior</strong> to Minecraft starting, so it CANNOT operate on minecraft
      * itself. The game will deliberately crash if this code is detected to trigger a
-     * minecraft class loading (TODO: implement crash ;) )
+     * minecraft class loading
+     * TODO: implement crash ;)
      */
     String getSetupClass();