diff --git a/1.10-mcp931/build.properties b/1.10-mcp931/build.properties index 12be265..9ccc4f3 100644 --- a/1.10-mcp931/build.properties +++ b/1.10-mcp931/build.properties @@ -1,4 +1,5 @@ minecraft_version=1.10 #forge gradle needs forge version -forge_version=1.10.2-12.18.1.2011 -mappings_version=snapshot_20160813 \ No newline at end of file +forge_mc_version=1.10.2 +forge_version=12.18.1.2011 +mappings_version=snapshot_20160820 \ No newline at end of file diff --git a/Common/customskinloader/tweaker/ClassTransformer.java b/Common/customskinloader/tweaker/ClassTransformer.java index 9fee380..5f0cba7 100644 --- a/Common/customskinloader/tweaker/ClassTransformer.java +++ b/Common/customskinloader/tweaker/ClassTransformer.java @@ -37,7 +37,7 @@ public class ClassTransformer implements IClassTransformer { } ZipFile tempZipFile = getZipFile(file); if(tempZipFile==null){ - ModSystemTweaker.logger.info(url.toString()+" : EXCEPTION (¡ü Message ¡ü)."); + ModSystemTweaker.logger.info(url.toString()+" : EXCEPTION (^ Message ^)."); continue; } if (tempZipFile.getEntry("customskinloader/tweaker/ClassTransformer.class") == null){ diff --git a/common.gradle b/common.gradle index 2d72650..1f01b37 100644 --- a/common.gradle +++ b/common.gradle @@ -35,7 +35,7 @@ group = config.group archivesBaseName = rootProject.ext.config.name+"_"+config.minecraft_version minecraft { - version = config.forge_version + version = config.forge_mc_version+"-"+config.forge_version runDir = "run" mappings = config.mappings_version @@ -83,8 +83,8 @@ task afterBuild << { def file1 = file("build/libs/${archivesBaseName}-${version}-srg.jar") file0.renameTo(file1) - //reobfToNotch - reobfToNotch() + //reobfSrgToNotch + reobfSrgToNotch() //copyBuildFile copy { @@ -98,12 +98,18 @@ task afterBuild << { build.finalizedBy afterBuild //notch pack -void reobfToNotch(){ - def inputName = "${archivesBaseName}-${version}-srg.jar" +void reobfSrgToNotch(){ + def srgName = "${archivesBaseName}-${version}-srg.jar" + def mcpName = srgName.replace('-srg', '-dev') + applySpecialSource(srgName,mcpName,"srg-mcp") + def notchName = srgName.replace('-srg', '') + applySpecialSource(mcpName,notchName,"mcp-notch") +} + +void applySpecialSource(String inputName,String outputName,String srgType){ def mcpVersion = minecraft.mappings.replace('_',"/") - def outputName = inputName.replace('-srg', '') def mapping = new net.md_5.specialsource.JarMapping() - def srgFile = file(System.getProperty('user.home') + "/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_${mcpVersion}/srgs/mcp-notch.srg") + def srgFile = file(System.getProperty('user.home') + "/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_${mcpVersion}/${config.forge_mc_version}/srgs/${srgType}.srg") def inputFile = file("build/libs/${inputName}") def outputFile = file("build/libs/${outputName}") def remapper = new net.md_5.specialsource.JarRemapper(null, mapping)