From 0feec3f35c64defaa3a63205044e8fb6edec42dc Mon Sep 17 00:00:00 2001 From: LinuxMint4Ever <> Date: Mon, 5 Aug 2019 01:24:16 +0200 Subject: [PATCH] Important fix: made the main function of earlyLauncher available for use as library. Removed some unnecessary files as well. --- .gitignore | 1 + earlyLauncher/config.txt | 4 +- earlyLauncher/earlylauncher.py | 6 +- earlyLauncher/logs/2019-08-05-1.log.gz | Bin 829 -> 0 bytes earlyLauncher/logs/2019-08-05-2.log.gz | Bin 829 -> 0 bytes earlyLauncher/logs/latest.log | 95 ------------------------- earlyLauncher/offline.txt | 2 +- 7 files changed, 8 insertions(+), 100 deletions(-) delete mode 100644 earlyLauncher/logs/2019-08-05-1.log.gz delete mode 100644 earlyLauncher/logs/2019-08-05-2.log.gz delete mode 100644 earlyLauncher/logs/latest.log diff --git a/.gitignore b/.gitignore index 96da138..e9bd22b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ run/* res/* lib/* earlylauncher/offline.txt +earlylauncher/logs/ diff --git a/earlyLauncher/config.txt b/earlyLauncher/config.txt index 068ca9e..85589c7 100644 --- a/earlyLauncher/config.txt +++ b/earlyLauncher/config.txt @@ -1,5 +1,5 @@ -ram=4 -#The multipiler for RAM amount (G, M, K or nothing) +ram=8 +#The multipiler for RAM amount (nothing, k, M or G) alignTo=G #Files assets=../res/ diff --git a/earlyLauncher/earlylauncher.py b/earlyLauncher/earlylauncher.py index 69fda56..1150cce 100644 --- a/earlyLauncher/earlylauncher.py +++ b/earlyLauncher/earlylauncher.py @@ -2,7 +2,7 @@ #why does the bang not work? import urllib2, json, os, sys -print "LinuxMint4Ever's EarlyLauncher version BETA 2.0_002" +print "LinuxMint4Ever's EarlyLauncher version BETA 2.1" #globally used variables config = [] @@ -107,6 +107,8 @@ def getToken(username, password): return access_token, profile_id, username +def run(java_executable, ram, alignTo, libs, username, gameDir, assets, uuid, accessToken): + return(os.system(java_executable+" -Xmx"+ram+alignTo+" -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M -Djava.library.path="+os.path.join(libs, "natives")+" -cp "+os.path.join(libs,"jar")+os.sep+(":"+os.path.join(libs,"jar")+os.sep).join(os.listdir(os.path.join(libs,"jar")))+" net.minecraft.launchwrapper.Launch --username "+username+" --version 1.7.10-Forge10.13.4.1614-1.7.10 --gameDir "+gameDir+" --assetsDir "+assets+" --assetIndex 1.7.10 --uuid "+str(uuid)+" --accessToken "+accessToken+" --userProperties {} --userType mojang --tweakClass cpw.mods.fml.common.launcher.FMLTweaker")) if main: loadConfig() @@ -127,5 +129,5 @@ if main: offlineDataFile.close() except: print "Error creating offline login data. Proceeding with launch anyways." - os.system(java_executable+" -Xmx"+ram+alignTo+" -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M -Djava.library.path="+os.path.join(libs, "natives")+" -cp "+os.path.join(libs,"jar")+os.sep+(":"+os.path.join(libs,"jar")+os.sep).join(os.listdir(os.path.join(libs,"jar")))+" net.minecraft.launchwrapper.Launch --username "+username+" --version 1.7.10-Forge10.13.4.1614-1.7.10 --gameDir "+gameDir+" --assetsDir "+assets+" --assetIndex 1.7.10 --uuid "+str(uuid)+" --accessToken "+accessToken+" --userProperties {} --userType mojang --tweakClass cpw.mods.fml.common.launcher.FMLTweaker") + sys.exit(run(java_executable, ram, alignTo, libs, username, gameDir, assets, uuid, accessToken)) diff --git a/earlyLauncher/logs/2019-08-05-1.log.gz b/earlyLauncher/logs/2019-08-05-1.log.gz deleted file mode 100644 index de607b9f44d5455b0c5b78ba1a7ec80bfc3b7e65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmV-D1H$|tiwFP!000000M(Y?Z__Xk$DiS^@Bf*HU-{T}>>oy8#P#BMK&iDQJn>$}FTsIB;)DJ(9i;_v@j8BeFKcr-$nUE?c zW&`XK;RUNIqF4!puQs&QqM}(@P_D~TD_XEx@dY3~o=(o24S4rHoD>k1%Q16EQi64NB1flIx}3rMDsOr-*jEHlKTG4)(hbT;lx z{hF;Akrg>zfqH%PhD1UCr8Hy)Xf?>Y>A{tjM~Bq?I2a5L2-Zq9XSAymsp`)uD@7Ef z0rf)a_QSBBg94QNfJjvtYX}I!3~}lTokGr?<+^m1R=7XxYpc5ypZaYEXNjOHd6 zYD*)!(*U&+WX%dGNM^+VZT~8BtK{1@p=1P>JCmFlxDgCK_eJRPm?y(XWO2ZwAmlFN zVG#LA9C$o&Ss2E@N3mOD~Lotl}c@V`>lEv9Dn={CG#&_!f4X5u@ zG~X@y+leolhPT^PPR|#pH*8+Ola5B5HU7*D0xQ$jt3su5kl0<R+ZEsQ#**nL32&!v*)#ZFe&`)^p2cps=$t?Wn53fmdAz!M<^ipn#k;Q}$Poe;(ap2Ya~%t~Y*z--5V- zxxL;24gCEQjhZoalc8Pd)PuczMg@kJS3|!WhnsG=(nR;8+>GMc2C>)zbR^$lS}tOA{}zXm2l-{|hjU&<&J<{fJ)y98++? H+718!YYLNB diff --git a/earlyLauncher/logs/2019-08-05-2.log.gz b/earlyLauncher/logs/2019-08-05-2.log.gz deleted file mode 100644 index b29a73bbb6a91d65d219236e5a79b35e53064bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmV-D1H$|tiwFP!000000M(Y?Z__Xk$DiS^@Bv^q(fA5B0=qhnH`-6nOw!!#k+ zzNGFFySg|n{P#G?*t(4Z8Y_&)IOqF*{LP&&=dPRhVG{H&$a%q}az@8TCl?7BYbK=1 zh*<->Bs^zjNfax9@a38oT9h;`a>{j4Xhm~YDLx0JN0aecy#es~`If{V$~x^5Wx??4 zbuknJ)fi+$wVsP$WlW*8d1+Bd28d= z)bH4e5m}OxC8&3Y?@8!)-$+BIfL4Qioa|p~d2~SC&%Iu6pJ1g_eMY-Fma6)autJ1> z;!`i6ZZ`_lZ=cv4(&k%n+w4(aGh^S*!|YVTHScuC}@haoKG$I17ZWqz^8L zky-#Z_6P?`Of?#tmc$!z4RG*M7 zmm3=Xy#}b1AS;$jK~gIQX!}>0J0;(=2_-|Y+^OWuz^!2D^S%gN9`Se(iZt?h=m*?o zJn+MQ9QhuPT^0nxQ@6R7TI{sMlq1EQjw@Qq$p_;Z#@1!P>!uy`P}$jO}};4RzX3M{1{jcZ!-rS!#T_H?GB; zTFg0_)ot+dkq`6C-hn^zl9dHD$W&WId+07DNwwMQJM>2=b{r5Fb;`M^P zr-NL(KVi$C1G`TM_?1-Byxz*{djAb;9PI+Ntd#wzX>L1%9y23XFw}OuW5tcemPF&I zSmsp0dQ=a7#lh{gp``8HC&ShGd1PZ_*xNPkA>@#;ddmI|@~@*CY=0-Wz|F?*@EZ`f zFgMp*pk9BsM8kSa-DYT3T6KRXpHYFK#r4o{$Kkpiu5{cyH4N zhIcUdTldVi8BS&M7dTQzZ_st_Mm4nke`M~};+2V4SG2d2%Kr_RTId!^&wj*j94>EG H+718!V$z{b diff --git a/earlyLauncher/logs/latest.log b/earlyLauncher/logs/latest.log deleted file mode 100644 index cbdfd47..0000000 --- a/earlyLauncher/logs/latest.log +++ /dev/null @@ -1,95 +0,0 @@ -[00:47:36] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[00:47:36] [main/INFO]: Using primary tweak class name cpw.mods.fml.common.launcher.FMLTweaker -[00:47:36] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLTweaker -[00:47:37] [main/INFO]: Forge Mod Loader version 7.99.40.1614 for Minecraft 1.7.10 loading -[00:47:37] [main/INFO]: Java is OpenJDK 64-Bit Server VM, version 1.8.0_222, running on Linux:amd64:4.15.0-55-generic, installed at /usr/lib/jvm/java-8-openjdk-amd64/jre -[00:47:37] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[00:47:37] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.FMLDeobfTweaker -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLInjectionAndSortingTweaker -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[00:47:37] [main/INFO]: Found valid fingerprint for Minecraft Forge. Certificate fingerprint e3c3d50c7c986df74c645c0ac54639741c90a557 -[00:47:37] [main/INFO]: Found valid fingerprint for Minecraft. Certificate fingerprint cd99959656f753dc28d863b46769f7f8fbaefcfc -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.relauncher.CoreModManager$FMLPluginWrapper -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.FMLDeobfTweaker -[00:47:37] [main/INFO]: Loading tweak class name cpw.mods.fml.common.launcher.TerminalTweaker -[00:47:37] [main/INFO]: Calling tweak class cpw.mods.fml.common.launcher.TerminalTweaker -[00:47:37] [main/INFO]: Launching wrapped minecraft {net.minecraft.client.main.Main} -[00:47:38] [main/INFO]: Setting user: LinuxMint4Ever -[00:47:38] [Client thread/INFO]: LWJGL Version: 2.9.1 -[00:47:39] [Client thread/ERROR]: Couldn't initialize twitch stream -[00:47:39] [Client thread/INFO]: Could not load splash.properties, will create a default one -[00:47:39] [Client thread/INFO]: [cpw.mods.fml.client.SplashProgress:start:188]: ---- Minecraft Crash Report ---- -// Sorry :( - -Time: 05.08.19 00:47 -Description: Loading screen debug info - -This is just a prompt for computer specs to be printed. THIS IS NOT A ERROR - - -A detailed walkthrough of the error, its code path and all known details is as follows: ---------------------------------------------------------------------------------------- - --- System Details -- -Details: - Minecraft Version: 1.7.10 - Operating System: Linux (amd64) version 4.15.0-55-generic - Java Version: 1.8.0_222, Private Build - Java VM Version: OpenJDK 64-Bit Server VM (mixed mode), Private Build - Memory: 409050352 bytes (390 MB) / 513015808 bytes (489 MB) up to 4281597952 bytes (4083 MB) - JVM Flags: 5 total; -Xmx4G -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:-UseAdaptiveSizePolicy -Xmn128M - AABB Pool Size: 0 (0 bytes; 0 MB) allocated, 0 (0 bytes; 0 MB) used - IntCache: cache: 0, tcache: 0, allocated: 0, tallocated: 0 - FML: - GL info: ' Vendor: 'NVIDIA Corporation' Version: '4.6.0 NVIDIA 390.116' Renderer: 'GeForce GTX 750 Ti/PCIe/SSE2' -[00:47:39] [Client thread/INFO]: Attempting early MinecraftForge initialization -[00:47:39] [Client thread/INFO]: MinecraftForge v10.13.4.1614 Initialized -[00:47:39] [Client thread/INFO]: Replaced 183 ore recipies -[00:47:39] [Client thread/INFO]: Completed early MinecraftForge initialization -[00:47:39] [Client thread/INFO]: Found 0 mods from the command line. Injecting into mod discoverer -[00:47:39] [Client thread/INFO]: Searching /home/administrator/Schreibtisch/Entwicklung/Launcher/CustomMinecraftLauncher/run/mods for mods -[00:47:42] [Client thread/INFO]: Forge Mod Loader has identified 3 mods to load -[00:47:42] [Client thread/INFO]: Attempting connection with missing mods [mcp, FML, Forge] at CLIENT -[00:47:42] [Client thread/INFO]: Attempting connection with missing mods [mcp, FML, Forge] at SERVER -[00:47:42] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge -[00:47:42] [Client thread/INFO]: Processing ObjectHolder annotations -[00:47:42] [Client thread/INFO]: Found 341 ObjectHolder annotations -[00:47:42] [Client thread/INFO]: Identifying ItemStackHolder annotations -[00:47:42] [Client thread/INFO]: Found 0 ItemStackHolder annotations -[00:47:42] [Client thread/INFO]: Configured a dormant chunk cache size of 0 -[00:47:42] [Client thread/INFO]: Applying holder lookups -[00:47:42] [Client thread/INFO]: Holder lookups applied -[00:47:42] [Client thread/INFO]: Injecting itemstacks -[00:47:42] [Client thread/INFO]: Itemstack injection complete -[00:47:42] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:42] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: Starting up SoundSystem... -[00:47:42] [Thread-7/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: Initializing LWJGL OpenAL -[00:47:42] [Thread-7/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org) -[00:47:42] [Thread-7/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: OpenAL initialized. -[00:47:42] [Client thread/INFO]: Created: 16x16 textures/blocks-atlas -[00:47:42] [Client thread/INFO]: Created: 16x16 textures/items-atlas -[00:47:42] [Client thread/INFO]: Injecting itemstacks -[00:47:42] [Client thread/INFO]: Itemstack injection complete -[00:47:42] [Client thread/INFO]: Forge Mod Loader has successfully loaded 3 mods -[00:47:42] [Client thread/INFO]: Reloading ResourceManager: Default, FMLFileResourcePack:Forge Mod Loader, FMLFileResourcePack:Minecraft Forge -[00:47:43] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:43] [Sound Library Loader/INFO]: Sound engine started -[00:47:43] [Client thread/INFO]: Created: 512x256 textures/blocks-atlas -[00:47:43] [Client thread/INFO]: Created: 256x256 textures/items-atlas -[00:47:43] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:43] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: SoundSystem shutting down... -[00:47:43] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:importantMessage:90]: Author: Paul Lamb, www.paulscode.com -[00:47:43] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:43] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:43] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: Starting up SoundSystem... -[00:47:43] [Thread-9/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: Initializing LWJGL OpenAL -[00:47:43] [Thread-9/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: (The LWJGL binding of OpenAL. For more information, see http://www.lwjgl.org) -[00:47:43] [Thread-9/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: OpenAL initialized. -[00:47:44] [Sound Library Loader/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:47:44] [Sound Library Loader/INFO]: Sound engine started -[00:48:02] [Client thread/INFO]: Stopping! -[00:48:02] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: -[00:48:02] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: SoundSystem shutting down... -[00:48:03] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:importantMessage:90]: Author: Paul Lamb, www.paulscode.com -[00:48:03] [Client thread/INFO]: [paulscode.sound.SoundSystemLogger:message:69]: diff --git a/earlyLauncher/offline.txt b/earlyLauncher/offline.txt index 7393ffc..9c51134 100644 --- a/earlyLauncher/offline.txt +++ b/earlyLauncher/offline.txt @@ -1,3 +1,3 @@ username=LinuxMint4Ever -access_token=f0c5a10e59df4f5eb53cc8069cec94f6 +access_token=e3b9a639c2bd420586b9d22ab4e7aadd profile_id=f8b426e586c04abf8e4dc5048f8719ac \ No newline at end of file