diff --git a/Einstellungen.bat b/Einstellungen.bat index 69551ad..1cad3cc 100755 --- a/Einstellungen.bat +++ b/Einstellungen.bat @@ -6,14 +6,14 @@ if not exist PCs\mc-config.bat goto Minecraft-Portable call PCs\mc-config.bat REM Version Prüfen -set aktuelleversion=6.0 +set aktuelleversion=7.2 if not %Version%==%aktuelleversion% goto Minecraft-Portable -goto start +goto startprogram :Minecraft-Portable call Minecraft-Portable.bat -goto start +goto startprogram :launcher cls @@ -21,28 +21,26 @@ echo [0] Zuruch ins menu echo. echo [1] Minecraft Launcher echo [2] Technic Launcher -echo [3] Cracket Launcher echo. set /p launcher=Bitte Zahl eingeben: -if %launcher%==0 goto start +if %launcher%==0 goto startprogram if %launcher%==1 goto minecraft if %launcher%==2 goto technic -if %launcher%==3 goto cracket -goto start +goto startprogram :technic del PCs\%computername%.bat echo set jar=TechnicLauncher>>PCs\%computername%.bat echo set Java=%Java%>>PCs\%computername%.bat echo set ram=%ram%>>PCs\%computername%.bat -goto start +goto startprogram -:cracket +:minecraft del PCs\%computername%.bat -echo set jar=Cracket_Launcher>>PCs\%computername%.bat +echo set jar=Minecraft>>PCs\%computername%.bat echo set Java=%Java%>>PCs\%computername%.bat echo set ram=%ram%>>PCs\%computername%.bat -goto start +goto startprogram :menu32 echo [1] = RAM einstellen @@ -56,7 +54,7 @@ if %ei%==3 goto launcher echo Falsche Eingabe, der Befehl: %ei% gibt es nicht. echo Bitte nochmal Versuchen ping localhost -n 10>nul -goto start +goto startprogram :Java CLS @@ -68,13 +66,13 @@ echo [1] 32Bit echo [2] 64Bit echo. set /p java=Bitte Zahl eingeben: -if %java%==0 goto start +if %java%==0 goto startprogram if %java%==1 goto Java32Bit if %java%==2 goto Java64Bit echo Falsche Eingabe, der Befehl: %java% gibt es nicht. echo Bitte nochmal Versuchen ping localhost -n 10>nul -goto start +goto startprogram :RAM CLS @@ -89,7 +87,7 @@ echo M = MB echo G = GB echo. set /p ram=Bitte Groesse eingeben: -if %ram%==0 goto start +if %ram%==0 goto startprogram FOR /F "tokens=2 delims='='" %%A in ('wmic memorychip Get capacity /value') Do (Set "pram=%%A") FOR /F "tokens=1 delims='|'" %%A in ("%pram%") Do (Set "pram=%%A") set /a kb=%pram:~0,-3% @@ -102,25 +100,21 @@ del PCs\%computername%.bat echo set jar=%jar%>>PCs\%computername%.bat echo set Java=%Java%>>PCs\%computername%.bat echo set ram=%ram%>>PCs\%computername%.bat -goto start - -:Update -start https://www.dropbox.com/sh/lhl2rlzj1fdkli2/AABHIf2r28jWq8gpQIHUEcJqa?dl=0 -goto start +goto startprogram :Java32Bit del PCs\%computername%.bat echo set jar=%jar%>>PCs\%computername%.bat echo set Java=32>>PCs\%computername%.bat echo set ram=%ram%>>PCs\%computername%.bat -goto start +goto startprogram :Java64Bit del PCs\%computername%.bat echo set jar=%jar%>>PCs\%computername%.bat echo set Java=64>>PCs\%computername%.bat echo set ram=%ram%>>PCs\%computername%.bat -goto start +goto startprogram :ram-error cls @@ -129,40 +123,26 @@ echo Du hast so viel RAM Eingegeben: %ram%B pause goto RAM -:minecraft -del PCs\%computername%.bat -echo set jar=Minecraft>>PCs\%computername%.bat -echo set Java=%Java%>>PCs\%computername%.bat -echo set ram=%ram%>>PCs\%computername%.bat -goto start - -:start -if not exist PCs\%computername%.bat goto Minecraft-Portable +:startprogram CLS call PCs\%computername%.bat title %starter% Einstellungen [Version: %Version%] [RAM: %ram%B] [Java: %java% Bit] [PC: %computername%] [Launcher: %jar%] if /i %processor_architecture%==x86 goto menu32_beta -echo [1] = Java Einstellen -echo [2] = RAM einstellen -echo [3] = Update Suchen -echo [4] = Launcher +echo [1] = Launcher +echo [2] = Java Einstellen +echo [3] = RAM einstellen +echo [4] = Update Suchen echo. set /p ei=Bitte zahl eingeben: -if %ei%==1 goto Java -if %ei%==2 goto RAM -if %ei%==3 goto Update -if %ei%==4 goto launcher -if %ei%==5 goto clear +if %ei%==1 goto launcher +if %ei%==2 goto Java +if %ei%==3 goto RAM +if %ei%==4 goto Update echo Falsche Eingabe, der Befehl: %ei% gibt es nicht. echo Bitte nochmal Versuchen ping localhost -n 10>nul -goto start +goto startprogram :Update -start https://www.dropbox.com/sh/lhl2rlzj1fdkli2/AABHIf2r28jWq8gpQIHUEcJqa?dl=0 -goto start - -:clear -rmdir /s /q .minecraft -rmdir /s /q PCs -exit \ No newline at end of file +start https://github.com/daniel156161/Minecraft-Portable +goto startprogram diff --git a/Launcher/Minecraft.jar b/Launcher/Minecraft.jar deleted file mode 100755 index 1f331a9..0000000 Binary files a/Launcher/Minecraft.jar and /dev/null differ diff --git a/Launcher/TechnicLauncher.jar b/Launcher/TechnicLauncher.jar deleted file mode 100755 index c8e35de..0000000 Binary files a/Launcher/TechnicLauncher.jar and /dev/null differ diff --git a/Minecraft-Portable.bat b/Minecraft-Portable.bat index 3c0bab5..58fdb11 100755 --- a/Minecraft-Portable.bat +++ b/Minecraft-Portable.bat @@ -2,29 +2,44 @@ color a REM Ladet Config oder erstellt Config (aktuelle Versions Variable) -set aktuelleversion=6.0 +set aktuelleversion=7.2 :start if not exist PCs\mc-config.bat goto Config-erstellen -call PCs\mc-config.bat +call PCs\mc-config.bat title %starter% -if not exist Java\mc-logic.bat goto logic-error +if not exist bin\mc-logic.bat goto logic-error REM Version Pr�fen if not %Version%==%aktuelleversion% goto Config-loeschen -REM �berbr�fen -call Java\mc-logic.bat load -call Java\mc-logic.bat ram-check - -REM Sucht den Pfad zum .minecraft-Verzeichnis -SET AppData=%CD% - -REM �berpr�ft ob sich JavaPortable unter \Java installiert ist und nutzt dann dieses -if exist %CD%\Java\%Java%\bin\javaw.exe SET PATH=%CD%\Java\%Java%\bin - +REM �berbr�fen +call bin\mc-logic.bat load +call bin\mc-logic.bat ram-check + +REM Sucht den Pfad zum .minecraft-Verzeichnis +SET AppData=%CD%\data + +REM �berpr�ft ob sich JavaPortable unter \Java installiert ist und nutzt dann dieses +if %Java%==64 goto 64 +if %Java%==32 goto 32 + +:64 +if exist %CD%\bin\Java64\bin\javaw.exe SET PATH=%CD%\bin\Java64\bin +goto startminecraft + +:32 +if exist %CD%\bin\Java\bin\javaw.exe SET PATH=%CD%\bin\Java\bin +goto startminecraft + +:startminecraft REM Startet Minecraft -start javaw.exe -Xms128M -Xmx%ram% -jar Launcher\%jar%.jar +if %jar%==Minecraft goto Minecraft +start javaw.exe -Xms128M -Xmx%ram% -jar bin\%jar%.jar +exit + +:Minecraft +start "" "%CD%\bin\MinecraftLauncher.exe" --workDir "%CD%\data\.minecraft" --lockDir %CD%\data\.minecraft exit REM Configs @@ -50,4 +65,4 @@ goto start echo Logic datei konnte nicht gefunden werden echo. echo Error -goto logic-error \ No newline at end of file +goto logic-error diff --git a/README.md b/README.md index 2e091ae..bdb5b65 100644 --- a/README.md +++ b/README.md @@ -1 +1,8 @@ -# Minecraft-Portable \ No newline at end of file +# Minecraft-Portable +Minecraft by https://www.minecraft.net/ +TechnicLauncher by https://www.technicpack.net/ + +32 Bit Java: Download Java Portable form https://portableapps.com/apps/utilities/java_portable and then start the .paf.exe file, put the files into bin/ after export +64 Bit Java: Download Java Portable form https://portableapps.com/apps/utilities/java_portable_64 and then start the .paf.exe file, put the files into bin/ after export + +after that all is done and you can run the Minecraft-Portable.bat file diff --git a/bin/MinecraftLauncher.exe b/bin/MinecraftLauncher.exe new file mode 100755 index 0000000..55d88ba Binary files /dev/null and b/bin/MinecraftLauncher.exe differ diff --git a/bin/TechnicLauncher.jar b/bin/TechnicLauncher.jar new file mode 100644 index 0000000..d20c908 Binary files /dev/null and b/bin/TechnicLauncher.jar differ diff --git a/Java/mc-logic.bat b/bin/mc-logic.bat similarity index 100% rename from Java/mc-logic.bat rename to bin/mc-logic.bat diff --git a/bin/readme.txt b/bin/readme.txt new file mode 100644 index 0000000..f4866f0 --- /dev/null +++ b/bin/readme.txt @@ -0,0 +1,7 @@ +export/install jPortable64_Version_online.paf.exe here +jPortable64_Version_online.paf.exe may look like jPortable64_8_Update_241_online.paf.exe + +export/install jPortable_Version_online.paf.exe here +jPortable_Version_online.paf.exe may look like jPortable_8_Update_241_online.paf.exe + +then you will have two folders named Java and Java64 into here and this files diff --git a/data/readme.txt b/data/readme.txt new file mode 100644 index 0000000..2bf1d7e --- /dev/null +++ b/data/readme.txt @@ -0,0 +1,3 @@ +the minecraft data will be here + +if you already have Minecraft stuff installed, move those from the following directory to the new .minecraft folder