diff --git a/fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java b/fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java similarity index 100% rename from fml/transformers/cpw/mods/fml/common/asm/transformers/AccessTransformer.java rename to fml/common/cpw/mods/fml/common/asm/transformers/AccessTransformer.java diff --git a/fml/eclipse/FML-Client/.classpath b/fml/eclipse/FML-Client/.classpath index a3cdf8217b..61f25769bc 100644 --- a/fml/eclipse/FML-Client/.classpath +++ b/fml/eclipse/FML-Client/.classpath @@ -23,7 +23,7 @@ - + diff --git a/fml/eclipse/FML-Server/.classpath b/fml/eclipse/FML-Server/.classpath index 15f2d6226f..b2e28853cf 100644 --- a/fml/eclipse/FML-Server/.classpath +++ b/fml/eclipse/FML-Server/.classpath @@ -7,7 +7,7 @@ - + diff --git a/fml/eclipse/MCP-Client/.classpath b/fml/eclipse/MCP-Client/.classpath index 698ecdb60e..f8e5fc45c8 100644 --- a/fml/eclipse/MCP-Client/.classpath +++ b/fml/eclipse/MCP-Client/.classpath @@ -19,7 +19,7 @@ - + diff --git a/fml/install/eclipse/Client/.classpath b/fml/install/eclipse/Client/.classpath index 38758db7ff..552dfcef22 100644 --- a/fml/install/eclipse/Client/.classpath +++ b/fml/install/eclipse/Client/.classpath @@ -20,7 +20,7 @@ - + diff --git a/fml/install/eclipse/Server/.classpath b/fml/install/eclipse/Server/.classpath index 068dadfa12..03d19e56a4 100644 --- a/fml/install/eclipse/Server/.classpath +++ b/fml/install/eclipse/Server/.classpath @@ -5,7 +5,7 @@ - + diff --git a/fml/install/fml.py b/fml/install/fml.py index 6699d0ce8d..027e8d1ff4 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -29,7 +29,7 @@ def download_deps(mcp_path): print "Downloading Fernflower failed download manually from http://goo.gl/PnJHp" ret = False - for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-4.0-source.zip']: + for lib in ['argo-2.25.jar', 'guava-12.0.1.jar', 'guava-12.0.1-sources.jar', 'asm-all-4.0.jar', 'asm-all-4.0-source.jar']: libF = os.path.join(mcp_path, 'lib') if not os.path.isdir(libF): os.makedirs(libF) @@ -158,7 +158,7 @@ def setup_fml(fml_dir, mcp_dir): #Compile AccessTransformer forkcmd = ('%s -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {target}' % self.cmdjavac).format( classpath=os.pathsep.join(['.', os.path.join(mcp_dir, 'lib', '*')]), sourcepath=os.path.join(fml_dir, 'common'), outpath=os.path.join(fml_dir, 'bin'), - target=os.path.join(fml_dir, 'transformers', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java')) + target=os.path.join(fml_dir, 'common', 'cpw', 'mods', 'fml', 'common', 'asm', 'transformers', 'AccessTransformer.java')) #print forkcmd self.runcmd(forkcmd)