From db14487eb5dd507e221ca76cdf77429a771878a6 Mon Sep 17 00:00:00 2001
From: AbrarSyed <sacabrarsyed@gmail.com>
Date: Sun, 9 Aug 2015 11:32:17 -0500
Subject: [PATCH] fixed a few bugs with the version checker

---
 .../net/minecraftforge/gradle/common/BaseExtension.java   | 2 +-
 .../java/net/minecraftforge/gradle/common/BasePlugin.java | 1 +
 .../gradle/user/patcherUser/forge/ForgePlugin.java        | 4 ++--
 .../gradle/util/json/fgversion/FGVersion.java             | 8 ++++++++
 .../gradle/util/json/fgversion/FGVersionWrapper.java      | 6 ++++++
 versionCheck/ForgeGradleVersion.json                      | 2 +-
 versionCheck/verify.groovy                                | 2 +-
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java b/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java
index ebee24aa7..8eb013b76 100644
--- a/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java
+++ b/src/main/java/net/minecraftforge/gradle/common/BaseExtension.java
@@ -40,7 +40,7 @@ public BaseExtension(BasePlugin<? extends BaseExtension> plugin)
         try
         {
             URL url = BaseExtension.class.getClassLoader().getResource("forgegradle.version.txt");
-            version = Resources.toString(url, Constants.CHARSET);
+            version = Resources.toString(url, Constants.CHARSET).trim();
 
             if (version.equals("${version}"))
             {
diff --git a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
index fe88e8f69..fedf11413 100644
--- a/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java
@@ -248,6 +248,7 @@ protected void doFGVersionCheck(List<String> outLines)
         
         if (webVersion == null || webVersion.status == FGBuildStatus.FINE)
         {
+            System.out.println("NULL OR FINE");
             return;
         }
         
diff --git a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java
index cf7c03fab..bc87a5052 100644
--- a/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java
+++ b/src/main/java/net/minecraftforge/gradle/user/patcherUser/forge/ForgePlugin.java
@@ -96,9 +96,9 @@ protected void onVersionCheck(FGVersion version, FGVersionWrapper wrapper)
         int maxBuild = version.ext.get("forgeMaxBuild").getAsInt();
         
         if (buildNum < minBuild)
-            throw new GradleConfigurationException("This version of FOrgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds less than #"+minBuild);
+            throw new GradleConfigurationException("This version of ForgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds less than #"+minBuild);
         else if (buildNum > maxBuild)
-            throw new GradleConfigurationException("This version of FOrgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds greater than #"+maxBuild);
+            throw new GradleConfigurationException("This version of ForgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds greater than #"+maxBuild);
     }
 
     @Override
diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java
index 17f618c5c..7c9ad5775 100644
--- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java
+++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java
@@ -1,5 +1,7 @@
 package net.minecraftforge.gradle.util.json.fgversion;
 
+import java.util.Arrays;
+
 import com.google.gson.JsonObject;
 
 public class FGVersion
@@ -9,4 +11,10 @@ public class FGVersion
     public FGBuildStatus status;
     public int           index;
     public JsonObject    ext;
+    
+    @Override
+    public String toString()
+    {
+        return "FGVersion [version=" + version + ", docUrl=" + docUrl + ", changes=" + Arrays.toString(changes) + ", bugs=" + Arrays.toString(bugs) + ", status=" + status + ", index=" + index + ", ext=" + ext + "]";
+    }
 }
diff --git a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java
index 4799fa8e5..fcb6189e7 100644
--- a/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java
+++ b/src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java
@@ -13,4 +13,10 @@ public class FGVersionWrapper
 {
     public List<String>           versions       = Lists.newArrayList();
     public Map<String, FGVersion> versionObjects = Maps.newHashMap();
+
+    @Override
+    public String toString()
+    {
+        return "FGVersionWrapper [versions=" + versions + ", versionObjects=" + versionObjects + "]";
+    }
 }
diff --git a/versionCheck/ForgeGradleVersion.json b/versionCheck/ForgeGradleVersion.json
index 0adb9e3a4..ffa96e40c 100644
--- a/versionCheck/ForgeGradleVersion.json
+++ b/versionCheck/ForgeGradleVersion.json
@@ -8,7 +8,7 @@
         ],
         "bugs": [
         ],
-        "pluginSpecific": {
+        "ext": {
             "forgeMinBuild": "1234",
             "forgeMaxBuild": "1234"
         }
diff --git a/versionCheck/verify.groovy b/versionCheck/verify.groovy
index cdec18173..523a02220 100755
--- a/versionCheck/verify.groovy
+++ b/versionCheck/verify.groovy
@@ -104,7 +104,7 @@ result.eachWithIndex { version, index ->
         }
     }
     // check 'broken' status
-    else if (version.status == "BROKEN" && version.bugs.isEmpty())
+    else if (version.status == "BROKEN")
     {
         if (!version.bugs)
         {