From 5090e87a428f6383159103f8b0af75d2f5182d92 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Fri, 8 May 2020 19:26:57 +0300 Subject: [PATCH] update windows version to 1.15.2 --- linux/mc_start.sh | 6 ++++++ windows/mc_start.bat | 16 ++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/linux/mc_start.sh b/linux/mc_start.sh index c700af3..e80124e 100755 --- a/linux/mc_start.sh +++ b/linux/mc_start.sh @@ -3,6 +3,11 @@ echo -ne "\033]2;Minecraft Launcher\007" # A minecraft root directory MC_DIR=~/.minecraft +# Are stored here... +# saves/, resourcepacks/ and screenshots/ dirs +# and options.txt and servers.dat files +GAME_DIR=%MC_DIR + # Assets location ASSETS_DIR=$MC_DIR/assets ASSETS_INDEX=1.15 @@ -33,6 +38,7 @@ net.minecraft.client.main.Main \ --username $PLAYER_NAME \ --version $GAME_VERSION \ --accessToken 0 --userProperties {} \ +--gameDir %GAME_DIR% \ --assetsDir $ASSETS_DIR \ --assetIndex $ASSETS_INDEX \ --width $WINDOW_W --height $WINDOW_H diff --git a/windows/mc_start.bat b/windows/mc_start.bat index decc58f..f89b327 100644 --- a/windows/mc_start.bat +++ b/windows/mc_start.bat @@ -1,8 +1,8 @@ -@echo off +rem @echo off title Minecraft Launcher :: set username -set /p player=What username would you like? +set /p player=What username would you like? :: main directory of the game set MC_DIR=%APPDATA%\.minecraft @@ -10,17 +10,17 @@ set MC_DIR=%APPDATA%\.minecraft :: Are stored here... :: saves/, resourcepacks/ and screenshots/ dirs :: and options.txt and servers.dat files -set GAME_DIR=%MC_DIR%\profile +set GAME_DIR=%MC_DIR% :: libraries and resource dir (requires no changes) set ASSETS_DIR=%MC_DIR%\assets -set ASSETS_INDEX=1.14 +set ASSETS_INDEX=1.15 :: version minecraft (from versions/ dir) -set VERSION=1.14.3 +set GAME_VERSION=1.15.2 :: get archive from natives/ dir -set NATIVES_DIR=%MC_DIR%\versions\%GAME_VERSION%\%GAME_VERSION%-natives +set NATIVES_DIR=%MC_DIR%\bin\%GAME_VERSION% :: player nickname (the over head) set PLAYER_NAME=%player% @@ -37,9 +37,9 @@ set "JVM_ARGS=-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent %SystemDrive% cd %MC_DIR% -javaw.exe %JVM_RAM% %JVM_ARGS% ^ +java.exe %JVM_RAM% %JVM_ARGS% ^ -Djava.library.path=%NATIVES_DIR% ^ --cp %MC_DIR%\libraries\com\mojang\datafixerupper\2.0.24\datafixerupper-2.0.24.jar;%MC_DIR%\libraries\com\mojang\authlib\1.5.25\authlib-1.5.25.jar;%MC_DIR%\libraries\com\mojang\patchy\1.1\patchy-1.1.jar;%MC_DIR%\libraries\com\mojang\text2speech\1.11.3\text2speech-1.11.3.jar;%MC_DIR%\libraries\com\mojang\text2speech\1.11.3\text2speech-1.11.3-natives-linux.jar;%MC_DIR%\libraries\com\mojang\javabridge\1.0.22\javabridge-1.0.22.jar;%MC_DIR%\libraries\com\mojang\brigadier\1.0.17\brigadier-1.0.17.jar;%MC_DIR%\libraries\com\google\code\gson\gson\2.8.0\gson-2.8.0.jar;%MC_DIR%\libraries\com\google\guava\guava\21.0\guava-21.0.jar;%MC_DIR%\libraries\com\ibm\icu\icu4j-core-mojang\51.2\icu4j-core-mojang-51.2.jar;%MC_DIR%\libraries\io\netty\netty-all\4.1.25.Final\netty-all-4.1.25.Final.jar;%MC_DIR%\libraries\org\apache\logging\log4j\log4j-core\2.8.1\log4j-core-2.8.1.jar;%MC_DIR%\libraries\org\apache\logging\log4j\log4j-api\2.8.1\log4j-api-2.8.1.jar;%MC_DIR%\libraries\org\apache\commons\commons-compress\1.8.1\commons-compress-1.8.1.jar;%MC_DIR%\libraries\org\apache\commons\commons-lang3\3.5\commons-lang3-3.5.jar;%MC_DIR%\libraries\org\apache\httpcomponents\httpclient\4.3.3\httpclient-4.3.3.jar;%MC_DIR%\libraries\org\apache\httpcomponents\httpcore\4.3.2\httpcore-4.3.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-tinyfd\3.2.2\lwjgl-tinyfd-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-tinyfd\3.2.2\lwjgl-tinyfd-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-opengl\3.2.2\lwjgl-opengl-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-opengl\3.2.2\lwjgl-opengl-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-openal\3.2.2\lwjgl-openal-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-openal\3.2.2\lwjgl-openal-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl\3.2.2\lwjgl-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl\3.2.2\lwjgl-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-stb\3.2.2\lwjgl-stb-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-stb\3.2.2\lwjgl-stb-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-glfw\3.2.2\lwjgl-glfw-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-glfw\3.2.2\lwjgl-glfw-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-jemalloc\3.2.2\lwjgl-jemalloc-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-jemalloc\3.2.2\lwjgl-jemalloc-3.2.2.jar;%MC_DIR%\libraries\it\unimi\dsi\fastutil\8.2.1\fastutil-8.2.1.jar;%MC_DIR%\libraries\oshi-project\oshi-core\1.1\oshi-core-1.1.jar;%MC_DIR%\libraries\commons-codec\commons-codec\1.10\commons-codec-1.10.jar;%MC_DIR%\libraries\commons-logging\commons-logging\1.1.3\commons-logging-1.1.3.jar;%MC_DIR%\libraries\net\java\dev\jna\platform\3.4.0\platform-3.4.0.jar;%MC_DIR%\libraries\net\java\dev\jna\jna\4.4.0\jna-4.4.0.jar;%MC_DIR%\libraries\net\java\jutils\jutils\1.0.0\jutils-1.0.0.jar;%MC_DIR%\libraries\net\java\jinput\jinput\2.0.5\jinput-2.0.5.jar;%MC_DIR%\libraries\net\sf\jopt-simple\jopt-simple\5.0.3\jopt-simple-5.0.3.jar;%MC_DIR%\libraries\commons-io\commons-io\2.5\commons-io-2.5.jar;%MC_DIR%\versions\$GAME_VERSION\$GAME_VERSION.jar ^ +-cp %MC_DIR%\libraries\com\mojang\datafixerupper\2.0.24\datafixerupper-2.0.24.jar;%MC_DIR%\libraries\com\mojang\authlib\1.5.25\authlib-1.5.25.jar;%MC_DIR%\libraries\com\mojang\patchy\1.1\patchy-1.1.jar;%MC_DIR%\libraries\com\mojang\text2speech\1.11.3\text2speech-1.11.3.jar;%MC_DIR%\libraries\com\mojang\text2speech\1.11.3\text2speech-1.11.3-natives-linux.jar;%MC_DIR%\libraries\com\mojang\javabridge\1.0.22\javabridge-1.0.22.jar;%MC_DIR%\libraries\com\mojang\brigadier\1.0.17\brigadier-1.0.17.jar;%MC_DIR%\libraries\com\google\code\gson\gson\2.8.0\gson-2.8.0.jar;%MC_DIR%\libraries\com\google\guava\guava\21.0\guava-21.0.jar;%MC_DIR%\libraries\com\ibm\icu\icu4j-core-mojang\51.2\icu4j-core-mojang-51.2.jar;%MC_DIR%\libraries\io\netty\netty-all\4.1.25.Final\netty-all-4.1.25.Final.jar;%MC_DIR%\libraries\org\apache\logging\log4j\log4j-core\2.8.1\log4j-core-2.8.1.jar;%MC_DIR%\libraries\org\apache\logging\log4j\log4j-api\2.8.1\log4j-api-2.8.1.jar;%MC_DIR%\libraries\org\apache\commons\commons-compress\1.8.1\commons-compress-1.8.1.jar;%MC_DIR%\libraries\org\apache\commons\commons-lang3\3.5\commons-lang3-3.5.jar;%MC_DIR%\libraries\org\apache\httpcomponents\httpclient\4.3.3\httpclient-4.3.3.jar;%MC_DIR%\libraries\org\apache\httpcomponents\httpcore\4.3.2\httpcore-4.3.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-tinyfd\3.2.2\lwjgl-tinyfd-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-tinyfd\3.2.2\lwjgl-tinyfd-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-opengl\3.2.2\lwjgl-opengl-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-opengl\3.2.2\lwjgl-opengl-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-openal\3.2.2\lwjgl-openal-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-openal\3.2.2\lwjgl-openal-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl\3.2.2\lwjgl-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl\3.2.2\lwjgl-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-stb\3.2.2\lwjgl-stb-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-stb\3.2.2\lwjgl-stb-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-glfw\3.2.2\lwjgl-glfw-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-glfw\3.2.2\lwjgl-glfw-3.2.2.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-jemalloc\3.2.2\lwjgl-jemalloc-3.2.2-natives-linux.jar;%MC_DIR%\libraries\org\lwjgl\lwjgl-jemalloc\3.2.2\lwjgl-jemalloc-3.2.2.jar;%MC_DIR%\libraries\it\unimi\dsi\fastutil\8.2.1\fastutil-8.2.1.jar;%MC_DIR%\libraries\oshi-project\oshi-core\1.1\oshi-core-1.1.jar;%MC_DIR%\libraries\commons-codec\commons-codec\1.10\commons-codec-1.10.jar;%MC_DIR%\libraries\commons-logging\commons-logging\1.1.3\commons-logging-1.1.3.jar;%MC_DIR%\libraries\net\java\dev\jna\platform\3.4.0\platform-3.4.0.jar;%MC_DIR%\libraries\net\java\dev\jna\jna\4.4.0\jna-4.4.0.jar;%MC_DIR%\libraries\net\java\jutils\jutils\1.0.0\jutils-1.0.0.jar;%MC_DIR%\libraries\net\java\jinput\jinput\2.0.5\jinput-2.0.5.jar;%MC_DIR%\libraries\net\sf\jopt-simple\jopt-simple\5.0.3\jopt-simple-5.0.3.jar;%MC_DIR%\libraries\commons-io\commons-io\2.5\commons-io-2.5.jar;%MC_DIR%\versions\%GAME_VERSION%\%GAME_VERSION%.jar ^ net.minecraft.client.main.Main ^ --username %PLAYER_NAME% ^ --version %GAME_VERSION% ^