Skip to content

Commit eef2ae9

Browse files
allow 1.7.10 forge to build again
1 parent aa42fb5 commit eef2ae9

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ project.ext {
1919
}
2020

2121
group = 'net.minecraftforge.gradle'
22-
version = "${project.ext.GIT_INFO.tag}.${project.ext.GIT_INFO.offset}"
22+
//version = "${project.ext.GIT_INFO.tag}.${project.ext.GIT_INFO.offset}"
23+
//TODO fix stub version as 1.2.4 forge now for dependency management purposes
24+
version = '1.2.4'
2325
archivesBaseName = 'ForgeGradle'
2426
targetCompatibility = '1.6'
2527
sourceCompatibility = '1.6'

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,18 @@ public String toString()
5050
public static final Closure<Boolean> CALL_FALSE = new Closure<Boolean>(null){ public Boolean call(Object o){ return false; }};
5151

5252
// urls
53-
public static final String MC_JSON_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/{MC_VERSION}.json";
54-
public static final String MC_JAR_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/{MC_VERSION}.jar";
55-
public static final String MC_SERVER_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/minecraft_server.{MC_VERSION}.jar";
53+
// TODO HACK USING UNSTABLE HARDCODED 1.7.10 URL SHOULD REPLACE WITH A SYSTEM SIMILAR TO ANATAWAS FG
54+
public static final String MC_JSON_URL = "https://piston-meta.mojang.com/v1/packages/ed5d8789ed29872ea2ef1c348302b0c55e3f3468/1.7.10.json";
55+
// TODO HACK USING UNSTABLE HARDCODED 1.7.10 URL SHOULD REPLACE WITH A SYSTEM SIMILAR TO ANATAWAS FG
56+
public static final String MC_JAR_URL = "https://launcher.mojang.com/v1/objects/e80d9b3bf5085002218d4be59e668bac718abbc6/client.jar";
57+
// TODO HACK USING UNSTABLE HARDCODED 1.7.10 URL SHOULD REPLACE WITH A SYSTEM SIMILAR TO ANATAWAS FG
58+
public static final String MC_SERVER_URL = "https://launcher.mojang.com/v1/objects/952438ac4e01b4d115c5fc38f891710c4941df29/server.jar";
5659
public static final String MCP_URL = "https://files.minecraftforge.net/fernflower-fix-1.0.zip";
5760
public static final String ASSETS_URL = "http://resources.download.minecraft.net";
5861
public static final String LIBRARY_URL = "https://libraries.minecraft.net/";
5962
public static final String FORGE_MAVEN = "https://maven.minecraftforge.net";
60-
public static final String ASSETS_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/{ASSET_INDEX}.json";
63+
// TODO HACK USING UNSTABLE HARDCODED 1.7.10 URL SHOULD REPLACE WITH A SYSTEM SIMILAR TO ANATAWAS FG
64+
public static final String ASSETS_INDEX_URL = "https://launchermeta.mojang.com/v1/packages/1863782e33ce7b584fc45b037325a1964e095d3e/1.7.10.json";
6165

6266
// MCP things
6367
public static final String CONFIG_MCP_DATA = "mcpSnapshotDataConfig";

src/main/java/net/minecraftforge/gradle/dev/DevBasePlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,6 @@ protected void signJar(File archive, String keyName, String... filters) throws
544544

545545
protected boolean hasInstaller()
546546
{
547-
return true;
547+
return false;
548548
}
549549
}

src/main/java/net/minecraftforge/gradle/dev/FmlDevPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ else if(f.getPath().endsWith(".srg"))
8282

8383
// the master task.
8484
task = makeTask("buildPackages");
85-
task.dependsOn("launch4j", "createChangelog", "packageUniversal", "packageInstaller", "packageUserDev", "packageSrc");
85+
task.dependsOn(/*"launch4j",*/ "createChangelog", "packageUniversal", /*"packageInstaller",*/ "packageUserDev", "packageSrc");
8686
task.setGroup("FML");
8787

8888
// clean decompile task

src/main/java/net/minecraftforge/gradle/dev/ForgeDevPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ else if(f.getPath().endsWith(".srg"))
9090

9191
// the master task.
9292
task = makeTask("buildPackages");
93-
task.dependsOn("launch4j", "createChangelog", "packageUniversal", "packageInstaller", "packageUserDev", "packageSrc");
93+
task.dependsOn(/*"launch4j",*/ "createChangelog", "packageUniversal", /*"packageInstaller",*/ "packageUserDev", "packageSrc");
9494
task.setGroup("Forge");
9595
}
9696

0 commit comments

Comments
 (0)