diff --git a/build.gradle b/build.gradle index 4042b8a..b750d21 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ compileJava options.encoding = "UTF-8" } sourceCompatibility = 1.6 -version = '1.2.0' +version = '1.2.1' repositories { mavenCentral() @@ -24,5 +24,5 @@ repositories { dependencies { compile gradleApi() - compile 'net.minecraftforge.gradle:ForgeGradle:2.0.2' -} + compile 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' +} \ No newline at end of file diff --git a/src/main/java/net/hakugyokurou/fgow/plugin/ClosureRepoHacker.java b/src/main/java/net/hakugyokurou/fgow/plugin/ClosureRepoHacker.java index e98e950..77b15ca 100644 --- a/src/main/java/net/hakugyokurou/fgow/plugin/ClosureRepoHacker.java +++ b/src/main/java/net/hakugyokurou/fgow/plugin/ClosureRepoHacker.java @@ -80,7 +80,7 @@ else if(name.equals("deobfDeps")) else if(name.equals("local")) { local = (FlatDirectoryArtifactRepository)artifactRepository; - local.setName("TweakerMcRepo"); + //local.setName("TweakerMcRepo"); hasFlat = true; } } @@ -101,7 +101,7 @@ public void execute(FlatDirectoryArtifactRepository repo) } } //For debug - for(Object o : proj.getRepositories()) + /*for(Object o : proj.getRepositories()) { AbstractArtifactRepository repository = (AbstractArtifactRepository)o; System.out.println("======================"); @@ -117,7 +117,7 @@ else if(repository instanceof DefaultFlatDirArtifactRepository) System.out.println(file); } } - } + }*/ /*proj.getRepositories().clear(); final String repoDir = plugin.delayedDirtyFilePublic("this", "doesnt", "matter").call().getParentFile().getAbsolutePath(); @@ -145,11 +145,6 @@ else if(repository instanceof DefaultFlatDirArtifactRepository) downloadServer.setUrl(plugin.delayedStringPublic(reposExtension.getMcServerUrl())); } - ObtainFernFlowerTask mcpTask = (ObtainFernFlowerTask)(proj.getTasksByName(Constants.TASK_DL_FERNFLOWER, false).toArray()[0]); - { - mcpTask.setMcpUrl(plugin.delayedStringPublic(reposExtension.getMcpUrl())); - } - EtagDownloadTask getAssetsIndex = (EtagDownloadTask)(proj.getTasksByName(Constants.TASK_DL_ASSET_INDEX, false).toArray()[0]); { getAssetsIndex.setUrl(plugin.delayedStringPublic(reposExtension.getAssestIndexUrl())); diff --git a/src/main/java/net/hakugyokurou/fgow/plugin/FgowUserPlugin.java b/src/main/java/net/hakugyokurou/fgow/plugin/FgowUserPlugin.java index 52c9248..7c000df 100644 --- a/src/main/java/net/hakugyokurou/fgow/plugin/FgowUserPlugin.java +++ b/src/main/java/net/hakugyokurou/fgow/plugin/FgowUserPlugin.java @@ -2,6 +2,8 @@ import java.io.File; import java.lang.reflect.Field; +import java.util.List; + import org.gradle.api.internal.file.collections.SimpleFileCollection; import org.gradle.api.tasks.JavaExec; import org.gradle.api.tasks.bundling.Jar; @@ -103,12 +105,14 @@ else if(strUrl.equals(forgeJsonUrl) && project.hasProperty("forgeJsonUrl")) { strUrl = project.property("forgeJsonUrl").toString(); } - else if(strUrl.equals("https://www.abrarsyed.com/ForgeGradleVersion.json") && project.hasProperty("forgeVersionUrl")) + else if(strUrl.equals("https://www.abrarsyed.com/ForgeGradleVersion.json") && project.hasProperty("fgVersionUrl")) { - strUrl = project.property("forgeVersionUrl").toString(); + strUrl = project.property("fgVersionUrl").toString(); } return super.getWithEtag(strUrl, cache, etagFile); } + + //hack forge json //UNUSED. @@ -132,6 +136,19 @@ else if(strUrl.equals("https://www.abrarsyed.com/ForgeGradleVersion.json") && pr } }*/ + @Override + protected void doFGVersionCheck(List outLines) { + if(project.hasProperty("skipFGVersionCheck")) + { + Object prop = project.property("skipFGVersionCheck"); + if(prop instanceof Boolean && ((Boolean)prop).booleanValue() == true) + return; + if(prop instanceof String && ((String)prop).equalsIgnoreCase("true")) + return; + } + super.doFGVersionCheck(outLines); + } + public DelayedString delayedStringPublic(String path) { return delayedString(path); }