diff --git a/fml/build.xml b/fml/build.xml index b2efeb098a..8a648d6e00 100644 --- a/fml/build.xml +++ b/fml/build.xml @@ -194,11 +194,11 @@ - - - - - + + + + + diff --git a/fml/install/fml.py b/fml/install/fml.py index 460220258c..79a576fef8 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -262,8 +262,8 @@ def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True): apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'minecraft'), src_dir) if os.path.isdir(os.path.join(fml_dir, 'patches', 'common')): apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'common'), src_dir, '/common/', '/minecraft/') - if copy_files and os.path.isdir(os.path.join(fml_dir, 'src', 'minecraft')): - copytree(os.path.join(fml_dir, 'src', 'minecraft'), os.path.join(src_dir, 'minecraft')) + if copy_files and os.path.isdir(os.path.join(fml_dir, 'client')): + copytree(os.path.join(fml_dir, 'client'), os.path.join(src_dir, 'minecraft')) #delete argo if os.path.isdir(os.path.join(src_dir, 'minecraft', 'argo')): shutil.rmtree(os.path.join(src_dir, 'minecraft', 'argo')) @@ -273,13 +273,13 @@ def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True): apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'minecraft_server'), src_dir) if os.path.isdir(os.path.join(fml_dir, 'patches', 'common')): apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'common'), src_dir, '/common/', '/minecraft_server/') - if copy_files and os.path.isdir(os.path.join(fml_dir, 'src', 'minecraft_server')): - copytree(os.path.join(fml_dir, 'src', 'minecraft_server'), os.path.join(src_dir, 'minecraft_server')) + if copy_files and os.path.isdir(os.path.join(fml_dir, 'server')): + copytree(os.path.join(fml_dir, 'server'), os.path.join(src_dir, 'minecraft_server')) if os.path.isdir(os.path.join(fml_dir, 'patches', 'common')): apply_patches(mcp_dir, os.path.join(fml_dir, 'patches', 'common'), src_dir) - if copy_files and os.path.isdir(os.path.join(fml_dir, 'src', 'common')): - copytree(os.path.join(fml_dir, 'src', 'common'), os.path.join(src_dir, 'common')) + if copy_files and os.path.isdir(os.path.join(fml_dir, 'common')): + copytree(os.path.join(fml_dir, 'common'), os.path.join(src_dir, 'common')) def finish_setup_fml(fml_dir, mcp_dir): sys.path.append(mcp_dir) diff --git a/fml/install/install.py b/fml/install/install.py index 6b4ca83bca..3317bcaa43 100644 --- a/fml/install/install.py +++ b/fml/install/install.py @@ -1,17 +1,14 @@ import os, os.path, sys -fml_dir = os.path.dirname(os.path.abspath(__file__)) -mcp_dir = os.path.abspath('..') - from fml import setup_fml, finish_setup_fml, apply_fml_patches, setup_mcp -def main(): +def fml_main(fml_dir, mcp_dir): print '================ Forge ModLoader Setup Start ===================' setup_mcp(fml_dir, mcp_dir) setup_fml(fml_dir, mcp_dir) - apply_fml_patches(fml_dir, mcp_sir, os.path.join(mcp_dir, 'src')) + apply_fml_patches(fml_dir, mcp_dir, os.path.join(mcp_dir, 'src')) finish_setup_fml(fml_dir, mcp_dir) print '================ Forge ModLoader Setup End ===================' if __name__ == '__main__': - main() \ No newline at end of file + fml_main(os.path.dirname(os.path.abspath(__file__)), os.path.abspath('..')) \ No newline at end of file