fix up converter some more

1 files changed, 8 insertions, 7 deletions

diff --git a/src/cuchaz/enigma/ConvertMain.java b/src/cuchaz/enigma/ConvertMain.java
index 068fe5b..1948c84 100644
--- a/src/cuchaz/enigma/ConvertMain.java
+++ b/src/cuchaz/enigma/ConvertMain.java
@@ -44,19 +44,20 @@ public class ConvertMain {
                 // init files
                 String inVer = "1.8.3";
                 String outVer = "1.8.8";
+                String side = "client";
                 File home = new File(System.getProperty("user.home"));
                 JarFile sourceJar = new JarFile(new File(home, ".minecraft/versions/" + inVer + "/" + inVer + ".jar"));
                 JarFile destJar = new JarFile(new File(home, ".minecraft/versions/" + outVer + "/" + outVer + ".jar"));
-                File inMappingsFile = new File("../minecraft-mappings/" + inVer + ".mappings");
-                File outMappingsFile = new File("../minecraft-mappings/" + outVer + ".mappings");
+                File inMappingsFile = new File("../Enigma Mappings/" + inVer + "-" + side + ".mappings");
+                File outMappingsFile = new File("../Enigma Mappings/" + outVer + "-" + side + ".mappings");
                 Mappings mappings = new MappingsReader().read(new FileReader(inMappingsFile));
-                File classMatchesFile = new File(inVer + "to" + outVer + ".class.matches");
-                File fieldMatchesFile = new File(inVer + "to" + outVer + ".field.matches");
-                File methodMatchesFile = new File(inVer + "to" + outVer + ".method.matches");
+                File classMatchesFile = new File(inVer + "to" + outVer + "-" + side + ".class.matches");
+                File fieldMatchesFile = new File(inVer + "to" + outVer + "-" + side + ".field.matches");
+                File methodMatchesFile = new File(inVer + "to" + outVer + "-" + side + ".method.matches");
 
                 // match classes
                 //computeClassMatches(classMatchesFile, sourceJar, destJar, mappings);
-                editClasssMatches(classMatchesFile, sourceJar, destJar, mappings);
+                //editClasssMatches(classMatchesFile, sourceJar, destJar, mappings);
                 //convertMappings(outMappingsFile, sourceJar, destJar, mappings, classMatchesFile);
                 
                 // match fields
@@ -67,7 +68,7 @@ public class ConvertMain {
                 // match methods/constructors
                 //computeMethodMatches(methodMatchesFile, destJar, outMappingsFile, classMatchesFile);
                 //editMethodMatches(sourceJar, destJar, outMappingsFile, mappings, classMatchesFile, methodMatchesFile);
-                //convertMappings(outMappingsFile, sourceJar, destJar, mappings, classMatchesFile, fieldMatchesFile, methodMatchesFile);
+                convertMappings(outMappingsFile, sourceJar, destJar, mappings, classMatchesFile, fieldMatchesFile, methodMatchesFile);
         }
         
         private static void computeClassMatches(File classMatchesFile, JarFile sourceJar, JarFile destJar, Mappings mappings)