From ee7d2c97d4cc0c0eb87ebd869d0623bf4891875e Mon Sep 17 00:00:00 2001 From: jrbudda Date: Fri, 17 Feb 2017 10:15:22 -0500 Subject: [PATCH] copy assets in applychanges did not test. --- applychanges.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/applychanges.py b/applychanges.py index 694cc5a3..11bf4228 100644 --- a/applychanges.py +++ b/applychanges.py @@ -59,7 +59,8 @@ def applychanges(mcp_dir, patch_dir = "patches", applyPatches=True, backup = Tru mod_src_dir = os.path.join(mcp_dir, "src","minecraft") mod_bak_dir = os.path.join(mcp_dir, "src","minecraft-bak") org_src_dir = os.path.join(mcp_dir, "src",origDir) - + mod_ass_dir = os.path.join(mcp_dir, "src","assets") + if backup and os.path.exists(mod_src_dir): print("Backing up src/minecraft to src/minecraft-bak") shutil.rmtree( mod_bak_dir, True ) @@ -75,7 +76,8 @@ def applychanges(mcp_dir, patch_dir = "patches", applyPatches=True, backup = Tru if mergeInNew: #merge in the new classes merge_tree( os.path.join( base_dir, "src" ), mod_src_dir ) - + merge_tree( os.path.join( base_dir, "assets", "vivecraft"), mod_ass_dir ) + if __name__ == '__main__': parser = OptionParser() parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='Path to MCP to use', default=None)