diff --git a/mk2/servers/__init__.py b/mk2/servers/__init__.py index 0160733..94af951 100644 --- a/mk2/servers/__init__.py +++ b/mk2/servers/__init__.py @@ -11,10 +11,11 @@ class Jar: - def __init__(self, name_long, name_short, url): + def __init__(self, name_long, name_short, url, display=True): self.name_long = list(name_long) self.name_short = list(name_short) self.url = str(url) + self.display = display for i, l in enumerate(self.name_long): l = l.replace(' ', '-').lower() @@ -108,10 +109,11 @@ def got_results(results): o = [] m = 0 for r in results: - left = '-'.join(r.name_short) - right = ' '.join(r.name_long) - m = max(m, len(left)) - o.append((left, right)) + if r.display: + left = '-'.join(r.name_short) + right = ' '.join(r.name_long) + m = max(m, len(left)) + o.append((left, right)) for left, right in sorted(o): listing += " %s | %s\n" % (left.ljust(m), right) diff --git a/mk2/servers/vanilla.py b/mk2/servers/vanilla.py index 94c1887..34547e8 100644 --- a/mk2/servers/vanilla.py +++ b/mk2/servers/vanilla.py @@ -10,6 +10,12 @@ def work(self): def handle_data(self, data): for k, v in json.loads(data)['latest'].iteritems(): self.add(('Vanilla', k.title()), (None, None), '{0}{1}/minecraft_server.{1}.jar'.format(self.base, v)) + + for version in json.loads(data)['versions']: + self.add(('Vanilla Version', version['id']), ('vanilla', None), '{0}{1}/minecraft_server.{1}.jar'.format(self.base, version['id']), False) + + self.add(('Vanilla,', 'Replace [version] with version'), ('vanilla', '[version]'), None) + self.commit() ref = Vanilla