From 543156a008295efb43f155c40e8aeb5db6080e6c Mon Sep 17 00:00:00 2001
From: cpw <cpw@weeksfamily.ca>
Date: Wed, 27 Jul 2016 10:52:48 -0400
Subject: [PATCH] Tidy up some more todos

---
 .../java/net/minecraftforge/fml/client/IModGuiFactory.java     | 2 ++
 .../fml/common/network/handshake/NetworkDispatcher.java        | 1 +
 .../fml/common/registry/PersistentRegistryManager.java         | 2 +-
 .../net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java   | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java b/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java
index 8901a271b3..6184e737bc 100644
--- a/src/main/java/net/minecraftforge/fml/client/IModGuiFactory.java
+++ b/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.
diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
index 796b39720f..8339db7c20 100644
--- a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
+++ b/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 {
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 1f5670a187..e38e6e0df5 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+++ b/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
diff --git a/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java b/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java
index de8fbfde6f..f2016bac20 100644
--- a/src/main/java/net/minecraftforge/fml/relauncher/IFMLLoadingPlugin.java
+++ b/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();