Skip to content

Commit db14487

Browse files
committed
fixed a few bugs with the version checker
1 parent 4cd84cb commit db14487

File tree

7 files changed

+20
-5
lines changed

7 files changed

+20
-5
lines changed

src/main/java/net/minecraftforge/gradle/common/BaseExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public BaseExtension(BasePlugin<? extends BaseExtension> plugin)
4040
try
4141
{
4242
URL url = BaseExtension.class.getClassLoader().getResource("forgegradle.version.txt");
43-
version = Resources.toString(url, Constants.CHARSET);
43+
version = Resources.toString(url, Constants.CHARSET).trim();
4444

4545
if (version.equals("${version}"))
4646
{

src/main/java/net/minecraftforge/gradle/common/BasePlugin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,7 @@ protected void doFGVersionCheck(List<String> outLines)
248248

249249
if (webVersion == null || webVersion.status == FGBuildStatus.FINE)
250250
{
251+
System.out.println("NULL OR FINE");
251252
return;
252253
}
253254

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ protected void onVersionCheck(FGVersion version, FGVersionWrapper wrapper)
9696
int maxBuild = version.ext.get("forgeMaxBuild").getAsInt();
9797

9898
if (buildNum < minBuild)
99-
throw new GradleConfigurationException("This version of FOrgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds less than #"+minBuild);
99+
throw new GradleConfigurationException("This version of ForgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds less than #"+minBuild);
100100
else if (buildNum > maxBuild)
101-
throw new GradleConfigurationException("This version of FOrgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds greater than #"+maxBuild);
101+
throw new GradleConfigurationException("This version of ForgeGradle ("+getExtension().forgeGradleVersion+") does not support forge builds greater than #"+maxBuild);
102102
}
103103

104104
@Override

src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersion.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package net.minecraftforge.gradle.util.json.fgversion;
22

3+
import java.util.Arrays;
4+
35
import com.google.gson.JsonObject;
46

57
public class FGVersion
@@ -9,4 +11,10 @@ public class FGVersion
911
public FGBuildStatus status;
1012
public int index;
1113
public JsonObject ext;
14+
15+
@Override
16+
public String toString()
17+
{
18+
return "FGVersion [version=" + version + ", docUrl=" + docUrl + ", changes=" + Arrays.toString(changes) + ", bugs=" + Arrays.toString(bugs) + ", status=" + status + ", index=" + index + ", ext=" + ext + "]";
19+
}
1220
}

src/main/java/net/minecraftforge/gradle/util/json/fgversion/FGVersionWrapper.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,10 @@ public class FGVersionWrapper
1313
{
1414
public List<String> versions = Lists.newArrayList();
1515
public Map<String, FGVersion> versionObjects = Maps.newHashMap();
16+
17+
@Override
18+
public String toString()
19+
{
20+
return "FGVersionWrapper [versions=" + versions + ", versionObjects=" + versionObjects + "]";
21+
}
1622
}

versionCheck/ForgeGradleVersion.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
],
99
"bugs": [
1010
],
11-
"pluginSpecific": {
11+
"ext": {
1212
"forgeMinBuild": "1234",
1313
"forgeMaxBuild": "1234"
1414
}

versionCheck/verify.groovy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ result.eachWithIndex { version, index ->
104104
}
105105
}
106106
// check 'broken' status
107-
else if (version.status == "BROKEN" && version.bugs.isEmpty())
107+
else if (version.status == "BROKEN")
108108
{
109109
if (!version.bugs)
110110
{

0 commit comments

Comments
 (0)