keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Updated the update_packages script to support different mcp locations

Browse source
This commit is contained in:
LexManos 2012-12-08 21:40:39 -08:00
parent 1742abb139
commit 21c66eaf98
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fml/update_packages.py
View file

@ -3,9 +3,9 @@ import shutil, glob, fnmatch
import csv, re import csv, re
from pprint import pprint from pprint import pprint
from zipfile import ZipFile from zipfile import ZipFile
from optparse import OptionParser
def get_merged_info(): def get_merged_info(mcp_dir):
mcp_dir = os.path.join(os.getcwd(), '..')
joined = os.path.join(mcp_dir, 'conf', 'joined.srg') joined = os.path.join(mcp_dir, 'conf', 'joined.srg')
values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}} values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}}
@ -24,8 +24,20 @@ def get_merged_info():
return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()} return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()}
def main(): def main():
client_jar = os.path.join('..', 'jars', 'bin', 'minecraft.jar.backup') parser = OptionParser()
server_jar = os.path.join('..', 'jars', 'minecraft_server.jar.backup') parser.add_option('-m', '--mcp-dir', action='store_true', dest='mcp_dir', help='Path to download/extract MCP to', default=None)
options, _ = parser.parse_args()
fml_dir = os.path.dirname(os.path.abspath(__file__))
mcp_dir = os.path.abspath('mcp')
if not options.mcp_dir is None:
mcp_dir = os.path.abspath(options.mcp_dir)
elif os.path.isfile(os.path.join('..', 'runtime', 'commands.py')):
mcp_dir = os.path.abspath('..')
client_jar = os.path.join(mcp_dir, 'jars', 'bin', 'minecraft.jar.backup')
server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar.backup')
server_classes = [] server_classes = []
client_classes = [] client_classes = []
@ -42,7 +54,7 @@ def main():
server_classes.append(i.filename[:-6]) server_classes.append(i.filename[:-6])
zip.close() zip.close()
srg = get_merged_info() srg = get_merged_info(mcp_dir)
pkgs = {} pkgs = {}
pkg_file = os.path.join('conf', 'packages.csv') pkg_file = os.path.join('conf', 'packages.csv')