From 32680bb84d5b83e17dfc92dd8f93ab3f6ac4a16f Mon Sep 17 00:00:00 2001
From: Christian <cpw@weeksfamily.ca>
Date: Wed, 10 Jul 2013 00:42:40 -0400
Subject: [PATCH] Force a global asset scan prior to mod construction : you
 should be able to reference assets anywhere in your mod now.

---
 fml/client/cpw/mods/fml/client/FMLClientHandler.java | 6 ++++++
 fml/common/cpw/mods/fml/common/FMLCommonHandler.java | 5 +++++
 fml/common/cpw/mods/fml/common/IFMLSidedHandler.java | 2 ++
 fml/common/cpw/mods/fml/common/LoadController.java   | 1 +
 fml/common/cpw/mods/fml/server/FMLServerHandler.java | 5 +++++
 5 files changed, 19 insertions(+)

diff --git a/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
index 34b1c5bef..64c587945 100644
--- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java
@@ -585,4 +585,10 @@ public class FMLClientHandler implements IFMLSidedHandler
             }
         }
     }
+
+    @Override
+    public void updateResourcePackList()
+    {
+        client.func_110436_a();
+    }
 }
diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
index 445c3076c..d19b213c5 100644
--- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
+++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java
@@ -491,4 +491,9 @@ public class FMLCommonHandler
     {
         sidedDelegate.addModAsResource(container);
     }
+
+    public void updateResourcePackList()
+    {
+        sidedDelegate.updateResourcePackList();
+    }
 }
diff --git a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java
index a9ba216d1..c105efb79 100644
--- a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java
+++ b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java
@@ -64,4 +64,6 @@ public interface IFMLSidedHandler
     void disconnectIDMismatch(MapDifference<Integer, ItemData> s, NetHandler toKill, INetworkManager mgr);
 
     void addModAsResource(ModContainer container);
+
+    void updateResourcePackList();
 }
diff --git a/fml/common/cpw/mods/fml/common/LoadController.java b/fml/common/cpw/mods/fml/common/LoadController.java
index cc681db6b..03b4557d6 100644
--- a/fml/common/cpw/mods/fml/common/LoadController.java
+++ b/fml/common/cpw/mods/fml/common/LoadController.java
@@ -95,6 +95,7 @@ public class LoadController
         }
 
         eventChannels = eventBus.build();
+        FMLCommonHandler.instance().updateResourcePackList();
     }
 
     public void distributeStateMessage(LoaderState state, Object... eventData)
diff --git a/fml/common/cpw/mods/fml/server/FMLServerHandler.java b/fml/common/cpw/mods/fml/server/FMLServerHandler.java
index e4ecec606..ae40c7015 100644
--- a/fml/common/cpw/mods/fml/server/FMLServerHandler.java
+++ b/fml/common/cpw/mods/fml/server/FMLServerHandler.java
@@ -195,4 +195,9 @@ public class FMLServerHandler implements IFMLSidedHandler
     {
         // NOOP on server
     }
+    @Override
+    public void updateResourcePackList()
+    {
+        // NOOP on server
+    }
 }