check that javaExe was found before trying to identify new server versions
This commit is contained in:
parent
8dd5f1a135
commit
6b9176e5a8
@ -120,6 +120,7 @@ this way.
|
|||||||
cacheDirList = os.listdir(self.cacheDir)
|
cacheDirList = os.listdir(self.cacheDir)
|
||||||
self.versions = list(reversed(sorted([v for v in cacheDirList if os.path.exists(self.jarfileForVersion(v))], key=alphanum_key)))
|
self.versions = list(reversed(sorted([v for v in cacheDirList if os.path.exists(self.jarfileForVersion(v))], key=alphanum_key)))
|
||||||
|
|
||||||
|
if MCServerChunkGenerator.javaExe:
|
||||||
for f in cacheDirList:
|
for f in cacheDirList:
|
||||||
p = os.path.join(self.cacheDir, f)
|
p = os.path.join(self.cacheDir, f)
|
||||||
if f.startswith("minecraft_server") and f.endswith(".jar") and os.path.isfile(p):
|
if f.startswith("minecraft_server") and f.endswith(".jar") and os.path.isfile(p):
|
||||||
@ -204,33 +205,7 @@ def saveProperties(filename, properties):
|
|||||||
for k, v in properties.iteritems():
|
for k, v in properties.iteritems():
|
||||||
f.write("{0}={1}\n".format(k, v))
|
f.write("{0}={1}\n".format(k, v))
|
||||||
|
|
||||||
class MCServerChunkGenerator(object):
|
def findJava():
|
||||||
"""Generates chunks using minecraft_server.jar. Uses a ServerJarStorage to
|
|
||||||
store different versions of minecraft_server.jar in an application support
|
|
||||||
folder.
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
from pymclevel import *
|
|
||||||
|
|
||||||
Example usage:
|
|
||||||
|
|
||||||
gen = MCServerChunkGenerator() # with no arguments, use the newest
|
|
||||||
# server version in the cache, or download
|
|
||||||
# the newest one automatically
|
|
||||||
level = loadWorldNamed("MyWorld")
|
|
||||||
|
|
||||||
gen.generateChunkInLevel(level, 12, 24)
|
|
||||||
|
|
||||||
|
|
||||||
Using an older version:
|
|
||||||
|
|
||||||
gen = MCServerChunkGenerator("Beta 1.6.5")
|
|
||||||
|
|
||||||
"""
|
|
||||||
defaultJarStorage = None
|
|
||||||
|
|
||||||
|
|
||||||
if sys.platform == "win32":
|
if sys.platform == "win32":
|
||||||
javaExe = which("java.exe")
|
javaExe = which("java.exe")
|
||||||
if javaExe is None:
|
if javaExe is None:
|
||||||
@ -260,6 +235,38 @@ class MCServerChunkGenerator(object):
|
|||||||
print "Error while locating java.exe using the Registry: ", repr(e)
|
print "Error while locating java.exe using the Registry: ", repr(e)
|
||||||
else:
|
else:
|
||||||
javaExe = which("java")
|
javaExe = which("java")
|
||||||
|
|
||||||
|
return javaExe
|
||||||
|
|
||||||
|
class MCServerChunkGenerator(object):
|
||||||
|
"""Generates chunks using minecraft_server.jar. Uses a ServerJarStorage to
|
||||||
|
store different versions of minecraft_server.jar in an application support
|
||||||
|
folder.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
from pymclevel import *
|
||||||
|
|
||||||
|
Example usage:
|
||||||
|
|
||||||
|
gen = MCServerChunkGenerator() # with no arguments, use the newest
|
||||||
|
# server version in the cache, or download
|
||||||
|
# the newest one automatically
|
||||||
|
level = loadWorldNamed("MyWorld")
|
||||||
|
|
||||||
|
gen.generateChunkInLevel(level, 12, 24)
|
||||||
|
|
||||||
|
|
||||||
|
Using an older version:
|
||||||
|
|
||||||
|
gen = MCServerChunkGenerator("Beta 1.6.5")
|
||||||
|
|
||||||
|
"""
|
||||||
|
defaultJarStorage = None
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
javaExe = findJava()
|
||||||
jarStorage = None
|
jarStorage = None
|
||||||
tempWorldCache = {}
|
tempWorldCache = {}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user