Fix missing argument and startclient/startserver support.
This commit is contained in:
parent
4f535cfbf8
commit
a1db21a601
|
@ -33,7 +33,7 @@
|
||||||
|
|
||||||
def startserver(self, mainclass, extraargs):
|
def startserver(self, mainclass, extraargs):
|
||||||
- classpath = [self.binserver] + self.cpathserver
|
- classpath = [self.binserver] + self.cpathserver
|
||||||
+ classpath = [self.binclient, self.srcclient] + self.cpathserver
|
+ classpath = [self.binclient, self.srcclient] + self.cpathserver + self.cpathclient
|
||||||
classpath = [os.path.join('..', p) for p in classpath]
|
classpath = [os.path.join('..', p) for p in classpath]
|
||||||
classpath = os.pathsep.join(classpath)
|
classpath = os.pathsep.join(classpath)
|
||||||
os.chdir(self.dirjars)
|
os.chdir(self.dirjars)
|
||||||
|
|
|
@ -159,5 +159,5 @@ CmdFernflower = %s -Xmx512M -jar %s -din=0 -rbr=0 -dgs=1 -asc=1 -log=WARN {indir
|
||||||
CmdExceptor = %s -jar %s {input} {output} {conf} {log}
|
CmdExceptor = %s -jar %s {input} {output} {conf} {log}
|
||||||
CmdRecomp = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
CmdRecomp = %s -encoding UTF-8 -Xlint:-options -deprecation -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
||||||
CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
CmdRecompScala = %s -encoding UTF-8 -deprecation -target:jvm-1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
||||||
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" "{mainclass}" "{extraargs}"
|
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" cpw.mods.fml.relauncher.ServerLaunchWrapper {extraargs}
|
||||||
CmdStartClt = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} "net.minecraft.launchwrapper.Launch" "--tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}"
|
CmdStartClt = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} net.minecraft.launchwrapper.Launch --tweakClass cpw.mods.fml.common.launcher.FMLTweaker --version FML_DEV {extraargs}
|
||||||
|
|
|
@ -923,7 +923,7 @@ def decompile_minecraft(fml_dir, mcp_dir, disable_at=False, disable_merge=False,
|
||||||
src_dir = os.path.join(mcp_dir, 'src')
|
src_dir = os.path.join(mcp_dir, 'src')
|
||||||
if os.path.isdir(src_dir):
|
if os.path.isdir(src_dir):
|
||||||
os.chdir(mcp_dir)
|
os.chdir(mcp_dir)
|
||||||
cleanup(None, False)
|
cleanup(None, False, False)
|
||||||
reset_logger()
|
reset_logger()
|
||||||
os.chdir(fml_dir)
|
os.chdir(fml_dir)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue