Skip to content

Commit df60738

Browse files
committed
Merge pull request #47 from The-TTP-Project/master
updated fernflower download url to the temporary one
2 parents 681c856 + 9caad21 commit df60738

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

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

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public String toString()
3434
return StringUtils.lower(name());
3535
}
3636
}
37-
37+
3838
// OS
3939
public static enum SystemArch
4040
{
@@ -62,11 +62,11 @@ public String toString()
6262
// urls
6363
public static final String MC_JAR_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/{MC_VERSION}.jar";
6464
public static final String MC_SERVER_URL = "http://s3.amazonaws.com/Minecraft.Download/versions/{MC_VERSION}/minecraft_server.{MC_VERSION}.jar";
65-
public static final String MCP_URL = "http://mcp.ocean-labs.de/files/archive/mcp804.zip";
65+
public static final String MCP_URL = "http://files.minecraftforge.net/fernflower_temporary.zip";
6666
public static final String ASSETS_URL = "http://resources.download.minecraft.net";
6767
public static final String LIBRARY_URL = "https://libraries.minecraft.net/";
6868
public static final String ASSETS_INDEX_URL = "https://s3.amazonaws.com/Minecraft.Download/indexes/{ASSET_INDEX}.json";
69-
69+
7070
public static final String LOG = ".gradle/gradle.log";
7171
public static final String ASSETS_INDEX = "legacy";
7272

@@ -77,15 +77,16 @@ public String toString()
7777
public static final String FERNFLOWER = "{CACHE_DIR}/minecraft/fernflower.jar";
7878
public static final String EXCEPTOR = "{CACHE_DIR}/minecraft/exceptor.jar";
7979
public static final String ASSETS = "{CACHE_DIR}/minecraft/assets";
80-
81-
public static final String DEOBF_JAR = "{BUILD_DIR}/deobfuscated.jar";
82-
public static final String DEOBF_BIN_JAR = "{BUILD_DIR}/deobfuscated-bin.jar";
83-
public static final String DECOMP_JAR = "{BUILD_DIR}/decompiled.jar";
84-
public static final String DECOMP_FMLED = "{BUILD_DIR}/decompiled-fmled.jar";
85-
public static final String DECOMP_FMLINJECTED = "{BUILD_DIR}/decompiled-fmlinjected.jar";
86-
public static final String DECOMP_FORGED = "{BUILD_DIR}/decompiled-forged.jar";
87-
public static final String DECOMP_FORGEINJECTED = "{BUILD_DIR}/decompiled-forgeinjected.jar";
88-
public static final String DECOMP_REMAPPED = "{BUILD_DIR}/decompiled-remapped.jar";
80+
81+
public static final String DEOBF_JAR = "{BUILD_DIR}/deobfuscated.jar";
82+
public static final String DEOBF_BIN_JAR = "{BUILD_DIR}/deobfuscated-bin.jar";
83+
public static final String DECOMP_JAR = "{BUILD_DIR}/decompiled.jar";
84+
public static final String DECOMP_FMLED = "{BUILD_DIR}/decompiled-fmled.jar";
85+
public static final String DECOMP_FMLINJECTED = "{BUILD_DIR}/decompiled-fmlinjected.jar";
86+
public static final String DECOMP_FORGEJAVADOCCED = "{BUILD_DIR}/decompiled-forged.jar";
87+
public static final String DECOMP_FORGED = "{BUILD_DIR}/decompiled-forged-nojd.jar";
88+
public static final String DECOMP_FORGEINJECTED = "{BUILD_DIR}/decompiled-forgeinjected.jar";
89+
public static final String DECOMP_REMAPPED = "{BUILD_DIR}/decompiled-remapped.jar";
8990

9091
// util
9192
public static final String NEWLINE = System.getProperty("line.separator");
@@ -145,11 +146,11 @@ else if (name.contains("linux") || name.contains("unix"))
145146
return null;
146147
}
147148
}
148-
149+
149150
public static File getMinecraftDirectory()
150151
{
151152
String userDir = System.getProperty("user.home");
152-
153+
153154
switch (OPERATING_SYSTEM)
154155
{
155156
case LINUX:
@@ -164,7 +165,7 @@ public static File getMinecraftDirectory()
164165
return new File(userDir, "minecraft/");
165166
}
166167
}
167-
168+
168169
private static SystemArch getArch()
169170
{
170171
String name = StringUtils.lower(System.getProperty("os.arch"));
@@ -177,7 +178,7 @@ private static SystemArch getArch()
177178
return SystemArch.BIT_32;
178179
}
179180
}
180-
181+
181182
public static String hash(File file)
182183
{
183184
return hash(file, "MD5");
@@ -253,3 +254,4 @@ public static OutputStream getNullStream()
253254
return NULL_OUT;
254255
}
255256
}
257+

0 commit comments

Comments
 (0)