fixed the coremod searching.. really this time..

Author: AbrarSyed

src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java

@@ -48,7 +48,10 @@ protected void applyUserPlugin()
         // add coremod loading hack to gradle start
         {
             CreateStartTask makeStart = ((CreateStartTask)project.getTasks().getByName(UserConstants.TASK_MAKE_START));
-            makeStart.addResource("net/minecraftforge/gradle/GradleForgeHacks.java");
+            for (String res : Constants.GRADLE_START_FML_RES)
+            {
+                makeStart.addResource(res);
+            }
             makeStart.addExtraLine("net.minecraftforge.gradle.GradleForgeHacks.searchCoremods(this);");
         }
 

src/main/resources/net/minecraftforge/gradle/GradleForgeHacks.java

@@ -46,13 +46,13 @@ public static void searchCoremods(GradleStartCommon common) throws Exception
     {
         // check for argument
         if (common.extras.contains(NO_CORE_SEARCH))
-        {
-            common.extras.remove(NO_CORE_SEARCH);
-        }
-        else
         {
             // no core searching
             GradleStartCommon.LOGGER.info("GradleStart coremod searching disabled!");
+            
+            // remove it so it cant potentially screw up the bonced start class
+            common.extras.remove(NO_CORE_SEARCH);
+            
             return;
         }