From 6b11a23027a4fc4783e30156a861ea7468510d6b Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Sun, 3 Dec 2023 11:01:41 +0300 Subject: [PATCH] Update linux clent to 1.20.2 Store one version in repo (move old files) --- HISTORY.md | 3 + NATIVES.md | 3 +- README.md | 2 +- vanilla/1.20.1/1.20.1-vanilla-linux.sh | 109 --------------- vanilla/{1.20.1 => }/README.md | 0 vanilla/linux.sh | 125 ++++++++++++++++++ .../1.20.1-vanilla-macos.sh => macos.sh} | 0 ...1.20.1-vanilla-windows.bat => windows.bat} | 0 8 files changed, 131 insertions(+), 111 deletions(-) delete mode 100755 vanilla/1.20.1/1.20.1-vanilla-linux.sh rename vanilla/{1.20.1 => }/README.md (100%) create mode 100755 vanilla/linux.sh rename vanilla/{1.20.1/1.20.1-vanilla-macos.sh => macos.sh} (100%) rename vanilla/{1.20.1/1.20.1-vanilla-windows.bat => windows.bat} (100%) diff --git a/HISTORY.md b/HISTORY.md index ae4a980..f7d4766 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -6,6 +6,9 @@ - ℹ️ - Information - ♻️ - Edited +## 03/12/2023 - (1.20.2 Update) **beta** +- ℹ️ - Linux client updated to 1.20.2 version + ## 13/07/2023 - (1.20.1 Update) **beta** - ℹ️ - Client updated to 1.20.1 version diff --git a/NATIVES.md b/NATIVES.md index 2fb72ba..54c60ba 100644 --- a/NATIVES.md +++ b/NATIVES.md @@ -1,4 +1,5 @@ ## Minecraft Natives The natives catalog is located on [Mega.nz](https://mega.nz/#F!hUNg0Y6I!93cYw1NZg4MUWUHaVrCO7w). -Not need **after the 1.19** version. +**UPD 1:** 1.20.2 need natives. +**UPD:** Not need **after the 1.19** version. diff --git a/README.md b/README.md index 203ebdc..9fd983c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ # 🏁 Releases 🏁 -* ⬇️ [Latest release `1.20.1`](https://git.a2s.su/iiiypuk/minecraft-launcher/releases/latest) +* ⬇️ [Latest release `1.20.2`](https://git.a2s.su/iiiypuk/minecraft-launcher/releases/latest) **Vanilla:** diff --git a/vanilla/1.20.1/1.20.1-vanilla-linux.sh b/vanilla/1.20.1/1.20.1-vanilla-linux.sh deleted file mode 100755 index 2a41c09..0000000 --- a/vanilla/1.20.1/1.20.1-vanilla-linux.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -echo -ne "\033]2;Minecraft Launcher\007" - -# Launcher title -echo "Minecraft Launcher by iiiypuk" -echo "=============================" - -# Set username -read -p "What username would you like? " player -if [ ! $player ]; then - player="Steve" -fi - -# A minecraft root directory -MC_DIR=$HOME/.minecraft - -# Are stored here... -# saves/, resourcepacks/ and screenshots/ dirs -# and options.txt and servers.dat files -GAME_DIR=$MC_DIR - -# Libraries and resource dir (requires no changes) -ASSETS_DIR=$MC_DIR/assets -ASSETS_INDEX=5 - -# Version minecraft (from versions/ dir) -GAME_VERSION=1.20.1 - -# *.jar paths from version.json -LIBRARIES_LIST="\ -$MC_DIR/libraries/com/github/oshi/oshi-core/6.2.2/oshi-core-6.2.2.jar:\ -$MC_DIR/libraries/com/google/code/gson/gson/2.10/gson-2.10.jar:\ -$MC_DIR/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar:\ -$MC_DIR/libraries/com/google/guava/guava/31.1-jre/guava-31.1-jre.jar:\ -$MC_DIR/libraries/com/ibm/icu/icu4j/71.1/icu4j-71.1.jar:\ -$MC_DIR/libraries/com/mojang/authlib/4.0.43/authlib-4.0.43.jar:\ -$MC_DIR/libraries/com/mojang/blocklist/1.0.10/blocklist-1.0.10.jar:\ -$MC_DIR/libraries/com/mojang/brigadier/1.1.8/brigadier-1.1.8.jar:\ -$MC_DIR/libraries/com/mojang/datafixerupper/6.0.8/datafixerupper-6.0.8.jar:\ -$MC_DIR/libraries/com/mojang/logging/1.1.1/logging-1.1.1.jar:\ -$MC_DIR/libraries/com/mojang/patchy/2.2.10/patchy-2.2.10.jar:\ -$MC_DIR/libraries/com/mojang/text2speech/1.17.9/text2speech-1.17.9.jar:\ -$MC_DIR/libraries/commons-codec/commons-codec/1.15/commons-codec-1.15.jar:\ -$MC_DIR/libraries/commons-io/commons-io/2.11.0/commons-io-2.11.0.jar:\ -$MC_DIR/libraries/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:\ -$MC_DIR/libraries/io/netty/netty-buffer/4.1.82.Final/netty-buffer-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-codec/4.1.82.Final/netty-codec-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-common/4.1.82.Final/netty-common-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-handler/4.1.82.Final/netty-handler-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-resolver/4.1.82.Final/netty-resolver-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-transport-classes-epoll/4.1.82.Final/netty-transport-classes-epoll-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-transport-native-epoll/4.1.82.Final/netty-transport-native-epoll-4.1.82.Final-linux-aarch_64.jar:\ -$MC_DIR/libraries/io/netty/netty-transport-native-epoll/4.1.82.Final/netty-transport-native-epoll-4.1.82.Final-linux-x86_64.jar:\ -$MC_DIR/libraries/io/netty/netty-transport-native-unix-common/4.1.82.Final/netty-transport-native-unix-common-4.1.82.Final.jar:\ -$MC_DIR/libraries/io/netty/netty-transport/4.1.82.Final/netty-transport-4.1.82.Final.jar:\ -$MC_DIR/libraries/it/unimi/dsi/fastutil/8.5.9/fastutil-8.5.9.jar:\ -$MC_DIR/libraries/net/java/dev/jna/jna-platform/5.12.1/jna-platform-5.12.1.jar:\ -$MC_DIR/libraries/net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar:\ -$MC_DIR/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:\ -$MC_DIR/libraries/org/apache/commons/commons-compress/1.21/commons-compress-1.21.jar:\ -$MC_DIR/libraries/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar:\ -$MC_DIR/libraries/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar:\ -$MC_DIR/libraries/org/apache/httpcomponents/httpcore/4.4.15/httpcore-4.4.15.jar:\ -$MC_DIR/libraries/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar:\ -$MC_DIR/libraries/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.jar:\ -$MC_DIR/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.19.0/log4j-slf4j2-impl-2.19.0.jar:\ -$MC_DIR/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.1/lwjgl-glfw-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.1/lwjgl-jemalloc-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.1/lwjgl-openal-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.1/lwjgl-opengl-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.1/lwjgl-stb-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.1/lwjgl-tinyfd-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1.jar:\ -$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.1/lwjgl-3.3.1-natives-linux.jar:\ -$MC_DIR/libraries/org/slf4j/slf4j-api/2.0.1/slf4j-api-2.0.1.jar:\ -$MC_DIR/versions/$GAME_VERSION/$GAME_VERSION.jar" - -# Player nickname (the over head) -PLAYER_NAME=$player - -# Game window resolution -WINDOW_W=800 -WINDOW_H=640 - -# Java machine arguments -JVM_RAM="-Xmx2G" -JVM_ARGS="-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M" - -# Running minecraft -cd $MC_DIR - -$MC_DIR/runtime/java-runtime-gamma/linux/java-runtime-gamma/bin/java \ -$JVM_RAM $JVM_ARGS \ --cp $LIBRARIES_LIST \ -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/vanilla/1.20.1/README.md b/vanilla/README.md similarity index 100% rename from vanilla/1.20.1/README.md rename to vanilla/README.md diff --git a/vanilla/linux.sh b/vanilla/linux.sh new file mode 100755 index 0000000..b6e3406 --- /dev/null +++ b/vanilla/linux.sh @@ -0,0 +1,125 @@ +#!/bin/sh +echo -ne "\033]2;Minecraft Launcher\007" + +# Launcher title +echo "Minecraft Launcher by iiiypuk" +echo "=============================" + +# Set username +read -p "What username would you like? " player +if [ ! $player ]; then + player="Steve" +fi + +# A minecraft root directory +MC_DIR=$HOME/.minecraft + +# Get archive from natives/ dir +NATIVES_DIR=$MC_DIR/bin/1.20.2 + +# Are stored here... +# saves/, resourcepacks/ and screenshots/ dirs +# and options.txt and servers.dat files +GAME_DIR=$MC_DIR + +# Libraries and resource dir (requires no changes) +ASSETS_DIR=$MC_DIR/assets +ASSETS_INDEX=5 + +# Version minecraft (from versions/ dir) +GAME_VERSION=1.20.2 + +# *.jar paths from version.json +LIBRARIES_LIST="\ +$MC_DIR/libraries/com/github/oshi/oshi-core/6.4.5/oshi-core-6.4.5.jar:\ +$MC_DIR/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar:\ +$MC_DIR/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar:\ +$MC_DIR/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar:\ +$MC_DIR/libraries/com/ibm/icu/icu4j/73.2/icu4j-73.2.jar:\ +$MC_DIR/libraries/com/mojang/authlib/5.0.47/authlib-5.0.47.jar:\ +$MC_DIR/libraries/com/mojang/blocklist/1.0.10/blocklist-1.0.10.jar:\ +$MC_DIR/libraries/com/mojang/brigadier/1.1.8/brigadier-1.1.8.jar:\ +$MC_DIR/libraries/com/mojang/datafixerupper/6.0.8/datafixerupper-6.0.8.jar:\ +$MC_DIR/libraries/com/mojang/logging/1.1.1/logging-1.1.1.jar:\ +$MC_DIR/libraries/com/mojang/patchy/2.2.10/patchy-2.2.10.jar:\ +$MC_DIR/libraries/com/mojang/text2speech/1.17.9/text2speech-1.17.9.jar:\ +$MC_DIR/libraries/commons-codec/commons-codec/1.16.0/commons-codec-1.16.0.jar:\ +$MC_DIR/libraries/commons-io/commons-io/2.13.0/commons-io-2.13.0.jar:\ +$MC_DIR/libraries/commons-logging/commons-logging/1.2/commons-logging-1.2.jar:\ +$MC_DIR/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-handler/4.1.97.Final/netty-handler-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-resolver/4.1.97.Final/netty-resolver-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-transport-classes-epoll/4.1.97.Final/netty-transport-classes-epoll-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar:\ +$MC_DIR/libraries/io/netty/netty-transport/4.1.97.Final/netty-transport-4.1.97.Final.jar:\ +$MC_DIR/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar:\ +$MC_DIR/libraries/net/java/dev/jna/jna-platform/5.13.0/jna-platform-5.13.0.jar:\ +$MC_DIR/libraries/net/java/dev/jna/jna/5.13.0/jna-5.13.0.jar:\ +$MC_DIR/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar:\ +$MC_DIR/libraries/org/apache/commons/commons-compress/1.22/commons-compress-1.22.jar:\ +$MC_DIR/libraries/org/apache/commons/commons-lang3/3.13.0/commons-lang3-3.13.0.jar:\ +$MC_DIR/libraries/org/apache/httpcomponents/httpclient/4.5.13/httpclient-4.5.13.jar:\ +$MC_DIR/libraries/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar:\ +$MC_DIR/libraries/org/apache/logging/log4j/log4j-api/2.19.0/log4j-api-2.19.0.jar:\ +$MC_DIR/libraries/org/apache/logging/log4j/log4j-core/2.19.0/log4j-core-2.19.0.jar:\ +$MC_DIR/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.19.0/log4j-slf4j2-impl-2.19.0.jar:\ +$MC_DIR/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.2/lwjgl-glfw-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.2/lwjgl-glfw-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.2/lwjgl-glfw-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-glfw/3.3.2/lwjgl-glfw-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.2/lwjgl-jemalloc-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.2/lwjgl-jemalloc-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.2/lwjgl-jemalloc-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-jemalloc/3.3.2/lwjgl-jemalloc-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.2/lwjgl-openal-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.2/lwjgl-openal-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.2/lwjgl-openal-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-openal/3.3.2/lwjgl-openal-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.2/lwjgl-opengl-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.2/lwjgl-opengl-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.2/lwjgl-opengl-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-opengl/3.3.2/lwjgl-opengl-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.2/lwjgl-stb-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.2/lwjgl-stb-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.2/lwjgl-stb-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-stb/3.3.2/lwjgl-stb-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.2/lwjgl-tinyfd-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.2/lwjgl-tinyfd-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.2/lwjgl-tinyfd-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl-tinyfd/3.3.2/lwjgl-tinyfd-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.2/lwjgl-3.3.2.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.2/lwjgl-3.3.2-natives-windows.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.2/lwjgl-3.3.2-natives-windows-arm64.jar:\ +$MC_DIR/libraries/org/lwjgl/lwjgl/3.3.2/lwjgl-3.3.2-natives-windows-x86.jar:\ +$MC_DIR/libraries/org/slf4j/slf4j-api/2.0.7/slf4j-api-2.0.7.jar:\ +$MC_DIR/versions/$GAME_VERSION/$GAME_VERSION.jar" + +# Player nickname (the over head) +PLAYER_NAME=$player + +# Game window resolution +WINDOW_W=800 +WINDOW_H=640 + +# Java machine arguments +JVM_RAM="-Xmx2G" +JVM_ARGS="-XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1NewSizePercent=20 -XX:G1ReservePercent=20 -XX:MaxGCPauseMillis=50 -XX:G1HeapRegionSize=32M" + +# Running minecraft +cd $MC_DIR + +$MC_DIR/runtime/java-runtime-gamma/linux/java-runtime-gamma/bin/java \ +$JVM_RAM $JVM_ARGS \ +-cp $LIBRARIES_LIST \ +-Djava.library.path=$NATIVES_DIR \ +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/vanilla/1.20.1/1.20.1-vanilla-macos.sh b/vanilla/macos.sh similarity index 100% rename from vanilla/1.20.1/1.20.1-vanilla-macos.sh rename to vanilla/macos.sh diff --git a/vanilla/1.20.1/1.20.1-vanilla-windows.bat b/vanilla/windows.bat similarity index 100% rename from vanilla/1.20.1/1.20.1-vanilla-windows.bat rename to vanilla/windows.bat