Fix wrong SRG mapping type

MinimallyCorrect · Mar 4, 2016 · f2d2325 · f2d2325
1 parent a06a8e3
commit f2d2325
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -91,9 +91,10 @@ if (System.env.GRADLE_USER_HOME) {
 	ext.homeDir = System.properties['user.home'] + '/.gradle/'
 }
 ext.mappingsPath = homeDir + 'caches/minecraft/de/oceanlabs/mcp/mcp_' + mappings_channel + '/' + mappings_version + '/'
+ext.srgPath = mappingsPath + 'srgs/srg-mcp.srg'
 
 jar.doFirst {
-	if (!file(mappingsPath + 'fields.csv').exists())
+	if (!file(mappingsPath + 'fields.csv').exists() || !file(srgPath))
 		throw new Error("Can't find mappings at " + mappingsPath)
 }
 
@@ -104,7 +105,7 @@ jar {
 	}) {
 		exclude "META-INF/**"
 	}
-	from mappingsPath + '/srg/srg-mcp.srg'
+	from srgPath
 	from mappingsPath + 'methods.csv'
 	from mappingsPath + 'fields.csv'
 	from './generated/extendsMap.obj'

diff --git a/src/main/java/me/nallar/modpatcher/MCPMappings.java b/src/main/java/me/nallar/modpatcher/MCPMappings.java
@@ -31,7 +31,7 @@ public MCPMappings() throws IOException {
 		try {
 			loadCsv(Mappings.class.getResourceAsStream("/methods.csv"), methodSeargeMappings);
 			loadCsv(Mappings.class.getResourceAsStream("/fields.csv"), fieldSeargeMappings);
-			loadSrg(Mappings.class.getResourceAsStream("/packaged.srg"));
+			loadSrg(Mappings.class.getResourceAsStream("/srg-mcp.srg"));
 		} catch (Exception e) {
 			PatcherLog.error("Failed to load MCP mappings", e);
 		}