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

Add suggestions output if it can.

Browse source
This commit is contained in:
LexManos 2013-06-27 22:58:00 -07:00
parent 030e8e71a8
commit 4cd3d06286
2 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fml/.gitignore vendored
View file

@ -14,3 +14,4 @@ fmlbranding.properties
/deobfuscation_data*.zip
/binpatch
/mcp_data/
/map_client.txt

37
fml/update_packages.py
View file

@ -15,7 +15,7 @@ def get_merged_info(fml_dir, mcp_dir):
from fml import gen_merged_srg
values = create_merged_srg(mcp_dir, None)
else:
with open(joined, 'r') as fh:
with closing(open(joined, 'r')) as fh:
for line in fh:
pts = line.rstrip('\r\n').split(' ')
if pts[0] == 'MD:':
@ -24,6 +24,20 @@ def get_merged_info(fml_dir, mcp_dir):
values[pts[0]][pts[1]] = pts[2]
return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()}
def load_suggestions(fml_dir):
map_file = os.path.join(fml_dir, 'map_client.txt')
if not os.path.isfile(map_file):
return None
map = {}
with closing(open(map_file, 'r')) as fh:
for line in fh:
if line[0] == ' ':
continue
line = line[0:-2].split(' -> ')
map[line[1]] = line[0].rsplit('.', 1)[0]
return map
def main():
parser = OptionParser()
parser.add_option('-m', '--mcp-dir', action='store', dest='mcp_dir', help='MCP install folder', default='mcp')
@ -34,6 +48,7 @@ def main():
from fml import read_mc_versions, load_srg
info = read_mc_versions(options.fml_dir, work_dir=os.path.join(options.mcp_dir, 'jars'))
suggs = load_suggestions(options.fml_dir)
types = {'client' : [], 'server' : []}
for type in ['client', 'server']:
@ -52,34 +67,38 @@ def main():
for line in reader:
pkgs[line['class']] = line['package']
classes = []
classes = {}
for cls in srg['CL:'].keys():
if cls.startswith('net/minecraft/src/'):
obf = srg['CL:'][cls]
cls = cls[18:]
classes.append(cls)
classes[cls] = obf
for type in ['server', 'client']:
if obf in types[type]:
types[type].remove(obf)
types[type].append(cls)
for cls in pkgs.keys():
if not cls in classes:
if not cls in classes.keys():
print 'Removed Class: %s/%s' % (pkgs[cls], cls)
pkgs.pop(cls)
for cls in classes:
for cls,obf in classes.items():
if not cls in pkgs.keys():
sug = ''
if not suggs is None and obf in suggs.keys():
sug = '_' + suggs[obf].replace('.', '_')
print 'New Class: %s' % cls
if cls.find('/') == -1:
if cls in types['server'] and cls in types['client']:
pkgs[cls] = 'get_me_out_of_here_shared'
pkgs[cls] = 'get_me_out_of_here_shared' + sug
elif cls in types['server']:
pkgs[cls] = 'get_me_out_of_here_server'
pkgs[cls] = 'get_me_out_of_here_server' + sug
elif cls in types['client']:
pkgs[cls] = 'get_me_out_of_here_client'
pkgs[cls] = 'get_me_out_of_here_client' + sug
else:
pkgs[cls] = 'get_me_out_of_here_src'
pkgs[cls] = 'get_me_out_of_here_src' + sug
tmp=[]
for cls,pkg in pkgs.items():